From 9638bf2b1eeb805b27eaf2f2e1e8a09bfd5c5514 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 21 Sep 2018 20:23:31 +0200
Subject: provide a return path from settings pages

---
 view/tpl/app.tpl             | 2 +-
 view/tpl/navbar_default.tpl  | 2 +-
 view/tpl/settings_module.tpl | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'view')

diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index 042f48704..6013f9548 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -20,7 +20,7 @@
 		{{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-outline-secondary btn-sm" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-fw fa-trash-o drop-icons"></i></button>{{/if}}
 		{{if $feature}}<button type="submit" name="feature" value="nav_featured_app" class="btn btn-outline-secondary btn-sm" title="{{if $featured}}{{$remove}}{{else}}{{$add}}{{/if}}"><i class="fa fa-fw fa-star{{if $featured}} text-warning{{/if}}"></i></button>{{/if}}
 		{{if $pin}}<button type="submit" name="pin" value="nav_pinned_app" class="btn btn-outline-secondary btn-sm" title="{{if $pinned}}{{$remove_nav}}{{else}}{{$add_nav}}{{/if}}"><i class="fa fa-fw fa-thumb-tack{{if $pinned}} text-success{{/if}}"></i></button>{{/if}}
-		{{if $settings_url}}<a href="{{$settings_url}}" class="btn btn-outline-secondary btn-sm"><i class="fa fa-fw fa-cog"></i></a>{{/if}}
+		{{if $settings_url}}<a href="{{$settings_url}}/?f=&rpath={{$rpath}}" class="btn btn-outline-secondary btn-sm"><i class="fa fa-fw fa-cog"></i></a>{{/if}}
 		</form>
 	</div>
 	{{/if}}
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl
index 73b5ccf59..0c8be512d 100755
--- a/view/tpl/navbar_default.tpl
+++ b/view/tpl/navbar_default.tpl
@@ -74,7 +74,7 @@
 </div>
 {{if $settings_url}}
 <div id="nav-app-settings-link-wrapper" class="navbar-nav mr-auto">
-	<a id="nav-app-settings-link" href="{{$settings_url}}" class="nav-link">
+	<a id="nav-app-settings-link" href="{{$settings_url}}/?f=&rpath={{$url}}" class="nav-link">
 		<i class="fa fa-fw fa-cog"></i>
 	</a>
 </div>
diff --git a/view/tpl/settings_module.tpl b/view/tpl/settings_module.tpl
index b2ac5462f..cabefc3e5 100755
--- a/view/tpl/settings_module.tpl
+++ b/view/tpl/settings_module.tpl
@@ -5,6 +5,9 @@
 	<div class="section-content-wrapper">
 		<form action="{{$action_url}}" method="post" autocomplete="off">
 		<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+		{{if $rpath}}
+		<input type='hidden' name='rpath' value='{{$rpath}}'>
+		{{/if}}
 		{{foreach $features as $feature}}
 		{{include file="field_checkbox.tpl" field=$feature}}
 		{{/foreach}}
-- 
cgit v1.2.3