From d02162ee83416ca651133724bd4a01fdc60c20d0 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Mon, 20 Oct 2014 23:01:58 +0200
Subject: minor correction and typo

---
 view/tpl/photo_view.tpl | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 88f9577b4..ddbce5b0b 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -67,7 +67,7 @@
 				{{$edit.aclselect}}
 				<div id="settings-default-perms-menu-end"></div>
 			</div>
-<			<br/>
+			<br/>
 			<div id="settings-default-perms-end"></div>
 				<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}">
 			<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();">
@@ -82,17 +82,16 @@
 		<div id="photo-photo-end"></div>
 
 		<div class="photo-item-tools">
+			{{if $tags}}
 			<div class="photo-item-tools-left pull-left">
-				{{if $tags}}
 				<div id="in-this-photo">
 				<span id="in-this-photo-text">{{$tag_hdr}}</span>
 				{{foreach $tags as $t}}
 					{{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}"><i class="icon-remove"></i></a>&nbsp;</span>{{/if}}
 				{{/foreach}}
 				</div>
-				{{/if}}
-
 			</div>
+			{{/if}}
 
 			{{if $likebuttons}}
 			<div class="photo-item-tools-right btn-group pull-right">
-- 
cgit v1.2.3


From a03c3d54805b087181730a84263a14e5a1ca3e96 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Tue, 21 Oct 2014 13:43:14 +0200
Subject: fix nav double dropdown

---
 view/tpl/nav.tpl | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index bc9d0ba37..a283b35a8 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -50,12 +50,16 @@
 			{{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
 			{{if !$userinfo}}
 			{{if $nav.loginmenu}}
-				<li class="{{$nav.loginmenu.0.2}}"><a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a>
-				<ul class="dropdown-menu" role="menu">
+				<li class="{{$nav.loginmenu.0.2}} hidden-xs"><a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a>
+					<ul class="dropdown-menu" role="menu">
+						{{foreach $nav.loginmenu as $loginmenu}}
+						<li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li>
+						{{/foreach}}
+					</ul>
+				</li>
 				{{foreach $nav.loginmenu as $loginmenu}}
-					<li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li>
+				<li role="presentation"><a class="{{$loginmenu.2}} visible-xs" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li>
 				{{/foreach}}
-				</ul></li>
 			{{/if}}
 			{{/if}}
 
-- 
cgit v1.2.3


From 1a9b8d4f0c89436d26f3e2e4aafb81c2e62fc8c2 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 23 Oct 2014 22:00:16 -0700
Subject: don't offer forum (@name+) completion in comments, since it won't do
 anything.

---
 view/tpl/display-head.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/display-head.tpl b/view/tpl/display-head.tpl
index 3d4e7e96a..007d33fe8 100755
--- a/view/tpl/display-head.tpl
+++ b/view/tpl/display-head.tpl
@@ -1,8 +1,8 @@
 <script>
 $(document).ready(function() {
-	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+	$(".comment-edit-wrapper textarea").contact_autocomplete(baseurl+"/acl?f=&n=1");
 	// make auto-complete work in more places
-	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl");
+	$(".wall-item-comment-wrapper textarea").contact_autocomplete(baseurl+"/acl?f=&n=1");
 });
 </script>
 
-- 
cgit v1.2.3


From 6497e78956825dc845eb8a998369154c4d823a95 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Sat, 25 Oct 2014 15:23:20 +0200
Subject: some work on photos like/dislike

---
 view/tpl/nav.tpl        |  3 +-
 view/tpl/photo_view.tpl | 85 +++++++++++++++++++++++++++++++++++++++++++------
 2 files changed, 77 insertions(+), 11 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index a283b35a8..a8a7a7da7 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -50,7 +50,8 @@
 			{{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}}
 			{{if !$userinfo}}
 			{{if $nav.loginmenu}}
-				<li class="{{$nav.loginmenu.0.2}} hidden-xs"><a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a>
+				<li class="{{$nav.loginmenu.0.2}} hidden-xs">
+					<a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a>
 					<ul class="dropdown-menu" role="menu">
 						{{foreach $nav.loginmenu as $loginmenu}}
 						<li role="presentation"><a class="{{$loginmenu.2}}" href="{{$loginmenu.0}}" title="{{$loginmenu.3}}" role="menuitem">{{$loginmenu.1}}</a></li>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index ddbce5b0b..f6b709247 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -81,24 +81,89 @@
 		<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
 		<div id="photo-photo-end"></div>
 
+		{{if $tags}}
+		<div class="photo-item-tools-left" id="in-this-photo">
+			<span id="in-this-photo-text">{{$tag_hdr}}</span>
+			{{foreach $tags as $t}}
+				{{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}"><i class="icon-remove"></i></a>&nbsp;</span>{{/if}}
+			{{/foreach}}
+		</div>
+		{{/if}}
+
 		<div class="photo-item-tools">
-			{{if $tags}}
+			{{if $like_count ||  $dislike_count}}
 			<div class="photo-item-tools-left pull-left">
-				<div id="in-this-photo">
-				<span id="in-this-photo-text">{{$tag_hdr}}</span>
-				{{foreach $tags as $t}}
-					{{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}"><i class="icon-remove"></i></a>&nbsp;</span>{{/if}}
-				{{/foreach}}
+					<div class="{{if $like_count &&  $dislike_count}}btn-group{{/if}}">
+						{{if $like_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-like-{{$id}}">{{$like_count}} {{$like_button_label}}</button>
+							{{if $like_list_part}}
+							<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $like_list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+							{{else}}
+							<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+							{{/if}}
+						</div>
+						{{/if}}
+						{{if $dislike_count}}
+						<div class="btn-group">
+							<button type="button" class="btn btn-default btn-sm wall-item-dislike dropdown-toggle" data-toggle="dropdown" id="wall-item-dislike-{{$id}}">{{$dislike_count}} {{$dislike_button_label}}</button>
+							{{if $dislike_list_part}}
+							<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$id}}">{{foreach $dislike_list_part as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
+							{{else}}
+							<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$id}}">{{foreach $dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
+							{{/if}}
+						</div>
+						{{/if}}
+					</div>
+					{{if $like_list_part}}
+					<div class="modal" id="likeModal-{{$id}}">
+						<div class="modal-dialog">
+							<div class="modal-content">
+								<div class="modal-header">
+									<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+									<h4 class="modal-title">{{$like_modal_title}}</h4>
+								</div>
+								<div class="modal-body">
+									<ul>{{foreach $like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+								</div>
+								<div class="modal-footer clear">
+									<button type="button" class="btn btn-default" data-dismiss="modal">{{$modal_dismiss}}</button>
+								</div>
+							</div><!-- /.modal-content -->
+						</div><!-- /.modal-dialog -->
+					</div><!-- /.modal -->
+					{{/if}}
+					{{if $dislike_list_part}}
+					<div class="modal" id="dislikeModal-{{$id}}">
+						<div class="modal-dialog">
+							<div class="modal-content">
+								<div class="modal-header">
+									<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+									<h4 class="modal-title">{{$dislike_modal_title}}</h4>
+								</div>
+								<div class="modal-body">
+									<ul>{{foreach $dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
+								</div>
+								<div class="modal-footer clear">
+									<button type="button" class="btn btn-default" data-dismiss="modal">{{$modal_dismiss}}</button>
+								</div>
+							</div><!-- /.modal-content -->
+						</div><!-- /.modal-dialog -->
+					</div><!-- /.modal -->
+					{{/if}}
 				</div>
 			</div>
 			{{/if}}
 
+
 			{{if $likebuttons}}
 			<div class="photo-item-tools-right btn-group pull-right">
-				<i class="icon-thumbs-up-alt item-tool btn btn-default btn-sm" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></i>
-				<i class="icon-thumbs-down-alt item-tool btn btn-default btn-sm" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></i>
-				{{$like}}
-				{{$dislike}}
+				<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false">
+					<i class="icon-thumbs-up-alt" title="{{$likethis}}"></i>
+				</button>
+				<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false">
+					<i class="icon-thumbs-down-alt" title="{{$nolike}}"></i>
+				</button>
 			</div>
 			<div id="like-rotator-{{$id}}" class="like-rotator pull-right"></div>
 			{{/if}}
-- 
cgit v1.2.3


From f2ccd37c8bd8c9f3bc4b579721439f65d55cec2b Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Sun, 26 Oct 2014 21:50:20 +0100
Subject: wrong vars in template

---
 view/tpl/photo_view.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index f6b709247..5e3518c9f 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -98,9 +98,9 @@
 						<div class="btn-group">
 							<button type="button" class="btn btn-default btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="wall-item-like-{{$id}}">{{$like_count}} {{$like_button_label}}</button>
 							{{if $like_list_part}}
-							<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $like_list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+							<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$id}}">{{foreach $like_list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
 							{{else}}
-							<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$item.id}}">{{foreach $like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+							<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$id}}">{{foreach $like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
 							{{/if}}
 						</div>
 						{{/if}}
-- 
cgit v1.2.3


From 655c3e1b4784f4bc37af1e1db0d7bcf313e71e66 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 26 Oct 2014 19:32:12 -0700
Subject: put privacy role selector in settings page. Change visibility of
 various permissions items accordingly.

---
 view/tpl/settings.tpl | 46 ++++++++++++++++++++++------------------------
 1 file changed, 22 insertions(+), 24 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 07a37f773..4c1b8eb8f 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -22,37 +22,44 @@
 
 <h3 class="settings-heading">{{$h_prv}}</h3>
 
-{{include file="field_checkbox.tpl" field=$hide_presence}}
-
-<button type="button" class="btn btn-xs btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button>
+<div class="field custom">
+<label for="privacy-role-select">{{$role_lbl}}</label>
+{{$role_select}}
+</div>
 
+<div id="advanced-perm" style="display:{{if $permissions_set}}none{{else}}block{{/if}};">
+{{include file="field_checkbox.tpl" field=$hide_presence}}
 
+<button type="button" class="btn btn-default" data-toggle="collapse" data-target="#settings-permissions-wrapper">{{$lbl_p2macro}}</button>
 
 <div class="collapse well" id="settings-permissions-wrapper">
-{{if !$expert}}
-	<div class="alert alert-info">{{$hint}}</div>
-{{/if}}
 
 {{foreach $permiss_arr as $permit}}
-	{{if $expert}}
-		{{include file="field_select.tpl" field=$permit}}
-	{{else}}
-		{{include file="field_select_disabled.tpl" field=$permit}}
-	{{/if}}
+	{{include file="field_select.tpl" field=$permit}}
 {{/foreach}}
-
-{{if $expert}}
 	<div class="settings-submit-wrapper" >
 	<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 	</div>
-{{/if}}
+</div>
 
+<div id="settings-default-perms" class="settings-default-perms" >
+	<button class="btn btn-default" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
+	{{$aclselect}}
+	<div id="settings-default-perms-menu-end"></div>
 </div>
-<div class="settings-common-perms">
+<br/>
+<div id="settings-default-perms-end"></div>
 
+{{$group_select}}
 
 {{$profile_in_dir}}
 
+</div>
+
+<div class="settings-common-perms">
+
+
+
 {{$suggestme}}
 
 {{include file="field_yesno.tpl" field=$blocktags}}
@@ -62,15 +69,6 @@
 
 </div>
 
-<div id="settings-default-perms" class="settings-default-perms" >
-	<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
-	{{$aclselect}}
-	<div id="settings-default-perms-menu-end"></div>
-</div>
-<br/>
-<div id="settings-default-perms-end"></div>
-
-{{$group_select}}
 
 
 <div class="settings-submit-wrapper" >
-- 
cgit v1.2.3


From d192bcad65852bb9225a368d1bf42b8918ae6022 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Mon, 27 Oct 2014 21:31:54 +0100
Subject: do not reload page for edit album and some minor cleanup

---
 view/tpl/album_edit.tpl  |  2 +-
 view/tpl/photo_album.tpl |  5 +++--
 view/tpl/photo_top.tpl   |  2 +-
 view/tpl/photo_view.tpl  | 24 +++++++++++-------------
 4 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl
index 61653c47c..84a47378b 100755
--- a/view/tpl/album_edit.tpl
+++ b/view/tpl/album_edit.tpl
@@ -3,7 +3,7 @@
 
 
 <label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
-<input type="text" size="64" name="albumname" value="{{$album}}" >
+<input type="text" name="albumname" value="{{$album}}" >
 
 <div id="photo-album-edit-name-end"></div>
 
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 0c878b950..0a26fc367 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,7 +1,7 @@
 <div class="section-title-wrapper">
 	<div class="btn-group btn-group-xs pull-right">
-		{{if $edit}}
-		<a class="btn btn-default" href="{{$edit.1}}" title="{{$edit.0}}"><i class="icon-pencil"></i></a>
+		{{if $album_edit.1}}
+		<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper');"></i>
 		{{/if}}
 		<a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
 		{{if $can_post}}
@@ -12,6 +12,7 @@
 
 	<div class="clear"></div>
 </div>
+{{$album_edit.1}}
 <div id="photo-album-contents" class="generic-content-wrapper">
 	{{foreach $photos as $photo}}
 		{{include file="photo_top.tpl"}}
diff --git a/view/tpl/photo_top.tpl b/view/tpl/photo_top.tpl
index ee21e5cce..a86aa7f80 100755
--- a/view/tpl/photo_top.tpl
+++ b/view/tpl/photo_top.tpl
@@ -1,4 +1,4 @@
 <a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
-	<img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{else}}{{$photo.alt}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
+	<img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
 </a>
 
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 5e3518c9f..786145691 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -31,7 +31,7 @@
 		<div class="clear"></div>
 
 	</div>
-	<div id="photo-edit-edit" style="display: none;">
+	<div id="photo-edit-edit">
 		<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form">
 			<input type="hidden" name="item_id" value="{{$edit.item_id}}">
 			<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label>
@@ -155,7 +155,6 @@
 			</div>
 			{{/if}}
 
-
 			{{if $likebuttons}}
 			<div class="photo-item-tools-right btn-group pull-right">
 				<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false">
@@ -167,23 +166,22 @@
 			</div>
 			<div id="like-rotator-{{$id}}" class="like-rotator pull-right"></div>
 			{{/if}}
-		<div class="clear"></div>
-		</div>
-
 
+			<div class="clear"></div>
+		</div>
 
-</div>
+	</div>
 
-{{$comments}}
+	{{$comments}}
 
-{{if $commentbox}}
-<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
-	{{$commentbox}}
-</div>
-{{/if}}
+	{{if $commentbox}}
+	<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
+		{{$commentbox}}
+	</div>
+	{{/if}}
 
 
-<div class="clear"></div>
+	<div class="clear"></div>
 
 </div>
 
-- 
cgit v1.2.3


From 9cc76cb33da489c01731ecb5195f8bb3d51ce513 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 27 Oct 2014 19:21:41 -0700
Subject: several unrelated things - auto_follow wasn't working for new
 accounts, error returned in private mention to a collection, and added
 auto-completion to photo tags; though it only matches people so the hover
 text is now wrong. Also made the photo edit form XHTML (XML) compliant.

---
 view/tpl/photo_view.tpl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 786145691..54e15de74 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -33,9 +33,9 @@
 	</div>
 	<div id="photo-edit-edit">
 		<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form">
-			<input type="hidden" name="item_id" value="{{$edit.item_id}}">
+			<input type="hidden" name="item_id" value="{{$edit.item_id}}" />
 			<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label>
-			<input id="photo-edit-albumname" type="text" name="albname" value="{{$edit.album}}" list="dl-albums">
+			<input id="photo-edit-albumname" type="text" name="albname" value="{{$edit.album}}" list="dl-albums" />
 			{{if $edit.albums}}
 			<datalist id="dl-albums">
 			{{foreach $edit.albums as $al}}
@@ -47,18 +47,18 @@
 			{{/if}}
 			<div id="photo-edit-albumname-end"></div>
 				<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
-			<input id="photo-edit-caption" type="text" name="desc" value="{{$edit.caption}}">
+			<input id="photo-edit-caption" type="text" name="desc" value="{{$edit.caption}}" />
 				<div id="photo-edit-caption-end"></div>
 				<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$edit.tag_label}}</label>
-			<input name="newtag" id="photo-edit-newtag" title="{{$edit.help_tags}}" type="text">
+			<input name="newtag" id="photo-edit-newtag" title="{{$edit.help_tags}}" type="text" />
 				<div id="photo-edit-tags-end"></div>
 			<div id="photo-edit-rotate-wrapper">
 				<div id="photo-edit-rotate-label">
 					{{$edit.rotatecw}}<br>
 					{{$edit.rotateccw}}
 				</div>
-				<input type="radio" name="rotate" value="1"><br>
-				<input type="radio" name="rotate" value="2">
+				<input type="radio" name="rotate" value="1" /><br>
+				<input type="radio" name="rotate" value="2" />
 			</div>
 			<div id="photo-edit-rotate-end"></div>
 				<div id="settings-default-perms" class="settings-default-perms">
@@ -69,8 +69,8 @@
 			</div>
 			<br/>
 			<div id="settings-default-perms-end"></div>
-				<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}">
-			<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();">
+				<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}" />
+			<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />
 				<div id="photo-edit-end"></div>
 		</form>
 	</div>
-- 
cgit v1.2.3


From ec8bab7784b531299150ddb2c18ede40d5c5df6c Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Tue, 28 Oct 2014 11:56:00 +0100
Subject: change the way tagrm works to allow tag removal on the fly

---
 view/tpl/photo_view.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 54e15de74..c79cd7d56 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -85,7 +85,7 @@
 		<div class="photo-item-tools-left" id="in-this-photo">
 			<span id="in-this-photo-text">{{$tag_hdr}}</span>
 			{{foreach $tags as $t}}
-				{{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}"><i class="icon-remove"></i></a>&nbsp;</span>{{/if}}
+				{{$t.0}}{{if $edit}}<span id="tag-remove">&nbsp;<a href="{{$t.1}}" onclick="return confirmDelete();"><i class="icon-remove"></i></a>&nbsp;</span>{{/if}}
 			{{/foreach}}
 		</div>
 		{{/if}}
-- 
cgit v1.2.3


From 0ff4d9015b3b06412e84f6fbc32ae4e78e16d6ae Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Thu, 30 Oct 2014 14:10:55 +0100
Subject: some work on photo upload

---
 view/tpl/album_edit.tpl    |  9 +++++-
 view/tpl/photos_upload.tpl | 76 +++++++++++++++++++++++++---------------------
 2 files changed, 49 insertions(+), 36 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl
index 84a47378b..a65887d3c 100755
--- a/view/tpl/album_edit.tpl
+++ b/view/tpl/album_edit.tpl
@@ -3,7 +3,14 @@
 
 
 <label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
-<input type="text" name="albumname" value="{{$album}}" >
+<input type="text" name="albumname" value="{{$album}}" list="dl-album-edit" />
+	<datalist id="dl-album-edit">
+	{{foreach $albums as $al}}
+		{{if $al.text}}
+		<option value="{{$al.text}}">
+		{{/if}}
+	{{/foreach}}
+	</datalist>
 
 <div id="photo-album-edit-name-end"></div>
 
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 81d7b6dc0..3db292f02 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -1,44 +1,50 @@
-<div class="section-title-wrapper">
-	<div id="photos-usage-message" class="pull-right">{{$usage}}</div>
-	<h2>{{$pagename}}</h2>
-	<div class="clear"></div>
-</div>
-
-<div class="generic-content-wrapper-styled">
-<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
-	<input type="hidden" id="photos-upload-source" name="source" value="photos" />
-	<div id="photos-upload-new-wrapper" >
-		<div id="photos-upload-newalbum-div">
-			<label id="photos-upload-newalbum-text" for="photos-upload-newalbum" >{{$newalbum}}</label>
-		</div>
-		<input id="photos-upload-newalbum" type="text" name="newalbum" />
-	</div>
-	<div id="photos-upload-new-end"></div>
-	<div id="photos-upload-exist-wrapper">
-		<div id="photos-upload-existing-album-text">{{$existalbumtext}}</div>
-		{{$albumselect}}
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div id="photos-usage-message" class="pull-right">{{$usage}}</div>
+		<h2>{{$pagename}}</h2>
+		<div class="clear"></div>
 	</div>
-	<div id="photos-upload-exist-end"></div>
 
-	<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-		<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
-		<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
-	</div>
+	<div class="section-content-wrapper">
+		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
+			<input type="hidden" id="photos-upload-source" name="source" value="photos" />
+			<div id="photos-album-name-label" >
+				<label id="photos-upload-newalbum-text" for="photos-upload-newalbum">{{$newalbum}}</label>
+			</div>
+			<div id="photos-album-name-input">
+				<input id="photos-upload-newalbum" type="text" value="{{$selname}}" name="newalbum" list="dl-photo-upload" />
+				<datalist id="dl-photo-upload">
+				{{foreach $albums as $al}}
+					{{if $al.text}}
+					<option value="{{$al.text}}">
+					{{/if}}
+				{{/foreach}}
+				</datalist>
+			</div>
 
+			<div id="photos-upload-new-end"></div>
 
-	<div id="photos-upload-perms" class="photos-upload-perms" >
-		<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span>
-		<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
-	</div>
-	{{$aclselect}}
-	<div id="photos-upload-perms-end"></div>
+			<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
+				<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
+				<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+			</div>
 
-	<div id="photos-upload-spacer"></div>
+			<div id="photos-upload-perms" class="photos-upload-perms" >
+				<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span>
+				<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
+			</div>
 
-	{{$uploader}}
+			{{$aclselect}}
 
-	{{$default}}
+			<div id="photos-upload-perms-end"></div>
 
-	<div class="photos-upload-end" ></div>
-</form>
+			<div id="photos-upload-spacer"></div>
+
+			{{$uploader}}
+
+			{{$default}}
+
+			<div class="photos-upload-end" ></div>
+		</form>
+	</div>
 </div>
-- 
cgit v1.2.3


From 2982212797dd64e1be13de20dc158842734ee5f8 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 31 Oct 2014 14:33:41 +0100
Subject: more work on photo upload

---
 view/tpl/photos_upload.tpl | 41 ++++++++++++++++++++++++++---------------
 1 file changed, 26 insertions(+), 15 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 3db292f02..4c53a7c62 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -8,11 +8,11 @@
 	<div class="section-content-wrapper">
 		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
 			<input type="hidden" id="photos-upload-source" name="source" value="photos" />
-			<div id="photos-album-name-label" >
-				<label id="photos-upload-newalbum-text" for="photos-upload-newalbum">{{$newalbum}}</label>
-			</div>
-			<div id="photos-album-name-input">
-				<input id="photos-upload-newalbum" type="text" value="{{$selname}}" name="newalbum" list="dl-photo-upload" />
+
+
+			<div class="form-group">
+				<label for="photos-upload-album">{{$newalbum_label}}</label>
+				<input type="text" class="form-control" id="photos-upload-album" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload">
 				<datalist id="dl-photo-upload">
 				{{foreach $albums as $al}}
 					{{if $al.text}}
@@ -22,27 +22,38 @@
 				</datalist>
 			</div>
 
+			{{$aclselect}}
+
+			{{if $default}}
+			<div class="form-group pull-left">
+				<input id="photos-upload-choose" type="file" name="userfile" />
+			</div>
+			<div class="btn-group pull-right">
+				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+					<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
+				</button>
+				<button class="btn btn-primary btn-sm" type="submit" name="submit" id="photos-upload-submit">{{$submit}}</button>
+			</div>
+			{{/if}}
+
 			<div id="photos-upload-new-end"></div>
 
-			<div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
-				<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />
-				<label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
+			<div class="form-group" id="photos-upload-noshare">
+				<label id="photos-upload-noshare-text" for="photos-upload-noshare" >
+					<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />&nbsp;{{$nosharetext}}
+				</label>
 			</div>
 
+			{{if $uploader}}
+			<div id="photos-upload-noshare-end"></div>
 			<div id="photos-upload-perms" class="photos-upload-perms" >
 				<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span>
 				<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
 			</div>
-
-			{{$aclselect}}
-
 			<div id="photos-upload-perms-end"></div>
-
-			<div id="photos-upload-spacer"></div>
-
 			{{$uploader}}
+			{{/if}}
 
-			{{$default}}
 
 			<div class="photos-upload-end" ></div>
 		</form>
-- 
cgit v1.2.3


From 5d1bb1b6854b4601eedaa9d39a40832b29d434e5 Mon Sep 17 00:00:00 2001
From: Thomas Willingham <beardyunixer@beardyunixer.com>
Date: Fri, 31 Oct 2014 16:09:46 +0000
Subject: Smarty3 now lives in store

---
 view/tpl/smarty3/README | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 view/tpl/smarty3/README

(limited to 'view/tpl')

diff --git a/view/tpl/smarty3/README b/view/tpl/smarty3/README
deleted file mode 100644
index 78ff8d9a1..000000000
--- a/view/tpl/smarty3/README
+++ /dev/null
@@ -1,4 +0,0 @@
-view/tpl/smarty3
-
-This directory must exist and be writeable by the webserver in order to store compiled template files, which are created dynamically. Please see the installation instructions. 
-
-- 
cgit v1.2.3


From 5d151b988605bc5aedbef65b687a43dedbc574e9 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 31 Oct 2014 20:25:43 +0100
Subject: do not reload page for photo upload

---
 view/tpl/album_edit.tpl    |  2 +-
 view/tpl/photo_album.tpl   |  3 ++-
 view/tpl/photo_albums.tpl  |  8 ++------
 view/tpl/photo_view.tpl    |  2 +-
 view/tpl/photos_recent.tpl |  3 ++-
 view/tpl/photos_upload.tpl | 12 +++---------
 6 files changed, 11 insertions(+), 19 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl
index a65887d3c..a6815352a 100755
--- a/view/tpl/album_edit.tpl
+++ b/view/tpl/album_edit.tpl
@@ -1,4 +1,4 @@
-<div id="photo-album-edit-wrapper">
+<div id="photo-album-edit-wrapper" class="section-content-tools-wrapper">
 <form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
 
 
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 0a26fc367..2c0b8e5b9 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -5,13 +5,14 @@
 		{{/if}}
 		<a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
 		{{if $can_post}}
-		<a class="btn btn-xs btn-success" href="{{$upload.1}}"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</a>
+		<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
 		{{/if}}
 	</div>
 	<h2>{{$album}}</h2>
 
 	<div class="clear"></div>
 </div>
+{{$upload_form}}
 {{$album_edit.1}}
 <div id="photo-album-contents" class="generic-content-wrapper">
 	{{foreach $photos as $photo}}
diff --git a/view/tpl/photo_albums.tpl b/view/tpl/photo_albums.tpl
index 0f8b809ac..de1105bbc 100755
--- a/view/tpl/photo_albums.tpl
+++ b/view/tpl/photo_albums.tpl
@@ -1,17 +1,13 @@
 <div id="side-bar-photos-albums" class="widget">
 	<h3>{{$title}}</h3>
 	<ul class="nav nav-pills nav-stacked">
-	{{if $upload}}
-		<li><a href="{{$baseurl}}/photos/{{$nick}}/upload" title="{{$upload}}">{{$upload}}</a></li>
-	{{/if}}
 		<li><a href="{{$baseurl}}/photos/{{$nick}}" title="{{$title}}" >Recent Photos</a></li>
-	{{if $albums}}
+		{{if $albums}}
 		{{foreach $albums as $al}}
 		{{if $al.text}}
 		<li><a href="{{$baseurl}}/photos/{{$nick}}/album/{{$al.bin2hex}}"><span class="badge pull-right">{{$al.total}}</span>{{$al.text}}</a></li>
 		{{/if}}
 		{{/foreach}}
-
-	{{/if}}
+		{{/if}}
 	</ul>
 </div>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index c79cd7d56..d1b077f36 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -31,7 +31,7 @@
 		<div class="clear"></div>
 
 	</div>
-	<div id="photo-edit-edit">
+	<div id="photo-edit-edit" class="section-content-tools-wrapper">
 		<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form">
 			<input type="hidden" name="item_id" value="{{$edit.item_id}}" />
 			<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label>
diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl
index 91b088c93..7727abcea 100755
--- a/view/tpl/photos_recent.tpl
+++ b/view/tpl/photos_recent.tpl
@@ -1,10 +1,11 @@
 <div class="section-title-wrapper">
 	{{if $can_post}}
-	<a class="btn btn-xs btn-success pull-right" href="{{$upload.1}}"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</a>
+	<button class="btn btn-xs btn-success pull-right" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
 	{{/if}}
 	<h2>{{$title}}</h2>
 	<div class="clear"></div>
 </div>
+{{$upload_form}}
 <div id="photo-album-contents" class="generic-content-wrapper">
 	{{foreach $photos as $photo}}
 		{{include file="photo_top.tpl"}}
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 4c53a7c62..5bb0092d6 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -1,18 +1,12 @@
-<div class="generic-content-wrapper">
-	<div class="section-title-wrapper">
-		<div id="photos-usage-message" class="pull-right">{{$usage}}</div>
-		<h2>{{$pagename}}</h2>
-		<div class="clear"></div>
-	</div>
-
-	<div class="section-content-wrapper">
+<div id="photo-upload-form" class="generic-content-wrapper">
+	<div class="section-content-tools-wrapper">
 		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
 			<input type="hidden" id="photos-upload-source" name="source" value="photos" />
 
 
 			<div class="form-group">
 				<label for="photos-upload-album">{{$newalbum_label}}</label>
-				<input type="text" class="form-control" id="photos-upload-album" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload">
+				<input type="text" class="form-control" id="photos-upload-album" name="newalbum" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload">
 				<datalist id="dl-photo-upload">
 				{{foreach $albums as $al}}
 					{{if $al.text}}
-- 
cgit v1.2.3


From 30281b161c6e3089a89c5035498bb72a72e66e4a Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Sat, 1 Nov 2014 20:30:13 +0100
Subject: close the eventual open tool if the other opens

---
 view/tpl/photo_album.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 2c0b8e5b9..7b1566a15 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,11 +1,11 @@
 <div class="section-title-wrapper">
 	<div class="btn-group btn-group-xs pull-right">
 		{{if $album_edit.1}}
-		<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper');"></i>
+		<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
 		{{/if}}
 		<a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
 		{{if $can_post}}
-		<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
+		<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
 		{{/if}}
 	</div>
 	<h2>{{$album}}</h2>
-- 
cgit v1.2.3


From dc5e05d3349bc493e4c1f33fb2561bb80ddd0c7f Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Sat, 1 Nov 2014 23:55:36 +0100
Subject: even more photos work

---
 view/tpl/album_edit.tpl    |  38 ++++++++--------
 view/tpl/photo_album.tpl   |  19 ++++----
 view/tpl/photo_view.tpl    | 109 ++++++++++++++++++++++-----------------------
 view/tpl/photos_upload.tpl |  15 +++----
 4 files changed, 90 insertions(+), 91 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/album_edit.tpl b/view/tpl/album_edit.tpl
index a6815352a..f5495f149 100755
--- a/view/tpl/album_edit.tpl
+++ b/view/tpl/album_edit.tpl
@@ -1,22 +1,22 @@
 <div id="photo-album-edit-wrapper" class="section-content-tools-wrapper">
-<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
-
-
-<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
-<input type="text" name="albumname" value="{{$album}}" list="dl-album-edit" />
-	<datalist id="dl-album-edit">
-	{{foreach $albums as $al}}
-		{{if $al.text}}
-		<option value="{{$al.text}}">
-		{{/if}}
-	{{/foreach}}
-	</datalist>
-
-<div id="photo-album-edit-name-end"></div>
+	<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
+		<div class="form-group">
+			<label id="photo-album-edit-name-label" for="photo-album-edit-name">{{$nametext}}</label>
+			<input type="text" name="albumname" placeholder="{{$name_placeholder}}" value="{{$album}}" class="form-control" list="dl-album-edit" />
+			<datalist id="dl-album-edit">
+			{{foreach $albums as $al}}
+				{{if $al.text}}
+				<option value="{{$al.text}}">
+				{{/if}}
+			{{/foreach}}
+			</datalist>
+		</div>
+		<div class="form-group">
+			<button id="photo-album-edit-submit" type="submit" name="submit" class="btn btn-primary btn-sm pull-right" />{{$submit}}</button>
+			<button id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" class="btn btn-danger btn-sm pull-left" onclick="return confirmDelete();" />{{$dropsubmit}}</button>
+		</div>
+	</form>
+	<div id="photo-album-edit-end" class="clear"></div>
+</div>
 
-<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" />
-<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete();" />
 
-</form>
-</div>
-<div id="photo-album-edit-end" ></div>
diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 7b1566a15..7175a62da 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,13 +1,16 @@
 <div class="section-title-wrapper">
-	<div class="btn-group btn-group-xs pull-right">
-		{{if $album_edit.1}}
-		<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
-		{{/if}}
-		<a class="btn btn-default" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
-		{{if $can_post}}
-		<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
-		{{/if}}
+	<div class="pull-right">
+		<a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
+		<div class="btn-group btn-group-xs">
+			{{if $album_edit.1}}
+			<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
+			{{/if}}
+			{{if $can_post}}
+			<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
+			{{/if}}
+		</div>
 	</div>
+
 	<h2>{{$album}}</h2>
 
 	<div class="clear"></div>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index d1b077f36..37aab3c96 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -2,28 +2,28 @@
 <div class="generic-content-wrapper">
 
 	<div class="section-title-wrapper">
+		<div class="pull-right">
 
-		<div class="btn-group btn-group-xs pull-right">
-			{{if $prevlink}}
-			<a href="{{$prevlink.0}}" class="btn btn-default" title="{{$prevlink.1}}"><i class="icon-backward"></i></a>
-			{{/if}}
-			{{if $nextlink}}
-			<a href="{{$nextlink.0}}" class="btn btn-default" title="{{$nextlink.1}}"><i class="icon-forward"></i></a>
-			{{/if}}
-		</div>
-		<div class="btn-group btn-group-xs pull-right dropdown">
 			{{if $tools}}
-			<a  class="btn btn-default" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a>
+			<a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a>
 			{{/if}}
 
-			{{if $edit}}
-			<i class="icon-pencil btn btn-default" title="{{$edit.edit}}" onclick="openClose('photo-edit-edit');"></i>
-			{{/if}}
-
-			{{if $lock}}
-			<i class="icon-lock btn btn-default dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
-			{{/if}}
-			&nbsp;
+			<div class="btn-group btn-group-xs dropdown">
+				{{if $edit}}
+				<i class="icon-pencil btn btn-default" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i>
+				{{/if}}
+				{{if $lock}}
+				<i id="lockview" class="icon-lock btn btn-default dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
+				{{/if}}
+			</div>
+			<div class="btn-group btn-group-xs">
+				{{if $prevlink}}
+				<a href="{{$prevlink.0}}" class="btn btn-default" title="{{$prevlink.1}}"><i class="icon-backward"></i></a>
+				{{/if}}
+				{{if $nextlink}}
+				<a href="{{$nextlink.0}}" class="btn btn-default" title="{{$nextlink.1}}"><i class="icon-forward"></i></a>
+				{{/if}}
+			</div>
 		</div>
 
 		<h2>{{if $desc}}{{$desc}}{{elseif $filename}}{{$filename}}{{else}}{{$unknown}}{{/if}}</h2>
@@ -31,55 +31,54 @@
 		<div class="clear"></div>
 
 	</div>
-	<div id="photo-edit-edit" class="section-content-tools-wrapper">
+	<div id="photo-edit" class="section-content-tools-wrapper">
 		<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form">
 			<input type="hidden" name="item_id" value="{{$edit.item_id}}" />
-			<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label>
-			<input id="photo-edit-albumname" type="text" name="albname" value="{{$edit.album}}" list="dl-albums" />
-			{{if $edit.albums}}
-			<datalist id="dl-albums">
-			{{foreach $edit.albums as $al}}
-				{{if $al.text}}
-				<option value="{{$al.text}}">
+			<div class="form-group">
+				<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum_label}}</label>
+				<input id="photo-edit-albumname" class="form-control" type="text" name="albname" value="{{$edit.album}}" placeholder="{{$edit.newalbum_placeholder}}" list="dl-albums" />
+				{{if $edit.albums}}
+				<datalist id="dl-albums">
+				{{foreach $edit.albums as $al}}
+					{{if $al.text}}
+					<option value="{{$al.text}}">
+					{{/if}}
+				{{/foreach}}
+				</datalist>
 				{{/if}}
