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

Use last settings page with GS shortcut

Browse Source
This commit is contained in:
Hillel Coren 2017-03-07 12:10:00 +02:00
parent 3dee1692c2
commit 01834935ca
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
resources/views/accounts/nav.blade.php
View File

@ -1,11 +1,27 @@
@if (!Utils::isPro() && isset($advanced) && $advanced) @if (!Utils::isPro() && isset($advanced) && $advanced)
<div class="alert alert-warning" style="font-size:larger;"> <div class="alert alert-warning" style="font-size:larger;">
<center> <center>
{!! trans('texts.pro_plan_advanced_settings', ['link'=>'<a href="javascript:showUpgradeModal()">' . trans('texts.pro_plan_remove_logo_link') . '</a>']) !!} {!! trans('texts.pro_plan_advanced_settings', ['link'=>'<a href="javascript:showUpgradeModal()">' . trans('texts.pro_plan_remove_logo_link') . '</a>']) !!}
</center> </center>
</div> </div>
@endif @endif
<script type="text/javascript">
$(function() {
if (isStorageSupported()) {
localStorage.setItem('last:settings_page', location.href);
}
$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
var target = $(e.target).attr("href") // activated tab
if (history.pushState) {
history.pushState(null, null, target);
}
});
})
</script>
<div class="row"> <div class="row">
<div class="col-md-3"> <div class="col-md-3">

3
resources/views/header.blade.php
View File

@ -337,6 +337,9 @@
if (history.pushState) { if (history.pushState) {
history.pushState(null, null, target); history.pushState(null, null, target);
} }
if (isStorageSupported() && /\/settings\//.test(location.href)) {
localStorage.setItem('last:settings_page', location.href);
}
}); });
}); });

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

@ -103,7 +103,11 @@
}); });
Mousetrap.bind('g s', function(e) { Mousetrap.bind('g s', function(e) {
location.href = "{{ url('/settings/company_details') }}"; var url = '{{ url('/settings/company_details') }}';
if (isStorageSupported()) {
url = localStorage.getItem('last:settings_page') || url;
}
location.href = url;
}); });
Mousetrap.bind('h', function(e) { Mousetrap.bind('h', function(e) {