From 030db6e26761b1def525ee3692e4de4fa6715452 Mon Sep 17 00:00:00 2001 From: snipe Date: Fri, 29 Nov 2013 04:10:25 -0500 Subject: [PATCH] Upgrading to bootstrap 3 Ugh. --- app/storage/logs/.gitignore | 2 - app/storage/views/.gitignore | 2 - app/views/backend/categories/edit.blade.php | 4 +- app/views/backend/categories/index.blade.php | 8 +- .../backend/depreciations/edit.blade.php | 10 +- .../backend/depreciations/index.blade.php | 10 +- app/views/backend/groups/create.blade.php | 10 +- app/views/backend/groups/edit.blade.php | 10 +- app/views/backend/groups/index.blade.php | 10 +- app/views/backend/hardware/checkin.blade.php | 14 +- app/views/backend/hardware/checkout.blade.php | 16 +- app/views/backend/hardware/clone.blade.php | 38 +- app/views/backend/hardware/edit.blade.php | 210 +- app/views/backend/hardware/index.blade.php | 28 +- app/views/backend/hardware/view.blade.php | 75 +- app/views/backend/layouts/default.blade.php | 110 +- app/views/backend/licenses/checkin.blade.php | 18 +- app/views/backend/licenses/checkout.blade.php | 20 +- app/views/backend/licenses/edit.blade.php | 38 +- app/views/backend/licenses/index.blade.php | 8 +- app/views/backend/licenses/view.blade.php | 60 +- app/views/backend/locations/edit.blade.php | 39 +- app/views/backend/locations/index.blade.php | 8 +- .../backend/manufacturers/edit.blade.php | 12 +- .../backend/manufacturers/index.blade.php | 4 +- app/views/backend/models/edit.blade.php | 20 +- app/views/backend/models/index.blade.php | 12 +- app/views/backend/models/view.blade.php | 12 +- app/views/backend/reports/index.blade.php | 22 +- app/views/backend/settings/edit.blade.php | 14 +- app/views/backend/settings/index.blade.php | 8 +- app/views/backend/statuslabels/edit.blade.php | 10 +- .../backend/statuslabels/index.blade.php | 8 +- app/views/backend/users/create.blade.php | 28 +- app/views/backend/users/edit.blade.php | 28 +- app/views/backend/users/index.blade.php | 12 +- app/views/backend/users/view.blade.php | 30 +- .../frontend/account/change-email.blade.php | 8 +- .../account/change-password.blade.php | 24 +- app/views/frontend/account/profile.blade.php | 22 +- .../auth/forgot-password-confirm.blade.php | 6 +- .../frontend/auth/forgot-password.blade.php | 4 +- app/views/frontend/auth/signin.blade.php | 8 +- app/views/frontend/auth/signup.blade.php | 14 +- app/views/frontend/layouts/account.blade.php | 4 +- app/views/frontend/notifications.blade.php | 20 +- .../css/bootstrap/bootstrap-overrides.css | 169 +- public/assets/css/bootstrap/bootstrap.css | 10592 ++++++++-------- public/assets/css/bootstrap/bootstrap.min.css | 842 +- public/assets/css/compiled/calendar.css | 6 +- public/assets/css/compiled/elements.css | 13 +- public/assets/css/compiled/form-showcase.css | 8 +- public/assets/css/compiled/form-wizard.css | 10 +- public/assets/css/compiled/gallery.css | 118 +- public/assets/css/compiled/grids.css | 3 +- public/assets/css/compiled/index.css | 31 +- public/assets/css/compiled/layout.css | 121 +- public/assets/css/compiled/new-user.css | 12 +- public/assets/css/compiled/personal-info.css | 29 +- public/assets/css/compiled/signin.css | 3 + public/assets/css/compiled/signup.css | 4 +- public/assets/css/compiled/skins/dark.css | 61 - public/assets/css/compiled/tables.css | 8 +- public/assets/css/compiled/ui-elements.css | 12 + public/assets/css/compiled/user-list.css | 14 +- public/assets/css/compiled/user-profile.css | 5 +- .../assets/css/lib/bootstrap.datepicker.css | 3 +- public/assets/css/lib/font-awesome.css | 295 +- public/assets/css/lib/fullcalendar.css | 1 + public/assets/css/lib/jquery.dataTables.css | 24 +- public/assets/css/scss/calendar.scss | 6 +- public/assets/css/scss/elements.scss | 11 +- public/assets/css/scss/form-showcase.scss | 8 +- public/assets/css/scss/form-wizard.scss | 9 +- public/assets/css/scss/gallery.scss | 128 +- public/assets/css/scss/grids.scss | 3 +- public/assets/css/scss/index.scss | 19 +- public/assets/css/scss/layout.scss | 131 +- public/assets/css/scss/new-user.scss | 12 +- public/assets/css/scss/personal-info.scss | 32 +- public/assets/css/scss/signin.scss | 3 + public/assets/css/scss/signup.scss | 4 +- public/assets/css/scss/skins/dark.scss | 55 - public/assets/css/scss/tables.scss | 6 +- public/assets/css/scss/ui-elements.scss | 15 + public/assets/css/scss/user-list.scss | 14 +- public/assets/css/scss/user-profile.scss | 2 +- 87 files changed, 7224 insertions(+), 6696 deletions(-) delete mode 100755 app/storage/logs/.gitignore delete mode 100755 app/storage/views/.gitignore mode change 100644 => 100755 public/assets/css/bootstrap/bootstrap.css mode change 100644 => 100755 public/assets/css/bootstrap/bootstrap.min.css delete mode 100644 public/assets/css/compiled/skins/dark.css delete mode 100644 public/assets/css/scss/skins/dark.scss diff --git a/app/storage/logs/.gitignore b/app/storage/logs/.gitignore deleted file mode 100755 index c96a04f008..0000000000 --- a/app/storage/logs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/app/storage/views/.gitignore b/app/storage/views/.gitignore deleted file mode 100755 index c96a04f008..0000000000 --- a/app/storage/views/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore \ No newline at end of file diff --git a/app/views/backend/categories/edit.blade.php b/app/views/backend/categories/edit.blade.php index 8b471b7cbf..18311ca731 100755 --- a/app/views/backend/categories/edit.blade.php +++ b/app/views/backend/categories/edit.blade.php @@ -31,7 +31,7 @@ -
+
@@ -40,7 +40,7 @@
-
+
@lang('general.cancel') diff --git a/app/views/backend/categories/index.blade.php b/app/views/backend/categories/index.blade.php index 34e4cc3508..14309aef10 100755 --- a/app/views/backend/categories/index.blade.php +++ b/app/views/backend/categories/index.blade.php @@ -19,7 +19,7 @@ Asset Categories ::
-
+