-			{{/foreach}}
-			</datalist>
-			{{/if}}
-			<div id="photo-edit-albumname-end"></div>
+			</div>
+			<div class="form-group">
 				<label id="photo-edit-caption-label" for="photo-edit-caption">{{$edit.capt_label}}</label>
-			<input id="photo-edit-caption" type="text" name="desc" value="{{$edit.caption}}" />
-				<div id="photo-edit-caption-end"></div>
-				<label id="photo-edit-tags-label" for="photo-edit-newtag" >{{$edit.tag_label}}</label>
-			<input name="newtag" id="photo-edit-newtag" title="{{$edit.help_tags}}" type="text" />
-				<div id="photo-edit-tags-end"></div>
-			<div id="photo-edit-rotate-wrapper">
-				<div id="photo-edit-rotate-label">
-					{{$edit.rotatecw}}<br>
-					{{$edit.rotateccw}}
-				</div>
-				<input type="radio" name="rotate" value="1" /><br>
-				<input type="radio" name="rotate" value="2" />
+				<input id="photo-edit-caption" class="form-control" type="text" name="desc" value="{{$edit.caption}}" />
+			</div>
+			<div class="form-group">
+				<label id="photo-edit-tags-label" for="photo-edit-newtag">{{$edit.tag_label}}</label>
+				<input name="newtag" id="photo-edit-newtag" class="form-control" title="{{$edit.help_tags}}" type="text" />
 			</div>
