X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FimageBrowser.html;h=3c58011b15384c85258243e2907402971a820e14;hp=5a26c1a2741fdd8360a0b46997185770c45311bc;hb=b7a4b01e5dc006b99379821ae9d12ba876f3ec26;hpb=f71a4ea27ef8a7ef12466a81d62b5ca60fc69854

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index 5a26c1a..3c58011 100644
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -2,6 +2,28 @@
 
 	<div class="page-id hidden">image-browser</div>
 
+	<script language="javascript">
+		$(function() {
+
+			/* hide all those forms. */
+			hideAndShowBlock = function(blockElement, clickToShowElement, clickToHideElement) {
+				$(blockElement).hide();
+				$(clickToShowElement).removeClass("hidden");
+				$(clickToShowElement).click(function() {
+					$(blockElement).slideDown();
+					$(clickToShowElement).addClass("hidden");
+					$(clickToHideElement).removeClass("hidden");
+				});
+				$(clickToHideElement).click(function() {
+					$(blockElement).slideUp();
+					$(clickToHideElement).addClass("hidden");
+					$(clickToShowElement).removeClass("hidden");
+				});
+			};
+
+		});
+	</script>
+
 	<%if albumRequested>
 
 		<%ifnull album>
@@ -16,6 +38,45 @@
 
 			<%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) {
+							console.log("event: " + event);
+							console.log("closest: " + $(event.target).closest("#image-" + imageId));
+							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() {
@@ -51,19 +112,20 @@
 						});
 						$("#edit-album label").hide();
 
-						/* hide all those forms. */
-						hideBlock = function(blockElement, clickElement) {
-							$(blockElement).hide();
-							$(clickElement).removeClass("hidden").click(function() {
-								$(blockElement).slideDown();
-								$(this).slideUp();
-								return false;
+						hideAndShowBlock(".edit-album", ".show-edit-album", ".hide-edit-album");
+						hideAndShowBlock(".create-album", ".show-create-album", ".hide-create-album");
+						hideAndShowBlock(".upload-image", ".show-upload-image", ".hide-upload-image");
+						hideAndShowBlock(".delete-album", ".show-delete-album", ".hide-delete-album");
+
+						$(".image").each(function() {
+							imageId = $(this).closest(".image").find(".image-id").text();
+							(function(element, imageId) {
+								$(".show-data", element).click(function() {
+									editImage(imageId);
+								});
+							})(this, imageId);
 							});
-						};
-
-						hideBlock(".edit-album", ".show-edit-album");
-						hideBlock(".create-album", ".show-create-album");
-						hideBlock(".upload-image", ".show-upload-image");
+						});
 					});
 				</script>
 			<%/if>
@@ -84,7 +146,8 @@
 			<p id="description"><% album.description|html></p>
 
 			<%if album.sone.local>
-				<p><a class="show-edit-album hidden small-link">» <%= Page.ImageBrowser.Album.Edit.Title|l10n|html></a></p>
+				<div class="show-edit-album hidden toggle-link"><a class="small-link">» <%= Page.ImageBrowser.Album.Edit.Title|l10n|html></a></div>
+				<div class="hide-edit-album hidden toggle-link"><a class="small-link">« <%= Page.ImageBrowser.Album.Edit.Title|l10n|html></a></div>
 				<div class="edit-album">
 					<h2><%= Page.ImageBrowser.Album.Edit.Title|l10n|html></h2>
 
@@ -92,6 +155,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>" />
@@ -109,15 +183,19 @@
 				<%first><h2><%= Page.ImageBrowser.Header.Albums|l10n|html></h2><%/first>
 				<%if loop.count|mod divisor=3><div class="image-row"><%/if>
 				<div class="album image">
-					<a href="imageBrowser.html?album=<% album.id|html>" title="<% album.title|html>">
-						<%ifnull album.albumImage>
-							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
-						<%else><!-- TODO -->
-							<% album.albumImage|image-link max-width=200 max-height=150 title==album.title>
-						<%/if>
-						<br/>
-						<% album.title|html>
-					</a>
+					<div class="image-container">
+						<a href="imageBrowser.html?album=<% album.id|html>" title="<% album.title|html>">
+							<%ifnull album.albumImage>
+								<img src="images/unknown-image-0.png" width="266" height="200" alt="<% album.title|html>" title="<% album.title|html>" style="position: relative; top: 0px; left: -33px;" />
+							<%else><!-- TODO -->
+								<% album.albumImage|image-link max-width=200 max-height=200 mode=enlarge title==album.title>
+							<%/if>
+						</a>
+					</div>
+					<div class="show-data">
+						<div class="album-title"><% album.title|html></div>
+						<div class="album-description"><% album.description|html></div>
+					</div>
 				</div>
 				<%= false|store key=endRow>
 				<%if loop.count|mod divisor=3 offset=1><%= true|store key=endRow><%/if>
