Clear before showing upload-image section.

[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 d97fc25..7e62490 100644 (file)
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -118,9 +118,9 @@
                                                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(".image-description").html(data.parsedDescription);
                                                                getImage(data.imageId).find(":input[name='title']").attr("defaultValue", title);
-                                                               getImage(data.imageId).find(":input[name='description']").attr("defaultValue", description);
+                                                               getImage(data.imageId).find(":input[name='description']").attr("defaultValue", data.description);
                                                                cancelImageEditing();
                                                        }
                                                });
@@ -298,6 +298,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 +312,11 @@
                                </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>
@@ -322,7 +327,7 @@
                                <%/foreach>
                        </div>
 
-                       <p id="description"><% album.description|html></p>
+                       <p id="description"><% album.description|parse sone=album.sone></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>
@@ -340,7 +345,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>
@@ -370,15 +375,15 @@
 
                        <%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>
+                               <%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>
+                                               <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|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">
@@ -386,6 +391,11 @@
                                                        <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>" />
@@ -402,15 +412,15 @@
                                                </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>
+                               <%= 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>
 
                        <%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>
@@ -435,6 +445,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>
@@ -443,6 +455,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>
@@ -472,9 +486,9 @@
 
                        <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>
 
@@ -538,6 +552,9 @@
                                        });
                                        $("#create-album label").hide();
 
+                                       /* hide non-js move buttons. */
+                                       $(".move-buttons").hide();
+
                                        hideAndShowBlock(".create-album", ".show-create-album", ".hide-create-album");
 
                                        prepareAlbums();
@@ -551,7 +568,13 @@
 
                <%else>
 
-                       <h1><%= Page.ImageBrowser.Sone.Title|l10n|replace needle='{sone}' replacementKey=sone.niceName|html></h1>
+                       <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.albums>
 
@@ -565,6 +588,40 @@
 
                <%/if>
 
+       <%elseif galleryRequested>
+
+               <%foreach albums album>
+                       <%first>
+                               <h2><%= Page.ImageBrowser.Header.Albums|l10n|html></h2>
+                               <%include include/pagination.html pagination=albumPagination pageParameter=="page">
+                       <%/first>
+                       <%if loop.count|mod divisor=3><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>
+                       </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>
+                               <%include include/pagination.html pagination=albumPagination pageParameter=="page">
+                       <%/if>
+               <%/foreach>
+
        <%/if>
 
 <%include include/tail.html>