-			<div id="photo-edit-rotate-end"></div>
-				<div id="settings-default-perms" class="settings-default-perms">
-				<span id="jot-perms-icon" class="{{$edit.lockstate}}"></span>
-				<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$edit.permissions}}</button>
-				{{$edit.aclselect}}
-				<div id="settings-default-perms-menu-end"></div>
+			<div class="form-group">
+				<label class="radio-inline" id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw"><input id="photo-edit-rotate-cw" type="radio" name="rotate" value="1" />{{$edit.rotatecw}}</label>
+				<label class="radio-inline" id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw"><input id="photo-edit-rotate-ccw" type="radio" name="rotate" value="2" />{{$edit.rotateccw}}</label>
+			</div>
+
+			{{$edit.aclselect}}
+
+			<div class="form-group pull-left">
+				<button class="btn btn-danger btn-sm" id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />{{$edit.delete}}</button>
+			</div>
+			<div class="form-group btn-group pull-right">
+				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+					<i id="jot-perms-icon" class="{{$edit.lockstate}}"></i>
+				</button>
+				<button class="btn btn-primary btn-sm" type="submit" name="submit" id="photos-edit-submit">{{$edit.submit}}</button>
 			</div>
-			<br/>
-			<div id="settings-default-perms-end"></div>
-				<input id="photo-edit-submit-button" type="submit" name="submit" value="{{$edit.submit}}" />
-			<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$edit.delete}}" onclick="return confirmDelete();" />
-				<div id="photo-edit-end"></div>
 		</form>
