X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FimageBrowser.html;h=3a720b6095ba39c3c4965c448fd3ff21868aec8c;hb=a404c9c2b1908f4b9181d8e60f11b846812757fb;hp=c999be23ba34b6d636d1145a5a76f2ba3b26a0fd;hpb=244ee27268a2d8d4c5775d20b15117f8fcb7be6f;p=Sone.git

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index c999be2..3a720b6 100644
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -116,13 +116,20 @@
 						title = $(":input[name='title']:enabled", this.form).val();
 						description = $(":input[name='description']:enabled", this.form).val();
 						ajaxGet("editImage.ajax", { "formPassword": getFormPassword(), "image": imageId, "title": title, "description": description }, function(data) {
-							if (data && data.success) {
-								getImage(data.imageId).find(".image-title").text(data.title);
-								getImage(data.imageId).find(".image-description").html(data.parsedDescription);
-								getImage(data.imageId).find(":input[name='title']").attr("defaultValue", title);
-								getImage(data.imageId).find(":input[name='description']").attr("defaultValue", data.description);
+                            var imageElement = getImage(data.imageId);
+                            var imageTitleInput = imageElement.find(":input[name='title']");
+                            var 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.attr("defaultValue", data.title);
+								imageDescriptionInput.attr("defaultValue", data.description);
 								cancelImageEditing();
-							}
+							} else if (data && !data.success) {
+								imageTitleInput.attr("value", imageTitleInput.attr("defaultValue"));
+                                imageDescriptionInput.attr("value", imageDescriptionInput.attr("defaultValue"));
+                                cancelImageEditing();
+                            }
 						});
 						return false;
 					});
@@ -232,13 +239,20 @@
 						title = $(":input[name='title']:enabled", this.form).val();
 						description = $(":input[name='description']:enabled", this.form).val();
 						ajaxGet("editAlbum.ajax", { "formPassword": getFormPassword(), "album": albumId, "title": title, "description": description }, function(data) {
-							if (data && data.success) {
-								getAlbum(data.albumId).find(".album-title").text(data.title);
-								getAlbum(data.albumId).find(".album-description").text(data.description);
-								getAlbum(data.albumId).find(":input[name='title']").attr("defaultValue", title);
-								getAlbum(data.albumId).find(":input[name='description']").attr("defaultValue", description);
-								cancelAlbumEditing();
-							}
+							if (data) {
+                                var albumTitleField = getAlbum(data.albumId).find(".album-title");
+                                var albumDescriptionField = getAlbum(data.albumId).find(".album-description");
+                                if (data.success) {
+                                    albumTitleField.text(data.title);
+                                    albumDescriptionField.html(data.description);
+                                    getAlbum(data.albumId).find(":input[name='title']").attr("defaultValue", title);
+                                    getAlbum(data.albumId).find(":input[name='description']").attr("defaultValue", description);
+                                } else {
+                                    albumTitleField.attr("value", albumTitleField.attr("defaultValue"));
+                                    albumDescriptionField.attr("value", albumDescriptionField.attr("defaultValue"));
+                                }
+                                cancelAlbumEditing();
+                            }
 						});
 						return false;
 					});
@@ -327,7 +341,7 @@
 				<%/foreach>
 			</div>
 
-			<p id="description"><% album.description|parse sone=album.sone></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>
@@ -373,55 +387,50 @@
 				</div>
 			<%/if>
 
-			<%foreach album.images image|paginate pageSize=core.preferences.imagesPerPage page=request.page>
+			<%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.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 class="show-data">
-						<div class="image-title"><% image.title|html></div>
-						<div class="image-description"><% image.description|parse sone=image.sone></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="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>" />
+					<%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>
+							<%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 <%if loop.first>class="hidden" <%/if>type="submit" name="moveLeft" value="true"><%= Page.ImageBrowser.Image.Button.MoveLeft|l10n|html></button>
+									<button <%if loop.last>class="hidden" <%/if>type="submit" name="moveRight" value="true"><%= Page.ImageBrowser.Image.Button.MoveRight|l10n|html></button>
 								</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 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 <%if loop.first>class="hidden" <%/if>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 <%if loop.last>class="hidden" <%/if>type="submit" name="moveRight" value="true"><%= Page.ImageBrowser.Image.Button.MoveRight|l10n|html></button>
+									</div>
 								</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>
+							</form>
+							<%/if>
+						</div>
+						<%= false|store key==endRow>
+						<%if loop.odd><%= true|store key==endRow><%/if>
+						<%last><%= true|store key==endRow><%/last>
+						<%if endRow>
 					</div>
-					<%include include/pagination.html pageParameter=="page">
 				<%/if>
+                <%last></div><%include include/pagination.html pageParameter=="page"><%/last>
 			<%/foreach>
 
 			<%if album.sone.local>
@@ -498,7 +507,7 @@
 				<%/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>
 
@@ -582,7 +591,7 @@
 				<div class="backlink"><a href="imageBrowser.html?sone=<%sone.id|html>"><%sone.niceName|html></a></div>
 			</div>
 
-			<%include include/browseAlbums.html albums=sone.albums>
+			<%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>
@@ -596,36 +605,25 @@
 
 	<%elseif galleryRequested>
 
-		<%foreach albums album>
+		<%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.count|mod divisor=3><div class="album-row"><%/if>
+			<%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>
-				<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 -->
-							<% album.albumImage|image-link max-width==250 max-height==250 mode==enlarge title=album.title>
-						<%/if>
-					</a>
-				</div>
-				<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></div>
-				</div>
+				<%include include/viewAlbum.html>
 			</div>
 			<%= false|store key==endRow>
-			<%if loop.count|mod divisor==3 offset==1><%= true|store key==endRow><%/if>
+			<%if loop.odd><%= true|store key==endRow><%/if>
 			<%last><%= true|store key==endRow><%/last>
-			<%if endRow>
+			<%if endRow></div><%/if>
+			<%last>
 				</div>
 				<%include include/pagination.html pagination=albumPagination pageParameter=="page">
-			<%/if>
+			<%/last>
 		<%/foreach>
 
 	<%/if>