diff options
| author | zotlabs <mike@macgirvin.com> | 2017-01-30 15:05:10 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-01-30 15:05:10 -0800 |
| commit | aadbd5a92d83eb6d3e0ed33340e17150d0804563 (patch) | |
| tree | 63951af4f22ca111b8748acb6656bfa71db3219a /view/tpl | |
| parent | 7b065365e0d64a06ddfb7ade55e713a4b6a0f802 (diff) | |
| parent | d0827dbb3c61727deba6fa9c2df3718467274e55 (diff) | |
| download | volse-hubzilla-aadbd5a92d83eb6d3e0ed33340e17150d0804563.tar.gz volse-hubzilla-aadbd5a92d83eb6d3e0ed33340e17150d0804563.tar.bz2 volse-hubzilla-aadbd5a92d83eb6d3e0ed33340e17150d0804563.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/app.tpl | 7 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index def98e869..434653e1e 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -14,9 +14,10 @@ <div class="app-tools"> <form action="{{$hosturl}}appman" method="post"> <input type="hidden" name="papp" value="{{$app.papp}}" /> - {{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></i></button>{{/if}} - {{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}} - {{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-default" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}} + {{if $install}}<button type="submit" name="install" value="{{$install}}" class="btn btn-default btn-xs" title="{{$install}}" ><i class="fa fa-arrow-circle-o-down" ></i></button>{{/if}} + {{if $edit}}<input type="hidden" name="appid" value="{{$app.guid}}" /><button type="submit" name="edit" value="{{$edit}}" class="btn btn-default btn-xs" title="{{$edit}}" ><i class="fa fa-pencil" ></i></button>{{/if}} + {{if $delete}}<button type="submit" name="delete" value="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" class="btn btn-default btn-xs" title="{{if $deleted}}{{$undelete}}{{else}}{{$delete}}{{/if}}" ><i class="fa fa-trash-o drop-icons"></i></button>{{/if}} + <button type="submit" name="feature" value="feature" class="btn btn-default btn-xs" ><i class="fa fa-star"{{if $featured}} style="color: gold"{{/if}}></i></button> </form> </div> {{/if}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 16cd9deca..86f9d5cf9 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -215,6 +215,11 @@ {{/if}} {{if $navapps}} + {{if $nav.help.6}} + <li class="{{$sel.help}} hidden-xs"> + <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="dropdown-toggle" data-toggle="dropdown"> <a href="#"><i class="fa fa-bars"></i></a> </li> |