diff options
author | zotlabs <mike@macgirvin.com> | 2017-12-12 11:54:26 -0800 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-12-12 11:54:26 -0800 |
commit | 215d615fc3bb9e168e21a78a6319a7971c4d1e9e (patch) | |
tree | ff0af309ef283c48a6f3df5d590068c103d6bf7a /view/tpl | |
parent | 979c05b24da0497be582aacaa8b744f692b56ccf (diff) | |
parent | d0956eb39d7a361639f5cd73fb1c3c8463fb1e99 (diff) | |
download | volse-hubzilla-215d615fc3bb9e168e21a78a6319a7971c4d1e9e.tar.gz volse-hubzilla-215d615fc3bb9e168e21a78a6319a7971c4d1e9e.tar.bz2 volse-hubzilla-215d615fc3bb9e168e21a78a6319a7971c4d1e9e.zip |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
-rw-r--r-- | view/tpl/cloud_directory.tpl | 10 | ||||
-rwxr-xr-x | view/tpl/navbar_tucson.tpl | 12 | ||||
-rw-r--r-- | view/tpl/notifications_widget.tpl | 6 |
3 files changed, 15 insertions, 13 deletions
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index ad3caff88..660e1e011 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -39,12 +39,12 @@ {{else}} <table id="cloud-index"> <tr> - <th width="1%"></th> - <th width="92%">{{$name}}</th> - <th width="1%"></th><th width="1%"></th><th width="1%"></th><th width="1%"></th> + <th width="4%"></th> + <th width="47%">{{$name}}</th> + <th width="4%"></th><th width="4%"></th><th width="4%"></th><th width="4%"></th> <th width="1%">{{*{{$type}}*}}</th> - <th width="1%" class="d-none d-md-table-cell">{{$size}}</th> - <th width="1%" class="d-none d-md-table-cell">{{$lastmod}}</th> + <th width="10%" class="d-none d-md-table-cell">{{$size}}</th> + <th width="22%" class="d-none d-md-table-cell">{{$lastmod}}</th> </tr> {{if $parentpath}} <tr> diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl index 4e045571f..08fc40656 100755 --- a/view/tpl/navbar_tucson.tpl +++ b/view/tpl/navbar_tucson.tpl @@ -113,7 +113,7 @@ <div id="navbar-network-menu" class="dropdown-menu" rel="network"> <a class="dropdown-item" id="nav-network-see-all" href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a> <a class="dropdown-item" id="nav-network-mark-all" href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a> - {{$emptynotifications}} + {{$emptynotifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> </li> {{/if}} @@ -126,7 +126,7 @@ <div id="navbar-home-menu" class="dropdown-menu" rel="home"> <a class="dropdown-item" id="nav-home-see-all" href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a> <a class="dropdown-item" id="nav-home-mark-all" href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a> - {{$emptynotifications}} + {{$emptynotifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> </li> {{/if}} @@ -139,7 +139,7 @@ <div id="navbar-mail-menu" class="dropdown-menu" rel="messages"> <a class="dropdown-item" id="nav-messages-see-all" href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a> <a class="dropdown-item" id="nav-messages-mark-all" href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a> - {{$emptynotifications}} + {{$emptynotifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> </li> {{/if}} @@ -152,7 +152,7 @@ <div id="navbar-all_events-menu" class="dropdown-menu" rel="all_events"> <a class="dropdown-item" id="nav-all_events-see-all" href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a> <a class="dropdown-item" id="nav-all_events-mark-all" href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a> - {{$emptynotifications}} + {{$emptynotifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> </li> {{/if}} @@ -164,7 +164,7 @@ </a> <div id="navbar-intros-menu" class="dropdown-menu" rel="intros"> <a class="dropdown-item" id="nav-intros-see-all" href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a> - {{$emptynotifications}} + {{$emptynotifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> </li> {{/if}} @@ -177,7 +177,7 @@ <div id="navbar-notify-menu" class="dropdown-menu" rel="notify"> <a class="dropdown-item" id="nav-notify-see-all" href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a> <a class="dropdown-item" id="nav-notify-mark-all" href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a> - {{$emptynotifications}} + {{$emptynotifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> </li> {{/if}} diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 9751f2e75..0974045fe 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -43,7 +43,9 @@ e.preventDefault(); if(! page_load) { - $(this).fadeOut(); + if($(this).parent().attr('id') !== 'nav-pubs-menu') + $(this).fadeOut(); + getData(b64mid, notify_id); } @@ -110,7 +112,7 @@ <i class="fa fa-fw fa-filter"></i> {{$notification.filter.label}} </div> {{/if}} - {{$loading}} + {{$loading}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> </div> {{/foreach}} |