diff options
author | nikrou <nikrou@piwigo.org> | 2006-06-22 18:17:47 +0000 |
---|---|---|
committer | nikrou <nikrou@piwigo.org> | 2006-06-22 18:17:47 +0000 |
commit | ad45eccd3349d44af4a251ab0f12eb3233cd08b8 (patch) | |
tree | 2924a4d6832bdd18658f15326f40de2ae4ee9105 /template/yoga/header.tpl | |
parent | 84536f02755a328ab689106719ba17c79f09f85d (diff) |
issue 426 step 1 reverted:
svn merge -r1466:1465 .
svn merge -r1463:1462 .
git-svn-id: http://piwigo.org/svn/trunk@1376 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r-- | template/yoga/header.tpl (renamed from template/admin/yoga/header.tpl) | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/template/admin/yoga/header.tpl b/template/yoga/header.tpl index 9776eabe8..d432d7b63 100644 --- a/template/admin/yoga/header.tpl +++ b/template/yoga/header.tpl @@ -4,16 +4,16 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}"> <link rel="shortcut icon" type="image/x-icon" href="{pwg_root}template-common/favicon.ico"> -<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/layout.css"> +<link rel="stylesheet" type="text/css" href="{pwg_root}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="{pwg_root}template/admin/{themeconf:template}/fix-khtml.css"> +<link rel="stylesheet" type="text/nonsense" href="{pwg_root}template/{themeconf:template}/fix-khtml.css"> <!--[if lt IE 7]> -<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/fix-ie5-ie6.css"> +<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/fix-ie5-ie6.css"> <![endif]--> -<link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/admin/{themeconf:template}/print.css"> -<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/default-colors.css"> -<link rel="stylesheet" type="text/css" href="{pwg_root}template/admin/{themeconf:template}/theme/{themeconf:theme}/theme.css"> +<link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/{themeconf:template}/print.css"> +<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/default-colors.css"> +<link rel="stylesheet" type="text/css" href="{pwg_root}template/{themeconf:template}/theme/{themeconf:theme}/theme.css"> <!-- BEGIN next --> <link rel="prefetch" href="{next.U_IMG_SRC}"> <!-- END next --> |