X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FimageBrowser.html;h=b8b9cb204eb3b07a74b438ab205ccd2273f1d0bd;hb=972ca0e1490124c9da45a12ee9a079d91d62d6dc;hp=d0badcdb4dcfeaff857f06b548e7189bab09a741;hpb=1998b0c5551c5488ff61e2dc9f790b5d68c846e2;p=Sone.git diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html index d0badcd..b8b9cb2 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").text(data.description); - getImage(data.imageId).find(":input[name='title']").attr("defaultValue", title); - getImage(data.imageId).find(":input[name='description']").attr("defaultValue", 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; }); @@ -298,6 +312,9 @@ }); $("#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"); @@ -309,9 +326,11 @@ <%/if> -

<%= Page.ImageBrowser.Album.Title|l10n|replace needle='{album}' replacementKey=album.title|html>

+

<%= Page.ImageBrowser.Album.Title|l10n|replace needle=='{album}' replacement=album.title|html>

+
<%= Page.ImageBrowser.Link.All|l10n|html>
+
>
<%foreach album.backlinks backlink backlinks>
<% backlink.name|html> @@ -322,7 +341,7 @@ <%/foreach>
-

<% album.description|html>

+

<% album.description|parse sone=album.sone|render>

<%if album.sone.local> @@ -334,17 +353,6 @@ - <%if ! album.images.empty> -
- - -
- <%/if>
@@ -358,7 +366,7 @@
<%/if> - <%include include/browseAlbums.html> + <%include include/browseAlbums.html albums=album.albums> <%if album.sone.local> @@ -368,17 +376,20 @@
<%/if> - <%foreach album.images image> - <%first>

<%= Page.ImageBrowser.Header.Images|l10n|html>

<%/first> - <%if loop.count|mod divisor=3>
<%/if> + <%foreach album.images image|paginate pageSize=preferences.imagesPerPage page=page> + <%first> +

<%= Page.ImageBrowser.Header.Images|l10n|html>

+ <%include include/pagination.html pageParameter=="page"> + <%/first> + <%if loop.count|mod divisor==3>
<%/if>
- <% image|image-link max-width=250 max-height=250 mode=enlarge title==image.title> + <% image|image-link max-width==250 max-height==250 mode==enlarge title=image.title>
<% image.title|html>
-
<% image.description|html>
+
<% image.description|parse sone=image.sone|render>
<%if album.sone.local>
@@ -386,6 +397,11 @@ +
+ + +
+
<%/if> + <%= 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> +
+ <%/if> + <%last><%include include/pagination.html pageParameter=="page"><%/last> <%/foreach> <%if album.sone.local> - - + +
<%include include/uploadImage.html>
@@ -435,6 +454,8 @@

<%image.title|html>

+
<%= Page.ImageBrowser.Link.All|l10n|html>
+
>
<%foreach image.album.backlinks backlink backlinks>
<% backlink.name|html> @@ -443,6 +464,8 @@
>
<%/if> <%/foreach> + <%ifnull !image.previous>
« <%image.previous.title|html>
<%/if> + <%ifnull !image.next>
» <%image.next.title|html>
<%/if>
<%ifnull image> @@ -472,13 +495,13 @@
<%ifnull !image.key> - <% image|image-link max-width=640 max-height=480> + <% image|image-link max-width==640 max-height==480> <%else> - <% image|image-link max-width=640 max-height=480> + <% image|image-link max-width==640 max-height==480> <%/if>
-

<%image.description|parse sone=image.sone>

+

<%image.description|parse sone=image.sone|render>

<%if image.sone.local> @@ -538,6 +561,9 @@ }); $("#create-album label").hide(); + /* hide non-js move buttons. */ + $(".move-buttons").hide(); + hideAndShowBlock(".create-album", ".show-create-album", ".hide-create-album"); prepareAlbums(); @@ -551,9 +577,15 @@ <%else> -

<%= Page.ImageBrowser.Sone.Title|l10n|replace needle='{sone}' replacementKey=sone.niceName|html>

+

<%= Page.ImageBrowser.Sone.Title|l10n|replace needle=='{sone}' replacement=sone.niceName|html>

+ +
+
<%= Page.ImageBrowser.Link.All|l10n|html>
+
>
+
<%sone.niceName|html>
+
- <%include include/browseAlbums.html> + <%include include/browseAlbums.html albums=sone.rootAlbum.albums> <%if sone.local> @@ -565,6 +597,42 @@ <%/if> + <%elseif galleryRequested> + + <%foreach albums album|paginate pageSize=preferences.imagesPerPage pageParameter=request.page pagination=albumPagination> + <%first> +

<%= Page.ImageBrowser.Header.Albums|l10n|html>

+ <%include include/pagination.html pagination=albumPagination pageParameter=="page"> + <%/first> + <%if loop.count|mod divisor==3>
<%/if> +
+ +
+ + <%ifnull album.albumImage> + <% album.title|html> (<%album.sone.niceName|html>) + <%else> + <% album.albumImage|image-link max-width==250 max-height==250 mode==enlarge title=album.title> + <%/if> + +
+
+
<%album.sone.niceName|html>
+
<% album.title|html> (<%= View.Sone.Stats.Images|l10n 0=album.images.size>)
+
<% album.description|parse sone=album.sone|render>
+
+
+ <%= 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> +
+ <%/if> + <%last> + <%include include/pagination.html pagination=albumPagination pageParameter=="page"> + <%/last> + <%/foreach> + <%/if> <%include include/tail.html>