diff options
| author | rvelices <rv-github@modusoptimus.com> | 2010-04-19 20:53:02 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2010-04-19 20:53:02 +0000 |
| commit | 335cbc9540bbc44d8184662d8bd63f933f876139 (patch) | |
| tree | b2f80c4e2c2df7c200c18b9ec3ad9071bfed7347 | |
| parent | 94d40c0eabf5c7be4e3fcf3b50b37c38e1dfaa65 (diff) | |
- 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
| -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, 13 insertions, 14 deletions
diff --git a/themes/default/local_head.tpl b/themes/default/local_head.tpl deleted file mode 100644 index 908a880ae..000000000 --- a/themes/default/local_head.tpl +++ /dev/null @@ -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"> diff --git a/themes/default/template/header.tpl b/themes/default/template/header.tpl index c0dbf9272..604c228e9 100644 --- a/themes/default/template/header.tpl +++ b/themes/default/template/header.tpl @@ -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} diff --git a/themes/default/themeconf.inc.php b/themes/default/themeconf.inc.php index 50ab59819..f5ac7fa32 100644 --- a/themes/default/themeconf.inc.php +++ b/themes/default/themeconf.inc.php @@ -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', ); ?> |