@@ -27,8 +27,8 @@ Asset Categories :: - - + + @@ -49,7 +49,7 @@ Asset Categories :: -
+


About Asset Categories

Asset categories help you organize your assets. Some diff --git a/app/views/backend/depreciations/edit.blade.php b/app/views/backend/depreciations/edit.blade.php index b6a026d466..3b5a43920d 100755 --- a/app/views/backend/depreciations/edit.blade.php +++ b/app/views/backend/depreciations/edit.blade.php @@ -39,18 +39,18 @@

-
+
- + {{ $errors->first('name', ':message') }}
-
+
- + {{ $errors->first('months', ':message') }}
@@ -58,7 +58,7 @@ -
+
@lang('general.cancel') diff --git a/app/views/backend/depreciations/index.blade.php b/app/views/backend/depreciations/index.blade.php index 223c0a9e3a..d7db648bbd 100755 --- a/app/views/backend/depreciations/index.blade.php +++ b/app/views/backend/depreciations/index.blade.php @@ -19,7 +19,7 @@ Asset Depreciations ::
-
+

@@ -27,9 +27,9 @@ Asset Depreciations ::
@lang('admin/categories/table.title')@lang('table.actions')@lang('admin/categories/table.title')@lang('table.actions')
- - - + + + @@ -51,7 +51,7 @@ Asset Depreciations :: -
+


About Asset Depreciations

You can set up asset depreciations to depreciate assets based on straight-line depreciation.

