From: David ‘Bombe’ Roden <bombe@pterodactylus.net>
Date: Wed, 13 Apr 2011 04:00:05 +0000 (+0200)
Subject: Implement a lot more image and album processing on the image browser.
X-Git-Tag: beta-freefall-0.6.2-1~16
X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=bbed3c23f95b429664e38711dcd33caf06e23a55

Implement a lot more image and album processing on the image browser.
---

diff --git a/src/main/resources/i18n/sone.en.properties b/src/main/resources/i18n/sone.en.properties
index aa90d0b..da15a37 100644
--- a/src/main/resources/i18n/sone.en.properties
+++ b/src/main/resources/i18n/sone.en.properties
@@ -162,6 +162,17 @@ Page.ImageBrowser.Album.Error.NotFound.Text=The requested album could not be fou
 Page.ImageBrowser.Sone.Title=Albums of {sone}
 Page.ImageBrowser.Sone.Error.NotFound.Text=The requested Sone could not be found. It is possible that it has not yet been downloaded.
 Page.ImageBrowser.CreateAlbum.Button.CreateAlbum=Create Album
+Page.ImageBrowser.Album.Edit.Title=Edit Album
+Page.ImageBrowser.Album.Label.Title=Title:
+Page.ImageBrowser.Album.Label.Description=Description:
+Page.ImageBrowser.Album.Button.Save=Save Album
+Page.ImageBrowser.Album.Button.Delete=Delete Album
+Page.ImageBrowser.Image.Edit.Title=Edit Image
+Page.ImageBrowser.Image.Title.Label=Title:
+Page.ImageBrowser.Image.Description.Label=Description:
+Page.ImageBrowser.Image.Button.Save=Save Image
+Page.ImageBrowser.Image.Delete.Title=Delete Image
+Page.ImageBrowser.Image.Button.Delete=Delete Image
 
 Page.CreateAlbum.Title=Create Album - Sone
 Page.CreateAlbum.Page.Title=Create Album
@@ -170,6 +181,11 @@ Page.CreateAlbum.Error.NameMissing=You seem to have forgotten to enter a name fo
 Page.UploadImage.Title=Upload Image - Sone
 Page.UploadImage.Error.InvalidImage=The image you were trying to upload could not be recognized. Please upload only JPEG (*.jpg or *.jpeg), or PNG (*.png) images.
 
+Page.EditImage.Title=Edit Image
+Page.DeleteImage.Title=Delete Image
+Page.EditAlbum.Title=Edit Album
+Page.DeleteAlbum.Title=Delete Album
+
 Page.Trust.Title=Trust Sone - Sone
 
 Page.Distrust.Title=Distrust Sone - Sone
@@ -257,8 +273,15 @@ WebInterface.DefaultText.BirthMonth=Month
 WebInterface.DefaultText.BirthYear=Year
 WebInterface.DefaultText.FieldName=Field name
 WebInterface.DefaultText.Option.InsertionDelay=Time to wait after a Sone is modified before insert (in seconds)
-WebInterface.DefaultText.CreateAlbum.Name=Album name
+WebInterface.DefaultText.Search=What are you looking for?
+WebInterface.DefaultText.CreateAlbum.Name=Album title
 WebInterface.DefaultText.CreateAlbum.Description=Album description
+WebInterface.DefaultText.EditAlbum.Title=Album title
+WebInterface.DefaultText.EditAlbum.Description=Album description
+WebInterface.DefaultText.UploadImage.Title=Image title
+WebInterface.DefaultText.UploadImage.Description=Image description
+WebInterface.DefaultText.EditImage.Title=Image title
+WebInterface.DefaultText.EditImage.Description=Image description
 WebInterface.Confirmation.DeletePostButton=Yes, delete!
 WebInterface.Confirmation.DeleteReplyButton=Yes, delete!
 WebInterface.SelectBox.Choose=Choose…
diff --git a/src/main/resources/templates/imageBrowser.html b/src/main/resources/templates/imageBrowser.html
index 80fe9c5..fd4c224 100644
--- a/src/main/resources/templates/imageBrowser.html
+++ b/src/main/resources/templates/imageBrowser.html
@@ -1,24 +1,5 @@
 <%include include/head.html>
 
