Changeset 2549

Timestamp:

Sep 18, 2008, 11:26:33 PM (16 years ago)

Author:

vdigital

Message:

Extend_for_templates include slideshow.tpl overides.
menubar.tpl is no longer supported by Extend_for_templates.
Titling_categories.tpl was in error (Wrong recent icon var)

Location:

trunk

Files:

• admin/extend_for_templates.php (modified) (3 diffs)
• picture.php (modified) (2 diffs)
• template-extension/distributed/samples/titling_categories.tpl (modified) (1 diff)

trunk/admin/extend_for_templates.php

@@ -113 +113 @@
     'thumbnails.tpl'          => 'index_thumbnails',
     'redirect.tpl'            => 'redirect',
-    'menubar.tpl'             => 'menubar',
+ // 'menubar.tpl'             => 'menubar', // TODO by blocks
     'header.tpl'              => 'header',
     'footer.tpl'              => 'tail',
@@ -120 +120 @@
     'notification.tpl'        => 'notification',
     'picture_content.tpl'     => 'default_content',
-    'slideshow.tpl'           => 'picture', /* => slideshow is missing */ 
     'picture.tpl'             => 'picture',
     'popuphelp.tpl'           => 'popuphelp',
@@ -128 +127 @@
     'search.tpl'              => 'search',
     'search_rules.tpl'        => 'search_rules',
+    'slideshow.tpl'           => 'slideshow',
     'tags.tpl'                => 'tags',
     'upload.tpl'              => 'upload',);

trunk/picture.php

@@ -551 +551 @@
   $page['slideshow'] = false;
 }
-
-$template->set_filenames(
-  array(
-    'picture' =>
-      (($page['slideshow'] and $conf['light_slideshow']) ? 'slideshow.tpl' : 'picture.tpl'),
-    ));
-
+if ($page['slideshow'] and $conf['light_slideshow'])
+{
+  $template->set_filenames( array('slideshow' => 'slideshow.tpl'));
+}
+else
+{
+  $template->set_filenames( array('picture' => 'picture.tpl'));
+}
 
 $title =  $picture['current']['name'];
@@ -949 +950 @@
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 trigger_action('loc_end_picture');
-$template->pparse('picture');
+if ($page['slideshow'] and $conf['light_slideshow'])
+{
+  $template->pparse('slideshow');
+}
+else
+{
+  $template->pparse('picture');
+}
 //------------------------------------------------------------ log informations
 pwg_log($picture['current']['id'], 'picture');

trunk/template-extension/distributed/samples/titling_categories.tpl

@@ -17 +17 @@
     <div class="unbordered"> {*                                                   W3C HTML non conform *}
     <h3> {*                                               2nd difference: h3 is outside of description *}
-      <a href="{$cat.URL}">{$cat.NAME}</a>{$cat.ICON}
+      <a href="{$cat.URL}">{$cat.NAME}</a>{$cat.ICON_TS}
     </h3>
     <li>