Changeset 5177

Timestamp:

Mar 18, 2010, 7:40:00 PM (14 years ago)

Author:

rvelices

Message:

• allow template class to be instantiated with an empty theme (in plugins for example)
• local_head must now be defined in the themeconf.inc.php otherwise not taken into account (avoid several calls to file_exists)
• renamed themeconftheme to themeconfname (this is what it is themeconf[theme] is confusing)

Location:

trunk

Files:

• admin/themes/clear/themeconf.inc.php (modified) (1 diff)
• admin/themes/default/themeconf.inc.php (modified) (1 diff)
• admin/themes/roma/themeconf.inc.php (modified) (1 diff)
• include/template.class.php (modified) (7 diffs)
• themes/Sylvia/themeconf.inc.php (modified) (1 diff)
• themes/clear/themeconf.inc.php (modified) (1 diff)
• themes/dark/themeconf.inc.php (modified) (1 diff)
• themes/default/themeconf.inc.php (modified) (1 diff)

trunk/admin/themes/clear/themeconf.inc.php

@@ -1 +1 @@
 <?php
 $themeconf = array(
-  'theme'    => 'clear',
+  'name'    => 'clear',
   'parent'   => 'default',
   'admin_icon_dir' => 'admin/themes/clear/icon',

trunk/admin/themes/default/themeconf.inc.php

@@ -1 +1 @@
 <?php
 $themeconf = array(
-  'theme'          => 'default',
+  'name'          => 'default',
   'icon_dir'       => 'themes/default/icon',
   'admin_icon_dir' => 'admin/themes/default/icon',
   'mime_icon_dir'  => 'themes/default/icon/mimetypes/',
+  'local_head'     => 'local_head.tpl',
 );
 ?>

trunk/admin/themes/roma/themeconf.inc.php

@@ -1 +1 @@
 <?php
 $themeconf = array(
-  'theme'  => 'roma',
+  'name'  => 'roma',
   'parent' => 'default',
 );

trunk/include/template.class.php

@@ -25 +25 @@
 require_once(PHPWG_ROOT_PATH.'include/smarty/libs/Smarty.class.php');
 
-// migrate lang:XXX
-//    sed "s/{lang:\([^}]\+\)}/{\'\1\'|@translate}/g" my_template.tpl
-// migrate change root level vars {XXX}
-//    sed "s/{pwg_root}/{ROOT_URL}/g" my_template.tpl
-// migrate change root level vars {XXX}
-//    sed "s/{\([a-zA-Z_]\+\)}/{$\1}/g" my_template.tpl
-// migrate all
-//    cat my_template.tpl | sed "s/{lang:\([^}]\+\)}/{\'\1\'|@translate}/g" | sed "s/{pwg_root}/{ROOT_URL}/g" | sed "s/{\([a-zA-Z_]\+\)}/{$\1}/g"
-
 
 class Template {
@@ -49 +40 @@
   // Templates prefilter from external sources (plugins)
   var $external_filters = array();
-  
+
   // used by html_head smarty block to add content before </head>
   var $html_head_elements = array();
@@ -79 +70 @@
 
     $this->smarty->template_dir = array();
-    $this->set_theme($root, $theme, $path);
+    if ( !empty($theme) )
+      $this->set_theme($root, $theme, $path);
+    else
+      $this->set_template_dir($root);
 
     $this->smarty->assign('lang_info', $lang_info);
@@ -104 +98 @@
     }
 
-    $tpl_var = array('name' => $themeconf['theme']);
-    if (file_exists($root.'/'.$theme.'/local_head.tpl'))
-    {
-      $tpl_var['local_head'] = realpath($root.'/'.$theme.'/local_head.tpl');
+    $tpl_var = array('name' => $themeconf['name']);
+    if (!empty($themeconf['local_head']) )
+    {
+      $tpl_var['local_head'] = realpath($root.'/'.$theme.'/'.$themeconf['local_head'] );
     }
     $this->smarty->append('themes', $tpl_var);
@@ -469 +463 @@
     ksort($this->external_filters[$handle]);
   }
-  
+
  /**
    * This function actually triggers the filters on the tpl files.
@@ -480 +474 @@
     {
       $compile_id = '';
-      foreach ($this->external_filters[$handle] as $filters) 
-      {
-        foreach ($filters as $filter) 
+      foreach ($this->external_filters[$handle] as $filters)
+      {
+        foreach ($filters as $filter)
         {
           list($type, $callback) = $filter;
@@ -497 +491 @@
     if (isset($this->external_filters[$handle]))
     {
-      foreach ($this->external_filters[$handle] as $filters) 
-      {
-        foreach ($filters as $filter) 
+      foreach ($this->external_filters[$handle] as $filters)
+      {
+        foreach ($filters as $filter)
         {
           list($type, $callback) = $filter;

trunk/themes/Sylvia/themeconf.inc.php

@@ -1 +1 @@
 <?php
 $themeconf = array(
-  'theme'         => 'Sylvia',
+  'name'         => 'Sylvia',
   'parent'        => 'default',
   'icon_dir'      => 'themes/Sylvia/icon',

trunk/themes/clear/themeconf.inc.php

@@ -1 +1 @@
 <?php
 $themeconf = array(
-  'theme'  => 'clear',
+  'name'  => 'clear',
   'parent' => 'default',
 );

trunk/themes/dark/themeconf.inc.php

@@ -1 +1 @@
 <?php
 $themeconf = array(
-  'theme'  => 'dark',
+  'name'  => 'dark',
   'parent' => 'default',
 );

trunk/themes/default/themeconf.inc.php

@@ -1 +1 @@
 <?php
 $themeconf = array(
-  'theme'         => 'default',
+  'name'         => 'default',
   'icon_dir'      => 'themes/default/icon',
   'mime_icon_dir' => 'themes/default/icon/mimetypes/',
+  'local_head'    => 'local_head.tpl',
 );
 ?>