Changeset 5991

Timestamp:

Apr 29, 2010, 2:45:27 PM (14 years ago)

Author:

patdenice

Message:

feature 1502: Add $themeconfload_parent_css parameter

Location:

trunk

Files:

• admin/themes/default/template/header.tpl (modified) (1 diff)
• include/template.class.php (modified) (2 diffs)
• themes/default/template/header.tpl (modified) (1 diff)

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

@@ -15 +15 @@
 
 {foreach from=$themes item=theme}
+{if $theme.load_css}
+<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.id}/theme.css">
+{/if}
 {if isset($theme.local_head)}{include file=$theme.local_head}{/if}
-<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/themes/{$theme.id}/theme.css">
 {/foreach}
 

trunk/include/template.class.php

@@ -103 +103 @@
    * Load theme's parameters.
    */
-  function set_theme($root, $theme, $path)
+  function set_theme($root, $theme, $path, $load_css=true)
   {
     $this->set_template_dir($root.'/'.$theme.'/'.$path);
@@ -111 +111 @@
     if (isset($themeconf['parent']) and $themeconf['parent'] != $theme)
     {
-      $this->set_theme($root, $themeconf['parent'], $path);
-    }
-
-    $tpl_var = array('id' => $theme);
+      if (!isset($themeconf['load_parent_css']))
+      {
+        $themeconf['load_parent_css'] = true;
+      }
+      $this->set_theme($root, $themeconf['parent'], $path, $themeconf['load_parent_css']);
+    }
+
+    $tpl_var = array(
+      'id' => $theme,
+      'load_css' => $load_css,
+    );
     if (!empty($themeconf['local_head']) )
     {

trunk/themes/default/template/header.tpl

@@ -32 +32 @@
 
 {foreach from=$themes item=theme}
+{if $theme.load_css}
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}themes/{$theme.id}/theme.css">
+{/if}
 {if isset($theme.local_head)}{include file=$theme.local_head}{/if}
 {/foreach}