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

17 files changed, 163 insertions, 130 deletions

diff --git a/admin/include/functions.php b/admin/include/functions.php
index 061de2740..6fc649e0e 100644
--- a/admin/include/functions.php
+++ b/admin/include/functions.php
@@ -1920,4 +1920,31 @@ function check_conf()
   }
 }
 
+/**
+ * Refer main PhpWebGallery URLs (currently phpwebgallery.net domain)
+ *
+ * @param void
+ * @return array like $conf['links']
+ */
+function pwg_URL()
+{
+  global $lang_info;
+  $urls = array(
+    'WIKI'       => 'http://phpwebgallery.net/doc/',
+    'HOME'       => 'http://phpwebgallery.net/',
+    'DEMO'       => 'http://demo.phpwebgallery.net/',
+    'FORUM'      => 'http://forum.phpwebgallery.net/',
+    'BUGS'       => 'http://bugs.phpwebgallery.net/',
+    'EXTENSIONS' => 'http://phpwebgallery.net/ext',
+    );
+  if ( isset($lang_info['code']) and 
+       in_array($lang_info['code'], array('fr','en')) )
+  { /* current wiki languages are French or English */
+    $urls['WIKI'] =
+      'http://phpwebgallery.net/doc/doku.php?id='.$lang_info['code'].':start';
+    $urls['HOME'] = 'http://phpwebgallery.net/?lang='.$lang_info['code'];
+  }
+  return $urls;
+}
+
 ?>
diff --git a/admin/intro.php b/admin/intro.php
index d855bc870..afb61576c 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -267,10 +267,13 @@ if ($nb_comments > 0)
     );
 }
 
+// Add the PhpWebGallery Official menu
+  $template->assign_block_vars( 'pwgmenu', pwg_URL() );
+  
 // +-----------------------------------------------------------------------+
 // |                           sending html code                           |
 // +-----------------------------------------------------------------------+
 
 $template->assign_var_from_handle('ADMIN_CONTENT', 'intro');
 
-?>
\ No newline at end of file
+?>
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

diff --git a/template-common/default-layout.css b/template-common/default-layout.css
index 79797560b..12b55a8a1 100644
--- a/template-common/default-layout.css
+++ b/template-common/default-layout.css
@@ -1,51 +1,51 @@
-/* $Id$ */
-
-/* Set the width of the menubar for the galery */
-#menubar {
-  width: 18em;
-}
-#content {
-  margin-left: 20em;	/* = #menubar width + 2em */
-}
-/* Set minimum width of the page before getting a scrollbar */
-/* IE5 and IE6 don't get that */
-BODY {
-  min-width: 60em;	/* ~ 3* #menubar width */
-}
-BODY#thePopuphelpPage {
-  min-width: 0;
-}
-
-/* Set the width of the menubar for the admin section */
-BODY#theAdminPage #menubar {
-  width: 12.5em;
-}
-BODY#theAdminPage #content {
-  margin-left: 14.5em;	/* = #menubar width + 2em */
-}
-
-/* Set some sizes according to your maximum thumbnail width and height */
-#content UL.thumbnails SPAN,
-#content UL.thumbnails SPAN.wrap2 A,
-#content UL.thumbnails LABEL,
-#content DIV.thumbnailCategory DIV.illustration {
-  width: 140px;			/* max thumbnail width + 2px */
-}
-#content UL.thumbnails SPAN.wrap2,
-#content DIV.thumbnailCategory DIV.description {
-  height: 140px;		/* max thumbnail height + 2px */
-}
-#content DIV.comment BLOCKQUOTE {
-  margin-left: 150px;		/*maximum thumbnail width + ~10px */
-}
-
-/* Category thumbnails on main page */
-#content UL.thumbnailCategories LI {
-  width: 49.9%;		/* 49.9% for 2 per line, 33.3% for 3 per line*/
-}
-
-/* Set defaults for thumbnails legend */
-#content UL.thumbnails SPAN.thumbLegend {
-  display: block;	/* display: none; if you don't want legend */
-  height: 4em;		/* legend height (don't set auto to be Gecko friendly)*/
-}
+/* $Id$ */

+

+/* Set the width of the menubar for the galery */

+#menubar {

+  width: 18em;

+}

+#content {

+  margin-left: 20em;	/* = #menubar width + 2em */

+}

+/* Set minimum width of the page before getting a scrollbar */

+/* IE5 and IE6 don't get that */

+BODY {

+  min-width: 60em;	/* ~ 3* #menubar width */

+}

+BODY#thePopuphelpPage {

+  min-width: 0;

+}

+

+/* Set the width of the menubar for the admin section */

+BODY#theAdminPage #menubar {

+  width: 12.5em;

+}

+BODY#theAdminPage #content {

+  margin-left: 14.5em;	/* = #menubar width + 2em */

+}

+

+/* Set some sizes according to your maximum thumbnail width and height */

+#content UL.thumbnails SPAN,

+#content UL.thumbnails SPAN.wrap2 A,

+#content UL.thumbnails LABEL,

+#content DIV.thumbnailCategory DIV.illustration {

+  width: 140px;			/* max thumbnail width + 2px */

+}

+#content UL.thumbnails SPAN.wrap2,

+#content DIV.thumbnailCategory DIV.description {

+  height: 140px;		/* max thumbnail height + 2px */

+}

+#content DIV.comment BLOCKQUOTE {

