X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FimageBrowser.html;h=a8a33c9e3a57b0df84b5d58d5b0f6ed9cb49923a;hp=fd4c2240830766f0c5044fecdc446f80a294466e;hb=faf66247a34f64946990a985d2ea3003465969cb;hpb=bbed3c23f95b429664e38711dcd33caf06e23a55

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index fd4c224..a8a33c9 100644
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -2,6 +2,266 @@
 
 	<div class="page-id hidden">image-browser</div>
 
+	<script type="application/javascript">
+
+		/* hide all those forms. */
+		function hideAndShowBlock(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");
+			});
+		}
+
+		/* ID of the image currently being edited. */
+		let editingImageId = null;
+
+		/**
+		 * Shows the form for editing an image.
+		 *
+		 * @param imageId The ID of the image to edit.
+		 */
+		function editImage(imageId) {
+			if (editingImageId !== imageId) {
+				cancelImageEditing();
+			} else {
+				return;
+			}
+			editingImageId = imageId;
+			$(".show-data", getImage(imageId)).hide();
+			$(".edit-data", getImage(imageId)).show();
+			$(document).bind("click.sone", function(event) {
+				if ($(event.target).closest("#image-" + imageId).size() === 0) {
+					cancelImageEditing();
+				}
+			});
+		}
+
+		/**
+		 * Cancels all image editing.
+		 */
+		function cancelImageEditing() {
+			$(".image .show-data").show();
+			$(".image .edit-data").hide();
+			$("form.edit-image").each(function() {
+				this.reset();
+			});
+			$(document).unbind("click.sone");
+			editingImageId = null;
+		}
+
+		/**
+		 * Returns the image element with the given ID.
+		 *
+		 * @param imageId The ID of the image
+		 * @return The image element
+		 */
+		function getImage(imageId) {
+			return $("#sone .image .image-id:contains('" + imageId + "')").closest(".image");
+		}
+
+		/**
+		 * Swaps two images.
+		 *
+		 * @param sourceId The ID of the source image
+		 * @param destinationId The ID of the destionation image
+		 */
+		function swapImage(sourceId, destinationId) {
+			const sourceElement = getImage(sourceId);
+			const destinationElement = getImage(destinationId);
+			const sourceParent = sourceElement.closest(".image-row");
+			const sourcePrevSibling = sourceElement.prev();
+			sourceElement.detach();
+			destinationElement.before(sourceElement);
+			if (sourcePrevSibling.get(0) !== destinationElement.get(0)) {
+				destinationElement.detach();
+				(sourcePrevSibling.size() > 0) ? sourcePrevSibling.after(destinationElement) : sourceParent.prepend(destinationElement);
+			}
+			if ($("button[name='moveLeft']", sourceElement).hasClass("hidden") !== $("button[name='moveLeft']", destinationElement).hasClass("hidden")) {
+				$("button[name='moveLeft']", sourceElement).toggleClass("hidden");
+				$("button[name='moveLeft']", destinationElement).toggleClass("hidden");
+			}
+			if ($("button[name='moveRight']", sourceElement).hasClass("hidden") !== $("button[name='moveRight']", destinationElement).hasClass("hidden")) {
+				$("button[name='moveRight']", sourceElement).toggleClass("hidden");
+				$("button[name='moveRight']", destinationElement).toggleClass("hidden");
+			}
+		}
+
+		/**
+		 * Prepare all images for inline editing.
+		 */
+		function prepareImages() {
+			$(".image").each(function() {
+				const imageId = $(this).closest(".image").find(".image-id").text();
+				(function(element, imageId) {
+					$(".show-data", element).click(function() {
+						editImage(imageId);
+					});
+					$("button[name='moveLeft'], button[name='moveRight']", element).click(function() {
+						ajaxGet("editImage.ajax", { "formPassword": getFormPassword(), "image": imageId, "moveLeft": this.name === "moveLeft", "moveRight": this.name === "moveRight" }, function(data) {
+							if (data && data.success) {
+								swapImage(data.sourceImageId, data.destinationImageId);
+							}
+						});
+						return false;
+					});
+					$("button[name='submit']", element).click(function() {
+						const title = $(":input[name='title']:enabled", this.form).val();
+						const description = $(":input[name='description']:enabled", this.form).val();
+						ajaxGet("editImage.ajax", { "formPassword": getFormPassword(), "image": imageId, "title": title, "description": description }, function(data) {
+							const imageElement = getImage(data.imageId);
+							const imageTitleInput = imageElement.find(":input[name='title']");
+							const imageDescriptionInput = imageElement.find(":input[name='description']");
+                            if (data && data.success) {
+								imageElement.find(".image-title").text(data.title);
+								imageElement.find(".image-description").html(data.parsedDescription);
+								imageTitleInput.prop("defaultValue", data.title);
+								imageDescriptionInput.prop("defaultValue", data.description);
+								cancelImageEditing();
+							} else if (data && !data.success) {
+								imageTitleInput.prop("value", imageTitleInput.prop("defaultValue"));
+                                imageDescriptionInput.prop("value", imageDescriptionInput.prop("defaultValue"));
+                                cancelImageEditing();
+                            }
+						});
+						return false;
+					});
+				})(this, imageId);
+			});
+		}
+
+		/* ID of the album currently being edited. */
+		let editingAlbumId = null;
+
+		/**
+		 * Shows the form for editing an album.
+		 *
+		 * @param albumId The ID of the album to edit.
+		 */
+		function editAlbum(albumId) {
+			if (editingAlbumId !== albumId) {
+				if (editingAlbumId != null) {
+					cancelAlbumEditing();
+				}
+			} else {
+				console.log("already editing " + albumId);
+				return;
+			}
+			editingAlbumId = albumId;
+			$(".show-data", getAlbum(albumId)).hide();
+			$(".edit-data", getAlbum(albumId)).show();
+			console.log(getAlbum(albumId));
+			$(document).bind("click.sone", function(event) {
+				if ($(event.target).closest("#album-" + albumId).size() === 0) {
+					cancelAlbumEditing();
+				}
+			});
+		}
+
+		/**
+		 * Cancels all album editing.
+		 */
+		function cancelAlbumEditing() {
+			console.log("cancel-album-edit");
+			$(".album .show-data").show();
+			$(".album .edit-data").hide();
+			$("form.edit-album").each(function() {
+				this.reset();
+			});
+			$(document).unbind("click.sone");
+			editingAlbumId = null;
+		}
+
+		/**
+		 * Returns the album element with the given ID.
+		 *
+		 * @param albumId The ID of the album
+		 * @return The album element
+		 */
+		function getAlbum(albumId) {
+			return $("#sone .album .album-id:contains('" + albumId + "')").closest(".album");
+		}
+
+		/**
+		 * Swaps two albums.
+		 *
+		 * @param sourceId The ID of the source album
+		 * @param destinationId The ID of the destionation album
+		 */
+		function swapAlbum(sourceId, destinationId) {
+			const sourceElement = getAlbum(sourceId);
+			const destinationElement = getAlbum(destinationId);
+			const sourceParent = sourceElement.closest(".album-row");
+			const sourcePrevSibling = sourceElement.prev();
+			sourceElement.detach();
+			destinationElement.before(sourceElement);
+			if (sourcePrevSibling.get(0) !== destinationElement.get(0)) {
+				destinationElement.detach();
+				(sourcePrevSibling.size() > 0) ? sourcePrevSibling.after(destinationElement) : sourceParent.prepend(destinationElement);
+			}
+			if ($("button[name='moveLeft']", sourceElement).hasClass("hidden") !== $("button[name='moveLeft']", destinationElement).hasClass("hidden")) {
+				$("button[name='moveLeft']", sourceElement).toggleClass("hidden");
+				$("button[name='moveLeft']", destinationElement).toggleClass("hidden");
+			}
+			if ($("button[name='moveRight']", sourceElement).hasClass("hidden") !== $("button[name='moveRight']", destinationElement).hasClass("hidden")) {
+				$("button[name='moveRight']", sourceElement).toggleClass("hidden");
+				$("button[name='moveRight']", destinationElement).toggleClass("hidden");
+			}
+		}
+
+		/**
+		 * Prepare all albums for inline editing.
+		 */
+		function prepareAlbums() {
+			$(".album").each(function() {
+				const albumId = $(this).closest(".album").find(".album-id").text();
+				(function(element, albumId) {
+					$(".show-data", element).click(function() {
+						console.log("show-data");
+						editAlbum(albumId);
+					});
+					$("button[name='moveLeft'], button[name='moveRight']", element).click(function() {
+						ajaxGet("editAlbum.ajax", { "formPassword": getFormPassword(), "album": albumId, "moveLeft": this.name === "moveLeft", "moveRight": this.name === "moveRight" }, function(data) {
+							if (data && data.success) {
+								swapAlbum(data.sourceAlbumId, data.destinationAlbumId);
+							}
+						});
+						return false;
+					});
+					$("button[name='submit']", element).click(function() {
+						const title = $(":input[name='title']:enabled", this.form).val();
+						const description = $(":input[name='description']:enabled", this.form).val();
+						ajaxGet("editAlbum.ajax", { "formPassword": getFormPassword(), "album": albumId, "title": title, "description": description }, function(data) {
+							if (data) {
+								const albumTitleField = getAlbum(data.albumId).find(".album-title");
+								const albumDescriptionField = getAlbum(data.albumId).find(".album-description");
+                                if (data.success) {
+                                    albumTitleField.text(data.title);
+                                    albumDescriptionField.text(data.description);
+                                    getAlbum(data.albumId).find(":input[name='title']").prop("defaultValue", title);
+                                    getAlbum(data.albumId).find(":input[name='description']").prop("defaultValue", description);
+                                } else {
+                                    albumTitleField.prop("value", albumTitleField.prop("defaultValue"));
+                                    albumDescriptionField.prop("value", albumDescriptionField.prop("defaultValue"));
+                                }
+                                cancelAlbumEditing();
+                            }
+						});
+						return false;
+					});
+				})(this, albumId);
+			});
+		}
+
+	</script>
+
 	<%if albumRequested>
 
 		<%ifnull album>
