Changeset 7990 for trunk

Timestamp:

Dec 3, 2010, 8:13:33 PM (13 years ago)

Author:

rvelices

Message:

admin theme uses combined_css

Location:

trunk/admin/themes/default

Files:

• local_head.tpl (modified) (1 diff)
• template/header.tpl (modified) (1 diff)

trunk/admin/themes/default/local_head.tpl

@@ +1 @@
+{if $load_css}
 <!--[if lt IE 7]>
-  <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/default/fix-ie5-ie6.css">
+        <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/default/fix-ie5-ie6.css">
 <![endif]-->
+{/if}

trunk/admin/themes/default/template/header.tpl

@@ -14 +14 @@
 <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}