aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-25 20:14:07 -0700
committerredmatrix <git@macgirvin.com>2016-04-25 20:14:07 -0700
commit78e4b64c8bbc85082eb4b589a1ff5cd796d695c9 (patch)
tree2c23035d4c2d7453611397ab075f875885db8925 /view/tpl
parentd62f4908146f2bdfb396bff06f74afb62995e4a3 (diff)
parent6aef5593d50c15f35b7d7d60fc12d91869c405b3 (diff)
downloadvolse-hubzilla-78e4b64c8bbc85082eb4b589a1ff5cd796d695c9.tar.gz
volse-hubzilla-78e4b64c8bbc85082eb4b589a1ff5cd796d695c9.tar.bz2
volse-hubzilla-78e4b64c8bbc85082eb4b589a1ff5cd796d695c9.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/abook_edit.tpl24
-rwxr-xr-xview/tpl/photo_view.tpl2
-rwxr-xr-xview/tpl/profile_edit.tpl2
3 files changed, 14 insertions, 14 deletions
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 4fa810cb4..74ba6072d 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -3,18 +3,18 @@
{{if $notself}}
<div class="dropdown pull-right">
<button id="connection-dropdown" class="btn btn-default btn-xs" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- <i class="icon-caret-down"></i>
+ <i class="icon-caret-down"></i>&nbsp;{{$tools_label}}
</button>
<ul class="dropdown-menu" aria-labelledby="dLabel">
- <li><a href="{{$buttons.view.url}}" title="{{$buttons.view.title}}">{{$buttons.view.label}}</a></li>
- <li><a href="{{$buttons.recent.url}}" title="{{$buttons.recent.title}}">{{$buttons.recent.label}}</a></li>
+ <li><a href="{{$tools.view.url}}" title="{{$tools.view.title}}">{{$tools.view.label}}</a></li>
+ <li><a href="{{$tools.recent.url}}" title="{{$tools.recent.title}}">{{$tools.recent.label}}</a></li>
<li class="divider"></li>
- <li><a href="#" title="{{$buttons.refresh.title}}" onclick="window.location.href='{{$buttons.refresh.url}}'; return false;">{{$buttons.refresh.label}}</a></li>
- <li><a href="#" title="{{$buttons.block.title}}" onclick="window.location.href='{{$buttons.block.url}}'; return false;">{{$buttons.block.label}}</a></li>
- <li><a href="#" title="{{$buttons.ignore.title}}" onclick="window.location.href='{{$buttons.ignore.url}}'; return false;">{{$buttons.ignore.label}}</a></li>
- <li><a href="#" title="{{$buttons.archive.title}}" onclick="window.location.href='{{$buttons.archive.url}}'; return false;">{{$buttons.archive.label}}</a></li>
- <li><a href="#" title="{{$buttons.hide.title}}" onclick="window.location.href='{{$buttons.hide.url}}'; return false;">{{$buttons.hide.label}}</a></li>
- <li><a href="#" title="{{$buttons.delete.title}}" onclick="window.location.href='{{$buttons.delete.url}}'; return false;">{{$buttons.delete.label}}</a></li>
+ <li><a href="#" title="{{$tools.refresh.title}}" onclick="window.location.href='{{$tools.refresh.url}}'; return false;">{{$tools.refresh.label}}</a></li>
+ <li><a href="#" title="{{$tools.block.title}}" onclick="window.location.href='{{$tools.block.url}}'; return false;">{{$tools.block.label}}</a></li>
+ <li><a href="#" title="{{$tools.ignore.title}}" onclick="window.location.href='{{$tools.ignore.url}}'; return false;">{{$tools.ignore.label}}</a></li>
+ <li><a href="#" title="{{$tools.archive.title}}" onclick="window.location.href='{{$tools.archive.url}}'; return false;">{{$tools.archive.label}}</a></li>
+ <li><a href="#" title="{{$tools.hide.title}}" onclick="window.location.href='{{$tools.hide.url}}'; return false;">{{$tools.hide.label}}</a></li>
+ <li><a href="#" title="{{$tools.delete.title}}" onclick="window.location.href='{{$tools.delete.url}}'; return false;">{{$tools.delete.label}}</a></li>
</ul>
</div>
{{/if}}
@@ -22,11 +22,11 @@
</div>
<div class="section-content-wrapper-np">
{{if $notself}}
- {{foreach $buttons as $b}}
- {{if $b.info}}
+ {{foreach $tools as $tool}}
+ {{if $tool.info}}
<div class="section-content-danger-wrapper">
<div>
- {{$b.info}}
+ {{$tool.info}}
</div>
</div>
{{/if}}
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 254733622..ca2b5e090 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -5,7 +5,7 @@
{{if $tools || $map || $edit}}
<div class="btn-group">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown">
- <i class="icon-caret-down"></i>
+ <i class="icon-caret-down"></i>&nbsp;{{$tools_label}}
</button>
<ul class="dropdown-menu">
{{if $tools}}
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index a02323e45..4908646b9 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -2,7 +2,7 @@
<div class="section-title-wrapper">
<div class="dropdown pull-right" id="profile-edit-links">
<button type="button" class="btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
- <i class="icon-caret-down"></i>
+ <i class="icon-caret-down"></i>&nbsp;{{$tools_label}}
</button>
<ul class="dropdown-menu">
<li class="nav-item">