Yay! Working item upload dialog from the album page!

3 files changed, 16 insertions, 12 deletions

diff --git a/themes/default/css/screen.css b/themes/default/css/screen.css
index 8c9af729..3f9c0fa7 100644
--- a/themes/default/css/screen.css
+++ b/themes/default/css/screen.css
@@ -760,6 +760,11 @@ span.gInPlaceEdit:hover {
 
 #gDialog {
   background-color: #fff;
+  text-align: left;
+}
+
+#gDialog form {
+	width: 450px;
 }
 
 .gDialogLink {
@@ -820,7 +825,6 @@ span.gInPlaceEdit:hover {
 
 /*dialog*/
 .ui-dialog {
-	/*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none;
 	font-family: Lucida Grande, Lucida Sans, Arial, sans-serif;
 	font-size: 1.2em;
 	background: #f3f3f3 url(../jquery/images/f3f3f3_40x100_textures_01_flat_0.png) 0 0 repeat-x;
@@ -896,7 +900,6 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body
 	top: -5px; 
 }
 .ui-dialog-titlebar {
-	/*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none;
 	padding: .5em 1.5em .5em 1em;
 	color: #444444;
 	background: #e6e6e6 url(../jquery/images/e6e6e6_40x100_textures_02_glass_80.png) 0 50% repeat-x;
@@ -907,7 +910,6 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body
 }
 .ui-dialog-title {}
 .ui-dialog-titlebar-close {
-	/*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none;
 	background: url(../jquery/images/888888_11x11_icon_close.gif) 0 0 no-repeat;
 	position: absolute;
 	right: 8px;
@@ -926,7 +928,6 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body
 	display: none;
 }
 .ui-dialog-content {
-	/*resets*/margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none;
 	color: #362b36;
 	padding: 1.5em 1.7em;	
 }
@@ -964,8 +965,6 @@ body .ui-resizable-autohide .ui-resizable-handle { display: none; } /* use 'body
 	cursor: move;
 }
 
-
-
 /*
 Generic ThemeRoller Classes
 >> Make your jQuery Components ThemeRoller-Compatible!
diff --git a/themes/default/views/album.html.php b/themes/default/views/album.html.php
index 70d9e944..84afdc35 100644
--- a/themes/default/views/album.html.php
+++ b/themes/default/views/album.html.php
@@ -8,8 +8,8 @@
     	<img src="<?= $theme->url("images/ico-view-hybrid.png") ?>" 
     		alt="<?= _("View album in hybrid mode") ?>" /></a></li>
     <li><?= $theme->album_top() ?></li>
-    <li><a href="<?= url::site("photos/add") ?>" title="<?= _("Add a photo") ?>" 
-    		class="gButtonLink gDialogLink"><?= _("Add Items") ?></a></li>
+    <li><a href="<?= url::site("/form/add/photos/$item->id") ?>" title="<?= _("Add an item") ?>" 
+    		class="gButtonLink gDialogLink"><?= _("Add an item") ?></a></li>
   </ul>
   
   <h1><?= $item->title_edit ?></h1>
diff --git a/themes/default/views/photo.html.php b/themes/default/views/photo.html.php
index f58c51d1..0f5799ce 100644
--- a/themes/default/views/photo.html.php
+++ b/themes/default/views/photo.html.php
@@ -1,10 +1,15 @@
 <? defined("SYSPATH") or die("No direct script access."); ?>
 <div id="gItemHeader">
   <ul id="gItemMenu">
-    <li><a href="#"><img src="<?= $theme->url("images/ico-view-fullsize.png") ?>" alt="<?= sprintf(_("View full size image (%dx%d)"), $item->width, $item->height) ?>" /></a></li>
-    <li><a href="#"><img src="<?= $theme->url("images/ico-view-hybrid.png") ?>" alt="<?= _("View album in hybrid mode") ?>" /></a></li>
-    <li><?= $theme->photo_top() ?></li>
-    <li><a href="#" id="gAddItemLink" class="gButtonLink">v <?= _("Options") ?></a></li>
+    <li><a href="#" title="<?= _("View full size image") ?>">
+	    <img src="<?= $theme->url("images/ico-view-fullsize.png") ?>" 
+    		alt="<?= sprintf(_("View full size image (%dx%d)"), $item->width, $item->height) ?>" /></a></li>
+    <li><a href="#" title="<?= _("View album in hybrid mode") ?>">
+    	<img src="<?= $theme->url("images/ico-view-hybrid.png") ?>" 
+    		alt="<?= _("View album in hybrid mode") ?>" /></a></li>
+    <li><?= $theme->album_top() ?></li>
+    <li><a href="#" title="<?= _("Options for this item") ?>" 
+			class="gButtonLink gDialogLink">v <?= _("Options") ?></a></li>
   </ul>
   <h1><?= $item->title_edit ?></h1>
 </div>