From 073ab4a9e3ef97fcfce21bf72d5eae6b61d2f801 Mon Sep 17 00:00:00 2001 From: vdigital Date: Mon, 15 Jan 2007 22:44:48 +0000 Subject: Feature "Admin Advices !" (Standard plugin) : May give you always now an advice on the administration page. Quick solved list: 1 - Wording on EXIF/IPTC Advices 2 - Default language is English 3 - Some Transparency issues under IE 4 - Some Border issues 5 - PWG Menu moved from Advices Box to Intro. 6 - phpwebgallery.net URLs are available thru a new admin function pwg_URL() 7 - PWG Menu URL open in a new target (XHTML strict compliant (JS)). git-svn-id: http://piwigo.org/svn/trunk@1724 68402e56-0260-453c-a942-63ccdbb3a9ee --- plugins/admin_advices/admin_advices.tpl | 11 ++---- plugins/admin_advices/default-layout.css | 40 +--------------------- .../admin_advices/en_UK.iso-8859-1/lang.adv.php | 18 +++++----- .../admin_advices/fr_FR.iso-8859-1/lang.adv.php | 20 +++++------ plugins/admin_advices/main.inc.php | 8 +++-- 5 files changed, 28 insertions(+), 69 deletions(-) (limited to 'plugins/admin_advices') diff --git a/plugins/admin_advices/admin_advices.tpl b/plugins/admin_advices/admin_advices.tpl index 5b24c5c9a..c9857b439 100644 --- a/plugins/admin_advices/admin_advices.tpl +++ b/plugins/admin_advices/admin_advices.tpl @@ -4,19 +4,12 @@

{lang:An_advice_about} {ADVICE_ABOUT}

{ADVICE_TEXT}

-
+
{More.ADVICE}