+		<div id="photo-edit-end" class="clear"></div>
 	</div>
 
 	<div id="photo-view-wrapper">
 
-
 		<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}" onclick="$.colorbox({href: '{{$photo.href}}'}); return false;"><img style="width: 100%;" src="{{$photo.src}}"></a></div>
-		<div id="photo-photo-end"></div>
+		<div id="photo-photo-end" class="clear"></div>
 
 		{{if $tags}}
 		<div class="photo-item-tools-left" id="in-this-photo">
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 5bb0092d6..7067c84f5 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -3,7 +3,6 @@
 		<form action="photos/{{$nickname}}" enctype="multipart/form-data" method="post" name="photos-upload-form" id="photos-upload-form">
 			<input type="hidden" id="photos-upload-source" name="source" value="photos" />
 
-
 			<div class="form-group">
 				<label for="photos-upload-album">{{$newalbum_label}}</label>
 				<input type="text" class="form-control" id="photos-upload-album" name="newalbum" placeholder="{{$newalbum_placeholder}}" value="{{$selname}}" list="dl-photo-upload">
@@ -22,17 +21,17 @@
 			<div class="form-group pull-left">
 				<input id="photos-upload-choose" type="file" name="userfile" />
 			</div>
-			<div class="btn-group pull-right">
+			<div class="form-group btn-group pull-right">
 				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-					<i id="jot-perms-icon" class="icon-{{$lockstate}} jot-icons"></i>
