Changeset 2713

Timestamp:

Oct 11, 2008, 2:57:31 PM (16 years ago)

Author:

patdenice

Message:

Merge from trunk 2712:

• Add known_template function (maybe we can change function name).
• Template extensions are working with menubar blocks templates.

Location:

branches/2.0

Files:

• admin/extend_for_templates.php (modified) (1 diff)
• include/template.class.php (modified) (2 diffs)
• plugins/LocalFilesEditor/admin.php (modified) (1 diff)
• template/yoga/menubar.tpl (modified) (1 diff)

branches/2.0/admin/extend_for_templates.php

@@ -74 +74 @@
 /* Link all supported templates to their respective handle */
 $eligible_templates = array(
-    '----------'              => 'N/A',
-    'about.tpl'               => 'about',
-    'identification.tpl'      => 'identification',
-    'mainpage_categories.tpl' => 'index_category_thumbnails',
-    'thumbnails.tpl'          => 'index_thumbnails',
-    'redirect.tpl'            => 'redirect',
- // 'menubar.tpl'             => 'menubar', // TODO by blocks
-    'header.tpl'              => 'header',
-    'footer.tpl'              => 'tail',
-    'index.tpl'               => 'index',
-    'nbm.tpl'                 => 'nbm',
-    'notification.tpl'        => 'notification',
-    'picture_content.tpl'     => 'default_content',
-    'picture.tpl'             => 'picture',
-    'popuphelp.tpl'           => 'popuphelp',
-    'profile.tpl'             => 'profile',
-    'profile_content.tpl'     => 'profile_content',
-    'register.tpl'            => 'register',
-    'search.tpl'              => 'search',
-    'search_rules.tpl'        => 'search_rules',
-    'slideshow.tpl'           => 'slideshow',
-    'tags.tpl'                => 'tags',
-    'upload.tpl'              => 'upload',);
+    '----------'                 => 'N/A',
+    'about.tpl'                  => 'about',
+    'identification.tpl'         => 'identification',
+    'mainpage_categories.tpl'    => 'index_category_thumbnails',
+    'thumbnails.tpl'             => 'index_thumbnails',
+    'redirect.tpl'               => 'redirect',
+    'menubar.tpl'                => 'menubar',
+    'menubar_categories.tpl'     => 'mbCategories',
+    'menubar_identification.tpl' => 'mbIdentification',
+    'menubar_links.tpl'          => 'mbLinks',
+    'menubar_menu.tpl'           => 'mbMenu',
+    'menubar_specials.tpl'       => 'mbSpecials',
+    'menubar_tags.tpl'           => 'mbTags',
+    'header.tpl'                 => 'header',
+    'footer.tpl'                 => 'tail',
+    'index.tpl'                  => 'index',
+    'nbm.tpl'                    => 'nbm',
+    'notification.tpl'           => 'notification',
+    'picture_content.tpl'        => 'default_content',
+    'picture.tpl'                => 'picture',
+    'popuphelp.tpl'              => 'popuphelp',
+    'profile.tpl'                => 'profile',
+    'profile_content.tpl'        => 'profile_content',
+    'register.tpl'               => 'register',
+    'search.tpl'                 => 'search',
+    'search_rules.tpl'           => 'search_rules',
+    'slideshow.tpl'              => 'slideshow',
+    'tags.tpl'                   => 'tags',
+    'upload.tpl'                 => 'upload',);
   $flip_templates = array_flip($eligible_templates);
 // +-----------------------------------------------------------------------+

branches/2.0/include/template.class.php

@@ -67 +67 @@
     $this->smarty->register_block('html_head', array(&$this, 'block_html_head') );
     $this->smarty->register_function('known_script', array(&$this, 'func_known_script') );
+    $this->smarty->register_function('known_template', array(&$this, 'func_known_template') );
     $this->smarty->register_prefilter( array('Template', 'prefilter_white_space') );
     if ( $conf['compiled_template_cache_language'] )
@@ -409 +410 @@
   }
 
+ /**
+   * This smarty "known_template" functions allows to include template
+   * If extent[$params['id']] exists, include template extension
+   * else include $params[$file]
+   */  
+  function func_known_template($params, &$smarty )
+  {
+    if (!isset($params['file']))
+    {
+      $smarty->trigger_error("known_template: missing 'file' parameter");
+      return;
+    }
+
+    if (isset($params['id']) and isset($this->extents[$params['id']]))
+    {
+      $file = $this->extents[$params['id']];
+    }
+    else
+    {
+      $file = $params['file'];
+    }
+
+    return $smarty->_smarty_include(array(
+             'smarty_include_tpl_file' => $file,
+             'smarty_include_vars' => array()
+             ));
+  }
+
   static function prefilter_white_space($source, &$smarty)
   {

branches/2.0/plugins/LocalFilesEditor/admin.php

@@ -185 +185 @@
           'thumbnails.tpl',
           'redirect.tpl',
-          // 'menubar.tpl' 
+          'menubar.tpl',
+          'menubar_categories.tpl',
+          'menubar_identification.tpl',
+          'menubar_links.tpl',
+          'menubar_menu.tpl',
+          'menubar_specials.tpl',
+          'menubar_tags.tpl',
           'header.tpl',
           'footer.tpl',

branches/2.0/template/yoga/menubar.tpl

@@ -5 +5 @@
         <dl id="{$id}">
                 {if not empty($block->template)}
-                {include file=$block->template }
+                {known_template id=$id file=$block->template }
                 {else}
                 {$block->raw_content|@default}