From 8732319ba150fad19aa8bbafeee3cd1a0973c72a Mon Sep 17 00:00:00 2001
From: Hillel Coren <hillelcoren@gmail.com>
Date: Wed, 8 Mar 2017 11:21:25 +0200
Subject: [PATCH] Go to last page when clicking 'Settings'

---
 .../views/partials/keyboard_shortcuts.blade.php   | 15 ++++++++++-----
 .../views/partials/navigation_option.blade.php    |  4 ++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/resources/views/partials/keyboard_shortcuts.blade.php b/resources/views/partials/keyboard_shortcuts.blade.php
index 9f635d606171..24a748349341 100644
--- a/resources/views/partials/keyboard_shortcuts.blade.php
+++ b/resources/views/partials/keyboard_shortcuts.blade.php
@@ -89,6 +89,15 @@
 
     $(function() {
 
+        var settingsURL = '{{ url('/settings/company_details') }}';
+        if (isStorageSupported()) {
+            settingsURL = localStorage.getItem('last:settings_page') || url;
+        }
+        // if they're on the last viewed settings page link to main settings page
+        if ('{{ request()->url() }}' != settingsURL) {
+            $('.nav-settings .nav-link').attr("href", settingsURL);
+        }
+
         Mousetrap.bind('?', function(e) {
             showKeyboardShortcuts();
         });
@@ -103,11 +112,7 @@
         });
 
         Mousetrap.bind('g s', function(e) {
-            var url = '{{ url('/settings/company_details') }}';
-            if (isStorageSupported()) {
-                url = localStorage.getItem('last:settings_page') || url;
-            }
-            location.href = url;
+            location.href = settingsURL;
         });
 
         Mousetrap.bind('h', function(e) {
diff --git a/resources/views/partials/navigation_option.blade.php b/resources/views/partials/navigation_option.blade.php
index cb48909329b4..5310f7971b15 100644
--- a/resources/views/partials/navigation_option.blade.php
+++ b/resources/views/partials/navigation_option.blade.php
@@ -1,4 +1,4 @@
-<li class="{{ Request::is("{$option}*") ? 'active' : '' }}">
+<li class="nav-{{ $option }} {{ Request::is("{$option}*") ? 'active' : '' }}">
 
     @if ($option == 'settings')
 
@@ -18,7 +18,7 @@
 
     <a href="{{ url($option == 'recurring' ? 'recurring_invoice' : $option) }}"
         style="font-size:15px; padding-top:6px; padding-bottom:6px"
-        class="{{ Request::is("{$option}*") ? 'active' : '' }}">
+        class="nav-link {{ Request::is("{$option}*") ? 'active' : '' }}">
         <i class="fa fa-{{ empty($icon) ? \App\Models\EntityModel::getIcon($option) : $icon }}" style="width:46px; padding-right:10px"></i>
         {{ ($option == 'recurring_invoices') ? trans('texts.recurring') : mtrans($option) }}
         {!! Utils::isTrial() && in_array($option, ['quotes', 'tasks', 'expenses', 'vendors', 'reports']) ? '&nbsp;<sup>' . trans('texts.pro') . '</sup>' : '' !!}