-	<script language="javascript">
-
-		/* ajaxify album creation input field. */
-		$(document).ready(function() {
-			getTranslation("WebInterface.DefaultText.CreateAlbum.Name", function(text) {
-				$("#create-album input[name='name']").each(function() {
-					registerInputTextareaSwap(this, text, "name", false, true);
-				});
-			});
-			getTranslation("WebInterface.DefaultText.CreateAlbum.Description", function(text) {
-				$("#create-album input[name='description']").each(function() {
-					registerInputTextareaSwap(this, text, "description", true, true);
-				});
-			});
-			$("#create-album label").hide();
-		});
-
-	</script>
-
 	<div class="page-id hidden">image-browser</div>
 
 	<%if albumRequested>
@@ -33,6 +14,46 @@
 
 		<%else>
 
+			<%if album.sone.local>
+				<script language="javascript">
+					$(function() {
+						getTranslation("WebInterface.DefaultText.UploadImage.Title", function(text) {
+							$("#upload-image :input[name='title']").each(function() {
+								registerInputTextareaSwap(this, text, "title", false, true);
+							});
+						});
+						getTranslation("WebInterface.DefaultText.UploadImage.Description", function(text) {
+							$("#upload-image :input[name='description']").each(function() {
+								registerInputTextareaSwap(this, text, "description", true, false);
+							});
+						});
+						$("#upload-image label").hide();
+						getTranslation("WebInterface.DefaultText.CreateAlbum.Name", function(text) {
+							$("#create-album input[name='name']").each(function() {
+								registerInputTextareaSwap(this, text, "name", false, true);
+							});
+						});
+						getTranslation("WebInterface.DefaultText.CreateAlbum.Description", function(text) {
+							$("#create-album input[name='description']").each(function() {
+								registerInputTextareaSwap(this, text, "description", true, true);
+							});
+						});
+						$("#create-album label").hide();
+						getTranslation("WebInterface.DefaultText.EditAlbum.Title", function(text) {
+							$("#edit-album input[name='title']").each(function() {
+								registerInputTextareaSwap(this, text, "title", false, true);
+							});
+						});
+						getTranslation("WebInterface.DefaultText.EditAlbum.Description", function(text) {
+							$("#edit-album :input[name='description']").each(function() {
+								registerInputTextareaSwap(this, text, "description", true, false);
+							});
+						});
+						$("#edit-album label").hide();
+					});
+				</script>
+			<%/if>
+
 			<h1><%= Page.ImageBrowser.Album.Title|l10n|replace needle='{album}' replacementKey=album.title|html></h1>
 
 			<div class="backlinks">
@@ -47,7 +68,7 @@
 			</div>
 
 			<%foreach album.albums album>
-				<div class="album">
+				<div class="album image">
 					<a href="imageBrowser.html?album=<% album.id|html>">
 						<%ifnull album.image>
 							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
@@ -71,26 +92,136 @@
 			<%if album.sone.current>
 				<%include include/uploadImage.html>
 				<%include include/createAlbum.html>
+
+				<h2><%= Page.ImageBrowser.Album.Edit.Title|l10n|html></h2>
+
+				<form id="edit-album" action="editAlbum.html" method="post">
+					<input type="hidden" name="formPassword" value="<%formPassword|html>" />
+					<input type="hidden" name="album" value="<%album.id|html>" />
+
+					<div>
+						<label for="title"><%= Page.ImageBrowser.Album.Label.Title|l10n|html></label>
+						<input type="text" name="title" value="<%album.title|html>" />
+					</div>
+					<div>
+						<label for="description"><%= Page.ImageBrowser.Album.Label.Description|l10n|html></label>
+						<textarea name="description"><%album.description|html></textarea>
+					</div>
+					<button type="submit"><%= Page.ImageBrowser.Album.Button.Save|l10n|html></button>
+				</form>
+
+				<%if album.empty>
+					<form id="delete-album" action="deleteAlbum.html" method="post">
+						<input type="hidden" name="formPassword" value="<%formPassword|html>" />
+						<input type="hidden" name="album" value="<%album.id|html>" />
+						<button type="submit"><%= Page.ImageBrowser.Album.Button.Delete|l10n|html></button>
+					</form>
+				<%/if>
+
 			<%/if>
 
 		<%/if>
 
 	<%elseif imageRequested>
 