@@ -15,7 +275,8 @@
 		<%else>
 
 			<%if album.sone.local>
-				<script language="javascript">
+				<script type="application/javascript">
+
 					$(function() {
 						getTranslation("WebInterface.DefaultText.UploadImage.Title", function(text) {
 							$("#upload-image :input[name='title']").each(function() {
@@ -50,13 +311,26 @@
 							});
 						});
 						$("#edit-album label").hide();
+
+						/* hide non-js image move buttons. */
+						$(".move-buttons").hide();
+
+						hideAndShowBlock("div.edit-album", ".show-edit-album", ".hide-edit-album");
+						hideAndShowBlock("div.create-album", ".show-create-album", ".hide-create-album");
+						hideAndShowBlock("div.upload-image", ".show-upload-image", ".hide-upload-image");
+						hideAndShowBlock("div.delete-album", ".show-delete-album", ".hide-delete-album");
+
+						prepareAlbums();
+						prepareImages();
 					});
 				</script>
 			<%/if>
 
-			<h1><%= Page.ImageBrowser.Album.Title|l10n|replace needle='{album}' replacementKey=album.title|html></h1>
+			<h1 class="backlink"><%= Page.ImageBrowser.Album.Title|l10n|replace needle=='{album}' replacement=album.title|html></h1>
 
 			<div class="backlinks">