+					<i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
 				</button>
 				<button class="btn btn-primary btn-sm" type="submit" name="submit" id="photos-upload-submit">{{$submit}}</button>
 			</div>
 			{{/if}}
 
-			<div id="photos-upload-new-end"></div>
+			<div id="photos-upload-new-end" class="clear"></div>
 
-			<div class="form-group" id="photos-upload-noshare">
+			<div id="photos-upload-noshare">
 				<label id="photos-upload-noshare-text" for="photos-upload-noshare" >
 					<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />&nbsp;{{$nosharetext}}
 				</label>
@@ -44,12 +43,10 @@
 				<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span>
 				<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
 			</div>
-			<div id="photos-upload-perms-end"></div>
+			<div id="photos-upload-perms-end" class="clear"></div>
 			{{$uploader}}
 			{{/if}}
-
-
-			<div class="photos-upload-end" ></div>
 		</form>
 	</div>
+	<div class="photos-upload-end" class="clear"></div>
 </div>
-- 
cgit v1.2.3


From 8cfe8a5f258b041b3a33f520125834a68afbea26 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Sun, 2 Nov 2014 19:36:28 +0100
Subject: css fixes

---
 view/tpl/photo_album.tpl   |  6 +++---
 view/tpl/photo_view.tpl    | 12 ++++++------
 view/tpl/photos_upload.tpl | 10 +++++-----
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photo_album.tpl b/view/tpl/photo_album.tpl
index 7175a62da..5506b01f2 100755
--- a/view/tpl/photo_album.tpl
+++ b/view/tpl/photo_album.tpl
@@ -1,12 +1,12 @@
 <div class="section-title-wrapper">
 	<div class="pull-right">
 		<a class="btn btn-default btn-xs" href="{{$order.1}}" title="{{$order.0}}"><i class="icon-sort"></i></a>