+  margin-left: 150px;		/*maximum thumbnail width + ~10px */

+}

+

+/* Category thumbnails on main page */

+#content UL.thumbnailCategories LI {

+  width: 49.7%;		/* 49.7% for 2 per line, 33.2% for 3 per line*/

+}

+

+/* Set defaults for thumbnails legend */

+#content UL.thumbnails SPAN.thumbLegend {

+  display: block;	/* display: none; if you don't want legend */

+  height: 4em;		/* legend height (don't set auto to be Gecko friendly)*/

+}

diff --git a/template/yoga/admin/default-layout.css b/template/yoga/admin/default-layout.css
index 227fa0ded..0f82bee63 100644
--- a/template/yoga/admin/default-layout.css
+++ b/template/yoga/admin/default-layout.css
@@ -103,3 +103,43 @@ FIELDSET#generalConf SPAN.property {
 FIELDSET#generalConf TEXTAREA.description {
   width: 70%;
 }
+
+/* PWG Links Menu is fixed Graphic charts */
+.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 1px auto;
+  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/template/yoga/admin/intro.tpl b/template/yoga/admin/intro.tpl
index 4605b35b3..9d35a6bc4 100644
--- a/template/yoga/admin/intro.tpl
+++ b/template/yoga/admin/intro.tpl
@@ -1,6 +1,16 @@
 <!-- $Id$ -->
 <h2>{lang:title_default}</h2>
-
+<!-- BEGIN pwgmenu -->
+<ul class="pwgmenu">
+  <!-- Keep Doctype XHTML Strict acceptable even in Admin -->
+  <!-- New window is open if Js available (Webmasters accept it usually) --> 
+  <li><a href="{pwgmenu.HOME}" onclick="window.open(this.href, ''); return false;">{lang:HOME}</a></li>
+  <li><a href="{pwgmenu.WIKI}" onclick="window.open(this.href, ''); return false;">{lang:WIKI / DOC}</a></li>
+  <li><a href="{pwgmenu.FORUM}" onclick="window.open(this.href, ''); return false;">{lang:FORUM}</a></li>
+  <li><a href="{pwgmenu.BUGS}" onclick="window.open(this.href, ''); return false;">{lang:BUGS}</a></li>
+  <li><a href="{pwgmenu.EXTENSIONS}" onclick="window.open(this.href, ''); return false;">{lang:EXTENSIONS}</a></li>
+</ul>   
+<!-- END pwgmenu -->
 <dl>
   <dt>{lang:PhpWebGallery version}</dt>
   <dd>
diff --git a/template/yoga/icon/check.png b/template/yoga/icon/check.png
index 30a841cae..d9abf2763 100644
--- a/template/yoga/icon/check.png
+++ b/template/yoga/icon/check.png
diff --git a/template/yoga/icon/pwg_footer.png b/template/yoga/icon/pwg_footer.png
index b01a882dc..e465f76f9 100644
--- a/template/yoga/icon/pwg_footer.png
+++ b/template/yoga/icon/pwg_footer.png
diff --git a/template/yoga/icon/uncheck.png b/template/yoga/icon/uncheck.png
index fe04c37db..2f7df3503 100644
--- a/template/yoga/icon/uncheck.png
+++ b/template/yoga/icon/uncheck.png
diff --git a/template/yoga/theme/clear/theme.css b/template/yoga/theme/clear/theme.css
index 70a7d510a..0a85ed60c 100644
--- a/template/yoga/theme/clear/theme.css
+++ b/template/yoga/theme/clear/theme.css
@@ -20,7 +20,7 @@ H2, #menubar DT, #imageHeaderBar, #imageToolBar A:hover, .row1 {
 }
 
 /* borders */
-#menubar DL, #content, #imageToolBar,
+#menubar DL, #content, #imageToolBar, 
 #comments DIV.comment BLOCKQUOTE {
   border: 1px solid #d3d3d3;
 }
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index e35761366..04632b6a4 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -47,7 +47,7 @@ H2, #menubar DT, .throw  {
 }
 
 /* borders */
-#menubar DL, #content,
+#menubar DL, #content, .content,
 #comments DIV.comment BLOCKQUOTE {
   border: 1px solid #000000;
 }
diff --git a/template/yoga/theme/p0w0/theme.css b/template/yoga/theme/p0w0/theme.css
index 980c386c8..42d0e8b47 100644
--- a/template/yoga/theme/p0w0/theme.css
+++ b/template/yoga/theme/p0w0/theme.css
@@ -10,9 +10,6 @@ INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
   background-color: transparent;

   border: 0px;

 }

-#content UL.thumbnailCategories LI {

-  width: 49.7%;		/* 49.8% for 2 per line, 33.3% for 3 per line*/

-}

 H2, .throw {

   color: #69c;

 }

diff --git a/template/yoga/theme/wipi/theme.css b/template/yoga/theme/wipi/theme.css
index 59d1c1258..cb91f1d14 100644
--- a/template/yoga/theme/wipi/theme.css
+++ b/template/yoga/theme/wipi/theme.css
@@ -10,9 +10,6 @@ INPUT.rateButtonSelected /* <= why IE doesn't inherit this ? */ {
   background-color: transparent;

   border: 0px;

 }

-#content UL.thumbnailCategories LI {

-  width: 49.7%;		/* 49.8% for 2 per line, 33.3% for 3 per line*/

-}

 H2, .throw {

   color: #eee;

 }