aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-06-11 12:13:44 +0200
committerMario <mario@mariovavti.com>2020-06-11 12:13:44 +0200
commitc8c4513af98a9dd2a6d9331ba4b3ab3af0e95a5f (patch)
tree255dc1dbe5745a2bf9b5a4f93ed82628052067cb /view
parent9da8e30c378a58a89d3eeaf2f29d8c8774128235 (diff)
parent3201a4bec5f3524c2eba813e46d69b4c5943840f (diff)
downloadvolse-hubzilla-c8c4513af98a9dd2a6d9331ba4b3ab3af0e95a5f.tar.gz
volse-hubzilla-c8c4513af98a9dd2a6d9331ba4b3ab3af0e95a5f.tar.bz2
volse-hubzilla-c8c4513af98a9dd2a6d9331ba4b3ab3af0e95a5f.zip
Merge branch 'dev' into 'dev'
allow apps to be both pinned and starred independently See merge request hubzilla/core!1858
Diffstat (limited to 'view')
-rw-r--r--view/tpl/app.tpl4
1 files changed, 2 insertions, 2 deletions
diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl
index cacbf7e64..774b75b31 100644
--- a/view/tpl/app.tpl
+++ b/view/tpl/app.tpl
@@ -31,8 +31,8 @@
<a class="dropdown-item{{if $app.active}} active{{/if}}" 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>
{{/if}}
{{if $order}}
-<a href="{{$hosturl}}appman/{{$app.guid}}/moveup{{if $pinned}}/nav_pinned_app{{else}}/nav_featured_app{{/if}}" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
-<a href="{{$hosturl}}appman/{{$app.guid}}/movedown{{if $pinned}}/nav_pinned_app{{else}}/nav_featured_app{{/if}}" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
+<a href="{{$hosturl}}appman/{{$app.guid}}/moveup{{if $mode == 'nav-order-pinned'}}/nav_pinned_app{{else}}/nav_featured_app{{/if}}" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-up"></i></a>
+<a href="{{$hosturl}}appman/{{$app.guid}}/movedown{{if $mode == 'nav-order-pinned'}}/nav_pinned_app{{else}}/nav_featured_app{{/if}}" class="btn btn-outline-secondary btn-sm" style="margin-bottom: 5px;"><i class="generic-icons-nav fa fa-fw fa-arrow-down"></i></a>
{{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}}<br>
{{/if}}