@@ -126,7 +204,8 @@
 			<%/foreach>
 
 			<%if album.sone.local>
-				<p><a class="show-create-album hidden small-link">» <%= View.CreateAlbum.Title|l10n|html></a></p>
+				<div class="show-create-album hidden toggle-link"><a class="small-link">» <%= View.CreateAlbum.Title|l10n|html></a></div>
+				<div class="hide-create-album hidden toggle-link"><a class="small-link">« <%= View.CreateAlbum.Title|l10n|html></a></div>
 				<div class="create-album">
 					<%include include/createAlbum.html>
 				</div>
@@ -135,8 +214,36 @@
 			<%foreach album.images image>
 				<%first><h2><%= Page.ImageBrowser.Header.Images|l10n|html></h2><%/first>
 				<%if loop.count|mod divisor=3><div class="image-row"><%/if>
-				<div class="image">
-					<a href="imageBrowser.html?image=<%image.id|html>"><% image|image-link max-width=200 max-height=150></a>
+				<div id="image-<% image.id|html>" class="image">
+					<div class="image-id hidden"><% image.id|html></div>
+					<div class="image-container">
+						<a href="imageBrowser.html?image=<%image.id|html>"><% image|image-link max-width=200 max-height=200 mode=enlarge title==image.title></a>
+					</div>
+					<div class="show-data">
+						<div class="image-title"><% image.title|html></div>
+						<div class="image-description"><% image.description|html></div>
+					</div>
+					<%if album.sone.local>
+						<form class="edit-image" action="editImage.html" method="post">
+							<input type="hidden" name="formPassword" value="<%formPassword|html>" />
+							<input type="hidden" name="returnPage" value="<%request.uri|html>" />
+							<input type="hidden" name="image" value="<%image.id|html>" />
+
+							<div class="edit-data hidden">
+								<div>
+									<input type="text" name="title" value="<%image.title|html>" />
+								</div>
+								<div>
+									<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>
+					<%/if>
 				</div>
 				<%= false|store key=endRow>
 				<%if loop.count|mod divisor=3 offset=1><%= true|store key=endRow><%/if>
@@ -145,16 +252,21 @@
 			<%/foreach>
 
 			<%if album.sone.local>
-				<p><a class="show-upload-image hidden small-link">» <%= View.UploadImage.Title|l10n|html></a></p>
+				<div class="show-upload-image hidden toggle-link"><a class="small-link">» <%= View.UploadImage.Title|l10n|html></a></div>
+				<div class="hide-upload-image hidden toggle-link"><a class="small-link">« <%= View.UploadImage.Title|l10n|html></a></div>
 				<div class="upload-image">
 					<%include include/uploadImage.html>
 				</div>
 
 				<%if album.empty>
-					<form id="delete-album" action="deleteAlbum.html" method="get">
-						<input type="hidden" name="album" value="<%album.id|html>" />
-						<button type="submit"><%= Page.ImageBrowser.Album.Button.Delete|l10n|html></button>
-					</form>
+					<div class="show-delete-album hidden toggle-link"><a class="small-link">» <%= Page.ImageBrowser.Album.Delete.Title|l10n|html></a></div>
+					<div class="hide-delete-album hidden toggle-link"><a class="small-link">« <%= Page.ImageBrowser.Album.Delete.Title|l10n|html></a></div>
+					<div class="delete-album">
+						<form id="delete-album" action="deleteAlbum.html" method="get">
+							<input type="hidden" name="album" value="<%album.id|html>" />
+							<button type="submit"><%= Page.ImageBrowser.Album.Button.Delete|l10n|html></button>
+						</form>
+					</div>
 				<%/if>
 
 			<%/if>
@@ -195,18 +307,8 @@
 						});
 						$("#edit-image label").hide();
 
