diff options
| author | zotlabs <mike@macgirvin.com> | 2017-03-13 15:13:31 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-03-13 15:13:31 -0700 |
| commit | 41c2f7477217634c2f8da3351cf10a520da6bd02 (patch) | |
| tree | 886785c5deac6902d816fbd54d11b87756c63c53 /view | |
| parent | 4a24a8de4341d1a3231c4dc22661c89559053424 (diff) | |
| parent | bdfdd23b36cac0881ef4096180e1c9242753dd49 (diff) | |
| download | volse-hubzilla-41c2f7477217634c2f8da3351cf10a520da6bd02.tar.gz volse-hubzilla-41c2f7477217634c2f8da3351cf10a520da6bd02.tar.bz2 volse-hubzilla-41c2f7477217634c2f8da3351cf10a520da6bd02.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/jot.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl index 377eef453..991873daa 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 0581989ec..11e107d2a 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -177,7 +177,7 @@ <a class="{{$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-question-circle"></i></a> </li> {{/if}} - <li class=""> + <li class="" id="app-menu"> <a href="#" data-toggle="dropdown"><i class="fa fa-bars"></i></a> <ul class="dropdown-menu"> {{foreach $navapps as $navapp}} |