feature 1502: based on Dotclear model, P@t has reorganized the way Piwigo

manages template/theme in a simpler "theme only level" architecture. It
supports multiple level inheritance.

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

7 files changed, 63 insertions, 7 deletions

diff --git a/themes/wipi/images/index.php b/themes/wipi/images/index.php
new file mode 100644
index 000000000..871b52b6a
--- /dev/null
+++ b/themes/wipi/images/index.php
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/template/yoga/theme/wipi/images/tableh1_bg.png b/themes/wipi/images/tableh1_bg.png
index 8163e23bf..8163e23bf 100644
--- a/template/yoga/theme/wipi/images/tableh1_bg.png
+++ b/themes/wipi/images/tableh1_bg.png
diff --git a/template/yoga/theme/wipi/images/tableh2_bg.png b/themes/wipi/images/tableh2_bg.png
index be06ee428..be06ee428 100644
--- a/template/yoga/theme/wipi/images/tableh2_bg.png
+++ b/themes/wipi/images/tableh2_bg.png
diff --git a/themes/wipi/index.php b/themes/wipi/index.php
new file mode 100644
index 000000000..871b52b6a
--- /dev/null
+++ b/themes/wipi/index.php
@@ -0,0 +1,30 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | Piwigo - a PHP based picture gallery                                  |
+// +-----------------------------------------------------------------------+
+// | Copyright(C) 2008-2009 Piwigo Team                  http://piwigo.org |
+// | Copyright(C) 2003-2008 PhpWebGallery Team    http://phpwebgallery.net |
+// | Copyright(C) 2002-2003 Pierrick LE GALL   http://le-gall.net/pierrick |
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+// Recursive call
+$url = '../';
+header( 'Request-URI: '.$url );
+header( 'Content-Location: '.$url );
+header( 'Location: '.$url );
+exit();
+?>
diff --git a/template/yoga/theme/wipi/mail-css.tpl b/themes/wipi/mail-css.tpl
index a99f13c5a..a8da286b3 100644
--- a/template/yoga/theme/wipi/mail-css.tpl
+++ b/themes/wipi/mail-css.tpl
@@ -5,7 +5,7 @@ body {ldelim} background-color:#111; color:#69c;}
 #content {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/header-bg.png) no-repeat scroll left top;}
 #copyright {ldelim} background: transparent url({$ROOT_URL}template/{$themeconf.template}/mail/text/html/images/footer-bg.png) no-repeat scroll left bottom;
 color: #69c;}
-h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/images/tableh1_bg.png);}
+h2 {ldelim} background-color: #222;color:#eee;background-image: url({$ROOT_URL}template/{$themeconf.template}/themes/{$themeconf.theme}/images/tableh1_bg.png);}
 img {ldelim} margin: 16px; padding:15px;border:1px solid #eee; -moz-border-radius: 4px; border-radius: 4px 4px; }
 img:hover {ldelim} border:1px solid #69c; -moz-border-radius: 4px; border-radius: 4px 4px; }
 a {ldelim} color: #69c; background: transparent; }
diff --git a/template/yoga/theme/wipi/theme.css b/themes/wipi/theme.css
index 670d3a57d..670d3a57d 100644
--- a/template/yoga/theme/wipi/theme.css
+++ b/themes/wipi/theme.css
diff --git a/template/yoga/theme/wipi/themeconf.inc.php b/themes/wipi/themeconf.inc.php
index 6644a7590..384e22769 100644
--- a/template/yoga/theme/wipi/themeconf.inc.php
+++ b/themes/wipi/themeconf.inc.php
@@ -1,11 +1,7 @@
 <?php
 $themeconf = array(
-  'template' => 'yoga',
-  'theme' => 'wipi',
-  'icon_dir' => 'template/yoga/icon',
-  'admin_icon_dir' => 'template/yoga/icon/admin',
-  'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
-  'local_head' => '',
+  'theme'  => 'wipi',
+  'parent' => 'default',
 );
 if ( !isset($lang['Theme: wipi']) )
 {