From be27fb56440c6687add239e10c5e46ee7f3018f1 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 25 Feb 2016 13:40:15 +0100
Subject: we have got a button for events in the nav. no need for it in the
 tabs if we are local.

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

(limited to 'view')

diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl
index b3c7ff03b..bc8a3aa31 100755
--- a/view/tpl/events_cal-js.tpl
+++ b/view/tpl/events_cal-js.tpl
@@ -1,3 +1,4 @@
+{{$tabs}}
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
-- 
cgit v1.2.3


From b2474334a7b7f009442883a08d544280231b29fc Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 25 Feb 2016 22:50:16 +0100
Subject: provide an edit button for the profile page

---
 view/tpl/profile_advanced.tpl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'view')

diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl
index a027a7c2e..780626cf9 100755
--- a/view/tpl/profile_advanced.tpl
+++ b/view/tpl/profile_advanced.tpl
@@ -12,6 +12,9 @@
 				<i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i>
 			</button>
 			{{/if}}
+			{{if $edit}}
+			<a href="{{$edit.link}}" class="btn btn-primary btn-xs"><i class="icon-pencil"></i>&nbsp;{{$edit.label}}</a>
+			{{/if}}
 		</div>
 		<h2>{{$title}}</h2>
 		<div class="clear"></div>
-- 
cgit v1.2.3


From df57c90d2d93fef1d021bee4b91a50b1b34ee938 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 26 Feb 2016 14:25:18 +0100
Subject: several photo item template fixes

---
 view/tpl/photo_drop.tpl |  3 +--
 view/tpl/photo_item.tpl | 39 +++++++++++++++++++++++----------------
 2 files changed, 24 insertions(+), 18 deletions(-)

(limited to 'view')

diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl
index 31b654374..24aff0209 100755
--- a/view/tpl/photo_drop.tpl
+++ b/view/tpl/photo_drop.tpl
@@ -1,4 +1,3 @@
 <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$id}}" >
-	<a href="item/drop/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-trash drop-icons"></i></a>
+	<a class="btn btn-default btn-sm" href="#" onclick="dropItem('item/drop/{{$id}}', '#wall-item-outside-wrapper-{{$id}}'); return false;" title="{{$delete}}" ><i class="icon-trash"></i></a>
 </div>
-<div class="wall-item-delete-end"></div>
diff --git a/view/tpl/photo_item.tpl b/view/tpl/photo_item.tpl
index 2ea7aa9f3..ec643c4a9 100755
--- a/view/tpl/photo_item.tpl
+++ b/view/tpl/photo_item.tpl
@@ -1,27 +1,34 @@
-<div class="wall-item-outside-wrapper {{$indent}}" id="wall-item-outside-wrapper-{{$id}}" >
-	<div class="wall-item-content-wrapper {{$indent}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;">
-		<div class="wall-item-info" id="wall-item-info-{{$item.id}}" >
-			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" >
-				<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
-				<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a>
+<div class="wall-item-outside-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-outside-wrapper-{{$id}}" >
+	<div class="wall-item-content-wrapper{{if $indent}} {{$indent}}{{/if}}" id="wall-item-content-wrapper-{{$id}}" style="clear:both;">
+		<div class="wall-item-head">
+			<div class="wall-item-info" id="wall-item-info-{{$id}}" >
+				<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$id}}" >
+					<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
+					<img src="{{$thumb}}" class="wall-item-photo" id="wall-item-photo-{{$id}}" style="height: 80px; width: 80px;" alt="{{$name}}" /></a>
+				</div>
 			</div>
-		</div>
-		<div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" >
-			<div class="wall-item-author">
-				<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a>
+			<div class="wall-item-wrapper" id="wall-item-wrapper-{{$id}}" >
+				<div class="wall-item-author">
+					<a href="{{$profile_url}}" title="View {{$name}}'s profile" class="wall-item-name-link"><span class="wall-item-name" id="wall-item-name-{{$id}}" >{{$name}}</span></a>
+				</div>
+				<div class="wall-item-ago"  id="wall-item-ago-{{$id}}">{{$ago}}</div>
 			</div>
-			<div class="wall-item-ago"  id="wall-item-ago-{{$id}}">{{$ago}}</div>
 		</div>
 		<div class="wall-item-content" id="wall-item-content-{{$id}}" >
 			<div class="wall-item-title" id="wall-item-title-{{$id}}">{{$title}}</div>
 			<div class="wall-item-body" id="wall-item-body-{{$id}}" >{{$body}}</div>
-		</div>
-		{{$drop}}
-		<div class="wall-item-wrapper-end"></div>
 
+		</div>
+		{{if $drop}}
+		<div class="wall-item-tools" id="wall-item-tools-{{$id}}" >
+			<div class="wall-item-tools-right pull-right">
+				{{$drop}}
+			</div>
+			<div class="clear"></div>
+		</div>
+		{{/if}}
+		<div class="clear"></div>
 		{{$comment}}
-
-	<div class="clear{{if $indent}} {{$indent}}{{/if}}"></div>
 	</div>
 </div>
 
-- 
cgit v1.2.3