aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-03-13 11:11:20 +0100
committerMario Vavti <mario@mariovavti.com>2017-03-13 11:11:20 +0100
commit188782c46195fcc530f8641f41da012aab9dbd76 (patch)
tree38e4b5544af3996000853f94b9f916078944da7f /view/tpl
parent61257094b7befe12dadbd3593fcfa70d09da2fbb (diff)
parentbdfdd23b36cac0881ef4096180e1c9242753dd49 (diff)
downloadvolse-hubzilla-188782c46195fcc530f8641f41da012aab9dbd76.tar.gz
volse-hubzilla-188782c46195fcc530f8641f41da012aab9dbd76.tar.bz2
volse-hubzilla-188782c46195fcc530f8641f41da012aab9dbd76.zip
merge dev into bs4
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/jot.tpl2
-rwxr-xr-xview/tpl/nav.tpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl
index 5b64867aa..8885da7c1 100755
--- a/view/tpl/jot.tpl
+++ b/view/tpl/jot.tpl
@@ -217,7 +217,7 @@
<div id="jot-preview-content" style="display:none;"></div>
-{{if $showacl}}{{$acl}}{{/if}}
+{{$acl}}
{{if $feature_expire}}
<!-- Modal for item expiry-->
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 42f331fee..d3ead3cfe 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -184,7 +184,7 @@
<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}}
- <li class="nav-item dropdown">
+ <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 class="dropdown-menu dropdown-menu-right">
{{foreach $navapps as $navapp}}