diff options
| -rw-r--r-- | include/channel.php | 1 | ||||
| -rw-r--r-- | include/nav.php | 5 | ||||
| -rw-r--r-- | view/js/mod_new_channel.js | 8 | ||||
| -rw-r--r-- | view/js/mod_register.js | 8 | ||||
| -rwxr-xr-x | view/tpl/main_slider.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 14 | ||||
| -rwxr-xr-x | view/tpl/new_channel.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/profile_tabs.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/register.tpl | 4 |
9 files changed, 33 insertions, 19 deletions
diff --git a/include/channel.php b/include/channel.php index fef933ba7..488bdeef0 100644 --- a/include/channel.php +++ b/include/channel.php @@ -1373,7 +1373,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa ? trim(substr($profile['channel_name'],0,strpos($profile['channel_name'],' '))) : $profile['channel_name']); $lastname = (($firstname === $profile['channel_name']) ? '' : trim(substr($profile['channel_name'],strlen($firstname)))); - // @fixme move this to the diaspora plugin itself $contact_block = contact_block(); diff --git a/include/nav.php b/include/nav.php index eccb89764..b51a03c4f 100644 --- a/include/nav.php +++ b/include/nav.php @@ -280,6 +280,8 @@ EOT; '$help' => t('@name, #tag, ?doc, content'), '$pleasewait' => t('Please wait...'), '$nav_apps' => $nav_apps, + '$channel_menu' => get_config('system','channel_menu'), + '$channel_thumb' => ((App::$profile) ? App::$profile['thumb'] : ''), '$channel_apps' => $channel_apps, '$addapps' => t('Add Apps'), '$orderapps' => t('Arrange Apps'), @@ -481,7 +483,8 @@ function channel_apps($is_owner = false, $nickname = null) { [ '$tabs' => $arr['tabs'], '$name' => App::$profile['channel_name'], - '$thumb' => App::$profile['thumb'] + '$thumb' => App::$profile['thumb'], + '$channel_menu' => get_config('system','channel_menu') ] ); } diff --git a/view/js/mod_new_channel.js b/view/js/mod_new_channel.js index 17b354a4b..e670e1a35 100644 --- a/view/js/mod_new_channel.js +++ b/view/js/mod_new_channel.js @@ -1,7 +1,7 @@ $(document).ready(function() { // $("#id_permissions_role").sSelect(); $("#id_name").blur(function() { - $("#name-spinner").spin('small'); + $("#name-spinner").show(); var zreg_name = $("#id_name").val(); $.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) { $("#id_nickname").val(data); @@ -9,12 +9,12 @@ $("#help_name").html(""); zFormError("#help_name",data.error); } - $("#name-spinner").spin(false); + $("#name-spinner").hide(); }); }); $("#id_nickname").blur(function() { - $("#nick-spinner").spin('small'); + $("#nick-spinner").show(); var zreg_nick = $("#id_nickname").val(); $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) { $("#id_nickname").val(data); @@ -22,7 +22,7 @@ $("#help_nickname").html(""); zFormError("#help_nickname",data.error); } - $("#nick-spinner").spin(false); + $("#nick-spinner").hide(); }); }); diff --git a/view/js/mod_register.js b/view/js/mod_register.js index f1f3e7f71..6607579a2 100644 --- a/view/js/mod_register.js +++ b/view/js/mod_register.js @@ -28,7 +28,7 @@ $(document).ready(function() { }); $("#id_name").blur(function() { - $("#name-spinner").spin('small'); + $("#name-spinner").show(); var zreg_name = $("#id_name").val(); $.get("new_channel/autofill.json?f=&name=" + encodeURIComponent(zreg_name),function(data) { $("#id_nickname").val(data); @@ -36,12 +36,12 @@ $(document).ready(function() { $("#help_name").html(""); zFormError("#help_name",data.error); } - $("#name-spinner").spin(false); + $("#name-spinner").hide(); }); }); $("#id_nickname").blur(function() { - $("#nick-spinner").spin('small'); + $("#nick-spinner").show(); var zreg_nick = $("#id_nickname").val(); $.get("new_channel/checkaddr.json?f=&nick=" + encodeURIComponent(zreg_nick),function(data) { $("#id_nickname").val(data); @@ -49,7 +49,7 @@ $(document).ready(function() { $("#help_nickname").html(""); zFormError("#help_nickname",data.error); } - $("#nick-spinner").spin(false); + $("#nick-spinner").hide(); }); }); diff --git a/view/tpl/main_slider.tpl b/view/tpl/main_slider.tpl index d4f0dd936..4cc265f59 100755 --- a/view/tpl/main_slider.tpl +++ b/view/tpl/main_slider.tpl @@ -1,5 +1,5 @@ <div id="main-slider" class="slider" ><input id="main-range" type="text" name="cminmax" value="{{$val}}" /></div> -<div id="profile-jot-text-loading" style="display:none;"></div> +<div id="profile-jot-text-loading" class="spinner-wrapper"><div class="spinner m"></div></div> <script> $(document).ready(function() { var old_cmin = 0; @@ -27,7 +27,7 @@ $(document).ready(function() { return; if((bParam_cmin == old_cmin) && (bParam_cmax == old_cmax)) return; - setTimeout(function() { $("#profile-jot-text-loading").spin('small'); }, 1000 ); + slideTimer = setTimeout(networkTimerRefresh,2000); } diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 82cdc0dd0..9f4525c17 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -218,10 +218,20 @@ <a class="nav-link {{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-question-circle"></i></a> </li> {{/if}} + {{if $channel_menu && $channel_apps.0}} + <li class="nav-item dropdown" id="channel-menu"> + <a class="nav-link" href="#" data-toggle="dropdown"><img src="{{$channel_thumb}}" style="height:14px; width:14px;position:relative; top:-2px;" /></a> + <div id="dropdown-menu" class="dropdown-menu dropdown-menu-right"> + {{foreach $channel_apps as $channel_app}} + {{$channel_app}} + {{/foreach}} + </div> + </li> + {{/if}} <li class="nav-item dropdown" id="app-menu"> <a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a> <div id="dropdown-menu" class="dropdown-menu dropdown-menu-right"> - {{if $channel_apps.0}} + {{if $channel_apps.0 && ! $channel_menu}} {{foreach $channel_apps as $channel_app}} {{$channel_app}} {{/foreach}} @@ -233,7 +243,7 @@ {{foreach $nav_apps as $nav_app}} {{$nav_app}} {{/foreach}} - {{if $channel_apps.0}} + {{if $channel_apps.0 && ! $channel_menu}} </div> {{/if}} {{if $is_owner}} diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl index cc1983ac4..c4837064f 100755 --- a/view/tpl/new_channel.tpl +++ b/view/tpl/new_channel.tpl @@ -19,10 +19,10 @@ {{/if}} {{include file="field_input.tpl" field=$name}} - <div id="name-spinner"></div> + <div id="name-spinner" class="spinner-wrapper"><div class="spinner m"></div></div> {{include file="field_input.tpl" field=$nickname}} - <div id="nick-spinner"></div> + <div id="nick-spinner" class="spinner-wrapper"><div class="spinner m"></div></div> <button class="btn btn-primary" type="submit" name="submit" id="newchannel-submit-button" value="{{$submit}}">{{$submit}}</button> <div id="newchannel-submit-end" class="clear"></div> diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl index 49b74bb8f..b59135209 100644 --- a/view/tpl/profile_tabs.tpl +++ b/view/tpl/profile_tabs.tpl @@ -1,5 +1,7 @@ -<div class="dropdown-header"><img src="{{$thumb}}" class="menu-img-1">{{$name}}:</div> +<div class="dropdown-header"><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div> {{foreach $tabs as $tab}} <a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a> {{/foreach}} +{{if ! $channel_menu}} <div class="dropdown-divider"></div> +{{/if}}
\ No newline at end of file diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index c84934626..493dba4c8 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -39,10 +39,10 @@ {{/if}} {{include file="field_input.tpl" field=$name}} - <div id="name-spinner"></div> + <div id="name-spinner" class="spinner-wrapper"><div class="spinner m"></div></div> {{include file="field_input.tpl" field=$nickname}} - <div id="nick-spinner"></div> + <div id="nick-spinner" class="spinner-wrapper"><div class="spinner m"></div></div> {{/if}} {{if $enable_tos}} |