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

5 files changed, 7 insertions, 11 deletions

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.';

+}

 ?>