Changeset 10611 for extensions/piclens/admin

Timestamp:

Apr 25, 2011, 3:51:54 PM (13 years ago)

Author:

Gotcha

Message:

combine_script remplace known_script
bug:2276

Location:

extensions/piclens/admin

Files:

• config.tpl (modified) (2 diffs)
• piclenswallconfig.tpl (modified) (3 diffs)
• piclenswallconfig2.tpl (modified) (3 diffs)

extensions/piclens/admin/config.tpl

@@ +1 @@
+{include file='include/autosize.inc.tpl'}
 
-{include file='include/autosize.inc.tpl'}
-{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
-{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
-<script type="text/javascript">
-jQuery().ready(function(){ldelim}
-  jQuery('.cluetip').cluetip({ldelim}
+{combine_script id='jquery.packed' path='themes/default/js/jquery.packed.js'}
+{combine_script id='jquery.cluetip' load='footer' require='jquery' path='themes/default/js/plugins/jquery.cluetip.js'}
+ 
+{footer_script require='jquery.cluetip'}{literal}
+jQuery(document).ready(function(){
+  jQuery('.cluetip').cluetip({
     width: 400,
     splitTitle: '|'
   });
 });
-</script>
+{/literal}{/footer_script}
 
 {html_head}
-{literal}
 
-<script type="text/javascript">
+{footer_script}{literal}
 
 window.onload = load;
@@ -36 +36 @@
 }
 
-</script>
+{/literal}{/footer_script}
 
-
-{/literal}
 {/html_head}
 

extensions/piclens/admin/piclenswallconfig.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.packed' path='themes/default/js/jquery.packed.js'}
 
 {html_head}
 {/html_head}
-
-
 
 <div class="titrePage">
@@ -155 +151 @@
                 
         </table>
-{literal}
-<script type="text/javascript">
+{footer_script require='jquery.ui.core.packed,jquery.ui.resizable.packed'}{literal}
 resize = false;
 function show_cat_list()
@@ -216 +211 @@
 }
 
-</script>
-{/literal}
+{/literal}{/footer_script}
 
 <br/>

extensions/piclens/admin/piclenswallconfig2.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.packed' path='themes/default/js/jquery.packed.js'}
 
 {html_head}
@@ -147 +145 @@
         </TABLE>
         
-{literal}
-<script type="text/javascript" charset="utf-8">
- $(document).ready(function() {
-     var f = $.farbtastic('#colorpicker');
+{footer_script require='jquery.ui.core.packed,jquery.ui.resizable.packed'}{literal}
+ jQuery(document).ready(function() {
+     var f = jQuery.farbtastic('#colorpicker');
      var selected;
-     $('.colorwell')
+     jQuery('.colorwell')
        .each(function () { f.linkTo(this);  })
        .focus(function() {
@@ -159 +156 @@
        });
   });
-</script>
-{/literal}
+{/literal}{/footer_script}