diff --git a/app/routes.php b/app/routes.php index 59db888558d7..71cebb330795 100755 --- a/app/routes.php +++ b/app/routes.php @@ -18,6 +18,7 @@ { Route::get('/', array('as' => '', 'uses' => 'Controllers\Admin\AssetsController@getIndex')); + Route::get('/', array('as' => 'hardware', 'uses' => 'Controllers\Admin\AssetsController@getIndex')); Route::get('create', array('as' => 'create/hardware', 'uses' => 'Controllers\Admin\AssetsController@getCreate')); Route::post('create', 'Controllers\Admin\AssetsController@postCreate'); Route::get('{assetId}/edit', array('as' => 'update/hardware', 'uses' => 'Controllers\Admin\AssetsController@getEdit')); diff --git a/app/views/backend/hardware/checkin.blade.php b/app/views/backend/hardware/checkin.blade.php index 3eee74af63c7..0985b49ca62d 100644 --- a/app/views/backend/hardware/checkin.blade.php +++ b/app/views/backend/hardware/checkin.blade.php @@ -13,13 +13,10 @@ {{-- Page content --}} @section('content')
-

- Checkin Asset -
Back
-

+

Checkin Asset

diff --git a/app/views/backend/hardware/checkout.blade.php b/app/views/backend/hardware/checkout.blade.php index d8e4e5ff4e2e..bd7b64bbe01b 100644 --- a/app/views/backend/hardware/checkout.blade.php +++ b/app/views/backend/hardware/checkout.blade.php @@ -13,16 +13,17 @@ {{-- Page content --}} @section('content')
+ +
+ Back +
+

@if ($asset->id) - Checkout Asset to User + Checkout Asset to User @else - Create Asset + Create Asset @endif - -
- Back -

diff --git a/app/views/backend/hardware/clone.blade.php b/app/views/backend/hardware/clone.blade.php index e56eef5bf4d6..ca51051fe353 100644 --- a/app/views/backend/hardware/clone.blade.php +++ b/app/views/backend/hardware/clone.blade.php @@ -9,13 +9,12 @@ {{-- Page content --}} @section('content')
-

- Clone Asset
Back
-

+ +

Clone Asset

diff --git a/app/views/backend/hardware/edit.blade.php b/app/views/backend/hardware/edit.blade.php index 0c08bf063dfc..a7bfa51b3324 100755 --- a/app/views/backend/hardware/edit.blade.php +++ b/app/views/backend/hardware/edit.blade.php @@ -13,21 +13,23 @@ {{-- Page content --}} @section('content')
+ +
+ @if ($asset->id) + Back + @else + Back + @endif +
+

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

diff --git a/app/views/backend/hardware/index.blade.php b/app/views/backend/hardware/index.blade.php index bfbf0a4ce6b3..be6551636f2c 100755 --- a/app/views/backend/hardware/index.blade.php +++ b/app/views/backend/hardware/index.blade.php @@ -23,7 +23,11 @@ {{-- Page content --}} @section('content')
-

+
+ Create New +
+ +

@if (Input::get('Pending') || Input::get('Undeployable') || Input::get('RTD') || Input::get('Deployed')) @if (Input::get('Pending')) Pending @@ -37,14 +41,8 @@ @else All @endif - Assets - -
- Create New - -
-

+
diff --git a/app/views/backend/hardware/view.blade.php b/app/views/backend/hardware/view.blade.php index 9e21b09c65e0..4d0835086a21 100644 --- a/app/views/backend/hardware/view.blade.php +++ b/app/views/backend/hardware/view.blade.php @@ -10,26 +10,29 @@ @section('content')
+ +
+ + + +
+

History for {{ $asset->asset_tag }} ({{ $asset->name }}) -
- - - -

diff --git a/app/views/backend/licenses/checkin.blade.php b/app/views/backend/licenses/checkin.blade.php index c60b2d60fab1..d6781b9af121 100644 --- a/app/views/backend/licenses/checkin.blade.php +++ b/app/views/backend/licenses/checkin.blade.php @@ -9,12 +9,12 @@ {{-- Page content --}} @section('content')
-

Checkin License

-
- Back -
- +
+ Back +
+ +

Checkin License

diff --git a/app/views/backend/licenses/checkout.blade.php b/app/views/backend/licenses/checkout.blade.php index 4422b57633a2..880baffbe430 100644 --- a/app/views/backend/licenses/checkout.blade.php +++ b/app/views/backend/licenses/checkout.blade.php @@ -9,12 +9,13 @@ {{-- Page content --}} @section('content')
+ +
+ Back +
+

Checkout License to User

-
- Back -
-
diff --git a/app/views/backend/licenses/edit.blade.php b/app/views/backend/licenses/edit.blade.php index e9f6568d6b6e..17c6c569d202 100755 --- a/app/views/backend/licenses/edit.blade.php +++ b/app/views/backend/licenses/edit.blade.php @@ -13,6 +13,15 @@ {{-- Page content --}} @section('content')
+ +
+ @if ($license->id) + Back + @else + Back + @endif +
+

@if ($license->id) Update License @@ -20,13 +29,7 @@ Create License @endif -
- @if ($license->id) - Back - @else - Back - @endif -
+

diff --git a/app/views/backend/licenses/index.blade.php b/app/views/backend/licenses/index.blade.php index e7cd60e56239..1c4a09536218 100755 --- a/app/views/backend/licenses/index.blade.php +++ b/app/views/backend/licenses/index.blade.php @@ -8,13 +8,11 @@ {{-- Page content --}} @section('content')
-

- Software Licenses +
+ Create New +
-
- Create New -
-

+

Software Licenses

diff --git a/app/views/backend/licenses/view.blade.php b/app/views/backend/licenses/view.blade.php index 4ee6abf83e31..bd6f0fdfa103 100644 --- a/app/views/backend/licenses/view.blade.php +++ b/app/views/backend/licenses/view.blade.php @@ -10,25 +10,24 @@ @section('content')
diff --git a/app/views/backend/models/view.blade.php b/app/views/backend/models/view.blade.php index a3e03abf11c9..8492fd7359d3 100644 --- a/app/views/backend/models/view.blade.php +++ b/app/views/backend/models/view.blade.php @@ -10,17 +10,17 @@ @section('content')