+				<div class="backlink"><a href="imageBrowser.html?mode=gallery"><%= Page.ImageBrowser.Link.All|l10n|html></a></div>
+				<div class="separator">&gt;</div>
 				<%foreach album.backlinks backlink backlinks>
 					<div class="backlink">
 						<a href="<% backlink.target|html>"><% backlink.name|html></a>
@@ -67,55 +341,108 @@
 				<%/foreach>
 			</div>
 
-			<%foreach album.albums album>
-				<div class="album image">
-					<a href="imageBrowser.html?album=<% album.id|html>">
-						<%ifnull album.image>
-							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
-						<%else><!-- TODO -->
-							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
-						<%/if>
-					</a>
-				</div>
-			<%/foreach>
+			<p id="description"><% album.description|parse sone=album.sone|render></p>
 
-			<%foreach album.images image>
-				<div class="image">
-					<a href="imageBrowser.html?image=<%image.id|html>"><% image|image-link max-width=200 max-height=150></a>
-				</div>
-			<%/foreach>
+			<%if album.sone.local>
+				<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>
 
-			<div id="description">
-				<% album.description|html>
-			</div>
+					<form id="edit-album" action="editAlbum.html" method="post">
+						<input type="hidden" name="formPassword" value="<%formPassword|html>" />
+						<input type="hidden" name="album" value="<%album.id|html>" />
 
