Changeset 7975 for trunk/themes

Timestamp:

Dec 2, 2010, 8:46:30 PM (13 years ago)

Author:

rvelices

Message:

new template features: combine_script, footer_script and get_combined_scripts
migrated public templates only; need more code doc

Location:

trunk/themes/default/template

Files:

• footer.tpl (modified) (1 diff)
• header.tpl (modified) (1 diff)
• include/datepicker.inc.tpl (modified) (3 diffs)
• include/resize.inc.tpl (modified) (2 diffs)
• index.tpl (modified) (1 diff)
• picture.tpl (modified) (4 diffs)
• search.tpl (modified) (2 diffs)

trunk/themes/default/template/footer.tpl

@@ -19 +19 @@
   {/if}
 
+{get_combined_scripts load='footer'}
 
 {if isset($footer_elements)}

trunk/themes/default/template/header.tpl

@@ -41 +41 @@
 
 {if not empty($page_refresh)    }<meta http-equiv="refresh" content="{$page_refresh.TIME};url={$page_refresh.U_REFRESH}">{/if}
-
+{*
 <script type="text/javascript" src="{$ROOT_URL}themes/default/js/scripts.js"></script>
+*}
 <!--[if lt IE 7]>
 <script type="text/javascript" src="{$ROOT_URL}themes/default/js/pngfix.js"></script>
 <![endif]-->
+
+{get_combined_scripts load='header'}
 
 {if not empty($head_elements)}

trunk/themes/default/template/include/datepicker.inc.tpl

@@ -1 +1 @@
 
-{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.datepicker" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.datepicker.packed.js"}
-{known_script id="datepicker.js" src=$ROOT_URL|@cat:"themes/default/js/datepicker.js"}
+{combine_script id='jquery' load='footer' path='themes/default/js/jquery.packed.js'}
+{combine_script id='jquery.ui' load='footer' require='jquery' path='themes/default/js/ui/packed/ui.core.packed.js'}
+{combine_script id='jquery.ui.datepicker' load='footer' require='jquery.ui' path='themes/default/js/ui/packed/ui.datepicker.packed.js'}
+{combine_script id='datepicker.js' load='footer' require='jquery.ui.datepicker' path='themes/default/js/datepicker.js'}
 
 {assign var="datepicker_language" value="themes/default/js/ui/i18n/ui.datepicker-"|@cat:$lang_info.code|@cat:".js"}
 
 {if "PHPWG_ROOT_PATH"|@constant|@cat:$datepicker_language|@file_exists}
-{known_script id="jquery.ui.datepicker-$lang_info.code" src=$ROOT_URL|@cat:$datepicker_language}
+{combine_script id="jquery.ui.datepicker-$lang_info.code" path=$datepicker_language}
 {/if}
 
@@ -15 +15 @@
 {/html_head}
 
-<script type="text/javascript">
+{footer_script}
 function pwg_initialization_datepicker(day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date)
 {ldelim}
@@ -22 +22 @@
     day, month, year, linked_date, checked_on_change, min_linked_date, max_linked_date);
 }
-</script>
+{/footer_script}

trunk/themes/default/template/include/resize.inc.tpl

@@ -1 @@
-{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
-{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
-{known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.resizable.packed.js"}
+{combine_script id='jquery' load='footer' path='themes/default/js/jquery.packed.js'}
+{combine_script id='jquery.ui' load='footer' require='jquery' path='themes/default/js/ui/packed/ui.core.packed.js'}
+{combine_script id='jquery.ui.resizable' load='footer' require='jquery.ui' path='themes/default/js/ui/packed/ui.resizable.packed.js'}
 
 {* Resize possible *}
-{literal}
-<script type="text/javascript">
+{footer_script}{literal}
   jQuery().ready(function(){
     // Resize possible for list
@@ -19 +18 @@
     });
   });
-</script>
-{/literal}
+{/literal}{/footer_script}
+

trunk/themes/default/template/index.tpl

@@ -28 +28 @@
 
       {if isset($U_SEARCH_RULES) }
+                        {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
       <li><a href="{$U_SEARCH_RULES}" onclick="popuphelp(this.href); return false;" title="{'Search rules'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/search_rules.png" class="button" alt="(?)"></a></li>
       {/if}

trunk/themes/default/template/picture.tpl

@@ -60 +60 @@
     {/if}
     {if isset($U_CADDIE) }{*caddie management BEGIN*}
+{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
 <script type="text/javascript">
 {literal}function addToCadie(aElement, rootUrl, id)
@@ -209 +210 @@
                         {/if}
                         {/foreach}
+                        {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
+                        {combine_script id='rating' load='async' require='core.scripts' path='themes/default/js/rating.js'}
                         <script type="text/javascript">
                                 var _pwgRatingAutoQueue = _pwgRatingAutoQueue || [];
@@ -214 +217 @@
                                         updateRateText: "{'Update your rating'|@translate|@escape:'javascript'}", updateRateElement: document.getElementById("updateRate"),
                                         ratingSummaryText: "{'%.2f (rated %d times)'|@translate|@escape:'javascript'}", ratingSummaryElement: document.getElementById("ratingSummary") {rdelim} );
-                                (function () {ldelim}
+                                /*(function () {ldelim}
                                 var s = document.createElement('script'); s.type = 'text/javascript'; s.async = true; s.src = '{$ROOT_URL}themes/default/js/rating.js';
                                 var s0 = document.getElementsByTagName('script')[0]; s0.parentNode.insertBefore(s, s0);
-                                })();
+                                })();*/
                         </script>
                         </div>
@@ -229 +232 @@
                 <td class="label">{'Who can see this photo?'|@translate}</td>
                 <td class="value"> 
+{combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
 <script type="text/javascript">
 {literal}function setPrivacyLevel(selectElement, rootUrl, id, level)

trunk/themes/default/template/search.tpl

@@ -1 +1 @@
 
 {* Example of resizeable *}
-{*
+
 {include file='include/resize.inc.tpl'}
-*}
+
 
 {* Example of datepicker *}
-{*
+
 {include file='include/datepicker.inc.tpl'}
 
-{literal}
-<script type="text/javascript">
+{footer_script}{literal}
   pwg_initialization_datepicker("#start_day", "#start_month", "#start_year", "#start_linked_date", null, null, "#end_linked_date");
   pwg_initialization_datepicker("#end_day", "#end_month", "#end_year", "#end_linked_date", null, "#start_linked_date", null);
  jQuery().ready(function(){ $(".date_today").hide(); });
-</script>
-{/literal}
-*}
+{/literal}{/footer_script}
+
 
 <div id="content" class="content">
@@ -22 +20 @@
   <div class="titrePage">
     <ul class="categoryActions">
+                        {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
       <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
       <li><a href="{$U_HOME}" title="{'Home'|@translate}" rel="Home"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'Home'|@translate}"></a></li>