aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/admin_queue.tpl3
-rwxr-xr-xview/tpl/conv_item.tpl19
-rwxr-xr-xview/tpl/conv_list.tpl14
-rw-r--r--view/tpl/item_attach.tpl2
-rwxr-xr-xview/tpl/new_channel.tpl2
-rw-r--r--view/tpl/rating_form.tpl3
-rw-r--r--view/tpl/sources_edit.tpl3
-rw-r--r--view/tpl/sources_list.tpl4
-rw-r--r--view/tpl/sources_new.tpl3
9 files changed, 32 insertions, 21 deletions
diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl
index 85b476266..56b70bbee 100644
--- a/view/tpl/admin_queue.tpl
+++ b/view/tpl/admin_queue.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
<h3>{{$banner}}</h3>
{{if $hasentries}}
@@ -11,4 +12,4 @@
</table>
-{{/if}} \ No newline at end of file
+{{/if}}
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 760d64db0..4782f827b 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -69,11 +69,6 @@
<span class="tag">{{$item.folders}}</span>
</div>
{{/if}}
- {{if $item.attachments}}
- <div class="body-tags" id="item-attachments">
- <span class='tag'>{{$item.attachments}}</span>
- </div>
- {{/if}}
<div class="clear"></div>
</div>
{{/if}}
@@ -157,9 +152,15 @@
</div>
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
- {{if $item.responses }}
- <div class="wall-item-tools-left{{if $item.responses.count > 1}} btn-group{{/if}}">
- {{foreach $item.responses as $verb=>$response}}
+ {{if $item.responses || $item.attachments}}
+ <div class="wall-item-tools-left{{if ($item.responses.count > 1) || ($item.responses.count && $item.attachments)}} btn-group{{/if}}">
+ {{if $item.attachments}}
+ <div class="btn-group">
+ <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
+ <ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
+ </div>
+ {{/if}}
+ {{foreach $item.responses as $verb=>$response}}
{{if $response.count}}
<div class="btn-group">
<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-{{$verb}}-{{$item.id}}">{{$response.count}} {{$response.button}}</button>
@@ -188,7 +189,7 @@
{{/if}}
</div>
{{/if}}
- {{/foreach}}
+ {{/foreach}}
</div>
{{/if}}
<div class="clear"></div>
diff --git a/view/tpl/conv_list.tpl b/view/tpl/conv_list.tpl
index a3fb642ce..53f65bc78 100755
--- a/view/tpl/conv_list.tpl
+++ b/view/tpl/conv_list.tpl
@@ -66,11 +66,6 @@
<span class="tag">{{$item.folders}}</span>
</div>
{{/if}}
- {{if $item.attachments}}
- <div class="body-tags" id="item-attachments">
- <span class='tag'>{{$item.attachments}}</span>
- </div>
- {{/if}}
<div class="clear"></div>
</div>
{{/if}}
@@ -151,7 +146,13 @@
</ul>
</div>
<div id="like-rotator-{{$item.id}}" class="like-rotator"></div>
- <div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count}} btn-group{{/if}}">
+ <div class="wall-item-tools-left{{if $item.unseen_comments || $item.like_count || $item.dislike_count || $item.attachments}} btn-group{{/if}}">
+ {{if $item.attachments}}
+ <div class="btn-group">
+ <button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="icon-paperclip"></i></button>
+ <ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$item.attachments}}</ul>
+ </div>
+ {{/if}}
<div class="wall-item-list-comments btn-group">
<button class="btn btn-default btn-sm" onclick="window.location.href='{{$item.viewthread}}'; return false;">
{{$item.comment_count_txt}}{{if $item.unseen_comments}}<span class="unseen-wall-indicator-{{$item.id}}">, {{$item.list_unseen_txt}}</span>{{/if}}
@@ -164,7 +165,6 @@
</button>
</div>
{{/if}}
-
{{if $item.responses }}
{{foreach $item.responses as $verb=>$response}}
{{if $response.count}}
diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl
index 7638f39e7..67accc1ec 100644
--- a/view/tpl/item_attach.tpl
+++ b/view/tpl/item_attach.tpl
@@ -1,5 +1,5 @@
{{if $attaches}}
{{foreach $attaches as $a}}
-<a href="{{$a.url}}" title="{{$a.title}}" class="btn btn-xs btn-default"><i class="{{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a>
+<li><a href="{{$a.url}}" title="{{$a.title}}"><i class="{{$a.icon}} attach-icons"></i>&nbsp;{{$a.label}}</a></li>
{{/foreach}}
{{/if}}
diff --git a/view/tpl/new_channel.tpl b/view/tpl/new_channel.tpl
index ff2011181..f78a3fc2d 100755
--- a/view/tpl/new_channel.tpl
+++ b/view/tpl/new_channel.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
<h2>{{$title}}</h2>
<form action="new_channel" method="post" id="newchannel-form" class="stylish-select">
@@ -34,3 +35,4 @@
<div id="newchannel-submit-end" class="newchannel-field-end"></div>
</form>
+</div>
diff --git a/view/tpl/rating_form.tpl b/view/tpl/rating_form.tpl
index d072a0b3c..4bd826484 100644
--- a/view/tpl/rating_form.tpl
+++ b/view/tpl/rating_form.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
<h3>{{$header}}</h3>
<div class="rating-target-name">{{if $site}}{{$website}} {{$site}}{{else}}{{$tgt_name}}{{/if}}</div>
@@ -12,6 +13,7 @@
<input type="hidden" name="target" value="{{$target}}" />
<input id="contact-rating-mirror" type="hidden" name="rating" value="{{$rating_val}}" />
+<br />
<h3 class="abook-rating-text-desc">{{$lbl_rating_txt}}</h3>
<textarea name="rating_text" id="rating-text" >{{$rating_txt}}</textarea>
@@ -20,3 +22,4 @@
<input class="contact-edit-submit" type="submit" name="done" value="{{$submit}}" />
</form>
+</div>
diff --git a/view/tpl/sources_edit.tpl b/view/tpl/sources_edit.tpl
index 34023e03f..a5b384ca3 100644
--- a/view/tpl/sources_edit.tpl
+++ b/view/tpl/sources_edit.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
<h1>{{$title}}</h1>
<div class="descriptive-text">{{$desc}}</div>
@@ -15,7 +16,7 @@
<br />
<br />
<a href="sources/{{$id}}/drop">{{$drop}}</a>
-
+</div>
diff --git a/view/tpl/sources_list.tpl b/view/tpl/sources_list.tpl
index 5fe50ba98..76be35b1a 100644
--- a/view/tpl/sources_list.tpl
+++ b/view/tpl/sources_list.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
<h1>{{$title}}</h1>
<div class="descriptive-text">{{$desc}}</div>
@@ -12,4 +13,5 @@
<li><a href="sources/{{$source.src_id}}">{{$source.xchan_name}}</a></li>
{{/foreach}}
</ul>
-{{/if}} \ No newline at end of file
+{{/if}}
+</div>
diff --git a/view/tpl/sources_new.tpl b/view/tpl/sources_new.tpl
index 3c6a4be30..3c8a54373 100644
--- a/view/tpl/sources_new.tpl
+++ b/view/tpl/sources_new.tpl
@@ -1,3 +1,4 @@
+<div class="generic-content-wrapper-styled">
<h1>{{$title}}</h1>
<div class="descriptive-text">{{$desc}}</div>
@@ -11,5 +12,5 @@
<input type="submit" name="submit" class="sources-submit" value="{{$submit}}" />
</div>
</form>
-
+</div>