From 5a59cd9b8cd6e0c00260f47c50e5433b070155d1 Mon Sep 17 00:00:00 2001
From: jeroenpraat <jeroenpraat@xs4all.nl>
Date: Tue, 15 Dec 2015 21:00:40 +0100
Subject: Invitation only added to the admin site page. Plus css wrapper class
 to docu search.

---
 view/tpl/admin_site.tpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view/tpl')

diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 4add59a0d..0e65dfa69 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -58,6 +58,7 @@
 	<h3>{{$registration}}</h3>
 	{{include file="field_input.tpl" field=$register_text}}
 	{{include file="field_select.tpl" field=$register_policy}}
+	{{include file="field_checkbox.tpl" field=$invite_only}}
 	{{include file="field_select.tpl" field=$access_policy}}
 	{{include file="field_textarea.tpl" field=$allowed_email}}
 	{{include file="field_textarea.tpl" field=$not_allowed_email}}	
-- 
cgit v1.2.3


From f78e9001f3d1b15b91787e956aa3555574dc2371 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 17 Dec 2015 19:39:26 +0100
Subject: fix search item attachment rendering

---
 view/tpl/search_item.tpl | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index b2689c7ba..24e1b97d5 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -65,11 +65,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}}
@@ -88,6 +83,12 @@
 						{{/if}}
 					</ul>
 				</div>
+				{{if $item.attachments}}
+				<div class="wall-item-tools-left 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="clear"></div>
 			</div>
 			<div class="clear"></div>
-- 
cgit v1.2.3