aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-03-29 16:11:50 -0700
committerzotlabs <mike@macgirvin.com>2017-03-29 16:11:50 -0700
commit2d4f84563b8832d2a5996e7ee59a3123f998c433 (patch)
treed6a220cfdf5db2eac2c2513ab41b629e4fe2ddfa /view/tpl
parentad3a3273660600be7932229a7af0293c1f04e28b (diff)
parent3b6a0d8e5cb787bace27aee67f7ae0f4130e3132 (diff)
downloadvolse-hubzilla-2d4f84563b8832d2a5996e7ee59a3123f998c433.tar.gz
volse-hubzilla-2d4f84563b8832d2a5996e7ee59a3123f998c433.tar.bz2
volse-hubzilla-2d4f84563b8832d2a5996e7ee59a3123f998c433.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/admin_channels.tpl6
-rwxr-xr-xview/tpl/photo_albums.tpl2
2 files changed, 4 insertions, 4 deletions
diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl
index 087ce6d3c..452e0eeec 100755
--- a/view/tpl/admin_channels.tpl
+++ b/view/tpl/admin_channels.tpl
@@ -34,9 +34,9 @@
<td class='channel_address'>{{$c.channel_address}}</td>
<td class="checkbox_bulkedit"><input type="checkbox" class="channels_ckbx" id="id_channel_{{$c.channel_id}}" name="channel[]" value="{{$c.channel_id}}"/></td>
<td class="tools">
- <a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
- <a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
- <a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-outline-secondary btn-sm" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
+ <a href="{{$baseurl}}/admin/channels/block/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{if ($c.blocked)}}{{$unblock}}{{else}}{{$block}}{{/if}}'><i class='fa fa-ban admin-icons {{if ($c.blocked)}}dim{{/if}}'></i></a>
+ <a href="{{$baseurl}}/admin/channels/code/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs{{if ($c.allowcode)}} btn-danger{{/if}}" title='{{if ($c.allowcode)}}{{$uncode}}{{else}}{{$code}}{{/if}}'><i class='fa fa-terminal admin-icons {{if ($c.allowcode)}}dim{{/if}}'></i></a>
+ <a href="{{$baseurl}}/admin/channels/delete/{{$c.channel_id}}?t={{$form_security_token}}" class="btn btn-default btn-xs" title='{{$delete}}' onclick="return confirm_delete('{{$c.channel_name}}')"><i class='fa fa-trash-o admin-icons'></i></a>
</td>
</tr>
{{/foreach}}
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index aa78c513a..c565ccaf1 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,7 +1,7 @@
<div id="side-bar-photos-albums" class="widget">
<h3>{{$title}}</h3>
<ul class="nav nav-pills flex-column">
- <li class="nav-item"><a class="nav-link"href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent_photos}}</a></li>
+ <li class="nav-item"><a class="nav-link" href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >{{$recent_photos}}</a></li>
{{if $albums}}
{{foreach $albums as $al}}
{{if $al.shorttext}}