Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Go to last page when clicking 'Settings'

Browse Source
This commit is contained in:
Hillel Coren 2017-03-08 11:21:25 +02:00
parent d786c3ec77
commit 8732319ba1
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
resources/views/partials/keyboard_shortcuts.blade.php
View File

@ -89,6 +89,15 @@
$(function() { $(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) { Mousetrap.bind('?', function(e) {
showKeyboardShortcuts(); showKeyboardShortcuts();
}); });
@ -103,11 +112,7 @@
}); });
Mousetrap.bind('g s', function(e) { Mousetrap.bind('g s', function(e) {
var url = '{{ url('/settings/company_details') }}'; location.href = settingsURL;
if (isStorageSupported()) {
url = localStorage.getItem('last:settings_page') || url;
}
location.href = url;
}); });
Mousetrap.bind('h', function(e) { Mousetrap.bind('h', function(e) {

4
resources/views/partials/navigation_option.blade.php
View File

@ -1,4 +1,4 @@
<li class="{{ Request::is("{$option}*") ? 'active' : '' }}"> <li class="nav-{{ $option }} {{ Request::is("{$option}*") ? 'active' : '' }}">
@if ($option == 'settings') @if ($option == 'settings')
@ -18,7 +18,7 @@
<a href="{{ url($option == 'recurring' ? 'recurring_invoice' : $option) }}" <a href="{{ url($option == 'recurring' ? 'recurring_invoice' : $option) }}"
style="font-size:15px; padding-top:6px; padding-bottom:6px" 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> <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) }} {{ ($option == 'recurring_invoices') ? trans('texts.recurring') : mtrans($option) }}
{!! Utils::isTrial() && in_array($option, ['quotes', 'tasks', 'expenses', 'vendors', 'reports']) ? '&nbsp;<sup>' . trans('texts.pro') . '</sup>' : '' !!} {!! Utils::isTrial() && in_array($option, ['quotes', 'tasks', 'expenses', 'vendors', 'reports']) ? '&nbsp;<sup>' . trans('texts.pro') . '</sup>' : '' !!}