diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-03 17:17:20 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-03 17:17:20 -0700 |
| commit | 4adf2caaa687287cf82b930bb5a0c07d39c7afc0 (patch) | |
| tree | 670ce1e8c82b813ce86b6c8815e66ea6ea3a5adb /view | |
| parent | db82d303e217c2ca599a8b740ebb62339d373124 (diff) | |
| parent | 0fac35686b28825da69c77f9a903e4e24a7036fa (diff) | |
| download | volse-hubzilla-4adf2caaa687287cf82b930bb5a0c07d39c7afc0.tar.gz volse-hubzilla-4adf2caaa687287cf82b930bb5a0c07d39c7afc0.tar.bz2 volse-hubzilla-4adf2caaa687287cf82b930bb5a0c07d39c7afc0.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 8 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/view/js/main.js b/view/js/main.js index 41be3da59..531f999f9 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -281,7 +281,7 @@ function closeMenu(theID) { function markRead(notifType) { $.get('ping?f=&markRead='+notifType); if(timer) clearTimeout(timer); - $('#' + notifType + '-update').html(''); + $('.' + notifType + '-button').hide(); timer = setTimeout(NavUpdate,2000); } @@ -446,13 +446,13 @@ function NavUpdate() { if(data.network == 0) { data.network = ''; - $('.net-update, .net-button').hide(); + $('.network-update, .network-button').hide(); document.title = savedTitle; } else { - $('.net-update, .net-button').show(); + $('.network-update, .network-button').show(); document.title = '(' + data.network + ') ' + savedTitle; } - $('.net-update').html(data.network); + $('.network-update').html(data.network); if(data.pubs == 0) { data.pubs = ''; diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ae354e371..f21017076 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -75,10 +75,10 @@ <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="navbar-nav mr-auto"> {{if $nav.network}} - <li class="nav-item dropdown net-button" style="display: none;"> + <li class="nav-item dropdown network-button" style="display: none;"> <a class="nav-link" href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu"> <i class="fa fa-fw fa-th"></i> - <span class="badge badge-pill badge-secondary net-update"></span> + <span class="badge badge-pill badge-secondary network-update"></span> </a> <div id="nav-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> |