harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

provide a return path from settings pages

Browse Source
This commit is contained in:
Mario Vavti 2018-09-21 20:23:31 +02:00
parent 6f43468724
commit 9638bf2b1e
7 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Lib/Apps.php
View File

@ -524,7 +524,8 @@ class Apps {
'$add' => t('Add to app-tray'), '$add' => t('Add to app-tray'),
'$remove' => t('Remove from app-tray'), '$remove' => t('Remove from app-tray'),
'$add_nav' => t('Pin to navbar'), '$add_nav' => t('Pin to navbar'),
'$remove_nav' => t('Unpin from navbar') '$remove_nav' => t('Unpin from navbar'),
'$rpath' => z_root() . '/apps'
)); ));
} }

2
Zotlabs/Module/Settings/Connections.php
View File

@ -19,10 +19,12 @@ class Connections {
function get() { function get() {
$features = self::get_features(); $features = self::get_features();
$rpath = (($_GET['rpath']) ? $_GET['rpath'] : '');
$tpl = get_markup_template("settings_module.tpl"); $tpl = get_markup_template("settings_module.tpl");
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$rpath' => $rpath,
'$action_url' => 'settings/connections', '$action_url' => 'settings/connections',
'$form_security_token' => get_form_security_token("settings_connections"), '$form_security_token' => get_form_security_token("settings_connections"),
'$title' => t('Connections Settings'), '$title' => t('Connections Settings'),

2
Zotlabs/Module/Settings/Network.php
View File

@ -19,10 +19,12 @@ class Network {
function get() { function get() {
$features = self::get_features(); $features = self::get_features();
$rpath = (($_GET['rpath']) ? $_GET['rpath'] : '');
$tpl = get_markup_template("settings_module.tpl"); $tpl = get_markup_template("settings_module.tpl");
$o .= replace_macros($tpl, array( $o .= replace_macros($tpl, array(
'$rpath' => $rpath,
'$action_url' => 'settings/network', '$action_url' => 'settings/network',
'$form_security_token' => get_form_security_token("settings_network"), '$form_security_token' => get_form_security_token("settings_network"),
'$title' => t('Activity Settings'), '$title' => t('Activity Settings'),

2
include/features.php
View File

@ -59,6 +59,8 @@ function process_features_post($uid, $features, $post_arr) {
else else
set_pconfig($uid,'feature', $k, ''); set_pconfig($uid,'feature', $k, '');
} }
if($post_arr['rpath'])
goaway($post_arr['rpath']);
} }
function get_features($filtered = true, $level = (-1)) { function get_features($filtered = true, $level = (-1)) {

2
view/tpl/app.tpl
View File

@ -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 $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 $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 $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> </form>
</div> </div>
{{/if}} {{/if}}

2
view/tpl/navbar_default.tpl
View File

@ -74,7 +74,7 @@
</div> </div>
{{if $settings_url}} {{if $settings_url}}
<div id="nav-app-settings-link-wrapper" class="navbar-nav mr-auto"> <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> <i class="fa fa-fw fa-cog"></i>
</a> </a>
</div> </div>

3
view/tpl/settings_module.tpl
View File

@ -5,6 +5,9 @@
<div class="section-content-wrapper"> <div class="section-content-wrapper">
<form action="{{$action_url}}" method="post" autocomplete="off"> <form action="{{$action_url}}" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <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}} {{foreach $features as $feature}}
{{include file="field_checkbox.tpl" field=$feature}} {{include file="field_checkbox.tpl" field=$feature}}
{{/foreach}} {{/foreach}}