diff options
| author | patdenice <patdenice@piwigo.org> | 2010-04-29 19:40:10 +0000 |
|---|---|---|
| committer | patdenice <patdenice@piwigo.org> | 2010-04-29 19:40:10 +0000 |
| commit | 6506716b114f16d9a9468f62cbe68947a14de9f7 (patch) | |
| tree | d741ede6a93ef744b4348877f119d8a550873eef | |
| parent | a6f0b397dfc19e11b5bb6b4bcd2ab7e990b51bb0 (diff) | |
Rollback revision 5923
git-svn-id: http://piwigo.org/svn/trunk@6004 68402e56-0260-453c-a942-63ccdbb3a9ee
| -rw-r--r-- | themes/default/local_head.tpl | 12 | ||||
| -rw-r--r-- | themes/default/template/header.tpl | 14 | ||||
| -rw-r--r-- | themes/default/themeconf.inc.php | 1 |
3 files changed, 14 insertions, 13 deletions
diff --git a/themes/default/local_head.tpl b/themes/default/local_head.tpl new file mode 100644 index 000000000..80241b851 --- /dev/null +++ b/themes/default/local_head.tpl @@ -0,0 +1,12 @@ +{* 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}themes/default/fix-khtml.css"> +<!--[if lt IE 7]> + <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie5-ie6.css"> +<![endif]--> +<!--[if IE 7]> + <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie7.css"> +<![endif]--> +<!--[if !IE]> <--> + <link rel="stylesheet" href="{$ROOT_URL}themes/default/not-ie.css" type="text/css"> +<!--> <![endif]--> +<link rel="stylesheet" type="text/css" media="print" href="{$ROOT_URL}themes/default/print.css"> diff --git a/themes/default/template/header.tpl b/themes/default/template/header.tpl index 434895819..807196312 100644 --- a/themes/default/template/header.tpl +++ b/themes/default/template/header.tpl @@ -36,18 +36,6 @@ {/if} {if isset($theme.local_head)}{include file=$theme.local_head}{/if} {/foreach} -{* 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}themes/default/fix-khtml.css"> -<!--[if lt IE 7]> - <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie5-ie6.css"> -<![endif]--> -<!--[if IE 7]> - <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/default/fix-ie7.css"> -<![endif]--> -<!--[if !IE]> <--> - <link rel="stylesheet" href="{$ROOT_URL}themes/default/not-ie.css" type="text/css"> -<!--> <![endif]--> -<link rel="stylesheet" type="text/css" media="print" href="{$ROOT_URL}themes/default/print.css"> {if isset($U_PREFETCH) }<link rel="prefetch" href="{$U_PREFETCH}">{/if} @@ -82,6 +70,6 @@ <div class="header_notes"> {foreach from=$header_notes item=elt} <p>{$elt}</p> - {/foreach} + {/foreach} </div> {/if} diff --git a/themes/default/themeconf.inc.php b/themes/default/themeconf.inc.php index f5ac7fa32..50ab59819 100644 --- a/themes/default/themeconf.inc.php +++ b/themes/default/themeconf.inc.php @@ -3,5 +3,6 @@ $themeconf = array( 'name' => 'default', 'icon_dir' => 'themes/default/icon', 'mime_icon_dir' => 'themes/default/icon/mimetypes/', + 'local_head' => 'local_head.tpl', ); ?> |