aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-04-09 18:01:14 +0000
committerplegall <plg@piwigo.org>2010-04-09 18:01:14 +0000
commit384108dd89b1d1b06a2d1cca9b169ecbcae10307 (patch)
tree1bc65b99ce22e0402f5a579d774e4b2f546cf503 /admin
parent96a2b84f6a8271465c95beb61a3c1bc8e508ebb7 (diff)
bug 1589: remove obsolete .csvignore file
git-svn-id: http://piwigo.org/svn/trunk@5740 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/photos_add_direct.php10
-rw-r--r--admin/themes/default/template/photos_add_direct.tpl6
2 files changed, 14 insertions, 2 deletions
diff --git a/admin/photos_add_direct.php b/admin/photos_add_direct.php
index 0c24fc6ef..0376ca181 100644
--- a/admin/photos_add_direct.php
+++ b/admin/photos_add_direct.php
@@ -356,6 +356,16 @@ $template->append(
'<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 1c15b922a..8002fd195 100644
--- a/admin/themes/default/template/photos_add_direct.tpl
+++ b/admin/themes/default/template/photos_add_direct.tpl
@@ -148,7 +148,8 @@ var buttonText = 'Browse';
</div>
<p id="batchLink"><a href="{$batch_link}">{$batch_label}</a></p>
</fieldset>
-{/if}
+<p><a href="">Add another set of photos</a></p>
+{else}
<div id="formErrors" class="errors" style="display:none">
<ul>
@@ -240,6 +241,7 @@ var buttonText = 'Browse';
</p>
{/if}
</form>
-{/if}
+{/if} {* empty($thumbnails) *}
+{/if} {* $setup_errors *}
</div> <!-- photosAddContent --> \ No newline at end of file