-			<%if album.sone.current>
-				<%include include/uploadImage.html>
-				<%include include/createAlbum.html>
+						<div>
+							<label for="title"><%= Page.ImageBrowser.Album.Label.Title|l10n|html></label>
+							<input type="text" name="title" value="<%album.title|html>" />
+						</div>
+						<div>
+							<label for="description"><%= Page.ImageBrowser.Album.Label.Description|l10n|html></label>
+							<textarea name="description"><%album.description|html></textarea>
+						</div>
+						<button type="submit"><%= Page.ImageBrowser.Album.Button.Save|l10n|html></button>
+					</form>
+				</div>
+			<%/if>
 
-				<h2><%= Page.ImageBrowser.Album.Edit.Title|l10n|html></h2>
+			<%include include/browseAlbums.html albums=album.albums>
 
-				<form id="edit-album" action="editAlbum.html" method="post">
-					<input type="hidden" name="formPassword" value="<%formPassword|html>" />
-					<input type="hidden" name="album" value="<%album.id|html>" />
+			<%if album.sone.local>
+				<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>
+			<%/if>
 
-					<div>
-						<label for="title"><%= Page.ImageBrowser.Album.Label.Title|l10n|html></label>
-						<input type="text" name="title" value="<%album.title|html>" />
+			<%foreach album.images image|paginate pageSize=preferences.imagesPerPage page=page>
+				<%first>
+					<h2><%= Page.ImageBrowser.Header.Images|l10n|html></h2>
+					<%include include/pagination.html pageParameter=="page">
+				<%/first>
+				<%if loop.count|mod divisor==3><div class="image-row"><%/if>
+				<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==250 max-height==250 mode==enlarge title=image.title></a>
 					</div>
-					<div>
-						<label for="description"><%= Page.ImageBrowser.Album.Label.Description|l10n|html></label>
-						<textarea name="description"><%album.description|html></textarea>
+					<div class="show-data">
+						<div class="image-title"><% image.title|html></div>
+						<div class="image-description"><% image.description|parse sone=image.sone|render></div>
 					</div>
-					<button type="submit"><%= Page.ImageBrowser.Album.Button.Save|l10n|html></button>
-				</form>
+					<%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="move-buttons">
+									<button <%first>class="hidden" <%/first>type="submit" name="moveLeft" value="true"><%= Page.ImageBrowser.Image.Button.MoveLeft|l10n|html></button>
+									<button <%last>class="hidden" <%/last>type="submit" name="moveRight" value="true"><%= Page.ImageBrowser.Image.Button.MoveRight|l10n|html></button>
+							</div>
+
+							<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>
+									<button <%first>class="hidden" <%/first>type="submit" name="moveLeft" value="true"><%= Page.ImageBrowser.Image.Button.MoveLeft|l10n|html></button>
+									<button type="submit" name="submit"><%= Page.ImageBrowser.Image.Button.Save|l10n|html></button>
+									<button <%last>class="hidden" <%/last>type="submit" name="moveRight" value="true"><%= Page.ImageBrowser.Image.Button.MoveRight|l10n|html></button>
+								</div>
+							</div>
+						</form>
+					<%/if>
+				</div>
+				<%= false|store key==endRow>
+				<%if loop.count|mod divisor==3 offset==1><%= true|store key==endRow><%/if>
+				<%last><%= true|store key==endRow><%/last>
+				<%if endRow>
+					</div>
+				<%/if>
+                <%last><%include include/pagination.html pageParameter=="page"><%/last>
+			<%/foreach>
+
+			<%if album.sone.local>
+				<div class="clear show-upload-image hidden toggle-link"><a class="small-link">» <%= View.UploadImage.Title|l10n|html></a></div>
+				<div class="clear 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="post">
-						<input type="hidden" name="formPassword" value="<%formPassword|html>" />
-						<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>
@@ -124,9 +451,11 @@
 
 	<%elseif imageRequested>
 
