diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-28 15:25:29 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-28 15:25:29 -0700 |
| commit | e316494e06062f05c8026111dc1132fb6868bce5 (patch) | |
| tree | 82c221a92d6075bd38c16174bcb8187fb017181e /view | |
| parent | d3a5911932201eda2328123873d75e8c13cb9a89 (diff) | |
| parent | 4585e35b3e086638fa7a0c3832d80c57339a397e (diff) | |
| download | volse-hubzilla-e316494e06062f05c8026111dc1132fb6868bce5.tar.gz volse-hubzilla-e316494e06062f05c8026111dc1132fb6868bce5.tar.bz2 volse-hubzilla-e316494e06062f05c8026111dc1132fb6868bce5.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view')
| -rw-r--r-- | view/js/main.js | 18 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 18 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 4 | ||||
| -rw-r--r-- | view/tpl/sharedwithme.tpl | 2 |
4 files changed, 39 insertions, 3 deletions
diff --git a/view/js/main.js b/view/js/main.js index 6c42531ea..8c49e3173 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -370,7 +370,7 @@ function NavUpdate() { updateCountsOnly = false; - if(data.network || data.home || data.intros || data.mail || data.all_events || data.notify) { + if(data.network || data.home || data.intros || data.mail || data.all_events || data.notify || data.files || data.pubs) { $('#notifications-btn').css('opacity', 1); } else { @@ -386,6 +386,22 @@ function NavUpdate() { } $('.net-update').html(data.network); + if(data.pubs == 0) { + data.pubs = ''; + $('.pubs-update, .pubs-button').hide(); + } else { + $('.pubs-update, .pubs-button').show(); + } + $('.pubs-update').html(data.pubs); + + if(data.files == 0) { + data.files = ''; + $('.files-update, .files-button').hide(); + } else { + $('.files-update, .files-button').show(); + } + $('.files-update').html(data.files); + if(data.home == 0) { data.home = ''; $('.home-update, .home-button').hide(); } else { $('.home-update, .home-button').show(); } $('.home-update').html(data.home); diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index c0b34bbe8..3e0ae8d5c 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -68,7 +68,7 @@ <i class="fa fa-exclamation-circle"></i> </button> {{/if}} - <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2"> + <button class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2"> <i class="fa fa-bars"></i> </button> </div> @@ -166,6 +166,22 @@ <a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a> </li> {{/if}} + {{if $nav.files}} + <li class="nav-item dropdown files-button" style="display: none;"> + <a class="nav-link" href="{{$nav.files.0}}" title="{{$nav.files.3}}" id="{{$nav.files.4}}" rel="#nav-files-menu"> + <i class="fa fa-fw fa-folder"></i> + <span class="badge badge-pill badge-primary files-update"></span> + </a> + </li> + {{/if}} + {{if $nav.pubs}} + <li class="nav-item dropdown pubs-button" style="display: none;"> + <a class="nav-link" href="{{$nav.pubs.0}}" title="{{$nav.pubs.3}}" id="{{$nav.pubs.4}}" rel="#nav-pubs-menu"> + <i class="fa fa-fw fa-globe"></i> + <span class="badge badge-pill badge-primary pubs-update"></span> + </a> + </li> + {{/if}} </ul> <div id="banner" class="navbar-text d-none d-md-flex">{{$banner}}</div> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 6673e5815..3a8e31107 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -137,6 +137,10 @@ {{include file="field_intcheckbox.tpl" field=$vnotify8}} {{include file="field_intcheckbox.tpl" field=$vnotify9}} {{include file="field_intcheckbox.tpl" field=$vnotify11}} + {{include file="field_intcheckbox.tpl" field=$vnotify12}} + {{if $vnotify13}} + {{include file="field_intcheckbox.tpl" field=$vnotify13}} + {{/if}} {{include file="field_intcheckbox.tpl" field=$always_show_in_notices}} {{include file="field_input.tpl" field=$evdays}} </div> diff --git a/view/tpl/sharedwithme.tpl b/view/tpl/sharedwithme.tpl index 68bdd6faa..8474ccd52 100644 --- a/view/tpl/sharedwithme.tpl +++ b/view/tpl/sharedwithme.tpl @@ -15,7 +15,7 @@ {{foreach $items as $item}} <tr id="cloud-index-{{$item.id}}"> <td><i class="fa {{$item.objfiletypeclass}}" title="{{$item.objfiletype}}"></i></td> - <td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}} <span class="label label-success">{{$label_new}}</span>{{/if}}</td> + <td><a href="{{$item.objurl}}">{{$item.objfilename}}</a>{{if $item.unseen}} <span class="badge badge-pill badge-success">{{$label_new}}</span>{{/if}}</td> <td class="cloud-index-tool"><a href="#" title="{{$drop}}" onclick="dropItem('/sharedwithme/{{$item.id}}/drop', '#cloud-index-{{$item.id}}'); return false;"><i class="fa fa-trash-o drop-icons"></i></a></td> <td class="d-none d-md-table-cell">{{$item.objfilesize}}</td> <td class="d-none d-md-table-cell">{{$item.objedited}}</td> |