-						/* hide all those forms. */
-						hideBlock = function(blockElement, clickElement) {
-							$(blockElement).hide();
-							$(clickElement).removeClass("hidden").click(function() {
-								$(blockElement).slideDown();
-								$(this).slideUp();
-								return false;
-							});
-						};
-
-						hideBlock(".edit-image", ".show-edit-image");
-						hideBlock(".delete-image", ".show-delete-image");
+						hideAndShowBlock(".edit-image", ".show-edit-image", ".hide-edit-image");
+						hideAndShowBlock(".delete-image", ".show-delete-image", ".hide-delete-image");
 					});
 				</script>
 			<%/if>
@@ -223,7 +325,8 @@
 
 			<%if image.sone.local>
 
-				<p><a class="show-edit-image hidden small-link">» <%= Page.ImageBrowser.Image.Edit.Title|l10n|html></a></p>
+				<div class="show-edit-image hidden toggle-link"><a class="small-link">» <%= Page.ImageBrowser.Image.Edit.Title|l10n|html></a></div>
+				<div class="hide-edit-image hidden toggle-link"><a class="small-link">« <%= Page.ImageBrowser.Image.Edit.Title|l10n|html></a></div>
 				<div class="edit-image">
 					<h2><%= Page.ImageBrowser.Image.Edit.Title|l10n|html></h2>
 
@@ -246,7 +349,8 @@
 					</form>
 				</div>
 
-				<p><a class="show-delete-image hidden small-link">» <%= Page.ImageBrowser.Image.Delete.Title|l10n|html></a></p>
+				<div class="show-delete-image hidden toggle-link"><a class="small-link">» <%= Page.ImageBrowser.Image.Delete.Title|l10n|html></a></div>
+				<div class="hide-delete-image hidden toggle-link"><a class="small-link">« <%= Page.ImageBrowser.Image.Delete.Title|l10n|html></a></div>
 				<div class="delete-image">
 					<h2><%= Page.ImageBrowser.Image.Delete.Title|l10n|html></h2>
 
@@ -277,17 +381,7 @@
 					});
 					$("#create-album label").hide();
 
-					/* hide all those forms. */
-					hideBlock = function(blockElement, clickElement) {
-						$(blockElement).hide();
-						$(clickElement).removeClass("hidden").click(function() {
-							$(blockElement).slideDown();
-							$(this).slideUp();
-							return false;
-						});
-					};
-
-					hideBlock(".create-album", ".show-create-album");
+					hideAndShowBlock(".create-album", ".show-create-album", ".hide-create-album");
 				});
 			</script>
 		<%/if>
@@ -303,15 +397,19 @@
 			<%foreach sone.albums album>
 				<%if loop.count|mod divisor=3><div class="image-row"><%/if>
 				<div class="album image">
-					<a href="imageBrowser.html?album=<% album.id|html>" title="<% album.title|html>">
-						<%ifnull album.albumImage>
-							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
-						<%else><!-- TODO -->
-							<% album.albumImage|image-link max-width=200 max-height=150 title==album.title>
-						<%/if>
-						<br/>
-						<% album.title|html>
-					</a>
+					<div class="image-container">
+						<a href="imageBrowser.html?album=<% album.id|html>" title="<% album.title|html>">
+							<%ifnull album.albumImage>
+								<img src="images/unknown-image-0.png" width="266" height="200" alt="<% album.title|html>" title="<% album.title|html>" style="position: relative; top: 0px; left: -33px;"/>
+							<%else><!-- TODO -->
+								<% album.albumImage|image-link max-width=200 max-height=200 mode=enlarge title==album.title>
+							<%/if>
+						</a>
+					</div>
+					<div class="show-data">
+						<div class="album-title"><% album.title|html></div>
+						<div class="album-description"><% album.description|html></div>
+					</div>
 				</div>
 				<%= false|store key=endRow>
 				<%if loop.count|mod divisor=3 offset=1><%= true|store key=endRow><%/if>
@@ -320,7 +418,8 @@
 			<%/foreach>
 
 			<%if sone.local>
-				<p><a class="show-create-album hidden small-link">» <%= View.CreateAlbum.Title|l10n|html></a></p>
+				<div class="show-create-album hidden toggle-link"><a class="small-link">» <%= View.CreateAlbum.Title|l10n|html></a></div>
+				<div class="hide-create-album hidden toggle-link"><a class="small-link">« <%= View.CreateAlbum.Title|l10n|html></a></div>
 				<div class="create-album">
 					<%include include/createAlbum.html>
 				</div>