X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FeditProfile.html;h=d61df4e192ae4e0f0f97d96ecd17e70add1cfee8;hp=12cbd74e076830607cd8cfff095865152f2c389a;hb=faf66247a34f64946990a985d2ea3003465969cb;hpb=bfd1b2e8caf931f4a27d414bce3fc7d688ccdef9

diff --git a/src/main/resources/templates/editProfile.html b/src/main/resources/templates/editProfile.html
index 12cbd74..d61df4e 100644
--- a/src/main/resources/templates/editProfile.html
+++ b/src/main/resources/templates/editProfile.html
@@ -1,6 +1,13 @@
 <%include include/head.html>
 
-	<script language="javascript">
+	<script type="application/javascript">
+		function recheckMoveButtons() {
+			$("#sone .profile-field").each(function() {
+				$(".move-up-field", this).toggleClass("hidden", $(this).prev(".profile-field").length === 0);
+				$(".move-down-field", this).toggleClass("hidden", $(this).next(".profile-field").length === 0);
+			});
+		}
+
 		$(function() {
 			getTranslation("WebInterface.DefaultText.FirstName", function(firstNameDefaultText) {
 				registerInputTextareaSwap("#sone #edit-profile input[name=first-name]", firstNameDefaultText, "first-name", true, true);
@@ -21,7 +28,7 @@
 				registerInputTextareaSwap("#sone #edit-profile input[name=birth-year]", birthYearDefaultText, "birth-year", true, true);
 			});
 			getTranslation("WebInterface.DefaultText.FieldName", function(fieldNameDefaultText) {
-				registerInputTextareaSwap("#sone #add-profile-field input[name=field-name]", fieldNameDefaultText, "field-name", true, true);
+				registerInputTextareaSwap("#sone #add-profile-field input[name=field-name]", fieldNameDefaultText, "field-name", false, true);
 			});
 
 			<%foreach fields field>
@@ -34,13 +41,13 @@
 			/* ajaxify the delete buttons. */
 			getTranslation("Page.EditProfile.Fields.Button.ReallyDelete", function(reallyDeleteText) {
 				$("#sone #edit-profile .delete-field-name button").each(function() {
-					confirmButton = $(this).clone().addClass("hidden").addClass("confirm").text(reallyDeleteText).insertAfter(this);
+					const confirmButton = $(this).clone().addClass("hidden").addClass("confirm").text(reallyDeleteText).insertAfter(this);
 					(function(deleteButton, confirmButton) {
 						deleteButton.click(function() {
 							deleteButton.fadeOut("slow", function() {
 								confirmButton.fadeIn("slow");
 								$(document).one("click", function() {
-									if (this != confirmButton.get(0)) {
+									if (this !== confirmButton.get(0)) {
 										confirmButton.fadeOut("slow", function() {
 											deleteButton.fadeIn("slow");
 										});
@@ -52,9 +59,10 @@
 						});
 						confirmButton.click(function() {
 							confirmButton.fadeOut("slow");
-							buttonName = confirmButton.attr("name");
-							fieldId = buttonName.substring("delete-field-".length);
+							const buttonName = confirmButton.prop("name");
+							const fieldId = buttonName.substring("delete-field-".length);
 							deleteProfileField(fieldId);
+							recheckMoveButtons();
 							return false;
 						});
 					})($(this), confirmButton);
@@ -63,13 +71,13 @@
 
 			/* ajaxify the edit button. */
 			$("#sone #edit-profile .edit-field-name button").each(function() {
-				profileField = $(this).parents(".profile-field");
-				fieldNameElement = profileField.find(".name");
-				inputField = $("input[type=text].short", profileField);
-				confirmButton = $("button.confirm", profileField);
-				cancelButton = $("button.cancel", profileField);
+				const profileField = $(this).parents(".profile-field");
+				const fieldNameElement = profileField.find(".name");
+				const inputField = $("input[type=text].short", profileField);
+				const confirmButton = $("button.confirm", profileField);
+				const cancelButton = $("button.cancel", profileField);
 				(function(editButton, inputField, confirmButton, cancelButton, fieldNameElement) {
-					cleanUp = function(editButton, inputField, confirmButton, cancelButton, fieldNameElement) {
+					const cleanUp = function(editButton, inputField, confirmButton, cancelButton, fieldNameElement) {
 						editButton.removeAttr("disabled");
 						inputField.addClass("hidden");
 						confirmButton.addClass("hidden");
@@ -77,10 +85,10 @@
 						fieldNameElement.removeClass("hidden");
 					};
 					confirmButton.click(function() {
-						inputField.attr("disabled", "disabled");
-						confirmButton.attr("disabled", "disabled");
-						cancelButton.attr("disabled", "disabled");
-						editProfileField(confirmButton.parents(".profile-field").attr("id"), inputField.val(), function() {
+						inputField.prop("disabled", "disabled");
+						confirmButton.prop("disabled", "disabled");
+						cancelButton.prop("disabled", "disabled");
+						editProfileField(confirmButton.parents(".profile-field").prop("id"), inputField.val(), function() {
 							fieldNameElement.text(inputField.val());
 							cleanUp(editButton, inputField, confirmButton, cancelButton, fieldNameElement);
 						});
@@ -91,16 +99,16 @@
 						return false;
 					});
 					inputField.keypress(function(event) {
-						if (event.which == 13) {
+						if (event.which === 13) {
 							confirmButton.click();
 							return false;
-						} else if (event.which == 27) {
+						} else if (event.which === 27) {
 							cancelButton.click();
 							return false;
 						}
 					});
 					editButton.click(function() {
-						editButton.attr("disabled", "disabled");
+						editButton.prop("disabled", "disabled");
 						fieldNameElement.addClass("hidden");
 						inputField.removeAttr("disabled").val(fieldNameElement.text()).removeClass("hidden").focus().select();
 						confirmButton.removeAttr("disabled").removeClass("hidden");
@@ -109,6 +117,24 @@
 					});
 				})($(this), inputField, confirmButton, cancelButton, fieldNameElement);
 			});
+
+			/* ajaxify “move up” and “move down” buttons. */
+			$("#sone .profile-field .move-down-field button").click(function() {
+				const profileField = $(this).parents(".profile-field");
+				moveProfileFieldDown(profileField.prop("id"), function() {
+					profileField.insertAfter(profileField.next());
+					recheckMoveButtons();
+				});
+				return false;
+			});
+			$("#sone .profile-field .move-up-field button").click(function() {
+				const profileField = $(this).parents(".profile-field");
+				moveProfileFieldUp(profileField.prop("id"), function() {
+					profileField.insertBefore(profileField.prev());
+					recheckMoveButtons();
+				});
+				return false;
+			});
 		});
 	</script>
 
@@ -152,6 +178,23 @@
 			<input type="text" name="birth-year" value="<% birthYear|html>" />
 		</div>
 
+		<h1><%= Page.EditProfile.Avatar.Title|l10n|html></h1>
+
+		<p><%= Page.EditProfile.Avatar.Description|l10n|html></p>
+
+		<ul id="avatar-selection">
+			<li id="no-avatar">
+				<input type="radio" name="avatarId" value="none"<%ifnull avatarId> checked="checked"<%/if>/>
+				<%= Page.EditProfile.Avatar.Delete|l10n|html>
+			</li>
+			<%foreach currentSone.allImages image>
+				<li>
+					<input type="radio" name="avatarId" value="<%image.id|html>"<%if avatarId|match value=image.id> checked="checked"<%/if>/>
+					<div class="post-avatar"><% image|image-link max-width==48 max-height==48 mode==enlarge title=image.title></div>
+				</li>
+			<%/foreach>
+		</ul>
+
 		<div>
 			<button type="submit" name="save-profile" value="true"><%= Page.EditProfile.Button.Save|l10n|html></button>
 		</div>
@@ -163,7 +206,7 @@
 		<%foreach fields field fieldLoop>
 			<div class="profile-field" id="<% field.id|html>">
 				<div class="name"><% field.name|html></div>
-				<input class="short hidden" type="text"><button class="confirm hidden" type="button">✔</button><button class="cancel hidden" type="button">✘</button>
+				<input class="short hidden" type="text"><button class="edit confirm hidden" type="button">✔</button><button class="cancel hidden" type="button">✘</button>
 				<div class="edit-field-name"><button type="submit" name="edit-field-<% field.id|html>" value="true"><%= Page.EditProfile.Fields.Button.Edit|l10n|html></button></div>
 				<div class="delete-field-name"><button type="submit" name="delete-field-<% field.id|html>" value="true"><%= Page.EditProfile.Fields.Button.Delete|l10n|html></button></div>
 				<div class="<%if fieldLoop.last>hidden <%/if>move-down-field"><button type="submit" name="move-down-field-<% field.id|html>" value="true"><%= Page.EditProfile.Fields.Button.MoveDown|l10n|html></button></div>
@@ -187,7 +230,7 @@
 		<h2><%= Page.EditProfile.Fields.AddField.Title|l10n|html></h2>
 
 		<%if duplicateFieldName>
-			<p><%= Page.EditProfile.Error.DuplicateFieldName|l10n|replace needle="{fieldName}" replacementKey="fieldName"|html></p>
+			<p><%= Page.EditProfile.Error.DuplicateFieldName|l10n|replace needle=="{fieldName}" replacement=fieldName|html></p>
 		<%/if>
 
 		<div id="new-field">