- fix display of thumbnail in IE8 (replaced conditional css includes as it was in version 2.0)

- remove local_head.tpl for default theme (avoid loading another file on every page hit - put the content of local_head.tpl in header.tpl)

git-svn-id: http://piwigo.org/svn/trunk@5923 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2010-04-19 20:53:02 +00:00
parent 94d40c0eab
commit 335cbc9540
3 changed files with 13 additions and 14 deletions
-12
View File
@@ -1,12 +0,0 @@
{* 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 gt IE 6]>
<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">
+13 -1
View File
@@ -34,6 +34,18 @@
<link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.id}/theme.css">
{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}
@@ -68,6 +80,6 @@
<div class="header_notes">
{foreach from=$header_notes item=elt}
<p>{$elt}</p>
{/foreach}
{/foreach}
</div>
{/if}
-1
View File
@@ -3,6 +3,5 @@ $themeconf = array(
'name' => 'default',
'icon_dir' => 'themes/default/icon',
'mime_icon_dir' => 'themes/default/icon/mimetypes/',
'local_head' => 'local_head.tpl',
);
?>