aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl/channels.tpl
diff options
context:
space:
mode:
authorPaolo Tacconi <p.tacconi@giunti.it>2016-04-15 09:20:58 +0200
committerPaolo Tacconi <p.tacconi@giunti.it>2016-04-15 09:20:58 +0200
commit45a854762b451dafb882bc56efce054b64420627 (patch)
tree958fcd22f04546f40b6ac68bb58cfe1a1b1fb7f6 /view/tpl/channels.tpl
parent1806da0851dd5cf5978b19d12783ae3101a11257 (diff)
parenta29c0371f1f3cceb9a9af3a62e5ed67886869c40 (diff)
downloadvolse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.gz
volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.tar.bz2
volse-hubzilla-45a854762b451dafb882bc56efce054b64420627.zip
Resolved conflict in view/it/hstrings.php
Diffstat (limited to 'view/tpl/channels.tpl')
-rwxr-xr-xview/tpl/channels.tpl60
1 files changed, 23 insertions, 37 deletions
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
index 44daa0a3e..1a6012926 100755
--- a/view/tpl/channels.tpl
+++ b/view/tpl/channels.tpl
@@ -1,38 +1,24 @@
-<div class="generic-content-wrapper-styled">
-<h3>{{$header}}</h3>
-
-{{if $links}}
-{{foreach $links as $l}}
-<a class="channels-links" href="{{$l.0}}" title="{{$l.1}}">{{$l.2}}</a>
-{{/foreach}}
-{{/if}}
-<div class="channels-break"></div>
-
-{{if $channel_usage_message}}
-<div id="channel-usage-message" class="usage-message">
-{{$channel_usage_message}}
-</div>
-{{/if}}
-<div id="channels-desc" class="descriptive-text">{{$desc}}</div>
-
-<div id="all-channels">
-{{foreach $all_channels as $chn}}
-{{include file="channel.tpl" channel=$chn}}
-{{/foreach}}
-</div>
-
-<div class="channels-end all"></div>
-
-{{if $delegates}}
-<hr />
-<h3>{{$delegate_header}}</h3>
-<div id="delegated-channels">
-{{foreach $delegates as $chn}}
-{{include file="channel.tpl" channel=$chn}}
-{{/foreach}}
-</div>
-
-<div class="channels-end all"></div>
-{{/if}}
-
+<div class="generic-content-wrapper">
+ <div class="section-title-wrapper">
+ <a class="btn btn-success btn-xs pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="icon-plus-sign"></i>&nbsp;{{$create.2}}</a>
+ <h2>{{$header}}</h2>
+ </div>
+ <div class="section-content-wrapper-np">
+ {{if $channel_usage_message}}
+ <div id="channel-usage-message" class="section-content-warning-wrapper">
+ {{$channel_usage_message}}
+ </div>
+ {{/if}}
+ <div id="channels-desc" class="section-content-info-wrapper">
+ {{$desc}}
+ </div>
+ {{foreach $all_channels as $chn}}
+ {{include file="channel.tpl" channel=$chn}}
+ {{/foreach}}
+ {{if $delegates}}
+ {{foreach $delegates as $chn}}
+ {{include file="channel.tpl" channel=$chn}}
+ {{/foreach}}
+ {{/if}}
+ </div>
</div>