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

1 files changed, 8 insertions, 26 deletions

diff --git a/template/default/header.tpl b/themes/default/template/header.tpl
index 74bc82b13..07c020405 100644
--- a/template/default/header.tpl
+++ b/themes/default/template/header.tpl
@@ -20,7 +20,7 @@
 {if (isset($REVERSE) and $REVERSE and $PAGE_TITLE == l10n('home'))}
 <title>{$GALLERY_TITLE} | {$PAGE_TITLE}</title>{else}
 <title>{$PAGE_TITLE} | {$GALLERY_TITLE}</title>{/if}
-<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}template-common/favicon.ico">
+<link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico">
 
 <link rel="start" title="{'Home'|@translate}" href="{$U_HOME}" >
 <link rel="search" title="{'Search'|@translate}" href="{$ROOT_URL}search.php" >
@@ -30,36 +30,18 @@
 {if isset($last.U_IMG)    }<link rel="last" title="{'Last'|@translate}" href="{$last.U_IMG}" >{/if}
 {if isset($U_UP)          }<link rel="up" title="{'Thumbnails'|@translate}" href="{$U_UP}" >{/if}
 
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/layout.css">
-{* the next css is used to fix khtml (Konqueror/Safari) issue the "text/nonsense" prevents gecko based browsers to load it *}
-<link rel="stylesheet" type="text/nonsense" href="{$ROOT_URL}template/{$themeconf.template}/fix-khtml.css">
-<!--[if lt IE 7]>
-	<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/fix-ie5-ie6.css">
-<![endif]-->
-<!--[if gt IE 6]>
-	<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/fix-ie7.css">
-<![endif]-->
-<!--[if !IE]> <-->
-	<link rel="stylesheet" href="{$ROOT_URL}template/{$themeconf.template}/not-ie.css" type="text/css">
-<!--> <![endif]-->
-<link rel="stylesheet" type="text/css" media="print" href="{$ROOT_URL}template/{$themeconf.template}/print.css">
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
-{$themeconf.local_head}
+{foreach from=$themes item=theme}
+{if isset($theme.local_head)}{include file=$theme.local_head}{/if}
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.name}/theme.css">
+{/foreach}
+
 {if isset($U_PREFETCH)          }<link rel="prefetch" href="{$U_PREFETCH}">{/if}
 
 {if not empty($page_refresh)    }<meta http-equiv="refresh" content="{$page_refresh.TIME};url={$page_refresh.U_REFRESH}">{/if}
 
-<script type="text/javascript" src="{$ROOT_URL}template-common/scripts.js"></script>
+<script type="text/javascript" src="{$ROOT_URL}{$themeconf.js_dir}/scripts.js"></script>
 <!--[if lt IE 7]>
-<style>
-	{* only because we need {$ROOT_URL} otherwise use fix-ie5-ie6.css *}
-	BODY {ldelim} behavior:url("{$ROOT_URL}template-common/csshover.htc"); }
-	A IMG, .button, .icon {ldelim}
-		behavior:url("{$ROOT_URL}template-common/tooltipfix.htc");
-	}
-	FORM {ldelim} behavior: url("{$ROOT_URL}template-common/inputfix.htc"); }
-</style>
-<script type="text/javascript" src="{$ROOT_URL}template-common/pngfix.js"></script>
+<script type="text/javascript" src="{$ROOT_URL}{$themeconf.js_dir}/pngfix.js"></script>
 <![endif]-->
 
 {if not empty($head_elements)}