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

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index 3c58011..c705a2c 100644
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -3,25 +3,135 @@
 	<div class="page-id hidden">image-browser</div>
 
 	<script language="javascript">
-		$(function() {
 
-			/* hide all those forms. */
-			hideAndShowBlock = function(blockElement, clickToShowElement, clickToHideElement) {
-				$(blockElement).hide();
+		/* 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");
-				$(clickToShowElement).click(function() {
-					$(blockElement).slideDown();
-					$(clickToShowElement).addClass("hidden");
-					$(clickToHideElement).removeClass("hidden");
-				});
-				$(clickToHideElement).click(function() {
-					$(blockElement).slideUp();
-					$(clickToHideElement).addClass("hidden");
-					$(clickToShowElement).removeClass("hidden");
-				});
-			};
+			});
+		}
+
+		/**
+		 * 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-in-album .image-id:contains('" + imageId + "')").closest(".image-in-album");
+		}
+
+		/**
+		 * Swaps two images.
+		 *
+		 * @param sourceId The ID of the source image
+		 * @param destinationId The ID of the destionation image
+		 */
+		function swapImage(sourceId, destinationId) {
+			sourceElement = getImage(sourceId);
+			destinationElement = getImage(destinationId);
+			sourceParent = sourceElement.closest(".image-row");
+			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-in-album").each(function() {
+				imageId = $(this).closest(".image-in-album").find(".image-id").text();
+				(function(element, 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;
+					});
+				})(this, imageId);
+			});
+		}
+
+		/**
+		 * 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) {
+			sourceElement = getAlbum(sourceId);
+			destinationElement = getAlbum(destinationId);
+			sourceParent = sourceElement.closest(".album-row");
+			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() {
+				albumId = $(this).closest(".album").find(".album-id").text();
+				(function(element, 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;
+					});
+				})(this, albumId);
+			});
+		}
 
-		});
 	</script>
 
 	<%if albumRequested>
@@ -39,44 +149,6 @@
 			<%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() {
@@ -112,27 +184,22 @@
 						});
 						$("#edit-album label").hide();
 
-						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);
-							});
-						});
+						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 class="backlink"><%= 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>
@@ -143,7 +210,7 @@
 				<%/foreach>
 			</div>
 
-			<p id="description"><% album.description|html></p>
+			<p id="description"><% album.description|parse sone=album.sone|render></p>
 
 			<%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>
@@ -161,7 +228,7 @@
 								<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>
+										<option value="<% image.id|html>"<%if album.albumImage.id|match value=image.id> selected="selected"<%/if>><% image.title|html></option>
 									<%/foreach>
 								</select>
 							</div>
@@ -179,29 +246,7 @@
 				</div>
 			<%/if>
 
-			<%foreach album.albums album>
-				<%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">
-					<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>
-				<%last><%= true|store key=endRow><%/last>
-				<%if endRow></div><%/if>
-			<%/foreach>
+			<%include include/browseAlbums.html albums=album.albums>
 
 			<%if album.sone.local>
 				<div class="show-create-album hidden toggle-link"><a class="small-link">» <%= View.CreateAlbum.Title|l10n|html></a></div>
@@ -211,49 +256,29 @@
 				</div>
 			<%/if>
 
-			<%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 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>
+			<%foreach album.images image|paginate pageSize=core.preferences.imagesPerPage page=page>
+				<%first>
+					<h2><%= Page.ImageBrowser.Header.Images|l10n|html></h2>
+					<%include include/pagination.html pageParameter=="page">
+					<div class="images">
+				<%/first>
+					<%if loop.even><div class="image-row"><%/if>
+						<div id="image-<% image.id|html>" class="image-in-album">
+							<div class="image-id hidden"><% image.id|html></div>
+							<%include include/viewImage.html>
+						</div>
+						<%= false|store key==endRow>
+						<%if loop.odd><%= true|store key==endRow><%/if>
+						<%last><%= true|store key==endRow><%/last>
+						<%if endRow>
 					</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>
-				<%last><%= true|store key=endRow><%/last>
-				<%if endRow></div><%/if>
+				<%/if>
+                <%last></div><%include include/pagination.html pageParameter=="page"><%/last>
 			<%/foreach>
 
 			<%if album.sone.local>
-				<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="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>
@@ -278,6 +303,8 @@
 		<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>
@@ -286,6 +313,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>
@@ -315,13 +344,13 @@
 
 			<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>
 
@@ -382,6 +411,8 @@
 					$("#create-album label").hide();
 
 					hideAndShowBlock(".create-album", ".show-create-album", ".hide-create-album");
+
+					prepareAlbums();
 				});
 			</script>
 		<%/if>
@@ -392,30 +423,15 @@
 
 		<%else>
 
-			<h1><%= Page.ImageBrowser.Sone.Title|l10n|replace needle='{sone}' replacementKey=sone.niceName|html></h1>
-
-			<%foreach sone.albums album>
-				<%if loop.count|mod divisor=3><div class="image-row"><%/if>
-				<div class="album image">
-					<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>
-				<%last><%= true|store key=endRow><%/last>
-				<%if endRow></div><%/if>
-			<%/foreach>
+			<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>
@@ -427,6 +443,29 @@
 
 		<%/if>
 
+	<%elseif galleryRequested>
+
+		<%foreach albums album|paginate pageSize=core.preferences.imagesPerPage pageParameter=request.page pagination=albumPagination>
+			<%first>
+				<h2><%= Page.ImageBrowser.Header.Albums|l10n|html></h2>
+				<%include include/pagination.html pagination=albumPagination pageParameter=="page">
+				<div class="images">
+			<%/first>
+			<%if loop.even><div class="album-row"><%/if>
+			<div id="album-<% album.id|html>" class="album">
+				<div class="album-id hidden"><% album.id|html></div>
+				<%include include/viewAlbum.html>
+			</div>
+			<%= false|store key==endRow>
+			<%if loop.odd><%= true|store key==endRow><%/if>
+			<%last><%= true|store key==endRow><%/last>
+			<%if endRow></div><%/if>
+			<%last>
+				</div>
+				<%include include/pagination.html pagination=albumPagination pageParameter=="page">
+			<%/last>
+		<%/foreach>
+
 	<%/if>
 
 <%include include/tail.html>