photo album finish, general cleanup begins

4 files changed, 39 insertions, 13 deletions

diff --git a/view/album_edit.tpl b/view/album_edit.tpl
new file mode 100644
index 000000000..44b541607
--- /dev/null
+++ b/view/album_edit.tpl
@@ -0,0 +1,15 @@
+<div id="photo-album-edit-wrapper">
+<form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/album/$hexalbum" method="post" >
+
+
+<label id="photo-album-edit-name-label" for="photo-album-edit-name" >$nametext</label>
+<input type="text" size="64" name="albumname" value="$album" >
+
+<div id="photo-album-edit-name-end"></div>
+
+<input id="photo-album-edit-submit" type="submit" name="submit" value="$submit" />
+<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="$dropsubmit" onclick="return confirmDelete();" />
+
+</form>
+</div>
+<div id="photo-album-edit-end" ></div>
diff --git a/view/photo_edit.tpl b/view/photo_edit.tpl
index e50637578..176ad3244 100644
--- a/view/photo_edit.tpl
+++ b/view/photo_edit.tpl
@@ -1,17 +1,19 @@
 
-<form action="photos/$id" method="post" id="photo_edit_form" >
+<form action="photos/$resource_id" method="post" id="photo_edit_form" >
 
 	<input type="hidden" name="item_id" value="$item_id" />
 
 	<label id="photo-edit-caption-label" for="photo-edit-caption">$capt_label</label>
-	<input id="photo-edit-caption" type="text" size="64" name="desc" value="$caption" />
+	<input id="photo-edit-caption" type="text" size="84" name="desc" value="$caption" />
 
 	<div id="photo-edit-caption-end"></div>
 
 	<label id="photo-edit-tags-label" for="photo-edit-tags-textarea" >$tag_label</label>
-	<textarea name="tags" id="photo-edit-tags-textarea">$tags</textarea>
+	<textarea name="tags" id="photo-edit-tags-textarea" rows="3" cols="64" >$tags</textarea>
 	<div id="photo-edit-tags-end"></div>
 
-	<input type="submit" name="submit" value="$submit" />
+	<input id="photo-edit-submit-button" type="submit" name="submit" value="$submit" />
+	<input id="photo-edit-delete-button" type="submit" name="delete" value="$delete" onclick="return confirmDelete()"; />
+
 	<div id="photo-edit-end"></div>
 </form>
diff --git a/view/profile_selectors.php b/view/profile_selectors.php
index 902f6a1a5..03dd2aacd 100644
--- a/view/profile_selectors.php
+++ b/view/profile_selectors.php
@@ -2,7 +2,7 @@
 
 
 function gender_selector($current="",$suffix="") {
-	$select = array('','Male', 'Female', 'Transsexual', 'Hermaphrodite', 'Neuter', 'Other', 'Undecided');
+	$select = array('', t('Male'), t('Female'), t('Transsexual'), t('Hermaphrodite'), t('Neuter'), t('Other'), t('Undecided'));
 
 	$o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
 	foreach($select as $selection) {
@@ -14,7 +14,7 @@ function gender_selector($current="",$suffix="") {
 }	
 
 function sexpref_selector($current="",$suffix="") {
-	$select = array('','Males', 'Females', 'Bisexual', 'Autosexual', 'Abstinent', 'Virgin', 'Nonsexual');
+	$select = array('', t('Males'), t('Females'), t('Bisexual'), t('Autosexual'), t('Abstinent'), t('Virgin'), t('Nonsexual'));
 
 	$o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
 	foreach($select as $selection) {
@@ -27,7 +27,7 @@ function sexpref_selector($current="",$suffix="") {
 
 
 function marital_selector($current="",$suffix="") {
-	$select = array('','Single', 'Lonely', 'Available', 'Unavailable', 'Dating', 'Unfaithful', 'Sex Addict', 'Friends', 'Friends/Benefits', 'Casual', 'Engaged', 'Married', 'Partners', 'Cohabiting', 'Happy', 'Not Looking', 'Swinger', 'Betrayed', 'Separated', 'Unstable', 'Divorced', 'Widowed', 'Uncertain', 'Complicated', 'Don\'t care', 'Ask me' );
+	$select = array('', t('Single'), t('Lonely'), t('Available'), t('Unavailable'), t('Dating'), t('Unfaithful'), t('Sex Addict'), t('Friends'), t('Friends/Benefits'), t('Casual'), t('Engaged'), t('Married'), t('Partners'), t('Cohabiting'), t('Happy'), t('Not Looking'), t('Swinger'), t('Betrayed'), t('Separated'), t('Unstable'), t('Divorced'), t('Widowed'), t('Uncertain'), t('Complicated'), t('Don\'t care'), t('Ask me') );
 
 	$o .= "<select name=\"marital[]\" id=\"marital-select\" multiple=\"multiple\" size=\"2\" >";
 	foreach($select as $selection) {
@@ -37,8 +37,3 @@ function marital_selector($current="",$suffix="") {
 	$o .= '</select>';
 	return $o;
 }	
-
-
-//function birthday_selector($current = '') {
-//	if($current && (strlen($current)
-//}
\ No newline at end of file
diff --git a/view/style.css b/view/style.css
index c590b5317..777f938b8 100644
--- a/view/style.css
+++ b/view/style.css
@@ -1346,12 +1346,16 @@ input#dfrn-url {
 }
 #photo-edit-caption, #photo-edit-tags-textarea {
 	float: left;
+	margin-bottom: 15px;
 }
 
 #photo-edit-caption-end, #photo-edit-tags-end {
 	clear: both;
 }
 
+#photo-edit-delete-button {
+	margin-left: 200px;
+}
 #photo-caption {
 	font-size: 110%;
 	font-weight: bold;
@@ -1368,4 +1372,14 @@ input#dfrn-url {
 	margin-left: 60px;
 	margin-top: 10px;
 	margin-bottom: 20px;
-}
\ No newline at end of file
+}
+
+#photo-album-edit-submit, #photo-album-edit-drop {
+	margin-top: 15px;
+	margin-bottom: 15px;
+}
+
+#photo-album-edit-drop {
+	margin-left: 200px;
+}
+