diff options
| author | zotlabs <mike@macgirvin.com> | 2017-12-21 13:36:33 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-12-21 13:36:33 -0800 |
| commit | e7143a265ac97b31a8e0ada85b876ba76c911a3d (patch) | |
| tree | dfa42a02359701960f525d10a22e1ebca5b82873 /view/tpl | |
| parent | 684b572aa8005479f3eb219fc526c812c801ca76 (diff) | |
| parent | 9c72963d7ce3c60709755edb5d40cb0b06b29cda (diff) | |
| download | volse-hubzilla-e7143a265ac97b31a8e0ada85b876ba76c911a3d.tar.gz volse-hubzilla-e7143a265ac97b31a8e0ada85b876ba76c911a3d.tar.bz2 volse-hubzilla-e7143a265ac97b31a8e0ada85b876ba76c911a3d.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/msg-header.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/navbar_default.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 3 |
3 files changed, 5 insertions, 2 deletions
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl index d71d432fb..b6856f139 100755 --- a/view/tpl/msg-header.tpl +++ b/view/tpl/msg-header.tpl @@ -26,7 +26,7 @@ }); $('#prvmail-attach-wrapper').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;}); - $('#prvmail-attach-wrapper-sub').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;}); + $('#prvmail-attach-sub').click(function(event) { event.preventDefault(); $('#invisible-wall-file-upload').trigger('click'); return false;}); }); diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index c4f5af1dc..2c9570938 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -64,7 +64,7 @@ <a id="nav-app-link" href="{{$url}}" class="nav-link text-truncate"> {{$sel.name}} {{if $sitelocation}} - <br><small class="text-muted">{{$sitelocation}}</small> + <br><small>{{$sitelocation}}</small> {{/if}} </a> </div> diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index 0974045fe..299c07592 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -28,6 +28,9 @@ var path = $(this)[0].pathname.substr(1,7); var stateObj = { b64mid: b64mid }; + if(b64mid === 'undefined' && notify_id === 'undefined') + return; + {{if $module == 'display'}} history.pushState(stateObj, '', 'display/' + b64mid); {{/if}} |