aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvdigital <vdigital@piwigo.org>2008-04-20 07:26:50 +0000
committervdigital <vdigital@piwigo.org>2008-04-20 07:26:50 +0000
commit57b03a7218475f365e8838bab029bc8a6de94a48 (patch)
tree80b62970dac58e7e164183761ed5ef9b92f91500
parent55095f9ce9d32fc12a6be8070adf74c9423d1d95 (diff)
LinuxLefty patch for bug 780: Hide caddie if no target
git-svn-id: http://piwigo.org/svn/trunk@2305 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--language/en_UK/admin.lang.php3
-rw-r--r--language/es_ES/admin.lang.php3
-rw-r--r--language/fr_FR/admin.lang.php3
-rw-r--r--language/nl_NL/admin.lang.php2
-rw-r--r--template/yoga/admin/element_set_global.tpl319
5 files changed, 170 insertions, 160 deletions
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index feabc83bc..c9b2abe13 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -632,6 +632,7 @@ $lang['plugins_archive_error'] = 'Can\'t read or extract archive.';
$lang['plugins_extract_error'] = 'An error occured during extraction (%s).';
$lang['plugins_check_chmod'] = 'Please check "plugins" folder and sub-folders permissions (CHMOD).';
$lang['plugins_server_error'] = 'Can\'t connect to server.';
-
+// --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
$lang['Purge compiled templates'] = 'Purge compiled templates';
+/* TODO */ $lang['Caddie is currently empty'] = 'Caddie is currently empty';
?>
diff --git a/language/es_ES/admin.lang.php b/language/es_ES/admin.lang.php
index 249222e39..acee9a7bf 100644
--- a/language/es_ES/admin.lang.php
+++ b/language/es_ES/admin.lang.php
@@ -637,6 +637,7 @@ $lang['plugins_archive_error'] = 'Imposible leer o extraer el archivo.';
$lang['plugins_extract_error'] = 'Un error sobrevino durante la extracción de los ficheros (%s).';
$lang['plugins_check_chmod'] = 'Verifique los autorizaciones del expediente " plugins " y de sus subexpedientes (CHMOD).';
$lang['plugins_server_error'] = 'Imposible conectarse al servidor.';
-
+// --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
$lang['Purge compiled templates'] = 'Purgar el templates compilado';
+$lang['Caddie is currently empty'] = 'Caddie is currently empty';
?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 01888ab72..f5534aa6d 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -632,6 +632,7 @@ $lang['plugins_archive_error'] = 'Impossible de lire ou d\'extraire l\'archive.'
$lang['plugins_extract_error'] = 'Une erreur est survenue pendant l\'extraction des fichiers (%s).';
$lang['plugins_check_chmod'] = 'Vérifiez les permissions du dossier "plugins" et de ses sous-dossiers (CHMOD).';
$lang['plugins_server_error'] = 'Impossible de se connecter au serveur.';
-
+// --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
$lang['Purge compiled templates'] = 'Purger les templates compilés';
+$lang['Caddie is currently empty'] = 'Le panier est actuellement vide.';
?>
diff --git a/language/nl_NL/admin.lang.php b/language/nl_NL/admin.lang.php
index 3e2bfbc51..cc05317a8 100644
--- a/language/nl_NL/admin.lang.php
+++ b/language/nl_NL/admin.lang.php
@@ -640,5 +640,7 @@ $lang['c13y_submit_correction'] = 'Pas geselecteerde correcties toe';
/* TODO */ $lang['plugins_check_chmod'] = 'Please check "plugins" folder and sub-folders permissions (CHMOD).';
/* TODO */ $lang['plugins_server_error'] = 'Can\'t connect to server.';
+// --------- Starting below: New or revised $lang ---- from Butterfly (1.8)
/* TODO */ $lang['Purge compiled templates'] = 'Purge compiled templates';
+/* TODO */ $lang['Caddie is currently empty'] = 'Caddie is currently empty';
?>
diff --git a/template/yoga/admin/element_set_global.tpl b/template/yoga/admin/element_set_global.tpl
index ae5c7b2e1..fc5a92e70 100644
--- a/template/yoga/admin/element_set_global.tpl
+++ b/template/yoga/admin/element_set_global.tpl
@@ -4,182 +4,187 @@
<h3>{$CATEGORIES_NAV}</h3>
-<p style="text-align:center;">
- {'global mode'|@translate}
- | <a href="{$U_UNIT_MODE}">{'unit mode'|@translate}</a>
-</p>
-
-<fieldset>
-
- <legend>{'Display options'|@translate}</legend>
-
- <p>{'elements per page'|@translate}:
- <a href="{$U_DISPLAY}&amp;display=20">20</a>
- | <a href="{$U_DISPLAY}&amp;display=50">50</a>
- | <a href="{$U_DISPLAY}&amp;display=100">100</a>
- | <a href="{$U_DISPLAY}&amp;display=all">{'all'|@translate}</a>
- </p>
-
-</fieldset>
-
-<form action="{$F_ACTION}" method="post">
-
-<fieldset>
-
- <legend>{'Elements'|@translate}</legend>
-
- {if !empty($NAV_BAR)}<div class="navigationBar">{$NAV_BAR}</div>{/if}
-
{if !empty($thumbnails)}
- <ul class="thumbnails">
- {foreach from=$thumbnails item=thumbnail}
- <li><span class="wrap1">
- <label>
- <span class="wrap2">
- {if $thumbnail.LEVEL > 0}
- <em class="levelIndicatorB">{$thumbnail.LEVEL}</em>
- <em class="levelIndicatorF" title="{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}">{$thumbnail.LEVEL}</em>
- {/if}
- <span>
- <img src="{$thumbnail.TN_SRC}"
- alt="{$thumbnail.FILE}"
- title="{$thumbnail.TITLE}"
- class="thumbnail" />
- </span></span>
- <input type="checkbox" name="selection[]" value="{$thumbnail.ID}" />
- </label>
- </span>
- </li>
- {/foreach}
- </ul>
-{/if}
-
-</fieldset>
-
-<fieldset>
-
- <legend>{'Form'|@translate}</legend>
-
- <table>
+ <p style="text-align:center;">
+ {'global mode'|@translate}
+ | <a href="{$U_UNIT_MODE}">{'unit mode'|@translate}</a>
+ </p>
- <tr>
- <td>{'associate to category'|@translate}</td>
- <td>
- <select style="width:400px" name="associate" size="1">
- <option value="0">------------</option>
- {html_options options=$associate_options }
- </select>
- </td>
- </tr>
+ <fieldset>
+
+ <legend>{'Display options'|@translate}</legend>
+
+ <p>{'elements per page'|@translate}:
+ <a href="{$U_DISPLAY}&amp;display=20">20</a>
+ | <a href="{$U_DISPLAY}&amp;display=50">50</a>
+ | <a href="{$U_DISPLAY}&amp;display=100">100</a>
+ | <a href="{$U_DISPLAY}&amp;display=all">{'all'|@translate}</a>
+ </p>
+
+ </fieldset>
+
+ <form action="{$F_ACTION}" method="post">
+
+ <fieldset>
+
+ <legend>{'Elements'|@translate}</legend>
+
+ {if !empty($NAV_BAR)}<div class="navigationBar">{$NAV_BAR}</div>{/if}
+
+ {if !empty($thumbnails)}
+ <ul class="thumbnails">
+ {foreach from=$thumbnails item=thumbnail}
+ <li><span class="wrap1">
+ <label>
+ <span class="wrap2">
+ {if $thumbnail.LEVEL > 0}
+ <em class="levelIndicatorB">{$thumbnail.LEVEL}</em>
+ <em class="levelIndicatorF" title="{$pwg->l10n($pwg->sprintf('Level %d',$thumbnail.LEVEL))}">{$thumbnail.LEVEL}</em>
+ {/if}
+ <span>
+ <img src="{$thumbnail.TN_SRC}"
+ alt="{$thumbnail.FILE}"
+ title="{$thumbnail.TITLE}"
+ class="thumbnail" />
+ </span></span>
+ <input type="checkbox" name="selection[]" value="{$thumbnail.ID}" />
+ </label>
+ </span>
+ </li>
+ {/foreach}
+ </ul>
+ {/if}
+
+ </fieldset>
+
+ <fieldset>
+
+ <legend>{'Form'|@translate}</legend>
+
+ <table>
+
+ <tr>
+ <td>{'associate to category'|@translate}</td>
+ <td>
+ <select style="width:400px" name="associate" size="1">
+ <option value="0">------------</option>
+ {html_options options=$associate_options }
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td>{'dissociate from category'|@translate}</td>
+ <td>
+ <select style="width:400px" name="dissociate" size="1">
+ <option value="0">------------</option>
+ {if !empty($dissociate_options)}{html_options options=$dissociate_options }{/if}
+ </select>
+ </td>
+ </tr>
+
+ <tr>
+ <td>{'add tags'|@translate}</td>
+ <td>{if !empty($ADD_TAG_SELECTION)}{$ADD_TAG_SELECTION}{else}<p>{'No tag defined. Use Administration>Pictures>Tags'|@translate}</p>{/if}</td>
+ </tr>
+
+ {if !empty($DEL_TAG_SELECTION)}
+ <tr>
+ <td>{'remove tags'|@translate}</td>
+ <td>{$DEL_TAG_SELECTION}</td>
+ </tr>
+ {/if}
+
+ <tr>
+ <td>{'Author'|@translate}</td>
+ <td>
+ <label><input type="radio" name="author_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
+ <label><input type="radio" name="author_action" value="unset" /> {'unset'|@translate}</label>
+ <label><input type="radio" name="author_action" value="set" id="author_action_set" /> {'set to'|@translate}</label>
+ <input onchange="document.getElementById('author_action_set').checked = true;" type="text" name="author" value="" />
+ </td>
+ </tr>
+
+ <tr>
+ <td>{'title'|@translate}</td>
+ <td>
+ <label><input type="radio" name="name_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
+ <label><input type="radio" name="name_action" value="unset" /> {'unset'|@translate}</label>
+ <label><input type="radio" name="name_action" value="set" id="name_action_set" /> {'set to'|@translate}</label>
+ <input onchange="document.getElementById('name_action_set').checked = true;" type="text" name="name" value="" />
+ </td>
+ </tr>
+
+ <tr>
+ <td>{'Creation date'|@translate}</td>
+ <td>
+ <label><input type="radio" name="date_creation_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
+ <label><input type="radio" name="date_creation_action" value="unset" /> {'unset'|@translate}</label>
+ <label><input type="radio" name="date_creation_action" value="set" id="date_creation_action_set" /> {'set to'|@translate}</label>
+ <select onchange="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_day">
+ <option value="0">--</option>
+ {section name=day start=1 loop=32}
+ <option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$DATE_CREATION_DAY}selected="selected"{/if}>{$smarty.section.day.index}</option>
+ {/section}
+ </select>
+ <select onchange="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_month">
+ {html_options options=$month_list selected=$DATE_CREATION_MONTH}
+ </select>
+ <input onchange="document.getElementById('date_creation_action_set').checked = true;"
+ name="date_creation_year"
+ type="text"
+ size="4"
+ maxlength="4"
+ value="{$DATE_CREATION_YEAR}" />
+ </td>
+ </tr>
<tr>
- <td>{'dissociate from category'|@translate}</td>
+ <td>{'Minimum privacy level'|@translate}</td>
<td>
- <select style="width:400px" name="dissociate" size="1">
- <option value="0">------------</option>
- {if !empty($dissociate_options)}{html_options options=$dissociate_options }{/if}
+ <label><input type="radio" name="level_action" value="leave" checked="checked" />{'leave'|@translate}</label>
+ <label><input type="radio" name="level_action" value="set" id="level_action_set" />{'set to'|@translate}</label>
+ <select onchange="document.getElementById('level_action_set').checked = true;" name="level" size="1">
+ {html_options options=$level_options}
</select>
</td>
</tr>
- <tr>
- <td>{'add tags'|@translate}</td>
- <td>{if !empty($ADD_TAG_SELECTION)}{$ADD_TAG_SELECTION}{else}<p>{'No tag defined. Use Administration>Pictures>Tags'|@translate}</p>{/if}</td>
- </tr>
+ </table>
- {if !empty($DEL_TAG_SELECTION)}
- <tr>
- <td>{'remove tags'|@translate}</td>
- <td>{$DEL_TAG_SELECTION}</td>
- </tr>
- {/if}
-
- <tr>
- <td>{'Author'|@translate}</td>
- <td>
- <label><input type="radio" name="author_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
- <label><input type="radio" name="author_action" value="unset" /> {'unset'|@translate}</label>
- <label><input type="radio" name="author_action" value="set" id="author_action_set" /> {'set to'|@translate}</label>
- <input onchange="document.getElementById('author_action_set').checked = true;" type="text" name="author" value="" />
- </td>
- </tr>
+ <p>
+ {'target'|@translate}
+ <label><input type="radio" name="target" value="all" /> {'all'|@translate}</label>
+ <label><input type="radio" name="target" value="selection" checked="checked" /> {'selection'|@translate}</label>
+ </p>
- <tr>
- <td>{'title'|@translate}</td>
- <td>
- <label><input type="radio" name="name_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
- <label><input type="radio" name="name_action" value="unset" /> {'unset'|@translate}</label>
- <label><input type="radio" name="name_action" value="set" id="name_action_set" /> {'set to'|@translate}</label>
- <input onchange="document.getElementById('name_action_set').checked = true;" type="text" name="name" value="" />
- </td>
- </tr>
- <tr>
- <td>{'Creation date'|@translate}</td>
- <td>
- <label><input type="radio" name="date_creation_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
- <label><input type="radio" name="date_creation_action" value="unset" /> {'unset'|@translate}</label>
- <label><input type="radio" name="date_creation_action" value="set" id="date_creation_action_set" /> {'set to'|@translate}</label>
- <select onchange="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_day">
- <option value="0">--</option>
- {section name=day start=1 loop=32}
- <option value="{$smarty.section.day.index}" {if $smarty.section.day.index==$DATE_CREATION_DAY}selected="selected"{/if}>{$smarty.section.day.index}</option>
- {/section}
- </select>
- <select onchange="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_month">
- {html_options options=$month_list selected=$DATE_CREATION_MONTH}
- </select>
- <input onchange="document.getElementById('date_creation_action_set').checked = true;"
- name="date_creation_year"
- type="text"
- size="4"
- maxlength="4"
- value="{$DATE_CREATION_YEAR}" />
- </td>
- </tr>
+ <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/></p>
- <tr>
- <td>{'Minimum privacy level'|@translate}</td>
- <td>
- <label><input type="radio" name="level_action" value="leave" checked="checked" />{'leave'|@translate}</label>
- <label><input type="radio" name="level_action" value="set" id="level_action_set" />{'set to'|@translate}</label>
- <select onchange="document.getElementById('level_action_set').checked = true;" name="level" size="1">
- {html_options options=$level_options}
- </select>
- </td>
- </tr>
-
- </table>
-
- <p>
- {'target'|@translate}
- <label><input type="radio" name="target" value="all" /> {'all'|@translate}</label>
- <label><input type="radio" name="target" value="selection" checked="checked" /> {'selection'|@translate}</label>
- </p>
+ </fieldset>
-
- <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/></p>
+ <fieldset>
-</fieldset>
+ <legend>{'Caddie management'|@translate}</legend>
-<fieldset>
+ <ul style="list-style-type:none;">
+ {if ($IN_CADDIE)}
+ <li><label><input type="radio" name="caddie_action" value="empty_all" /> {'Empty caddie'|@translate}</label></li>
+ <li><label><input type="radio" name="caddie_action" value="empty_selected" /> {'Take selected elements out of caddie'|@translate}</label></li>
+ {else}
+ <li><label><input type="radio" name="caddie_action" value="add_selected" /> {'Add selected elements to caddie'|@translate}</label></li>
+ {/if}
- <legend>{'Caddie management'|@translate}</legend>
+ <li><label><input type="radio" name="caddie_action" value="export" /> {'Export data'|@translate}</label></li>
- <ul style="list-style-type:none;">
- {if ($IN_CADDIE)}
- <li><label><input type="radio" name="caddie_action" value="empty_all" /> {'Empty caddie'|@translate}</label></li>
- <li><label><input type="radio" name="caddie_action" value="empty_selected" /> {'Take selected elements out of caddie'|@translate}</label></li>
- {else}
- <li><label><input type="radio" name="caddie_action" value="add_selected" /> {'Add selected elements to caddie'|@translate}</label></li>
- {/if}
+ </ul>
- <li><label><input type="radio" name="caddie_action" value="export" /> {'Export data'|@translate}</label></li>
-
- </ul>
+ <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit_caddie" /></p>
- <p><input class="submit" type="submit" value="{'Submit'|@translate}" name="submit_caddie" /></p>
+ </fieldset>
-</fieldset>
+ </form>
-</form>
+{else}
+ <div class="infos"><p>{'Caddie is currently empty'|@translate}</p></div>
+{/if}