diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-02-06 20:10:10 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-02-06 20:10:10 +0100 |
| commit | 70edcabca1e9341b857c469760c88e5c9d318c53 (patch) | |
| tree | 6af269b8e2d64e3be5ff6036e38e860e55fe2f33 /view | |
| parent | dce5e8d0ccc1bb01b7db53af67bd872704a918ed (diff) | |
| download | volse-hubzilla-70edcabca1e9341b857c469760c88e5c9d318c53.tar.gz volse-hubzilla-70edcabca1e9341b857c469760c88e5c9d318c53.tar.bz2 volse-hubzilla-70edcabca1e9341b857c469760c88e5c9d318c53.zip | |
move icon stuff back to app_render() and send navapps through app_render()
Diffstat (limited to 'view')
| -rw-r--r-- | view/tpl/app.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 8 | ||||
| -rw-r--r-- | view/tpl/navapps.tpl | 8 |
3 files changed, 12 insertions, 10 deletions
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index d4b4c19e8..2ecb5a701 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -1,6 +1,7 @@ +{{if !$navapps}} <div class="app-container"> <div class="app-detail{{if $deleted}} app-deleted{{/if}}"> - <a href="{{$app.url}}" {{if $ap.target}}target="{{$app.target}}" {{/if}}{{if $app.desc}}title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $app.icon}}<i class="app-icon fa fa-fw fa-{{$app.icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}} + <a href="{{$app.url}}"{{if $app.target}} target="{{$app.target}}"{{/if}}{{if $app.desc}} title="{{$app.desc}}{{if $app.price}} ({{$app.price}}){{/if}}"{{else}}title="{{$app.name}}"{{/if}}>{{if $icon}}<i class="app-icon fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="80" height="80" />{{/if}} <div class="app-name" style="text-align:center;">{{$app.name}}</div> </a> </div> @@ -24,4 +25,7 @@ </div> {{/if}} </div> +{{else}} +<li><a href="{{$app.url}}">{{if $icon}}<i class="generic-icons-nav fa fa-fw fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a></li> +{{/if}} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 972b919fa..236cde230 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -170,7 +170,13 @@ <li class=""> <a href="#" data-toggle="dropdown"><i class="fa fa-bars"></i></a> <ul class="dropdown-menu"> - {{$navapps}} + {{foreach $navapps as $navapp}} + {{$navapp}} + {{/foreach}} + {{if $localuser}} + <li class="divider"></li> + <li><a href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>Add Apps</a></li> + {{/if}} </ul> </li> </ul> diff --git a/view/tpl/navapps.tpl b/view/tpl/navapps.tpl deleted file mode 100644 index 735c322e5..000000000 --- a/view/tpl/navapps.tpl +++ /dev/null @@ -1,8 +0,0 @@ -{{foreach $apps as $app}} -<li><a href="{{$app.url}}">{{if $app.icon}}<i class="generic-icons-nav fa fa-fw fa-{{$app.icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" style="margin-right:9px;"/>{{/if}}{{$app.name}}</a></li> -{{/foreach}} -{{if $localuser}} -<li class="divider"></li> -<li><a href="/apps"><i class="generic-icons-nav fa fa-fw fa-plus-circle"></i>Add Apps</a></li> -{{/if}} - |