-		<h1><%image.title|html></h1>
+		<h1 class="backlink"><%image.title|html></h1>
 
 		<div class="backlinks">
+			<div class="backlink"><a href="imageBrowser.html?mode=gallery"><%= Page.ImageBrowser.Link.All|l10n|html></a></div>
+			<div class="separator">&gt;</div>
 			<%foreach image.album.backlinks backlink backlinks>
 				<div class="backlink">
 					<a href="<% backlink.target|html>"><% backlink.name|html></a>
@@ -135,6 +464,8 @@
 					<div class="separator">&gt;</div>
 				<%/if>
 			<%/foreach>
+			<%ifnull !image.previous><div class="backlink"><a href="imageBrowser.html?image=<%image.previous.id|html>">« <%image.previous.title|html></a></div><%/if>
+			<%ifnull !image.next><div class="backlink"><a href="imageBrowser.html?image=<%image.next.id|html>">» <%image.next.title|html></a></div><%/if>
 		</div>
 
 		<%ifnull image>
@@ -142,7 +473,7 @@
 		<%else>
 
 			<%if image.sone.local>
-				<script language="javascript">
+				<script type="application/javascript">
 					$(function() {
 						getTranslation("WebInterface.DefaultText.EditImage.Title", function(text) {
 							$("#edit-image input[name='title']").each(function() {
@@ -155,48 +486,59 @@
 							});
 						});
 						$("#edit-image label").hide();
+
+						hideAndShowBlock(".edit-image", ".show-edit-image", ".hide-edit-image");
+						hideAndShowBlock(".delete-image", ".show-delete-image", ".hide-delete-image");
 					});
 				</script>
 			<%/if>
 
 			<div class="single-image">
 				<%ifnull !image.key>
-					<a href="/<%image.key|html>"><% image|image-link max-width=640 max-height=480></a>
+					<a href="/<%image.key|html>"><% image|image-link max-width==640 max-height==480></a>
 				<%else>
-					<a href="imageBrowser.html?image=<%image.id|html>"><% image|image-link max-width=640 max-height=480></a>
+					<a href="imageBrowser.html?image=<%image.id|html>"><% image|image-link max-width==640 max-height==480></a>
 				<%/if>
 			</div>
 
-			<p class="parsed"><%image.description|parse sone=image.sone></p>
+			<p class="parsed"><%image.description|parse sone=image.sone|render></p>
 
 			<%if image.sone.local>
 
-				<h2><%= Page.ImageBrowser.Image.Edit.Title|l10n|html></h2>
-
-				<form id="edit-image" action="editImage.html" method="post">
-					<input type="hidden" name="formPassword" value="<%formPassword|html>" />
-					<input type="hidden" name="image" value="<%image.id|html>" />
+				<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>
 
-					<div>
-						<label for="title"><%= Page.ImageBrowser.Image.Title.Label|l10n|html></label>
-						<input type="text" name="title" value="<%image.title|html>" />
-					</div>
-					<div>
-						<label for="description"><%= Page.ImageBrowser.Image.Description.Label|l10n|html></label>
-						<textarea name="description"><%image.description|html></textarea>
-					</div>
-					<div>
-						<button type="submit"><%= Page.ImageBrowser.Image.Button.Save|l10n|html></button>
-					</div>
-				</form>
+					<form id="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>
+							<label for="title"><%= Page.ImageBrowser.Image.Title.Label|l10n|html></label>
+							<input type="text" name="title" value="<%image.title|html>" />
+						</div>
+						<div>
+							<label for="description"><%= Page.ImageBrowser.Image.Description.Label|l10n|html></label>
+							<textarea name="description"><%image.description|html></textarea>
+						</div>
+						<div>
+							<button type="submit"><%= Page.ImageBrowser.Image.Button.Save|l10n|html></button>
+						</div>
+					</form>
+				</div>
 
-				<h2><%= Page.ImageBrowser.Image.Delete.Title|l10n|html></h2>
+				<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>
 
