diff options
Diffstat (limited to '')
| -rw-r--r-- | plugins/admin_advices/admin_advices.tpl | 11 | ||||
| -rw-r--r-- | plugins/admin_advices/default-layout.css | 40 | ||||
| -rw-r--r-- | plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php | 18 | ||||
| -rw-r--r-- | plugins/admin_advices/fr_FR.iso-8859-1/lang.adv.php | 20 | ||||
| -rw-r--r-- | plugins/admin_advices/main.inc.php | 8 |
5 files changed, 28 insertions, 69 deletions
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 @@ <h2>{lang:An_advice_about} {ADVICE_ABOUT}</h2>
<h3>{ADVICE_TEXT}</h3>
<table>
- <tr><td style="text-align: left; width: 45em;">
+ <tr><td style="text-align: left; width: 50%;">
<!-- BEGIN More -->
{More.ADVICE} <br />
<!-- END More -->
<br />
- <ul class="pwgmenu">
- <li><a href="http://demo.phpwebgallery.net">DEMO</a></li>
- <li><a href="http://phpwebgallery.net/doc">WIKI / DOC</a></li>
- <li><a href="http://forum.phpwebgallery.net">FORUM</a></li>
- <li><a href="http://bugs.phpwebgallery.net">BUGS</a></li>
- <li><a href="http://phpwebgallery.net/ext">EXTENSIONS</a></li>
-</ul>
- </td><td style="text-align: right; width: 155px;">
+ </td><td style="text-align: right; width: 20%;">
<!-- BEGIN thumbnail -->
<a href="{thumbnail.U_MODIFY}" alt="{lang:link_info_image}">
<img class="thumbnail" src="{thumbnail.IMAGE}"
diff --git a/plugins/admin_advices/default-layout.css b/plugins/admin_advices/default-layout.css index dfc4e7fb8..334d20d1c 100644 --- a/plugins/admin_advices/default-layout.css +++ b/plugins/admin_advices/default-layout.css @@ -2,8 +2,7 @@ .content {
list-style-type:none;
margin: 0 1em 0 14.5em;
- border: 1px solid;
- padding: 0;
+ padding: 0 0 15px 0;
}
.content h2 {
font-weight: bold;
@@ -18,41 +17,4 @@ text-align: left;
padding-left: 2em;
}
-.pwgmenu {
- display: table;
- list-style-type: none;
- list-style-image: none; /* for firefox */
- white-space: nowrap;
- position: relative;
- text-decoration : none;
- font-family: verdana, arial, helvetica, sans-serif;
- font-size: 70%;
- line-height: 1.1em;
- width: 66em;
- margin: 1px 8px;
- padding: 3px;
- background: transparent;
-}
-.pwgmenu li {
- float: left;
- width: 10em !important;
- text-align: center;
- margin: 0 6px;
- padding: 0;
-}
-.pwgmenu a {
- width: 9em !important;
- display: block;
- padding: 4px 8px;
- background: #69c; /* PWG Graphic charts */
- color: white;
- text-align: center;
- text-decoration: none;
- font-weight: bold;
- border: 1px solid #fff; /* Why bordered? in case of #69c background */
-}
-.pwgmenu a:hover {
- background: #f92;
- color: white;
-} /* PWG Graphic charts */
diff --git a/plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php b/plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php index a56febb66..a6584b0af 100644 --- a/plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php +++ b/plugins/admin_advices/en_UK.iso-8859-1/lang.adv.php @@ -334,7 +334,7 @@ foreach ($cases as $id_adv) 'their reasons are not really professional.' ;
$adv[] = 'Do NOT confuse between <strong>show</strong>_iptc and ' .
'<strong>use</strong>_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 <strong>show</strong>_iptc and ' .
'<strong>use</strong>_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 <strong>show</strong>_exif and ' .
'<strong>use</strong>_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, <strong>show</strong>_exif_mapping and ' .
+ $adv[] = 'In any case, <strong>show</strong>_exif_fields and ' .
'<strong>use</strong>_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 <strong>show</strong>_exif and ' .
'<strong>use</strong>_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.' .
- '<br />Mentionned fields would be rewrited with IPTC values ' .
+ '<br />Mentionned fields would be rewrited with EXIF values ' .
' even those ones are NOT empty.';
- $adv[] = 'In any case, <strong>show</strong>_iptc_mapping and ' .
- '<strong>use</strong>_iptc_mapping must be totally different.';
+ $adv[] = 'In any case, <strong>show</strong>_exif_fields and ' .
+ '<strong>use</strong>_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 <strong>show</strong>_iptc et '
. '<strong>use</strong>_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 <strong>show</strong>_iptc et '
. '<strong>use</strong>_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 <strong>show</strong>_exif et '
. '<strong>use</strong>_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, <strong>show</strong>_iptc_mapping et '
- . '<strong>use</strong>_iptc_mapping seront '
+ $adv[] = 'Dans tous les cas, <strong>show</strong>_exif_fields et '
+ . '<strong>use</strong>_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 <strong>show</strong>_exif et '
. '<strong>use</strong>_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.<br />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, <strong>show</strong>_iptc_mapping et '
- . '<strong>use</strong>_iptc_mapping seront '
+ $adv[] = 'Dans tous les cas, <strong>show</strong>_exif_fields et '
+ . '<strong>use</strong>_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
|