allow changing album name in photo edit page

6 files changed, 15 insertions, 6 deletions

diff --git a/view/de/strings.php b/view/de/strings.php
index 887b43394..f59dcf63b 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -303,6 +303,7 @@ $a->strings['Edit photo'] = 'Foto bearbeiten';
 $a->strings['View Full Size'] = 'Betrachte Originalgröße';
 $a->strings['Tags: '] = 'Tags: ';
 $a->strings['[Remove any tag]'] = '[Tag entfernen]';
+$a->strings['New album name'] = 'Name des neuen Albums';
 $a->strings['Caption'] = 'Titel';
 $a->strings['Add a Tag'] = 'Tag hinzufügen';
 $a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping';
diff --git a/view/fr/strings.php b/view/fr/strings.php
index c64bba1b7..39e15eccf 100644
--- a/view/fr/strings.php
+++ b/view/fr/strings.php
@@ -293,6 +293,7 @@ $a->strings['Edit Album'] = 'Éditer l\'album';
 $a->strings['View Photo'] = 'Voir la photo';
 $a->strings['Photo not available'] = 'Photo indisponible';
 $a->strings['Edit photo'] = 'Éditer la photo';
+$a->strings['New album name] = 'Nom du nuovel album';
 $a->strings['View Full Size'] = 'Voir en taille réelle';
 $a->strings['Tags: '] = 'Étiquettes: ';
 $a->strings['[Remove any tag]'] = '[Retirer toutes les étiquettes]';
diff --git a/view/it/strings.php b/view/it/strings.php
index aa5359dbf..6ae9285ad 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -270,6 +270,7 @@ $a->strings['Edit photo'] = 'Modifica foto';
 $a->strings['View Full Size'] = 'Vedi dimensione intera';
 $a->strings['Tags: '] = 'Tag: ';
 $a->strings['[Remove any tag]'] = '[Rimuovi tutti i tag]';
+$a->strings['New album name'] = 'Nome nuovo album';
 $a->strings['Caption'] = 'Didascalia';
 $a->strings['Add a Tag'] = 'Aggiungi un tag';
 $a->strings['Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'] = 'Esempio: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping';
diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl
index a40e3fef6..bf8563b3c 100644
--- a/view/photo_edit.tpl
+++ b/view/photo_edit.tpl
@@ -3,6 +3,12 @@
 
 	<input type="hidden" name="item_id" value="$item_id" />
 
+	<label id="photo-edit-albumname-label" for="photo-edit-albumname">$newalbum</label>
+	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="$album" />
+
+	<div id="photo-edit-albumname-end"></div>
+
+
 	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
 	<input id="photo-edit-caption" type="text" size="84" name="desc" value="$caption" />
 
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index a60ea9db6..61782f6e3 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -1798,11 +1798,11 @@ a.mail-list-link {
 	margin-bottom: 15px;
 }
 
-#photo-edit-caption-label, #photo-edit-tags-label {
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {
 	float: left;
 	width: 150px;
 }
-#photo-edit-caption, #photo-edit-newtag {
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
 	float: left;
 	margin-bottom: 25px;
 }
@@ -1813,7 +1813,7 @@ a.mail-list-link {
 	margin-bottom: 25px;
 }
 
-#photo-edit-caption-end, #photo-edit-tags-end {
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
 	clear: both;
 }
 
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index d27a894b7..a1098f6a4 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -1673,11 +1673,11 @@ a.mail-list-link {
 	margin-bottom: 15px;
 }
 
-#photo-edit-caption-label, #photo-edit-tags-label {
+#photo-edit-caption-label, #photo-edit-tags-label, #photo-edit-albumname-label {
 	float: left;
 	width: 150px;
 }
-#photo-edit-caption, #photo-edit-newtag {
+#photo-edit-caption, #photo-edit-newtag, #photo-edit-albumname {
 	float: left;
 	margin-bottom: 25px;
 }
@@ -1688,7 +1688,7 @@ a.mail-list-link {
 	margin-bottom: 25px;
 }
 
-#photo-edit-caption-end, #photo-edit-tags-end {
+#photo-edit-caption-end, #photo-edit-tags-end, #photo-edit-albumname-end {
 	clear: both;
 }