From 5096c1292c4a55a53e96c25f7037286ed988f07b Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Fri, 9 Apr 2010 18:17:50 +0000
Subject: merge back r5740, I should have commited only the galleries directory

git-svn-id: http://piwigo.org/svn/trunk@5741 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/photos_add_direct.php                         | 12 +-----------
 admin/themes/default/template/photos_add_direct.tpl |  6 ++----
 2 files changed, 3 insertions(+), 15 deletions(-)

(limited to 'admin')

diff --git a/admin/photos_add_direct.php b/admin/photos_add_direct.php
index 0376ca181..0cae2b3bb 100644
--- a/admin/photos_add_direct.php
+++ b/admin/photos_add_direct.php
@@ -355,17 +355,7 @@ $template->append(
   'head_elements',
   '<link rel="stylesheet" type="text/css" href="'.$uploadify_path.'/uploadify.css">'."\n"
   );
-
-// $page['thumbnails'] = array(
-//   array(
-//     'src' => 'http://localhost/piwigo/dev/trunk/upload/2006/08/16/thumbnail/TN-20060816234638-f9bebf5a.jpg',
-//     ),
-//   array(
-//     'src' => 'http://localhost/piwigo/dev/trunk/upload/2005/10/04/thumbnail/TN-20051004000000-864a003c.jpg',
-//     ),
-//   );
-// $page['batch_link'] = PHOTOS_ADD_BASE_URL.'&batch=1460,3307';
-
+ 
 if (isset($page['thumbnails']))
 {
   $template->assign(
diff --git a/admin/themes/default/template/photos_add_direct.tpl b/admin/themes/default/template/photos_add_direct.tpl
index 8002fd195..1c15b922a 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -148,8 +148,7 @@ var buttonText = 'Browse';
   </div>
   <p id="batchLink"><a href="{$batch_link}">{$batch_label}</a></p>
 </fieldset>
-<p><a href="">Add another set of photos</a></p>
-{else}
+{/if}
 
 <div id="formErrors" class="errors" style="display:none">
   <ul>
@@ -241,7 +240,6 @@ var buttonText = 'Browse';
     </p>
 {/if}
 </form>
-{/if} {* empty($thumbnails) *}
-{/if} {* $setup_errors *}
+{/if}
 
 </div> <!-- photosAddContent -->
\ No newline at end of file
-- 
cgit v1.2.3