Update year in copyright lines

[Sone.git] / src / main / resources / templates / imageBrowser.html

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index da8d032..b8b9cb2 100644 (file)
--- 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;
                                        });
@@ -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>
@@ -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>" />
@@ -373,7 +376,7 @@
                                </div>
                        <%/if>
 
-                       <%foreach album.images image|paginate pageSize=core.preferences.imagesPerPage page=page>
+                       <%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">
@@ -386,7 +389,7 @@
                                        </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 class="image-description"><% image.description|parse sone=image.sone|render></div>
                                        </div>
                                        <%if album.sone.local>
                                                <form class="edit-image" action="editImage.html" method="post">
@@ -498,7 +501,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>
 
@@ -596,7 +599,7 @@
 
        <%elseif galleryRequested>
 
-               <%foreach albums album|paginate pageSize=core.preferences.imagesPerPage pageParameter=request.page pagination=albumPagination>
+               <%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">
@@ -616,7 +619,7 @@
                                <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 class="album-description"><% album.description|parse sone=album.sone|render></div>
                                </div>
                        </div>
                        <%= false|store key==endRow>