-				<form id="delete-image" action="deleteImage.html" method="post">
-					<input type="hidden" name="formPassword" value="<%formPassword|html>" />
-					<input type="hidden" name="image" value="<%image.id|html>" />
-					<button type="submit"><%= Page.ImageBrowser.Image.Button.Delete|l10n|html></button>
-				</form>
+					<form id="delete-image" action="deleteImage.html" method="get">
+						<input type="hidden" name="image" value="<%image.id|html>" />
+						<button type="submit"><%= Page.ImageBrowser.Image.Button.Delete|l10n|html></button>
+					</form>
+				</div>
 
 			<%/if>
 
@@ -205,7 +547,7 @@
 	<%elseif soneRequested>
 
 		<%if sone.local>
-			<script language="javascript">
+			<script type="application/javascript">
 				$(function() {
 					getTranslation("WebInterface.DefaultText.CreateAlbum.Name", function(text) {
 						$("#create-album input[name='name']").each(function() {
@@ -218,6 +560,13 @@
 						});
 					});
 					$("#create-album label").hide();
+
+					/* hide non-js move buttons. */
+					$(".move-buttons").hide();
+
+					hideAndShowBlock(".create-album", ".show-create-album", ".hide-create-album");
+
+					prepareAlbums();
 				});
 			</script>
 		<%/if>
@@ -228,25 +577,61 @@
 
 		<%else>
 
-			<h1><%= Page.ImageBrowser.Sone.Title|l10n|replace needle='{sone}' replacementKey=sone.niceName|html></h1>
+			<h1><%= Page.ImageBrowser.Sone.Title|l10n|replace needle=='{sone}' replacement=sone.niceName|html></h1>
+
+			<div class="backlinks">
+				<div class="backlink"><a href="imageBrowser.html?mode=gallery"><%= Page.ImageBrowser.Link.All|l10n|html></a></div>
+				<div class="separator">&gt;</div>
+				<div class="backlink"><a href="imageBrowser.html?sone=<%sone.id|html>"><%sone.niceName|html></a></div>
+			</div>
+
+			<%include include/browseAlbums.html albums=sone.rootAlbum.albums>
+
+			<%if sone.local>
+				<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>
+			<%/if>
+
+		<%/if>
 
-			<%foreach sone.albums album>
-				<div class="album image">
-					<a href="imageBrowser.html?album=<% album.id|html>">
-						<%ifnull album.image>
-							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
+	<%elseif galleryRequested>
+
+		<%foreach albums album|paginate pageSize=preferences.imagesPerPage pageParameter=request.page pagination=albumPagination>
+			<%first>
+				<h2><%= Page.ImageBrowser.Header.Albums|l10n|html></h2>
+				<%include include/pagination.html pagination=albumPagination pageParameter=="page">
+			<%/first>
+			<%if loop.count|mod divisor==3><div class="album-row"><%/if>
+			<div id="album-<% album.id|html>" class="album">
+				<div class="album-id hidden"><% album.id|html></div>
+				<div class="album-container">
+					<a href="imageBrowser.html?album=<% album.id|html>" title="<% album.title|html>">
+						<%ifnull album.albumImage>
+							<img src="images/unknown-image-0.png" width="333" height="250" alt="<% album.title|html> (<%album.sone.niceName|html>)" title="<% album.title|html> (<%album.sone.niceName|html>)" style="position: relative; top: 0px; left: -41px;" />
 						<%else><!-- TODO -->
-							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
+							<% album.albumImage|image-link max-width==250 max-height==250 mode==enlarge title=album.title>
 						<%/if>
 					</a>
 				</div>
-			<%/foreach>
-
-			<%if sone.current>
-				<%include include/createAlbum.html>
+				<div class="show-data">
+					<div class="album-sone"><a href="imageBrowser.html?sone=<%album.sone.id|html>"><%album.sone.niceName|html></a></div>
+					<div class="album-title"><% album.title|html> (<%= View.Sone.Stats.Images|l10n 0=album.images.size>)</div>
+					<div class="album-description"><% album.description|parse sone=album.sone|render></div>
+				</div>
+			</div>
+			<%= false|store key==endRow>
+			<%if loop.count|mod divisor==3 offset==1><%= true|store key==endRow><%/if>
+			<%last><%= true|store key==endRow><%/last>
+			<%if endRow>
+				</div>
 			<%/if>
-
-		<%/if>
+			<%last>
+				<%include include/pagination.html pagination=albumPagination pageParameter=="page">
+			<%/last>
+		<%/foreach>
 
 	<%/if>