0000497: (facultative) themeconf.inc.php can build additional about text for PWG about page (see wipi theme).

git-svn-id: http://piwigo.org/svn/trunk@1834 68402e56-0260-453c-a942-63ccdbb3a9ee

8 files changed, 22 insertions, 20 deletions

diff --git a/about.php b/about.php
index c25bd5712..cb23cf1fa 100644
--- a/about.php
+++ b/about.php
@@ -42,18 +42,31 @@ $title= $lang['about_page_title'];
 $page['body_id'] = 'theAboutPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 
+/**
+ * set in ./language/en_UK.iso-8859-1/local.lang.php (maybe to create)
+ * for example for clear theme:
+  $lang['Theme: clear'] = 'This is the clear theme based on yoga template. '.
+  ' A standard template/theme of PhpWebgallery.';
+ *
+ * Don't forget php tags !!!
+ *
+ * Another way is to code it thru the theme itself in ./themeconf.inc.php
+ */
+@include(PHPWG_ROOT_PATH.'template/'.$user['template'].
+  '/theme/'.$user['theme'].'/themeconf.inc.php');
+
 $template->set_filenames(
   array(
     'about'=>'about.tpl',
     'about_content' => get_language_filepath('about.html')
     )
   );
-if ( isset( $themeconf['About']) and $themeconf['About']!=='' )
+if ( isset($lang['Theme: '.$user['theme']]) )
 {
   $template->assign_block_vars(
   'theme',
   array(
-    'ABOUT' => l10n($themeconf['About']),
+    'ABOUT' => l10n('Theme: '.$user['theme']),
     )
   );
 }
diff --git a/language/en_UK.iso-8859-1/about.html b/language/en_UK.iso-8859-1/about.html
index 36ad2557b..b5a46d006 100644
--- a/language/en_UK.iso-8859-1/about.html
+++ b/language/en_UK.iso-8859-1/about.html
@@ -1,5 +1,3 @@
-<ul>
-
   <li>PhpWebGallery is a web application giving you the possibility to
   create an online images gallery easily.</li>
 
@@ -10,4 +8,3 @@
   href="http://www.phpwebgallery.net">PhpWebGallery</a> official site, and
   its dedicated <a href="http://forum.phpwebgallery.net">forum</a>.</li>
 
-</ul>
diff --git a/language/fr_FR.iso-8859-1/about.html b/language/fr_FR.iso-8859-1/about.html
index 1eb394b37..56bd9535b 100644
--- a/language/fr_FR.iso-8859-1/about.html
+++ b/language/fr_FR.iso-8859-1/about.html
@@ -1,5 +1,3 @@
-<ul>
-
   <li>PhpWebGallery est une application web permettant de créer facilement
 une galerie d'images en ligne.</li>
 
@@ -8,5 +6,3 @@ données MySQL.</li>
 
   <li>Si vous avez des suggestions ou des commentaires, visitez le <a
   href="http://www.phpwebgallery.net">site officiel</a>.</li>
-
-</ul>
diff --git a/template/yoga/about.tpl b/template/yoga/about.tpl
index 77af4ada5..2769ec71e 100644
--- a/template/yoga/about.tpl
+++ b/template/yoga/about.tpl
@@ -9,11 +9,10 @@
     </ul>
     <h2>{lang:About}</h2>
   </div>
-
+  <ul>
   {ABOUT_MESSAGE}
   <!-- BEGIN theme -->
-  <ul>
   <li>{theme.ABOUT}</li>
-  </ul>
   <!-- END theme -->
+  </ul>
 </div>
diff --git a/template/yoga/theme/clear/themeconf.inc.php b/template/yoga/theme/clear/themeconf.inc.php
index 02831007d..5e3aef9a0 100644
--- a/template/yoga/theme/clear/themeconf.inc.php
+++ b/template/yoga/theme/clear/themeconf.inc.php
@@ -1,5 +1,4 @@
 <?php
-global $themeconf; /* Share $themeconf if About is used */
 $themeconf = array(
   'template' => 'yoga',
   'theme' => 'clear',
@@ -8,6 +7,5 @@ $themeconf = array(
   'admin_icon_dir' => 'template/yoga/icon/admin',
   'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
   'local_head' => '<!-- no theme specific head content -->',
-  'About' => '', /* About text to display on About screen */
 );
 ?>
diff --git a/template/yoga/theme/dark/themeconf.inc.php b/template/yoga/theme/dark/themeconf.inc.php
index 324997c69..bdee2e443 100644
--- a/template/yoga/theme/dark/themeconf.inc.php
+++ b/template/yoga/theme/dark/themeconf.inc.php
@@ -1,5 +1,4 @@
 <?php
-global $themeconf; /* Share $themeconf if About is used */
 $themeconf = array(
   'template' => 'yoga',
   'theme' => 'dark',
@@ -8,6 +7,5 @@ $themeconf = array(
   'admin_icon_dir' => 'template/yoga/icon/admin',
   'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
   'local_head' => '<!-- no theme specific head content -->',
-  'About' => '', /* About text to display on About screen */
 );
 ?>
diff --git a/template/yoga/theme/p0w0/themeconf.inc.php b/template/yoga/theme/p0w0/themeconf.inc.php
index b1e1a421e..d24b701ca 100644
--- a/template/yoga/theme/p0w0/themeconf.inc.php
+++ b/template/yoga/theme/p0w0/themeconf.inc.php
@@ -1,5 +1,4 @@
 <?php
-global $themeconf; /* Share $themeconf if About is used */
 $themeconf = array(
   'template' => 'yoga',
   'theme' => 'p0w0',
@@ -8,6 +7,5 @@ $themeconf = array(
   'admin_icon_dir' => 'template/yoga/icon/admin',
   'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
   'local_head' => '<!-- no theme specific head content -->',
-  'About' => '', /* About text to display on About screen */
 );
 ?>
diff --git a/template/yoga/theme/wipi/themeconf.inc.php b/template/yoga/theme/wipi/themeconf.inc.php
index 853f01c8b..05c933e08 100644
--- a/template/yoga/theme/wipi/themeconf.inc.php
+++ b/template/yoga/theme/wipi/themeconf.inc.php
@@ -1,5 +1,4 @@
 <?php

-global $themeconf; /* Share $themeconf if About is used */

 $themeconf = array(

   'template' => 'yoga',

   'theme' => 'wipi',

@@ -8,6 +7,10 @@ $themeconf = array(
   'admin_icon_dir' => 'template/yoga/icon/admin',

   'mime_icon_dir' => 'template/yoga/icon/mimetypes/',

   'local_head' => '<!-- no theme specific head content -->',

-  'About' => '', /* About text to display on About screen */

 );

+if ( !isset($lang['Theme: wipi']) )

+{

+  $lang['Theme: wipi'] = 'The site is displayed with wipi theme based ' .

+  ' on yoga template, a standard template/theme of PhpWebgallery.';

+}

 ?>