From 81f391a1e441d424d67c9662531c770004aa4d89 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Fri, 3 Dec 2010 19:13:33 +0000
Subject: admin theme uses combined_css

git-svn-id: http://piwigo.org/svn/trunk@7990 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/themes/default/local_head.tpl      | 8 +++++---
 admin/themes/default/template/header.tpl | 5 +++--
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'admin/themes')

diff --git a/admin/themes/default/local_head.tpl b/admin/themes/default/local_head.tpl
index dd2ebc552..b45a62918 100644
--- a/admin/themes/default/local_head.tpl
+++ b/admin/themes/default/local_head.tpl
@@ -1,3 +1,5 @@
-<!--[if lt IE 7]>
-  <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/default/fix-ie5-ie6.css">
-<![endif]-->
+{if $load_css}
+<!--[if lt IE 7]>
+	<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/default/fix-ie5-ie6.css">
+<![endif]-->
+{/if}
\ No newline at end of file
diff --git a/admin/themes/default/template/header.tpl b/admin/themes/default/template/header.tpl
index 7bef274d9..566d12941 100644
--- a/admin/themes/default/template/header.tpl
+++ b/admin/themes/default/template/header.tpl
@@ -13,11 +13,12 @@
 <title>{$GALLERY_TITLE} :: {$PAGE_TITLE}</title>
 <link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico">
 
+{get_combined_css}
 {foreach from=$themes item=theme}
 {if $theme.load_css}
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.id}/theme.css">
+{combine_css path="admin/themes/`$theme.id`/theme.css" order=-10}
 {/if}
-{if isset($theme.local_head)}{include file=$theme.local_head}{/if}
+{if !empty($theme.local_head)}{include file=$theme.local_head load_css=$theme.load_css}{/if}
 {/foreach}
 
 {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=1} {*jQuery is always available by default*}
-- 
cgit v1.2.3