aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-04-09 18:17:50 +0000
committerplegall <plg@piwigo.org>2010-04-09 18:17:50 +0000
commit5096c1292c4a55a53e96c25f7037286ed988f07b (patch)
tree328d8d2b87cf4f6a5fbb236b4f7296e469023b35 /admin
parent384108dd89b1d1b06a2d1cca9b169ecbcae10307 (diff)
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
Diffstat (limited to 'admin')
-rw-r--r--admin/photos_add_direct.php12
-rw-r--r--admin/themes/default/template/photos_add_direct.tpl6
2 files changed, 3 insertions, 15 deletions
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