- - 		+ use_iptc (have a look on metadata page ' . - 'on our wiki.'; + 'on our wiki).'; $cond = $conf['show_iptc']; $confk = 'show_iptc'; break; @@ -349,7 +349,7 @@ foreach ($cases as $id_adv) ' even those ones are NOT empty.'; $adv[] = 'Do NOT confuse between show_iptc and ' . 'use_iptc (have a look on metadata page ' . - 'on our wiki.'; + 'on our wiki).'; $cond = $conf['use_iptc']; $confk = 'use_iptc'; break; @@ -404,7 +404,7 @@ foreach ($cases as $id_adv) 'their reasons are to protect their knowledge.' ; $adv[] = 'Do NOT confuse between show_exif and ' . 'use_exif (have a look on metadata page ' . - 'on our wiki.'; + 'on our wiki).'; $cond = true; $confk = 'show_exif'; break; @@ -419,10 +419,10 @@ foreach ($cases as $id_adv) $adv[] = 'Beginners would prefer to let default values.'; $adv[] = 'Advanced users would take care of $lang values and ' . 'impacts on templates.'; - $adv[] = 'In any case, show_exif_mapping and ' . + $adv[] = 'In any case, show_exif_fields and ' . 'use_exif_mapping must be totally different.'; $cond = true; - $confk = 'show_exif_mapping'; + $confk = 'show_exif_fields'; break; Case 34 : @@ -435,7 +435,7 @@ foreach ($cases as $id_adv) ' even those ones are NOT empty.'; $adv[] = 'Do NOT confuse between show_exif and ' . 'use_exif (have a look on metadata page ' . - 'on our wiki.'; + 'on our wiki).'; $cond = true; $confk = 'use_exif'; break; @@ -451,10 +451,10 @@ foreach ($cases as $id_adv) $adv[] = 'Advanced users would carefully chose overrided fields ' . 'prior to synchronize.'; $adv[] = 'Take care of mentionned fields in metadata synchronization.' . - '
Mentionned fields would be rewrited with IPTC values ' . + '
Mentionned fields would be rewrited with EXIF values ' . ' even those ones are NOT empty.'; - $adv[] = 'In any case, show_iptc_mapping and ' . - 'use_iptc_mapping must be totally different.'; + $adv[] = 'In any case, show_exif_fields and ' . + 'use_exif_mapping must be totally different.'; $cond = true; $confk = 'use_exif_mapping'; break; diff --git a/plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php b/plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php index 49b2b2979..e53847b7e 100644 --- a/plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php +++ b/plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php @@ -355,7 +355,7 @@ foreach ($cases as $id_adv) . 'false bien que leurs raisons ne soient guère professionnelles.'; $adv[] = 'Ne confondez pas show_iptc et ' . 'use_iptc (consultez la pages de métadonnées ' - . 'sur notre wiki.'; + . 'sur notre wiki).'; $cond = $conf['show_iptc']; $confk = 'show_iptc'; break; @@ -371,7 +371,7 @@ foreach ($cases as $id_adv) . 'champs ne seraient pas vides.'; $adv[] = 'Ne confondez pas show_iptc et ' . 'use_iptc (consultez la pages de métadonnées ' - . 'sur notre wiki.'; + . 'sur notre wiki).'; $cond = $conf['use_iptc']; $confk = 'use_iptc'; break; @@ -431,7 +431,7 @@ foreach ($cases as $id_adv) . 'ceci afin de protéger leur savoir-faire.' ; $adv[] = 'Ne confondez pas show_exif et ' . 'use_exif (consultez la pages de métadonnées ' - . 'sur notre wiki.'; + . 'sur notre wiki).'; $cond = true; $confk = 'show_exif'; break; @@ -446,11 +446,11 @@ foreach ($cases as $id_adv) $adv[] = 'Les débutants laisseront la valeur par défaut.'; $adv[] = 'Les utilisateurs avancés penseront aux valeurs du tableau ' . '$lang; voire même à l\'impact possible sur les templates.'; - $adv[] = 'Dans tous les cas, show_iptc_mapping et ' - . 'use_iptc_mapping seront ' + $adv[] = 'Dans tous les cas, show_exif_fields et ' + . 'use_exif_mapping seront ' . 'totalement différents.'; $cond = true; - $confk = 'show_exif_mapping'; + $confk = 'show_exif_fields'; break; Case 34 : @@ -465,7 +465,7 @@ foreach ($cases as $id_adv) . 'champs ne seraient pas vides.'; $adv[] = 'Ne confondez pas show_exif et ' . 'use_exif (consultez la pages de métadonnées ' - . 'sur notre wiki.'; + . 'sur notre wiki).'; $cond = true; $confk = 'use_exif'; break; @@ -480,15 +480,15 @@ foreach ($cases as $id_adv) $adv[] = 'Les débutants laisseront la valeur par défaut.'; $adv[] = 'Les utilisateurs avancés penseront aux valeurs du tableau ' . '$lang; voire même à l\'impact possible sur les templates.'; - $adv[] = 'Les débutants laisseront $conf[\'use_iptc\'] = false;'; + $adv[] = 'Les débutants laisseront $conf[\'use_exif\'] = false;'; $adv[] = 'Les utilisateurs avancés feront très attention aux champs ' . 'sélectionnés et modifiés par la synchronisation.'; $adv[] = 'Faire attention aux champs mentionnés dans la synchronisation ' . 'des métadonnées.
Ces champs pourront être ' . 'écrasés par des valeurs de champs EXIF quand bien même ces ' . 'champs ne seraient pas vides.'; - $adv[] = 'Dans tous les cas, show_iptc_mapping et ' - . 'use_iptc_mapping seront ' + $adv[] = 'Dans tous les cas, show_exif_fields et ' + . 'use_exif_mapping seront ' . 'totalement différents.'; $cond = true; $confk = 'use_exif_mapping'; diff --git a/plugins/admin_advices/main.inc.php b/plugins/admin_advices/main.inc.php index 008b0b445..e94da7c09 100644 --- a/plugins/admin_advices/main.inc.php +++ b/plugins/admin_advices/main.inc.php @@ -61,9 +61,13 @@ function set_admin_advice() $user['language'] : $conf['default_language']; // en_UK.iso-8859-1 $adv = array(); - + if ( !@file_exists(PHPWG_ROOT_PATH + . "plugins/admin_advices/$advlang/lang.adv.php") ) + { + $advlang = 'en_UK.iso-8859-1'; + } // Include language advices - include_once( PHPWG_ROOT_PATH + @include_once( PHPWG_ROOT_PATH . "plugins/admin_advices/$advlang/lang.adv.php" ); // If there is an advice -- cgit v1.2.3