X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FimageBrowser.html;h=644848a4020480cc895de33690df042f883aa3ab;hb=30178c4e9ce4f0ce338e319d13633145e82347b8;hp=7752ffb969449d1525681abdfe7cf18aca142490;hpb=61fea0173ef87542cae35247e6356ef36f2664d3;p=Sone.git

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index 7752ffb..644848a 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.text(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;
 					});
@@ -339,17 +353,6 @@
 						<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 value=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>" />
@@ -420,8 +423,8 @@
 				<%last><%= true|store key==endRow><%/last>
 				<%if endRow>
 					</div>
-					<%include include/pagination.html pageParameter=="page">
 				<%/if>
+                <%last><%include include/pagination.html pageParameter=="page"><%/last>
 			<%/foreach>
 
 			<%if album.sone.local>
@@ -582,7 +585,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>