-		<div class="btn-group btn-group-xs">
+		<div class="btn-group btn-group">
 			{{if $album_edit.1}}
-			<i class="icon-pencil btn btn-default" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
+			<i class="icon-pencil btn btn-default btn-xs" title="{{$album_edit.0}}" onclick="openClose('photo-album-edit-wrapper'); closeMenu('photo-upload-form');"></i>
 			{{/if}}
 			{{if $can_post}}
-			<button class="btn btn-xs btn-success" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
+			<button class="btn btn-xs btn-success btn-xs" title="{{$usage}}" onclick="openClose('photo-upload-form'); closeMenu('photo-album-edit-wrapper');"><i class="icon-upload"></i>&nbsp;{{$upload.0}}</button>
 			{{/if}}
 		</div>
 	</div>
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 37aab3c96..e7456427b 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -8,20 +8,20 @@
 			<a class="btn btn-default btn-xs" title="{{$tools.profile.1}}" href="{{$tools.profile.0}}"><i class="icon-user"></i></a>
 			{{/if}}
 
-			<div class="btn-group btn-group-xs dropdown">
+			<div class="btn-group btn-group dropdown">
 				{{if $edit}}
-				<i class="icon-pencil btn btn-default" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i>
+				<i class="icon-pencil btn btn-default btn-xs" title="{{$edit.edit}}" onclick="openClose('photo-edit');"></i>
 				{{/if}}
 				{{if $lock}}
-				<i id="lockview" class="icon-lock btn btn-default dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
+				<i id="lockview" class="icon-lock btn btn-default btn-xs dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul>
 				{{/if}}
 			</div>
-			<div class="btn-group btn-group-xs">
+			<div class="btn-group btn-group">
 				{{if $prevlink}}
-				<a href="{{$prevlink.0}}" class="btn btn-default" title="{{$prevlink.1}}"><i class="icon-backward"></i></a>
+				<a href="{{$prevlink.0}}" class="btn btn-default btn-xs" title="{{$prevlink.1}}"><i class="icon-backward"></i></a>
 				{{/if}}
 				{{if $nextlink}}
-				<a href="{{$nextlink.0}}" class="btn btn-default" title="{{$nextlink.1}}"><i class="icon-forward"></i></a>
+				<a href="{{$nextlink.0}}" class="btn btn-default btn-xs" title="{{$nextlink.1}}"><i class="icon-forward"></i></a>
 				{{/if}}
 			</div>
 		</div>
diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 7067c84f5..d06af4f99 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -18,10 +18,10 @@
 			{{$aclselect}}
 
 			{{if $default}}
-			<div class="form-group pull-left">
+			<div class="pull-left">
 				<input id="photos-upload-choose" type="file" name="userfile" />
 			</div>
-			<div class="form-group btn-group pull-right">
+			<div class="btn-group pull-right">
 				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
 					<i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
 				</button>
@@ -31,9 +31,9 @@
 
 			<div id="photos-upload-new-end" class="clear"></div>
 
-			<div id="photos-upload-noshare">
-				<label id="photos-upload-noshare-text" for="photos-upload-noshare" >
-					<input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />&nbsp;{{$nosharetext}}
+			<div class="checkbox">
+				<label class="checkbox-inline" for="photos-upload-noshare" >
+					<input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />{{$nosharetext}}
 				</label>
 			</div>
 
-- 
cgit v1.2.3


From 2f85d12a6c6bcaeb5e5197a86863b6915ab93ddb Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Mon, 3 Nov 2014 10:46:57 +0100
Subject: if deleting a photo go away to album

---
 view/tpl/photos_upload.tpl | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index d06af4f99..13fb41687 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -31,20 +31,20 @@
 
 			<div id="photos-upload-new-end" class="clear"></div>
 
-			<div class="checkbox">
+			<div class="checkbox pull-left">
 				<label class="checkbox-inline" for="photos-upload-noshare" >
 					<input class="checkbox-inline" id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" />{{$nosharetext}}
 				</label>
 			</div>
 
 			{{if $uploader}}
-			<div id="photos-upload-noshare-end"></div>
-			<div id="photos-upload-perms" class="photos-upload-perms" >
-				<span id="jot-perms-icon" class="icon-{{$lockstate}}" ></span>
-				<button class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" onclick="return false;">{{$permissions}}</button>
+			<div id="photos-upload-perms" class="pull-right">
+				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
+					<i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
+				</button>
+			<div class="pull-right">
+				{{$uploader}}
 			</div>
-			<div id="photos-upload-perms-end" class="clear"></div>
-			{{$uploader}}
 			{{/if}}
 		</form>
 	</div>
-- 
cgit v1.2.3


From 1d923d2b0d6b6b83c57d3ca257addcd1080f7f44 Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Mon, 3 Nov 2014 12:54:17 +0100
Subject: one </div> to much and css fixes

---
 view/tpl/photo_view.tpl | 153 +++++++++++++++++++++++-------------------------
 1 file changed, 74 insertions(+), 79 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index e7456427b..009158c37 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -92,97 +92,92 @@
 		<div class="photo-item-tools">
 			{{if $like_count ||  $dislike_count}}
 			<div class="photo-item-tools-left pull-left">
-					<div class="{{if $like_count &&  $dislike_count}}btn-group{{/if}}">
-						{{if $like_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-like-{{$id}}">{{$like_count}} {{$like_button_label}}</button>
-							{{if $like_list_part}}
-							<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$id}}">{{foreach $like_list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
-							{{else}}
-							<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$id}}">{{foreach $like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
-							{{/if}}
-						</div>
-						{{/if}}
-						{{if $dislike_count}}
-						<div class="btn-group">
-							<button type="button" class="btn btn-default btn-sm wall-item-dislike dropdown-toggle" data-toggle="dropdown" id="wall-item-dislike-{{$id}}">{{$dislike_count}} {{$dislike_button_label}}</button>
-							{{if $dislike_list_part}}
-							<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$id}}">{{foreach $dislike_list_part as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
-							{{else}}
-							<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$id}}">{{foreach $dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
-							{{/if}}
-						</div>
+				<div class="{{if $like_count &&  $dislike_count}}btn-group{{/if}}">
+					{{if $like_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-like-{{$id}}">{{$like_count}} {{$like_button_label}}</button>
+						{{if $like_list_part}}
+						<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$id}}">{{foreach $like_list_part as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+						{{else}}
+						<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-like-{{$id}}">{{foreach $like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
 						{{/if}}
 					</div>
