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/js/mod_photos.js   | 13 +++++++++++++
 view/tpl/photo_view.tpl | 16 ++++++++--------
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'view')

diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index aaa86df40..8b7706f16 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -13,6 +13,19 @@ $(document).ready(function() {
 		'transition' : 'elastic' 
 	});
 
+	var a;
+	a = $("#photo-edit-newtag").autocomplete({ 
+		serviceUrl: baseurl + '/acl',
+		minChars: 2,
+		width: 250,
+		id: 'newtag-ac',
+		onSelect: function(value,data) {
+			$("#photo-edit-newtag").val(data);
+		},
+	});
+	a.setOptions({ params: { type: 'p' }});
+
+
 	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
 		var selstr;
 		$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
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