Changeset 2513

Timestamp:

Sep 9, 2008, 11:53:31 AM (16 years ago)

Author:

rvelices

Message:

• fix typing error in index.tpl
• added template smarty function known_script (e.g.{known_script id="x" src"y.js"}) - useful to avoid double inclusion of a script such as prototype,jquery,... when a template and plugin need it independently (see the use in admin.tpl for example)
• removed unused themeconf.template_dir

Location:

trunk

Files:

• admin/template/yoga/admin.tpl (modified) (1 diff)
• admin/template/yoga/header.tpl (modified) (2 diffs)
• admin/template/yoga/theme/admin/themeconf.inc.php (modified) (1 diff)
• include/template.class.php (modified) (2 diffs)
• picture.php (modified) (1 diff)
• template/yoga/index.tpl (modified) (1 diff)
• template/yoga/theme/Sylvia/themeconf.inc.php (modified) (1 diff)
• template/yoga/theme/clear/themeconf.inc.php (modified) (1 diff)
• template/yoga/theme/dark/themeconf.inc.php (modified) (1 diff)
• template/yoga/theme/p0w0/themeconf.inc.php (modified) (1 diff)
• template/yoga/theme/wipi/themeconf.inc.php (modified) (1 diff)

trunk/admin/template/yoga/admin.tpl

@@ -1 +1 @@
 {* $Id$ *}
+{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js"}
+{known_script id="jquery.ui" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.core.packed.js" }
+{known_script id="jquery.ui.accordion" src=$ROOT_URL|@cat:"template-common/lib/ui/ui.accordion.packed.js" }
+
+<script type="text/javascript">
+jQuery().ready(function(){ldelim}
+  jQuery('#menubar').accordion({ldelim}
+    header: "dt.rdion",
+    event: "click",
+    active: {$themeconf.selected_admin_menu}
+  });
+});
+</script>
+
 <div id="menubar">
   <dl class="first">

trunk/admin/template/yoga/header.tpl

@@ -4 +4 @@
 
           Warning : This is the admin pages header only 
-          don't be confusing with the public page header
+          don't confuse with the public page header
 
 *}
@@ -23 +23 @@
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/default-colors.css">
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/theme/{$themeconf.theme}/theme.css">
+{known_script id="jquery" src=$ROOT_URL|@cat:"template-common/lib/jquery.packed.js" now=1} {*jQuery is always available by default*}
 {$themeconf.local_head}
 <script type="text/javascript" src="{$ROOT_URL}template-common/scripts.js"></script>

trunk/admin/template/yoga/theme/admin/themeconf.inc.php

@@ -52 +52 @@
   'template' => 'yoga',
   'theme' => 'admin',
-  'template_dir' => 'admin/template/yoga',
   'icon_dir' => 'template/yoga/icon',
   'admin_icon_dir' => 'template/yoga/icon/admin',
   'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
-  'local_head' => '
-<!-- New template location for admin -->
-<!-- Admin Accordion Menus -->
-  <script type="text/javascript" src="template-common/lib/jquery.packed.js"></script>
-  <script type="text/javascript" src="template-common/lib/ui/ui.core.packed.js"></script>
-  <script type="text/javascript" src="template-common/lib/ui/ui.accordion.packed.js"></script>
-  <script type="text/javascript">
-  jQuery().ready(function(){
-    jQuery(\'#menubar\').accordion({
-      header: "dt.rdion",
-      event: "click",
-      active: '. selected_admin_menu() . '
-    });
-  });
-  </script>'
+  'selected_admin_menu' => selected_admin_menu(),
+  'local_head' => '',
 );
 ?>

trunk/include/template.class.php

@@ -63 +63 @@
     $this->smarty->register_modifier( 'explode', array('Template', 'mod_explode') );
     $this->smarty->register_block('html_head', array(&$this, 'block_html_head') );
+    $this->smarty->register_function('known_script', array(&$this, 'func_known_script'), false );
     $this->smarty->register_prefilter( array('Template', 'prefilter_white_space') );
     if ( $conf['compiled_template_cache_language'] )
@@ -340 +341 @@
   }
 
