Pulled account sub-nav into top menu to free up UI space. #changelog

snipe · Jul 2, 2014 · c782f29 · c782f29
1 parent 2825bcb
commit c782f29
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/app/lang/en/general.php b/app/lang/en/general.php
@@ -14,6 +14,8 @@
     'cancel'  				=> 'Cancel',
     'categories'			=> 'Categories',
     'category'				=> 'Category',
+    'changeemail'  			=> 'Update Email',
+    'changepassword'  		=> 'Update Password',
     'checkin'  				=> 'Checkin',
     'checkout'  			=> 'Checkout',
     'city'  				=> 'City',
@@ -29,6 +31,7 @@
     'deployed'				=> 'Deployed',
     'depreciation_report'	=> 'Depreciation Report',
     'depreciation'			=> 'Depreciation',
+    'editprofile'  			=> 'Edit Profile',
     'eol'					=> 'EOL',
     'first_name'			=> 'First Name',
     'groups'				=> 'Groups',
@@ -41,14 +44,14 @@
     'list_all'				=> 'List All',
     'locations'				=> 'Locations',
     'logout'				=> 'Logout',
-    'manufacturers'			=> 'Manufacturers',
     'manufacturer'			=> 'Manufacturer',
+    'manufacturers'			=> 'Manufacturers',
     'model_no'				=> 'Model No.',
     'months'				=> 'months',
     'moreinfo'				=> 'More Info',
     'name'					=> 'Name',
-    'no_results'			=> 'No Results.',
     'no_depreciation'		=> 'No Derepciation',
+    'no_results'			=> 'No Results.',
     'no'  					=> 'No',
     'pending'				=> 'Pending',
     'people'				=> 'People',
@@ -69,6 +72,7 @@
     'undeployable'			=> 'Un-deployable',
     'unknown_admin'			=> 'Unknown Admin',
     'user'					=> 'User',
+    'viewassets'  			=> 'View Assets',
     'welcome'				=> 'Welcome, :name',
     'years'					=> 'years',
     'yes' 					=> 'Yes',

diff --git a/app/views/frontend/account/change-email.blade.php b/app/views/frontend/account/change-email.blade.php
@@ -10,7 +10,7 @@
 <div class="row header">
 
     <div class="col-md-12">
-        <h3>Change Your Email</h3>
+        <h3>@lang('general.changeemail')</h3>
     </div>
 </div>
 

diff --git a/app/views/frontend/account/change-password.blade.php b/app/views/frontend/account/change-password.blade.php
@@ -10,7 +10,7 @@
 <div class="row header">
 
     <div class="col-md-12">
-        <h3>Change Your Password</h3>
+        <h3>@lang('general.changepassword')</h3>
     </div>
 </div>
 

diff --git a/app/views/frontend/account/profile.blade.php b/app/views/frontend/account/profile.blade.php
@@ -10,7 +10,7 @@
 <div class="row header">
 
     <div class="col-md-12">
-        <h3>Update Profile</h3>
+        <h3>@lang('general.editprofile')</h3>
     </div>
 </div>
 

diff --git a/app/views/frontend/layouts/account.blade.php b/app/views/frontend/layouts/account.blade.php
@@ -3,15 +3,7 @@
 {{-- Page content --}}
 @section('content')
 <div class="row">
-    <div class="col-md-3">
-        <ul class="nav nav-list">
-            <li{{ Request::is('account/profile') ? ' class="active"' : '' }}><a href="{{ URL::route('profile') }}">Profile</a></li>
-            <li{{ Request::is('account/change-password') ? ' class="active"' : '' }}><a href="{{ URL::route('change-password') }}">Change Password</a></li>
-            <li{{ Request::is('account/change-email') ? ' class="active"' : '' }}><a href="{{ URL::route('change-email') }}">Change Email</a></li>
-
-        </ul>
-    </div>
-    <div class="col-md-9">
+    <div class="col-md-12">
         @yield('account-content')
     </div>
 </div>