-					{{if $like_list_part}}
-					<div class="modal" id="likeModal-{{$id}}">
-						<div class="modal-dialog">
-							<div class="modal-content">
-								<div class="modal-header">
-									<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-									<h4 class="modal-title">{{$like_modal_title}}</h4>
-								</div>
-								<div class="modal-body">
-									<ul>{{foreach $like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
-								</div>
-								<div class="modal-footer clear">
-									<button type="button" class="btn btn-default" data-dismiss="modal">{{$modal_dismiss}}</button>
-								</div>
-							</div><!-- /.modal-content -->
-						</div><!-- /.modal-dialog -->
-					</div><!-- /.modal -->
 					{{/if}}
-					{{if $dislike_list_part}}
-					<div class="modal" id="dislikeModal-{{$id}}">
-						<div class="modal-dialog">
-							<div class="modal-content">
-								<div class="modal-header">
-									<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-									<h4 class="modal-title">{{$dislike_modal_title}}</h4>
-								</div>
-								<div class="modal-body">
-									<ul>{{foreach $dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
-								</div>
-								<div class="modal-footer clear">
-									<button type="button" class="btn btn-default" data-dismiss="modal">{{$modal_dismiss}}</button>
-								</div>
-							</div><!-- /.modal-content -->
-						</div><!-- /.modal-dialog -->
-					</div><!-- /.modal -->
+					{{if $dislike_count}}
+					<div class="btn-group">
+						<button type="button" class="btn btn-default btn-sm wall-item-dislike dropdown-toggle" data-toggle="dropdown" id="wall-item-dislike-{{$id}}">{{$dislike_count}} {{$dislike_button_label}}</button>
+						{{if $dislike_list_part}}
+						<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$id}}">{{foreach $dislike_list_part as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
+						{{else}}
+						<ul class="dropdown-menu" role="menu" aria-labelledby="wall-item-dislike-{{$id}}">{{foreach $dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
+						{{/if}}
+					</div>
 					{{/if}}
 				</div>
+				{{if $like_list_part}}
+				<div class="modal" id="likeModal-{{$id}}">
+					<div class="modal-dialog">
+						<div class="modal-content">
+							<div class="modal-header">
+								<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+								<h4 class="modal-title">{{$like_modal_title}}</h4>
+							</div>
+							<div class="modal-body">
+								<ul>{{foreach $like_list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+							</div>
+							<div class="modal-footer clear">
+								<button type="button" class="btn btn-default" data-dismiss="modal">{{$modal_dismiss}}</button>
+							</div>
+						</div><!-- /.modal-content -->
+					</div><!-- /.modal-dialog -->
+				</div><!-- /.modal -->
+				{{/if}}
+				{{if $dislike_list_part}}
+				<div class="modal" id="dislikeModal-{{$id}}">
+					<div class="modal-dialog">
+						<div class="modal-content">
+							<div class="modal-header">
+								<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+								<h4 class="modal-title">{{$dislike_modal_title}}</h4>
+							</div>
+							<div class="modal-body">
+								<ul>{{foreach $dislike_list as $disliker}}<li role="presentation">{{$disliker}}</li>{{/foreach}}</ul>
+							</div>
+							<div class="modal-footer clear">
+								<button type="button" class="btn btn-default" data-dismiss="modal">{{$modal_dismiss}}</button>
+							</div>
+						</div><!-- /.modal-content -->
+					</div><!-- /.modal-dialog -->
+				</div><!-- /.modal -->
+				{{/if}}
 			</div>
-			{{/if}}
-
-			{{if $likebuttons}}
-			<div class="photo-item-tools-right btn-group pull-right">
-				<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false">
-					<i class="icon-thumbs-up-alt" title="{{$likethis}}"></i>
-				</button>
-				<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false">
-					<i class="icon-thumbs-down-alt" title="{{$nolike}}"></i>
-				</button>
-			</div>
-			<div id="like-rotator-{{$id}}" class="like-rotator pull-right"></div>
-			{{/if}}
-
-			<div class="clear"></div>
 		</div>
+		{{/if}}
 
+		{{if $likebuttons}}
+		<div class="photo-item-tools-right btn-group pull-right">
+			<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'like'); return false">
+				<i class="icon-thumbs-up-alt" title="{{$likethis}}"></i>
+			</button>
+			<button type="button" class="btn btn-default btn-sm" onclick="dolike({{$id}},'dislike'); return false">
+				<i class="icon-thumbs-down-alt" title="{{$nolike}}"></i>
+			</button>
+		</div>
+		<div id="like-rotator-{{$id}}" class="photo-like-rotator pull-right"></div>
+		{{/if}}
+		<div class="clear"></div>
 	</div>
+</div>
 
-	{{$comments}}
-
-	{{if $commentbox}}
-	<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
-		{{$commentbox}}
-	</div>
-	{{/if}}
-
-
-	<div class="clear"></div>
+{{$comments}}
 
+{{if $commentbox}}
+<div class="wall-item-comment-wrapper{{if $comments}} wall-item-comment-wrapper-wc{{/if}}" >
+	{{$commentbox}}
 </div>
+{{/if}}
+
+<div class="clear"></div>
 
 {{$paginate}}
 
-- 
cgit v1.2.3


From a6d8c3193a6fc243f3e516118c793e5b871b8247 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 3 Nov 2014 14:49:03 -0800
Subject: various UI issues related to having an enormous number of entries in
 the posted_date selector including years/months that had no posts

---
 view/tpl/posted_date_widget.tpl | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/posted_date_widget.tpl b/view/tpl/posted_date_widget.tpl
index 1104d61bb..6298ca0aa 100755
--- a/view/tpl/posted_date_widget.tpl
+++ b/view/tpl/posted_date_widget.tpl
@@ -1,8 +1,30 @@
+<script>
+
+function toggle_posted_date_button() {
+	if($('#posted-date-dropdown').is(':visible')) {
+		$('#posted-date-icon').removeClass('icon-caret-up');
+		$('#posted-date-icon').addClass('icon-caret-down');
+		$('#posted-date-dropdown').hide();
+	}
+	else {
+		$('#posted-date-icon').addClass('icon-caret-up');
+		$('#posted-date-icon').removeClass('icon-caret-down');
+		$('#posted-date-dropdown').show();
+	}
+}
+</script>
+		
+
 <div id="datebrowse-sidebar" class="widget">
 	<h3>{{$title}}</h3>
 	<script>function dateSubmit(dateurl) { window.location.href = dateurl; } </script>
 	<ul id="posted-date-selector" class="nav nav-pills nav-stacked">
 		{{foreach $dates as $y => $arr}}
+		{{if $y == $cutoff_year}}
+		</ul>
+		<div id="posted-date-dropdown" style="display: none;">
+		<ul id="posted-date-selector-drop" class="nav nav-pills nav-stacked">
+		{{/if}} 
 		<li id="posted-date-selector-year-{{$y}}">
 			<a href="#" onclick="openClose('posted-date-selector-{{$y}}'); return false;">{{$y}}</a>
 		</li>
@@ -10,11 +32,15 @@
 			<ul class="posted-date-selector-months nav nav-pills nav-stacked">
 				{{foreach $arr as $d}}
 				<li>
-					<a href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}&dbegin={{$d.2}}'); return false;">{{$d.0}}</a>
+					<a href="#" onclick="dateSubmit('{{$url}}?f=&dend={{$d.1}}{{if $showend}}&dbegin={{$d.2}}{{/if}}'); return false;">{{$d.0}}</a>
 				</li>
 				{{/foreach}}
 			</ul>
 		</div>
 		{{/foreach}}
+		{{if $cutoff}}
+		</div>
+		<button class="btn btn-default btn-sm" onclick="toggle_posted_date_button(); return false;"><i id="posted-date-icon" class="icon-caret-down"></i></button>
+		{{/if}}
 	</ul>
 </div>
-- 
cgit v1.2.3


From ba73b60177df1f24564436bea0bb2d7b50d68b7a Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Tue, 4 Nov 2014 09:29:11 +0100
Subject: missing </div>

---
 view/tpl/photos_upload.tpl | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index 13fb41687..ae06b808a 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -42,8 +42,9 @@
 				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
 					<i id="jot-perms-icon" class="icon-{{$lockstate}}"></i>
 				</button>
-			<div class="pull-right">
-				{{$uploader}}
+				<div class="pull-right">
+					{{$uploader}}
+				</div>
 			</div>
 			{{/if}}
 		</form>
-- 
cgit v1.2.3


From 73e645fe3da80164d1970d31803727cfcf73f46b Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Tue, 4 Nov 2014 09:35:39 +0100
Subject: class > id mixup

---
 view/tpl/photos_upload.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photos_upload.tpl b/view/tpl/photos_upload.tpl
index ae06b808a..611068b6d 100755
--- a/view/tpl/photos_upload.tpl
+++ b/view/tpl/photos_upload.tpl
@@ -49,5 +49,5 @@
 			{{/if}}
 		</form>
 	</div>
-	<div class="photos-upload-end" class="clear"></div>
+	<div id="photos-upload-end" class="clear"></div>
 </div>
-- 
cgit v1.2.3


From ba7f1bb8eee5f5374246a512b6c510f874f417ce Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 4 Nov 2014 15:24:24 -0800
Subject: configurable visual alerts/notifications

---
 view/tpl/settings.tpl | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 4c1b8eb8f..7fa52677b 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -100,6 +100,27 @@
 {{include file="field_intcheckbox.tpl" field=$notify8}}
 </div>
 
+<div id="settings-vnotify-desc">{{$lbl_vnot}}</div>
+
+<div class="group">
+{{include file="field_intcheckbox.tpl" field=$vnotify1}}
+{{include file="field_intcheckbox.tpl" field=$vnotify2}}
+{{include file="field_intcheckbox.tpl" field=$vnotify3}}
+{{include file="field_intcheckbox.tpl" field=$vnotify4}}
+{{include file="field_intcheckbox.tpl" field=$vnotify5}}
+{{include file="field_intcheckbox.tpl" field=$vnotify6}}
+{{include file="field_intcheckbox.tpl" field=$vnotify10}}
+{{include file="field_intcheckbox.tpl" field=$vnotify7}}
+{{include file="field_intcheckbox.tpl" field=$vnotify8}}
+{{include file="field_intcheckbox.tpl" field=$vnotify9}}
+
+{{*include file="field_intcheckbox.tpl" field=$vnotify11*}}
+</div>
+
+{{include file="field_input.tpl" field=$evdays}}
+
+
+
 </div>
 
 <div class="settings-submit-wrapper" >
@@ -110,6 +131,8 @@
 {{if $menus}}
 <h3 class="settings-heading">{{$lbl_misc}}</h3>
 
+
+
 <div id="settings-menu-desc">{{$menu_desc}}</div>
 <div class="settings-channel-menu-div">
 <select name="channel_menu" class="settings-channel-menu-sel">
-- 
cgit v1.2.3


From d5d6158973ecb83b63d42c57c96dce849842c83b Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 4 Nov 2014 17:11:02 -0800
Subject: ok heads up - potentially destabilising change. I've tried to sort
 out all the default connection permissions for those who don't have a
 predefined (or therefore have a "custom") permissions role. Unfortunately
 this includes most people that were using this software more than a month
 ago. The real changes are that the SELF address book entry no longer holds
 "auto-permissions" but instead holds your "default permissions" (if you have
 a pre-defined role, the defaults will be pulled from the role table).

The auto permissions have moved to a pconfig (uid.system.autoperms). A DB update will move these settings into their new homes.

What used to be the "Auto-permissions settings" page is now the "default permissions settings" page and a checkbox therein decides whether or not to apply the permissions automatically. A link to this page will only be shown when you have the "custom" role selected.

With luck nobody will notice anything wrong. But at least for the next few days, please review permissions that have been assigned to new connections (either automatically or manually) and make sure they make sense (e.g. they aren't "nothing"). You still need to take action when seeing a message "permissions have changed but not yet submitted" as we always let you review and perhaps adjust the settings _before_ a connection is established (unless you have autoperms turned on).
---
 view/tpl/abook_edit.tpl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'view/tpl')

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 078eb4df4..0f91d6024 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -10,7 +10,10 @@
 {{/if}}
 
 {{if $self}}
+<div class="abook-autotext">
 <div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div>
+{{include file="field_checkbox.tpl" field=$autoperms}}
+</div>
 {{/if}}
 
 
-- 
cgit v1.2.3


From 1896855c8540101abb7af9bbc3aa45d738750d95 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Tue, 4 Nov 2014 17:38:49 -0800
Subject: minor adjustments to make the form work as designed

---
 view/tpl/abook_edit.tpl | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'view/tpl')

diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 0f91d6024..c2c11e4b1 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -9,12 +9,6 @@
 </div>
 {{/if}}
 
-{{if $self}}
-<div class="abook-autotext">
-<div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div>
-{{include file="field_checkbox.tpl" field=$autoperms}}
-</div>
-{{/if}}
 
 
 <div id="contact-edit-wrapper">
@@ -34,6 +28,15 @@
 
 
 <form id="abook-edit-form" action="connedit/{{$contact_id}}" method="post" >
+
+{{if $self}}
+<div class="abook-autotext">
+<div id="autoperm-desc" class="descriptive-paragraph">{{$autolbl}}</div>
+{{include file="field_checkbox.tpl" field=$autoperms}}
+</div>
+{{/if}}
+
+
 <input type="hidden" name="contact_id" value="{{$contact_id}}">
 <input id="contact-closeness-mirror" type="hidden" name="closeness" value="{{$close}}" />
 
-- 
cgit v1.2.3


From 038e7c892376f51f81a2b9769a5a0b69cc17571a Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 5 Nov 2014 18:39:10 -0800
Subject: crude skeleton for location manager and the UI sucks but at least
 it's on a webpage and you don't have to do it by hand.

---
 view/tpl/locmanage.tpl | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 view/tpl/locmanage.tpl

(limited to 'view/tpl')

diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl
new file mode 100644
index 000000000..5a25850a1
--- /dev/null
+++ b/view/tpl/locmanage.tpl
@@ -0,0 +1,26 @@
+<h2>{{$header}}</h2>
+
+<script>
+function primehub(id) {
+	$.post('locs','primary='+id,function(data) { window.location.href=window.location.href; });
+}
+function drophub(id) {
+	$.post('locs','drop='+id,function(data) { window.location.href=window.location.href; });
+}
+</script>
+
+<table>
+<tr><td>{{$loc}}</td><td>{{$mkprm}}</td><td>{{$drop}}</td></tr>
+{{foreach $hubs as $hub}}
+<tr><td>
+{{if $hub.deleted}}<strike>{{/if}}
+{{$hub.hubloc_url}} ({{$hub.hubloc_addr}}){{if $hub.deleted}}</strike>{{/if}}</td>
+<td>
+
+{{if $hub.primary}}<i class="icon-check"></i>{{else}}<button class="btn btn-std"><i class="icon-check-empty" onclick="primehub({{$hub.hubloc_id}}); return false;" ></i></button>{{/if}}
+</td>
+<td>{{if $hub.primary}}{{else}}{{if ! $hub.deleted}}<button class="btn btn-std" onclick="drophub({{$hub.hubloc_id}}); return false;"><i class="icon-remove"></i></button>{{/if}}{{/if}}</td>
+</tr>
+{{/foreach}}
+</table>
+
-- 
cgit v1.2.3


From 1fbd1a79c7a19ff51b9e8ab4bad67ec0bf687839 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 6 Nov 2014 17:27:28 -0800
Subject: Provide a way to mark photos as adult and hide them from the default
 album view. Still need a button or setting to enable "unsafe viewing". This
 has no effect anywhere but in the album views. They can still be viewed by
 flipping through the individual photos with 'prev' and 'next'. We probably
 need a comprehensive strategy for how to deal with n-s-f-w photos in albums
 so consider this a band-aid which requires additional work and integration
 with other facilities which access these photos. It is entirely optional.

---
 view/tpl/photo_view.tpl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index 009158c37..b1f39a9e2 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -59,7 +59,9 @@
 				<label class="radio-inline" id="photo-edit-rotate-cw-label" for="photo-edit-rotate-cw"><input id="photo-edit-rotate-cw" type="radio" name="rotate" value="1" />{{$edit.rotatecw}}</label>
 				<label class="radio-inline" id="photo-edit-rotate-ccw-label" for="photo-edit-rotate-ccw"><input id="photo-edit-rotate-ccw" type="radio" name="rotate" value="2" />{{$edit.rotateccw}}</label>
 			</div>
-
+			<div class="form-group">
+			{{include file="field_checkbox.tpl" field=$edit.adult}}
+			</div>
 			{{$edit.aclselect}}
 
 			<div class="form-group pull-left">
-- 
cgit v1.2.3


From 2cfe0f15452c2231314991cdbbab3a9e6926a68b Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Fri, 7 Nov 2014 12:13:38 +0100
Subject: provide lockstate for photo edit

---
 view/tpl/photo_view.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index b1f39a9e2..969f66f44 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -69,7 +69,7 @@
 			</div>
 			<div class="form-group btn-group pull-right">
 				<button class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" onclick="return false;">
-					<i id="jot-perms-icon" class="{{$edit.lockstate}}"></i>
+					<i id="jot-perms-icon" class="icon-{{$edit.lockstate}}"></i>
 				</button>
 				<button class="btn btn-primary btn-sm" type="submit" name="submit" id="photos-edit-submit">{{$edit.submit}}</button>
 			</div>
-- 
cgit v1.2.3