X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FimageBrowser.html;h=74dac806886cc49cffbbc9b086fa39da13388c16;hb=768bbb738423c13854a195dc8dafe64bf4eeba6c;hp=ba8220d56d4f60da93bb12f49ac2363de4b2841a;hpb=e3ae4a824c152c12ce220f1269b75dd308707f2b;p=Sone.git

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index ba8220d..74dac80 100644
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -38,6 +38,43 @@
 
 			<%if album.sone.local>
 				<script language="javascript">
+
+					/* ID of the image currently being edited. */
+					var editingImageId = null;
+
+					/**
+					 * Shows the form for editing an image.
+					 *
+					 * @param imageId The ID of the image to edit.
+					 */
+					function editImage(imageId) {
+						if (editingImageId != imageId) {
+							cancelEditing();
+						} else {
+							return;
+						}
+						$(".show-data", "#image-" + imageId).hide();
+						$(".edit-data", "#image-" + imageId).show();
+						$(document).bind("click.sone", function(event) {
+							if ($(event.target).closest("#image-" + imageId).size() == 0) {
+								cancelEditing();
+							}
+						});
+					}
+
+					/**
+					 * Cancels all image editing.
+					 */
+					function cancelEditing() {
+						$(".show-data").show();
+						$(".edit-data").hide();
+						$("form.edit-image").each(function() {
+							this.reset();
+						});
+						$(document).unbind("click.sone");
+						editingImageId = null;
+					}
+
 					$(function() {
 						getTranslation("WebInterface.DefaultText.UploadImage.Title", function(text) {
 							$("#upload-image :input[name='title']").each(function() {
@@ -78,22 +115,15 @@
 						hideAndShowBlock(".upload-image", ".show-upload-image", ".hide-upload-image");
 						hideAndShowBlock(".delete-album", ".show-delete-album", ".hide-delete-album");
 
-						hideAndShowData = function(activationElements, activeElements, hideElement, showElement) {
-							$(activationElements).click(function() {
-								imageId = $(this).closest(".image").find(".image-id").text();
-								$(hideElement, $("#image-" + imageId)).hide();
-								$(showElement, $("#image-" + imageId)).show();
-								$(document).click(function(event) {
-									if ($(event.target).closest("#image-" + imageId).size() == 0) {
-										$(showElement).hide();
-										$(hideElement).show();
-									}
-									return $(event.target).is("button");
+						$(".image").each(function() {
+							imageId = $(this).closest(".image").find(".image-id").text();
+							(function(element, imageId) {
+								$(".show-data", element).click(function() {
+									editImage(imageId);
 								});
+							})(this, imageId);
 							});
-						};
-
-						hideAndShowData(".image-title, .image-description", ".image", ".show-data", ".edit-data");
+						});
 					});
 				</script>
 			<%/if>
@@ -123,6 +153,17 @@
 						<input type="hidden" name="formPassword" value="<%formPassword|html>" />
 						<input type="hidden" name="album" value="<%album.id|html>" />
 
+						<%if ! album.images.empty>
+							<div>
+								<label for="album-image"><%= Page.ImageBrowser.Album.Label.AlbumImage|l10n|html></label>
+								<select name="album-image">
+									<option disabled="disabled"><%= Page.ImageBrowser.Album.AlbumImage.Choose|l10n|html></option>
+									<%foreach album.images image>
+										<option value="<% image.id|html>"<%if album.albumImage.id|match key=image.id> selected="selected"<%/if>><% image.title|html></option>
+									<%/foreach>
+								</select>
+							</div>
+						<%/if>
 						<div>
 							<label for="title"><%= Page.ImageBrowser.Album.Label.Title|l10n|html></label>
 							<input type="text" name="title" value="<%album.title|html>" />
@@ -194,7 +235,9 @@
 									<textarea name="description"><%image.description|html></textarea>
 								</div>
 								<div>
+									<%notfirst><button type="submit" name="moveLeft" value="true"><%= Page.ImageBrowser.Image.Button.MoveLeft|l10n|html></button><%/notfirst>
 									<button type="submit"><%= Page.ImageBrowser.Image.Button.Save|l10n|html></button>
+									<%notlast><button type="submit" name="moveRight" value="true"><%= Page.ImageBrowser.Image.Button.MoveRight|l10n|html></button><%/notlast>
 								</div>
 							</div>
 						</form>