diff --git a/app/views/backend/groups/create.blade.php b/app/views/backend/groups/create.blade.php index d679b61a75..8b61fab30c 100755 --- a/app/views/backend/groups/create.blade.php +++ b/app/views/backend/groups/create.blade.php @@ -33,7 +33,7 @@ Create a Group ::
-
+
@@ -44,7 +44,7 @@ Create a Group ::
-
+
@foreach ($permissions as $area => $permissions) @@ -52,8 +52,8 @@ Create a Group :: {{ $area }} @foreach ($permissions as $permission) -
- +
+
-
+
Cancel diff --git a/app/views/backend/groups/edit.blade.php b/app/views/backend/groups/edit.blade.php index b7135496b7..ed49fbd71e 100755 --- a/app/views/backend/groups/edit.blade.php +++ b/app/views/backend/groups/edit.blade.php @@ -33,7 +33,7 @@ Group Update ::
-
+
@@ -45,15 +45,15 @@ Group Update ::
-
+
@foreach ($permissions as $area => $permissions)
{{ $area }} @foreach ($permissions as $permission) -
- +
+
-
+
@lang('general.cancel') diff --git a/app/views/backend/groups/index.blade.php b/app/views/backend/groups/index.blade.php index 50786391dc..9985ddd4bd 100755 --- a/app/views/backend/groups/index.blade.php +++ b/app/views/backend/groups/index.blade.php @@ -23,11 +23,11 @@ Group Management ::
@lang('admin/depreciations/table.title')@lang('admin/depreciations/table.term')@lang('table.actions')@lang('admin/depreciations/table.title')@lang('admin/depreciations/table.term')@lang('table.actions')
- - - - - + + + + + diff --git a/app/views/backend/hardware/checkin.blade.php b/app/views/backend/hardware/checkin.blade.php index 0985b49ca6..b96e8c736a 100644 --- a/app/views/backend/hardware/checkin.blade.php +++ b/app/views/backend/hardware/checkin.blade.php @@ -25,32 +25,32 @@ -
+
- +
-
+
- +
-
+
- + {{ $errors->first('note', ' :message') }}
-
+
@lang('general.cancel') diff --git a/app/views/backend/hardware/checkout.blade.php b/app/views/backend/hardware/checkout.blade.php index bd7b64bbe0..35e7bbeda1 100644 --- a/app/views/backend/hardware/checkout.blade.php +++ b/app/views/backend/hardware/checkout.blade.php @@ -38,23 +38,23 @@
-
+
- +
-
+
- +
-
+
@@ -64,10 +64,10 @@
-
+
- + {{ $errors->first('note', ' :message') }}
@@ -75,7 +75,7 @@
-
+
@lang('general.cancel') diff --git a/app/views/backend/hardware/clone.blade.php b/app/views/backend/hardware/clone.blade.php index ca51051fe3..93dc1d4c68 100644 --- a/app/views/backend/hardware/clone.blade.php +++ b/app/views/backend/hardware/clone.blade.php @@ -23,43 +23,43 @@ -
+
- + {{ $errors->first('asset_tag', ' :message') }}
-
+
- + {{ $errors->first('name', ' :message') }}
-
+
- + {{ $errors->first('serial', ' :message') }}
-
+
- + {{ $errors->first('order_number', ' :message') }}
-
+
{{ Form::select('model_id', $model_list , Input::old('model_id', $asset->model_id), array('class'=>'select2', 'style'=>'min-width:350px')) }} @@ -68,7 +68,7 @@
-
+
@@ -78,28 +78,28 @@
-
+
$ - + {{ $errors->first('purchase_cost', ' :message') }}
-
+
- months + months {{ $errors->first('warranty_months', ' :message') }}
-
+
@@ -110,7 +110,7 @@
-
+
@@ -122,16 +122,16 @@ -
+
- + {{ $errors->first('notes', ' :message') }}
-
+
Cancel diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index a7bfa51b33..2d4f8427af 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -11,166 +11,156 @@ @stop {{-- Page content --}} + @section('content') -
-
- @if ($asset->id) - Back + + +
+
+ @if ($asset->id) + Back @else - Back + Back @endif -
-

- @if ($asset->id) +

+ @if ($asset->id) Asset Update - @else - Create Asset - @endif - - -

