X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fresources%2Ftemplates%2FimageBrowser.html;h=bb21d46bec19b78b0830a87aaff694bc7754a464;hb=7a14e6aab2b0458ee97452447845995bbf407ae7;hp=f34f4a625bee6df7adb34564675883ba82755d90;hpb=b89370064bdc618ee7a3ce77a705fcecb28c3dcc;p=Sone.git

diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index f34f4a6..bb21d46 100644
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -88,7 +88,7 @@
 										$(showElement).hide();
 										$(hideElement).show();
 									}
-									return false;
+									return $(event.target).is("button");
 								});
 							});
 						};
@@ -123,6 +123,17 @@
 						<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 key=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>" />
@@ -149,7 +160,10 @@
 							<%/if>
 						</a>
 					</div>
-					<% album.title|html>
+					<div class="show-data">
+						<div class="album-title"><% album.title|html></div>
+						<div class="album-description"><% album.description|html></div>
+					</div>
 				</div>
 				<%= false|store key=endRow>
 				<%if loop.count|mod divisor=3 offset=1><%= true|store key=endRow><%/if>
@@ -173,16 +187,16 @@
 					<div class="image-container">
 						<a href="imageBrowser.html?image=<%image.id|html>"><% image|image-link max-width=200 max-height=200 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>
 					<%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="show-data">
-								<div class="image-title"><% image.title|html></div>
-								<div class="image-description"><% image.description|html></div>
-							</div>
 							<div class="edit-data hidden">
 								<div>
 									<input type="text" name="title" value="<%image.title|html>" />
@@ -191,7 +205,9 @@
 									<textarea name="description"><%image.description|html></textarea>
 								</div>
 								<div>
+									<%notfirst><button type="submit" name="moveLeft" value="true"><%= Page.ImageBrowser.Image.Button.MoveLeft|l10n|html></button><%/notfirst>
 									<button type="submit"><%= Page.ImageBrowser.Image.Button.Save|l10n|html></button>
+									<%notlast><button type="submit" name="moveRight" value="true"><%= Page.ImageBrowser.Image.Button.MoveRight|l10n|html></button><%/notlast>
 								</div>
 							</div>
 						</form>
@@ -357,7 +373,10 @@
 								<% album.albumImage|image-link max-width=200 max-height=200 mode=enlarge title==album.title>
 							<%/if>
 						</a>
-						<% album.title|html>
+					</div>
+					<div class="show-data">
+						<div class="album-title"><% album.title|html></div>
+						<div class="album-description"><% album.description|html></div>
 					</div>
 				</div>
 				<%= false|store key=endRow>