+ /**
+   * This smarty "known_script" functions allows to insert well known java scripts
+   * such as prototype, jquery, etc... only once. Examples:
+   * {known_script id="jquery" src="{$ROOT_URL}template-common/lib/jquery.packed.js"}
+   */
+  function func_known_script($params, &$smarty )
+  {
+    if (!isset($params['id']))
+    {
+        $smarty->trigger_error("known_script: missing 'id' parameter");
+        return;
+    }
+    $id = $params['id'];
+    if (! isset( $this->known_scripts[$id] ) )
+    {
+      if (!isset($params['src']))
+      {
+          $smarty->trigger_error("known_script: missing 'src' parameter");
+          return;
+      }
+      $this->known_scripts[$id] = $params['src'];
+      $content = '<script type="text/javascript" src="'.$params['src'].'"></script>';
+      if (isset($params['now']) and $params['now'] and empty($this->output) )
+      {
+        return $content;
+      }
+      $repeat = false;
+      $this->block_html_head(null, $content, $smarty, $repeat);
+    }
+  }
+
   /*static */ function prefilter_white_space($source, &$smarty)
   {

trunk/picture.php

@@ -623 +623 @@
 if ($page['slideshow'])
 {
-  // Add local-slideshow.css file if exists
-  // Not only for ligth
-  $css = PHPWG_ROOT_PATH . get_themeconf('template_dir') . '/theme/'
-       . get_themeconf('theme') . '/local-slideshow.css';
-  if (file_exists($css))
-  {
-    //TODO CORRECT THIS $template->assign_block_vars('slideshow', array());
-  }
-
   $tpl_slideshow = array();
 

trunk/template/yoga/index.tpl

@@ -11 +11 @@
       <select onchange="document.location = this.options[this.selectedIndex].value;">
         {foreach from=$image_orders item=image_order }
-        <option value="{$image_order.URL}"{if $image_order.SELECTED} selected="selected"{/if}}>{$image_order.DISPLAY}</option>
+        <option value="{$image_order.URL}"{if $image_order.SELECTED} selected="selected"{/if}>{$image_order.DISPLAY}</option>
         {/foreach}
       </select>

trunk/template/yoga/theme/Sylvia/themeconf.inc.php

@@ -3 +3 @@
   'template' => 'yoga',
   'theme' => 'Sylvia',
-  'template_dir' => 'template/yoga',
   'icon_dir' => 'template/yoga/icon',
   'admin_icon_dir' => 'template/yoga/icon/admin',
   'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
-  'local_head' => '<!-- no theme specific head content -->',
+  'local_head' => '',
 );
 ?>

trunk/template/yoga/theme/clear/themeconf.inc.php

@@ -3 +3 @@
   'template' => 'yoga',
   'theme' => 'clear',
-  'template_dir' => 'template/yoga',
   'icon_dir' => 'template/yoga/icon',
   'admin_icon_dir' => 'template/yoga/icon/admin',
   'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
-  'local_head' => '<!-- no theme specific head content -->',
+  'local_head' => '',
 );
 ?>

trunk/template/yoga/theme/dark/themeconf.inc.php

@@ -3 +3 @@
   'template' => 'yoga',
   'theme' => 'dark',
-  'template_dir' => 'template/yoga',
   'icon_dir' => 'template/yoga/icon',
   'admin_icon_dir' => 'template/yoga/icon/admin',
   'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
-  'local_head' => '<!-- no theme specific head content -->',
+  'local_head' => '',
 );
 ?>

trunk/template/yoga/theme/p0w0/themeconf.inc.php

@@ -3 +3 @@
   'template' => 'yoga',
   'theme' => 'p0w0',
-  'template_dir' => 'template/yoga',
   'icon_dir' => 'template/yoga/icon',
   'admin_icon_dir' => 'template/yoga/icon/admin',
   'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
-  'local_head' => '<!-- no theme specific head content -->',
+  'local_head' => '',
 );
 ?>

trunk/template/yoga/theme/wipi/themeconf.inc.php

@@ -3 +3 @@
   'template' => 'yoga',
   'theme' => 'wipi',
-  'template_dir' => 'template/yoga',
   'icon_dir' => 'template/yoga/icon',
   'admin_icon_dir' => 'template/yoga/icon/admin',
   'mime_icon_dir' => 'template/yoga/icon/mimetypes/',
-  'local_head' => '<!-- no theme specific head content -->',
+  'local_head' => '',
 );
 if ( !isset($lang['Theme: wipi']) )