aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2010-04-09 18:29:34 +0000
committerplegall <plg@piwigo.org>2010-04-09 18:29:34 +0000
commitfce10ca2d46e0cdc86f2c4b76209ce5af692f32c (patch)
tree0e839469de6c1c95bbb3e41d8762514d2c71c6ca
parent5096c1292c4a55a53e96c25f7037286ed988f07b (diff)
feature 1590: hide the upload form when displaying upload results.
git-svn-id: http://piwigo.org/svn/trunk@5742 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/photos_add_direct.php2
-rw-r--r--admin/themes/default/template/photos_add_direct.tpl6
-rw-r--r--language/en_UK/admin.lang.php1
-rw-r--r--language/fr_FR/admin.lang.php3
4 files changed, 8 insertions, 4 deletions
diff --git a/admin/photos_add_direct.php b/admin/photos_add_direct.php
index 0cae2b3bb..0c24fc6ef 100644
--- a/admin/photos_add_direct.php
+++ b/admin/photos_add_direct.php
@@ -355,7 +355,7 @@ $template->append(
'head_elements',
'<link rel="stylesheet" type="text/css" href="'.$uploadify_path.'/uploadify.css">'."\n"
);
-
+
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..1200a049e 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'|@translate}</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
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index 888fb9425..18d9798fa 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -761,4 +761,5 @@ $lang['Virtual Links'] = 'Virtual Links';
$lang['There is no other language available.'] = 'There is no other language available.';
$lang['There is no other plugin available.'] = 'There is no other plugin available.';
$lang['There is no other theme available.'] = 'There is no other theme available.';
+$lang['Add another set of photos'] = 'Add another set of photos';
?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index da667d9b6..3dd069d2c 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -766,4 +766,5 @@ $lang['There is no other language available.'] = 'Il n\'y a pas d\'autre langue
$lang['There is no other plugin available.'] = 'Il n\'y a pas d\'autre plugin disponible.';
$lang['There is no other theme available.'] = 'Il n\'y a pas d\'autre thème disponible.';
$lang['delete'] = 'effacer';
-?> \ No newline at end of file
+$lang['Add another set of photos'] = 'Ajouter d\'autres photos';
+?>