+		<h1><%image.title|html></h1>
+
+		<div class="backlinks">
+			<%foreach image.album.backlinks backlink backlinks>
+				<div class="backlink">
+					<a href="<% backlink.target|html>"><% backlink.name|html></a>
+				</div>
+				<%if ! backlinks.last>
+					<div class="separator">&gt;</div>
+				<%/if>
+			<%/foreach>
+		</div>
+
 		<%ifnull image>
 
 		<%else>
 
-			<div class="image">
-				<a href="imageBrowser.html?image=<%image.id|html>">
-					<% image|image-link max-width=200 max-height=150>
-				</a>
+			<%if image.sone.local>
+				<script language="javascript">
+					$(function() {
+						getTranslation("WebInterface.DefaultText.EditImage.Title", function(text) {
+							$("#edit-image input[name='title']").each(function() {
+								registerInputTextareaSwap(this, text, "title", false, true);
+							});
+						});
+						getTranslation("WebInterface.DefaultText.EditImage.Description", function(text) {
+							$("#edit-image :input[name='description']").each(function() {
+								registerInputTextareaSwap(this, text, "description", true, false);
+							});
+						});
+						$("#edit-image label").hide();
+					});
+				</script>
+			<%/if>
+
+			<div class="single-image">
+				<%ifnull !image.key>
+					<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>
+				<%/if>
 			</div>
 
+			<p class="parsed"><%image.description|parse sone=image.sone></p>
+
+			<%if image.sone.local>
+
+				<h2><%= Page.ImageBrowser.Image.Edit.Title|l10n|html></h2>
+
+				<form id="edit-image" action="editImage.html" method="post">
+					<input type="hidden" name="formPassword" value="<%formPassword|html>" />
+					<input type="hidden" name="image" value="<%image.id|html>" />
+
+					<div>
+						<label for="title"><%= Page.ImageBrowser.Image.Title.Label|l10n|html></label>
+						<input type="text" name="title" value="<%image.title|html>" />
+					</div>
+					<div>
+						<label for="description"><%= Page.ImageBrowser.Image.Description.Label|l10n|html></label>
+						<textarea name="description"><%image.description|html></textarea>
+					</div>
+					<div>
+						<button type="submit"><%= Page.ImageBrowser.Image.Button.Save|l10n|html></button>
+					</div>
+				</form>
+
+				<h2><%= Page.ImageBrowser.Image.Delete.Title|l10n|html></h2>
+
+				<form id="delete-image" action="deleteImage.html" method="post">
+					<input type="hidden" name="formPassword" value="<%formPassword|html>" />
+					<input type="hidden" name="image" value="<%image.id|html>" />
+					<button type="submit"><%= Page.ImageBrowser.Image.Button.Delete|l10n|html></button>
+				</form>
+
+			<%/if>
+
 		<%/if>
 
 	<%elseif soneRequested>
 
+		<%if sone.local>
+			<script language="javascript">
+				$(function() {
+					getTranslation("WebInterface.DefaultText.CreateAlbum.Name", function(text) {
+						$("#create-album input[name='name']").each(function() {
+							registerInputTextareaSwap(this, text, "name", false, true);
+						});
+					});
+					getTranslation("WebInterface.DefaultText.CreateAlbum.Description", function(text) {
+						$("#create-album input[name='description']").each(function() {
+							registerInputTextareaSwap(this, text, "description", true, true);
+						});
+					});
+					$("#create-album label").hide();
+				});
+			</script>
+		<%/if>
+
 		<%ifnull sone>
 
 			<p><%= Page.ImageBrowser.Sone.Error.NotFound.Text|l10n|html></p>
@@ -100,16 +231,14 @@
 			<h1><%= Page.ImageBrowser.Sone.Title|l10n|replace needle='{sone}' replacementKey=sone.niceName|html></h1>
 
 			<%foreach sone.albums album>
-				<div class="album">
-					<div class="image">
-						<a href="imageBrowser.html?album=<% album.id|html>">
-							<%ifnull album.image>
-								<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
-							<%else><!-- TODO -->
-								<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
-							<%/if>
-						</a>
-					</div>
+				<div class="album image">
+					<a href="imageBrowser.html?album=<% album.id|html>">
+						<%ifnull album.image>
+							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
+						<%else><!-- TODO -->
+							<img src="images/unknown-image-0.png" width="200" height="150" alt="<% album.title|html>" title="<% album.title|html>" />
+						<%/if>
+					</a>
 				</div>
 			<%/foreach>