diff options
| author | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-02-18 16:53:04 +0100 |
|---|---|---|
| committer | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-02-18 16:53:04 +0100 |
| commit | fe392a3144f2c2e81e0451b1e6629136a60a7acd (patch) | |
| tree | f19860cf935189fd701b86f6e5e3edf58414fbf3 | |
| parent | eeed7077ca699256df05184abfce1177358b524c (diff) | |
| download | volse-hubzilla-fe392a3144f2c2e81e0451b1e6629136a60a7acd.tar.gz volse-hubzilla-fe392a3144f2c2e81e0451b1e6629136a60a7acd.tar.bz2 volse-hubzilla-fe392a3144f2c2e81e0451b1e6629136a60a7acd.zip | |
Removed export temporary from UNO. Removed 'Remove Channel' from UNO, cause a UNO member has only 1 channel, so it's logical to remove the acccount (by experience on UNO hub). Styling oauth settings.
| -rw-r--r-- | include/widgets.php | 13 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings_oauth.tpl | 9 | ||||
| -rwxr-xr-x | view/tpl/settings_oauth_edit.tpl | 9 |
4 files changed, 22 insertions, 11 deletions
diff --git a/include/widgets.php b/include/widgets.php index fa2b3de4d..a995fdf1c 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -542,11 +542,14 @@ function widget_settings_menu($arr) { 'selected' => ((argv(1) === 'oauth') ? 'active' : ''), ); - $tabs[] = array( - 'label' => t('Export channel'), - 'url' => $a->get_baseurl(true) . '/uexport', - 'selected' => '' - ); + // IF can go away when UNO export and import is fully functional + if(! UNO) { + $tabs[] = array( + 'label' => t('Export channel'), + 'url' => $a->get_baseurl(true) . '/uexport', + 'selected' => '' + ); + } if($role === false || $role === 'custom') { $tabs[] = array( diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 820ffd711..6f50f820a 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -1,6 +1,6 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> - <a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i> {{$removeme}}</a> + {{if $server_role != 'basic'}}<a title="{{$removechannel}}" class="btn btn-danger btn-xs pull-right" href="removeme"><i class="icon-trash"></i> {{$removeme}}</a>{{/if}} <h2>{{$ptitle}}</h2> <div class="clear"></div> </div> diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index 20e8f458f..5d77fe3ec 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -1,7 +1,9 @@ -<div class="generic-content-wrapper-styled"> -<h1>{{$title}}</h1> - +<div class="generic-content-wrapper"> +<div class="section-title-wrapper"> + <h1>{{$title}}</h1> +</div> +<div class="section-content-tools-wrapper"> <form action="settings/oauth" method="post" autocomplete="off"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> @@ -31,3 +33,4 @@ </form> </div> +</div> diff --git a/view/tpl/settings_oauth_edit.tpl b/view/tpl/settings_oauth_edit.tpl index bf805363c..417378cb9 100755 --- a/view/tpl/settings_oauth_edit.tpl +++ b/view/tpl/settings_oauth_edit.tpl @@ -1,5 +1,8 @@ -<h1>{{$title}}</h1> - +<div class="generic-content-wrapper"> + <div class="section-title-wrapper"> + <h1>{{$title}}</h1> + </div> +<div class="section-content-tools-wrapper"> <form method="POST"> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'> @@ -15,3 +18,5 @@ </div> </form> +</div> +</div> |