+ @else + Create Asset + @endif + +
+
+ +
-
- - - - -
- -
- - + + + -
- -
- - {{ $errors->first('asset_tag', ' :message') }} -
+
+ +
+ + {{ $errors->first('asset_tag', ' :message') }} +
+ -
- -
- - {{ $errors->first('name', ' :message') }} -
+
+ +
+ + {{ $errors->first('name', ' :message') }} +
- - -
- -
- - {{ $errors->first('serial', ' :message') }} +
+ +
+ + {{ $errors->first('serial', ' :message') }}
-
- -
- - {{ $errors->first('order_number', ' :message') }} +
+ +
+ + {{ $errors->first('order_number', ' :message') }}
- -
- -
+ +
+ +
{{ Form::select('model_id', $model_list , Input::old('model_id', $asset->model_id), array('class'=>'select2', 'style'=>'min-width:350px')) }} - {{ $errors->first('model_id', ' :message') }} + {{ $errors->first('model_id', ' :message') }}
-
- -
- - {{ $errors->first('purchase_date', ' :message') }} - +
+ +
+ + + {{ $errors->first('purchase_date', ' :message') }}
-
- -
-
- $ - - {{ $errors->first('purchase_cost', ' :message') }} -
+
+ +
+
+ $ + + {{ $errors->first('purchase_cost', ' :message') }} +
-
- -
- months - {{ $errors->first('warranty_months', ' :message') }} +
+ +
+
+ months + {{ $errors->first('warranty_months', ' :message') }} +
-
- -
-
- {{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $asset->depreciation_id), array('class'=>'select2', 'style'=>'width:250px')) }} - {{ $errors->first('depreciation_id', ' :message') }} +
+ +
+ {{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $asset->depreciation_id), array('class'=>'select2', 'style'=>'width:350px')) }} + {{ $errors->first('depreciation_id', ' :message') }}
-
+ -
- -
-
- {{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2', 'style'=>'width:250px')) }} - {{ $errors->first('depreciation_id', ' :message') }} +
+ +
+ {{ Form::select('status_id', $statuslabel_list , Input::old('status_id', $asset->status_id), array('class'=>'select2', 'style'=>'width:350px')) }} + {{ $errors->first('depreciation_id', ' :message') }}
-
- -
- -
- - {{ $errors->first('notes', ' :message') }} +
+ +
+ + {{ $errors->first('notes', ' :message') }}
+ +
+ +
+ @if ($asset->id) + Cancel + @else + Cancel + @endif + +
+
- - -
- - -
-
- @if ($asset->id) - Cancel - @else - Cancel - @endif - - -
+
- - - +
@stop diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index be6551636f..f14e572dad 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -22,11 +22,11 @@ Assets :: {{-- Page content --}} @section('content') -
-
- Create New -
+ +
+
+ Create New

@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD') || Input::get('Deployed')) @if (Input::get('Pending')) @@ -43,27 +43,29 @@ Assets :: @endif Assets

- +
+ + @if ($assets->count() > 0)
@lang('admin/groups/table.id')@lang('admin/groups/table.name')@lang('admin/groups/table.users')@lang('admin/groups/table.created_at')@lang('table.actions')@lang('admin/groups/table.id')@lang('admin/groups/table.name')@lang('admin/groups/table.users')@lang('admin/groups/table.created_at')@lang('table.actions')
- - - + + + @if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD')) - + @else - - + + @endif - - + + diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php index 4d0835086a..7611405eb3 100644 --- a/app/views/backend/hardware/view.blade.php +++ b/app/views/backend/hardware/view.blade.php @@ -10,67 +10,64 @@ View Asset {{ $asset->asset_tag }} :: @section('content')
@lang('admin/hardware/table.asset_tag')@lang('admin/hardware/table.title')@lang('admin/hardware/table.serial')@lang('admin/hardware/table.asset_tag')@lang('admin/hardware/table.title')@lang('admin/hardware/table.serial')StatusStatus@lang('admin/hardware/table.checkoutto')@lang('admin/hardware/table.location')@lang('admin/hardware/table.checkoutto')@lang('admin/hardware/table.location')@lang('admin/hardware/table.change')@lang('table.actions')@lang('admin/hardware/table.change')@lang('table.actions')
- - - - - - + + + + + + @@ -143,7 +140,7 @@ View Asset {{ $asset->asset_tag }} :: -
+
@if ((isset($asset->assigned_to ) && ($asset->assigned_to > 0)))

Checked Out To:
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php index 17420cc415..7f4c08326d 100755 --- a/app/views/backend/layouts/default.blade.php +++ b/app/views/backend/layouts/default.blade.php @@ -17,21 +17,22 @@ - + + - + @@ -66,60 +67,69 @@ + +
+ @if (Sentry::check()) - +
DateAdminActionUserNoteDateAdminActionUserNote
- - - - + + + + diff --git a/app/views/backend/licenses/view.blade.php b/app/views/backend/licenses/view.blade.php index 7010483c59..1ef4e9c6c3 100644 --- a/app/views/backend/licenses/view.blade.php +++ b/app/views/backend/licenses/view.blade.php @@ -10,28 +10,29 @@ View License {{ $license->name }} :: @section('content')
@lang('admin/licenses/table.title')@lang('admin/licenses/table.serial')@lang('admin/licenses/table.assigned_to')@lang('table.actions')@lang('admin/licenses/table.title')@lang('admin/licenses/table.serial')@lang('admin/licenses/table.assigned_to')@lang('table.actions')
- - - + + + @@ -55,7 +56,7 @@ View License {{ $license->name }} ::
SeatUserSeatUser
Seat {{ $count }} @if ($licensedto->assigned_to) - + {{ $licensedto->user->fullName() }} @endif @@ -82,12 +83,12 @@ View License {{ $license->name }} :: - - - - - - + + + + + + @@ -108,9 +109,10 @@ View License {{ $license->name }} :: @@ -145,7 +147,7 @@ View License {{ $license->name }} :: -
+

License Info:
    @if ($license->serial) diff --git a/app/views/backend/locations/edit.blade.php b/app/views/backend/locations/edit.blade.php index f43a0923a6..df42cd7e6f 100755 --- a/app/views/backend/locations/edit.blade.php +++ b/app/views/backend/locations/edit.blade.php @@ -15,11 +15,6 @@ {{-- Page content --}} @section('content')
    - -
    - Back -
    -

    @if ($location->id) Update Location @@ -27,7 +22,9 @@ Create Location @endif - +
    + Back +

    @@ -41,55 +38,55 @@
    -
    +
    - + {{ $errors->first('name', ':message') }}
    -
    +
    - + {{ $errors->first('address', ':message') }}
    -
    +
    - + {{ $errors->first('address2', ':message') }}
    -
    +
    - + {{ $errors->first('city', ':message') }}
    -
    +
    - + {{ $errors->first('state', ':message') }}
    -
    +
    - + {{ $errors->first('zip', ':message') }}
    -
    +
    - + {{ $errors->first('country', ':message') }}
    @@ -97,7 +94,7 @@ -
    +
    @lang('general.cancel') diff --git a/app/views/backend/locations/index.blade.php b/app/views/backend/locations/index.blade.php index 9afaf8c75b..d736ce240a 100755 --- a/app/views/backend/locations/index.blade.php +++ b/app/views/backend/locations/index.blade.php @@ -21,12 +21,12 @@ Locations ::
DateAdminActionUserNoteDateAdminActionUserNote
{{ $log->action_type }} - @if (($log->checkedout_to) && ($log->checkedout_to > 0 )) + @if (isset($log->checkedout_to)) - {{ $log->userlog->fullName() }} + {{ $log->userlog->fullName() }} + @endif
- - - + + - + diff --git a/app/views/backend/manufacturers/edit.blade.php b/app/views/backend/manufacturers/edit.blade.php index 5a1f29cc69..b5601338cb 100755 --- a/app/views/backend/manufacturers/edit.blade.php +++ b/app/views/backend/manufacturers/edit.blade.php @@ -13,11 +13,6 @@ {{-- Page content --}} @section('content')
- -
- Back -
-

@if ($manufacturer->id) Update Manufacturer @@ -25,6 +20,9 @@ Create manufacturer @endif +
+ Back +

@@ -38,7 +36,7 @@
-
+
@@ -49,7 +47,7 @@
-
+
@lang('general.cancel') diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php index 45ad2d4e45..252b90dbd2 100755 --- a/app/views/backend/manufacturers/index.blade.php +++ b/app/views/backend/manufacturers/index.blade.php @@ -22,8 +22,8 @@ Asset Manufacturers ::
@lang('admin/locations/table.name')Address@lang('admin/locations/table.city'), + @lang('admin/locations/table.name')Address@lang('admin/locations/table.city'), @lang('admin/locations/table.state') @lang('admin/locations/table.country')@lang('table.actions')@lang('table.actions')
- - + + diff --git a/app/views/backend/models/edit.blade.php b/app/views/backend/models/edit.blade.php index d679f63e22..c106733fb3 100755 --- a/app/views/backend/models/edit.blade.php +++ b/app/views/backend/models/edit.blade.php @@ -13,16 +13,16 @@ {{-- Page content --}} @section('content')
-
- Back -
-

@if ($model->id) Update Model @else Create New Model @endif + +
+ Back +

@@ -34,7 +34,7 @@
-
+
@@ -42,7 +42,7 @@
-
+
@@ -51,7 +51,7 @@
-
+
{{ Form::select('manufacturer_id', $manufacturer_list , Input::old('manufacturer_id', $model->manufacturer_id), array('class'=>'select2', 'style'=>'width:250px')) }} @@ -60,7 +60,7 @@
-
+
{{ Form::select('depreciation_id', $depreciation_list , Input::old('depreciation_id', $model->depreciation_id), array('class'=>'select2', 'style'=>'width:250px')) }} @@ -69,7 +69,7 @@
-
+
{{ Form::select('category_id', $category_list , Input::old('category_id', $model->category_id), array('class'=>'select2', 'style'=>'width:250px')) }} @@ -81,7 +81,7 @@
-
+
@lang('general.cancel') diff --git a/app/views/backend/models/index.blade.php b/app/views/backend/models/index.blade.php index 1efaef40c2..3d07be6314 100755 --- a/app/views/backend/models/index.blade.php +++ b/app/views/backend/models/index.blade.php @@ -20,12 +20,12 @@ Asset Models ::
@lang('admin/manufacturers/table.title')@lang('table.actions')@lang('admin/manufacturers/table.title')@lang('table.actions')
- - - - - - + + + + + + diff --git a/app/views/backend/models/view.blade.php b/app/views/backend/models/view.blade.php index 8492fd7359..776413424b 100644 --- a/app/views/backend/models/view.blade.php +++ b/app/views/backend/models/view.blade.php @@ -25,7 +25,7 @@ View Model {{ $model->model_tag }} ::
-
+

@@ -33,10 +33,10 @@ View Model {{ $model->model_tag }} ::
@lang('admin/models/table.title')@lang('admin/models/table.modelnumber')@lang('admin/models/table.numassets')DepreciationCategory@lang('table.actions')@lang('admin/models/table.title')@lang('admin/models/table.modelnumber')@lang('admin/models/table.numassets')DepreciationCategory@lang('table.actions')
- - - - + + + + @@ -80,7 +80,7 @@ View Model {{ $model->model_tag }} :: -
+

More Info:
    diff --git a/app/views/backend/reports/index.blade.php b/app/views/backend/reports/index.blade.php index f7cf766dea..277c74753e 100644 --- a/app/views/backend/reports/index.blade.php +++ b/app/views/backend/reports/index.blade.php @@ -28,20 +28,20 @@ Depreciation Report

    Depreciation Report

- -
+
+
NameAsset TagUserActionsNameAsset TagUserActions
- - - - - - - - - + + + + + + + + + diff --git a/app/views/backend/settings/edit.blade.php b/app/views/backend/settings/edit.blade.php index 6960910572..daaf6d2612 100755 --- a/app/views/backend/settings/edit.blade.php +++ b/app/views/backend/settings/edit.blade.php @@ -20,7 +20,7 @@
-
+

@@ -31,17 +31,17 @@ @foreach ($settings as $setting) -
+
- + {{ $errors->first('site_name', ':message') }}
-
+
- + {{ $errors->first('per_page', ':message') }}
@@ -51,7 +51,7 @@ @endforeach -
+
@lang('general.cancel') @@ -63,7 +63,7 @@
-
+


These settings let you customize certain aspects of your installation.

diff --git a/app/views/backend/settings/index.blade.php b/app/views/backend/settings/index.blade.php index 83b05b651e..c95f9d02b9 100755 --- a/app/views/backend/settings/index.blade.php +++ b/app/views/backend/settings/index.blade.php @@ -21,7 +21,7 @@ Settings ::
-
+

@@ -29,8 +29,8 @@ Settings ::
@lang('admin/hardware/table.asset_tag')@lang('admin/hardware/table.title')@lang('admin/hardware/table.serial')@lang('admin/hardware/table.checkoutto')@lang('admin/hardware/table.location')@lang('admin/hardware/table.purchase_date')@lang('admin/hardware/table.purchase_cost')@lang('admin/hardware/table.book_value')Diff@lang('admin/hardware/table.asset_tag')@lang('admin/hardware/table.title')@lang('admin/hardware/table.serial')@lang('admin/hardware/table.checkoutto')@lang('admin/hardware/table.location')@lang('admin/hardware/table.purchase_date')@lang('admin/hardware/table.purchase_cost')@lang('admin/hardware/table.book_value')Diff
- - + + @@ -51,7 +51,7 @@ Settings :: -
+


These settings let you customize certain aspects of your installation.

diff --git a/app/views/backend/statuslabels/edit.blade.php b/app/views/backend/statuslabels/edit.blade.php index 8ad60e5634..c4ee736603 100755 --- a/app/views/backend/statuslabels/edit.blade.php +++ b/app/views/backend/statuslabels/edit.blade.php @@ -29,7 +29,7 @@
-
+

@@ -38,16 +38,16 @@ -
+
- + {{ $errors->first('name', ':message') }}
-
+
@lang('general.cancel') @@ -59,7 +59,7 @@
-
+


About Status Labels

Status labels are used to describe the various reasons why an asset cannot be deployed.

diff --git a/app/views/backend/statuslabels/index.blade.php b/app/views/backend/statuslabels/index.blade.php index d50d5f41a8..08ac61983a 100755 --- a/app/views/backend/statuslabels/index.blade.php +++ b/app/views/backend/statuslabels/index.blade.php @@ -19,7 +19,7 @@ Status Labels
-
+

@@ -27,8 +27,8 @@ Status Labels
SettingValueSettingValue
- - + + @@ -48,7 +48,7 @@ Status Labels -
+


About Status Labels

Status labels are used to describe the various reasons why an asset cannot be deployed.

diff --git a/app/views/backend/users/create.blade.php b/app/views/backend/users/create.blade.php index 0e8ed78fdf..374c85991a 100755 --- a/app/views/backend/users/create.blade.php +++ b/app/views/backend/users/create.blade.php @@ -34,7 +34,7 @@ Create a User ::
-
+
@@ -43,7 +43,7 @@ Create a User ::
-
+
@@ -52,7 +52,7 @@ Create a User ::
-
+
@@ -61,7 +61,7 @@ Create a User ::
-
+
@@ -72,7 +72,7 @@ Create a User ::
-
+
@@ -81,7 +81,7 @@ Create a User ::
-
+
@@ -90,7 +90,7 @@ Create a User ::
-
+
@@ -99,7 +99,7 @@ Create a User ::
-
+
@@ -108,7 +108,7 @@ Create a User ::
-
+
@@ -138,7 +138,7 @@ Create a User ::
-
+
@foreach ($permissions as $area => $permissions) @@ -146,8 +146,8 @@ Create a User :: {{ $area }} @foreach ($permissions as $permission) -
- +
+
-
+
Cancel diff --git a/app/views/backend/users/edit.blade.php b/app/views/backend/users/edit.blade.php index 8d84d7ddf8..efacdbe52c 100755 --- a/app/views/backend/users/edit.blade.php +++ b/app/views/backend/users/edit.blade.php @@ -33,7 +33,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -42,7 +42,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -51,7 +51,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -60,7 +60,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -71,7 +71,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -81,7 +81,7 @@ Update User {{ $user->fullName() }} :: -
+
@@ -90,7 +90,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -99,7 +99,7 @@ Update User {{ $user->fullName() }} ::
-
+
@@ -108,7 +108,7 @@ Update User {{ $user->fullName() }} ::
-
+
id === Sentry::getId() ? ' disabled="disabled"' : '') }} name="activated" id="activated"> @@ -120,7 +120,7 @@ Update User {{ $user->fullName() }} ::
-
+
@lang('admin/statuslabels/table.name')@lang('table.actions')@lang('admin/statuslabels/table.name')@lang('table.actions')
- - - - - - + + + + + + diff --git a/app/views/backend/users/view.blade.php b/app/views/backend/users/view.blade.php index 848f04b015..92311dced9 100644 --- a/app/views/backend/users/view.blade.php +++ b/app/views/backend/users/view.blade.php @@ -11,7 +11,7 @@ View User {{ $user->fullName() }} ::
@lang('admin/users/table.name')@lang('admin/users/table.email')AssetsLicenses@lang('admin/users/table.activated')@lang('table.actions')@lang('admin/users/table.name')@lang('admin/users/table.email')AssetsLicenses@lang('admin/users/table.activated')@lang('table.actions')
- - - - + + + + @@ -74,10 +74,10 @@ View User {{ $user->fullName() }} ::
Asset TypeAsset TagNameActionsAsset TypeAsset TagNameActions
- - - - + + + + @@ -117,10 +117,10 @@ View User {{ $user->fullName() }} ::
Asset TypeSerialNameActionsAsset TypeSerialNameActions
- - - - + + + + @@ -156,7 +156,7 @@ View User {{ $user->fullName() }} :: -
+
Contact {{ $user->first_name }}
diff --git a/app/views/frontend/account/change-email.blade.php b/app/views/frontend/account/change-email.blade.php index d834dde848..199273cda5 100755 --- a/app/views/frontend/account/change-email.blade.php +++ b/app/views/frontend/account/change-email.blade.php @@ -19,7 +19,7 @@ Change your Email -
+
@@ -28,7 +28,7 @@ Change your Email
-
+
@@ -37,7 +37,7 @@ Change your Email
-
+
@@ -48,7 +48,7 @@ Change your Email
-
+
diff --git a/app/views/frontend/account/change-password.blade.php b/app/views/frontend/account/change-password.blade.php index a48d15825d..edf904662d 100755 --- a/app/views/frontend/account/change-password.blade.php +++ b/app/views/frontend/account/change-password.blade.php @@ -16,28 +16,26 @@ Change your Password -
+
-
- + {{ $errors->first('old_password', ':message') }} -
-
+
- + {{ $errors->first('password', ':message') }}
-
+
- + {{ $errors->first('password_confirm', ':message') }}
@@ -45,7 +43,7 @@ Change your Password
-
+
@@ -78,7 +76,7 @@ Change your Password -
+
@@ -87,7 +85,7 @@ Change your Password
-
+
@@ -96,7 +94,7 @@ Change your Password
-
+
@@ -105,7 +103,7 @@ Change your Password
-
+
Cancel diff --git a/app/views/frontend/account/profile.blade.php b/app/views/frontend/account/profile.blade.php index b821b2c80b..36ed3527c1 100755 --- a/app/views/frontend/account/profile.blade.php +++ b/app/views/frontend/account/profile.blade.php @@ -16,46 +16,46 @@ Your Profile -
+
- + {{ $errors->first('first_name', ':message') }}
-
+
- + {{ $errors->first('last_name', ':message') }}
-
+
- + {{ $errors->first('website', ':message') }}
-
+
- + {{ $errors->first('country', ':message') }}
-
+
- + {{ $errors->first('gravatar', ':message') }}
@@ -68,7 +68,7 @@ Your Profile
-
+
diff --git a/app/views/frontend/auth/forgot-password-confirm.blade.php b/app/views/frontend/auth/forgot-password-confirm.blade.php index 8ed5a8bf72..e33d90534f 100755 --- a/app/views/frontend/auth/forgot-password-confirm.blade.php +++ b/app/views/frontend/auth/forgot-password-confirm.blade.php @@ -16,7 +16,7 @@ Forgot Password :: -
+
@@ -25,7 +25,7 @@ Forgot Password ::
-
+
@@ -34,7 +34,7 @@ Forgot Password ::
-
+
Cancel diff --git a/app/views/frontend/auth/forgot-password.blade.php b/app/views/frontend/auth/forgot-password.blade.php index bf4453cece..9353c71add 100755 --- a/app/views/frontend/auth/forgot-password.blade.php +++ b/app/views/frontend/auth/forgot-password.blade.php @@ -16,7 +16,7 @@ Forgot Password :: -
+
@@ -25,7 +25,7 @@ Forgot Password ::
-
+
Cancel diff --git a/app/views/frontend/auth/signin.blade.php b/app/views/frontend/auth/signin.blade.php index b44b666d50..f26db70eca 100755 --- a/app/views/frontend/auth/signin.blade.php +++ b/app/views/frontend/auth/signin.blade.php @@ -17,7 +17,7 @@ Account Sign in :: -
+
@@ -26,7 +26,7 @@ Account Sign in ::
-
+
@@ -35,7 +35,7 @@ Account Sign in ::
-
+
DateActionAssetByDateActionAssetBy