Merge branch 'refs/heads/develop'

snipe · Nov 28, 2013 · 0382183 · 0382183
2 parents 0d0d42f + d2959e8
commit 0382183
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 15 deletions.
diff --git a/app/routes.php b/app/routes.php
@@ -256,7 +256,11 @@
 |
 */
 
-// default admin screen until we get a fancy dashboard up
-Route::get('/', array('as' => 'hardware', 'uses' => 'Controllers\Admin\AssetsController@getIndex'));
-Route::get('reports', array('as' => 'reports', 'uses' => 'Controllers\Admin\AssetsController@getReports'));
 
+// Redirect requests to / to the hardware section until we get a fancy dashboard set up
+Route::get('/', function()
+{
+    return Redirect::to('hardware');
+});
+Route::get('/', array('as' => 'home', 'uses' => 'Controllers\Admin\AssetsController@getIndex'));
+Route::get('reports', array('as' => 'reports', 'uses' => 'Controllers\Admin\AssetsController@getReports'));
diff --git a/app/views/backend/layouts/default.blade.php b/app/views/backend/layouts/default.blade.php
@@ -250,15 +250,15 @@
                 <div class="row-fluid stats-row">
                     <div class="span3 stat">
                         <div class="data">
-                            <a href="{{ URL::to('admin') }}">
+                            <a href="{{ URL::to('hardware') }}">
                             	<span class="number">{{ number_format(Asset::assetcount()) }}</span>
                            	 	<span style="color:black">total assets</span>
                             </a>
                         </div>
                     </div>
                     <div class="span3 stat">
                         <div class="data">
-                            <a href="{{ URL::to('admin?RTD=true') }}">
+                            <a href="{{ URL::to('hardware?RTD=true') }}">
                             	<span class="number">{{ number_format(Asset::availassetcount()) }}</span>
                             	<span style="color:black">assets available</span>
                             </a>

diff --git a/app/views/backend/manufacturers/index.blade.php b/app/views/backend/manufacturers/index.blade.php
@@ -23,8 +23,8 @@
 <table id="example">
 	<thead>
 		<tr role="row">
-			<th class="span10">@lang('admin/manufacturers/table.title')</th>
-			<th class="span2">@lang('table.actions')</th>
+			<th class="span6">@lang('admin/manufacturers/table.title')</th>
+			<th class="span3">@lang('table.actions')</th>
 		</tr>
 	</thead>
 	<tbody>

diff --git a/app/views/backend/reports/index.blade.php b/app/views/backend/reports/index.blade.php
@@ -35,14 +35,14 @@
 <table id="example">
 		<thead>
 			<tr role="row">
-			<th class="span2">@lang('admin/assets/table.asset_tag')</th>
-			<th class="span2">@lang('admin/assets/table.title')</th>
-			<th class="span2">@lang('admin/assets/table.serial')</th>
-			<th class="span3">@lang('admin/assets/table.checkoutto')</th>
-			<th class="span2">@lang('admin/assets/table.location')</th>
-			<th class="span2">@lang('admin/assets/table.purchase_date')</th>
-			<th class="span1">@lang('admin/assets/table.purchase_cost')</th>
-			<th class="span1">@lang('admin/assets/table.book_value')</th>
+			<th class="span2">@lang('admin/hardware/table.asset_tag')</th>
+			<th class="span2">@lang('admin/hardware/table.title')</th>
+			<th class="span2">@lang('admin/hardware/table.serial')</th>
+			<th class="span3">@lang('admin/hardware/table.checkoutto')</th>
+			<th class="span2">@lang('admin/hardware/table.location')</th>
+			<th class="span2">@lang('admin/hardware/table.purchase_date')</th>
+			<th class="span1">@lang('admin/hardware/table.purchase_cost')</th>
+			<th class="span1">@lang('admin/hardware/table.book_value')</th>
 			<th class="span1">Diff</th>
 		</tr>
 	</thead>