From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Mon, 26 Mar 2007 15:58:02 +0000 (+0000)
Subject: New smarty plugin {javascript} to load js-files on demand
X-Git-Tag: xorg/0.9.14~172
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=5721c9a3eea688dfd3d8588c1e0770f94ce635c7;p=platal.git

New smarty plugin {javascript} to load js-files on demand


git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1614 839d8a87-29fc-0310-9880-83ba4fa771e5
---

diff --git a/plugins/compiler.javascript.php b/plugins/compiler.javascript.php
new file mode 100644
index 0000000..da41a11
--- /dev/null
+++ b/plugins/compiler.javascript.php
@@ -0,0 +1,42 @@
+<?php
+/***************************************************************************
+ *  Copyright (C) 2003-2007 Polytechnique.org                              *
+ *  http://opensource.polytechnique.org/                                   *
+ *                                                                         *
+ *  This program is free software; you can redistribute it and/or modify   *
+ *  it under the terms of the GNU General Public License as published by   *
+ *  the Free Software Foundation; either version 2 of the License, or      *
+ *  (at your option) any later version.                                    *
+ *                                                                         *
+ *  This program is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *  GNU General Public License for more details.                           *
+ *                                                                         *
+ *  You should have received a copy of the GNU General Public License      *
+ *  along with this program; if not, write to the Free Software            *
+ *  Foundation, Inc.,                                                      *
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
+ ***************************************************************************/
+require_once 'platal.inc.php';
+
+function smarty_compiler_javascript($tag_attrs, &$compiler)
+{
+    extract($compiler->_parse_attrs($tag_attrs));
+
+    if (!isset($name)) {
+        return null;
+    }
+    $name = pl_entities(trim($name, '\'"'), ENT_QUOTES);
+    $name = "javascript/$name.js";
+    if ($full) {
+        global $globals;
+        $name = $globals->baseurl . '/' . $name;
+    }
+
+    return "?><script type='text/javascript' src='$name'></script><?php";
+}
+
+/* vim: set expandtab enc=utf-8: */
+
+?>
diff --git a/templates/emails/alias.tpl b/templates/emails/alias.tpl
index 6ec64c1..579710f 100644
--- a/templates/emails/alias.tpl
+++ b/templates/emails/alias.tpl
@@ -36,7 +36,7 @@
   </h1>
 
 {if $actuel}
-<script type="text/javascript" src="javascript/ajax.js"></script>
+  {javascript name=ajax}
   <table class="flags">
     <tr>
       <td class="orange">
diff --git a/templates/emails/antispam.tpl b/templates/emails/antispam.tpl
index 4ec1279..060ec90 100644
--- a/templates/emails/antispam.tpl
+++ b/templates/emails/antispam.tpl
@@ -22,7 +22,7 @@
 
 {include file=../spool/wiki.d/cache_Xorg.Antispam.tpl part=1 included=1}
 
-<script type="text/javascript" src="javascript/ajax.js"></script>
+{javascript name=ajax}
 <script type="text/javascript">//<![CDATA[
   {literal}
   function bogoUpdated()
diff --git a/templates/emails/index.tpl b/templates/emails/index.tpl
index fa0d53e..8ca1ad6 100644
--- a/templates/emails/index.tpl
+++ b/templates/emails/index.tpl
@@ -22,8 +22,7 @@
 
 <h1>Gestion de mes courriers électroniques</h1>
 
-<script type="text/javascript" src="javascript/ajax.js">
-</script>
+{javascript name=ajax}
 {literal}
 <script type="text/javascript">
   function bestaliasUpdated() {
diff --git a/templates/emails/redirect.tpl b/templates/emails/redirect.tpl
index 8cda86e..8740971 100644
--- a/templates/emails/redirect.tpl
+++ b/templates/emails/redirect.tpl
@@ -73,7 +73,7 @@
     <a href="Xorg/SMTPS%E9curis%E9">service d'envoi de courrier SMTP sécurisé</a>.
   </p>
 
-  <script type="text/javascript" src="javascript/ajax.js"></script>
+  {javascript name=ajax}
   <script type="text/javascript">//<![CDATA[
     {literal}
     function redirectUpdate()
diff --git a/templates/profile/emploi.tpl b/templates/profile/emploi.tpl
index 3867049..bad6bca 100644
--- a/templates/profile/emploi.tpl
+++ b/templates/profile/emploi.tpl
@@ -221,7 +221,7 @@
         <span class="comm"><a href="wiki_help" class="popup3">{icon name=information title="Syntaxe wiki"} Voir la syntaxe wiki</a></span>
       </td>
       <td class="dcold">
-        <script type="text/javascript" src="javascript/ajax.js"></script>
+        {javascript name=ajax}
         <div id="cv_preview" style="display: none"></div>
         <textarea name="cv" id="cv" rows="15" cols="40">{$cv}</textarea><br />
         <input type="submit" name="preview" value="Aperçu" onclick="previewWiki('cv',  'cv_preview', true, 'cv_preview'); return false;" />
diff --git a/templates/profile/fiche_referent.tpl b/templates/profile/fiche_referent.tpl
index cc8ef84..f365b40 100644
--- a/templates/profile/fiche_referent.tpl
+++ b/templates/profile/fiche_referent.tpl
@@ -20,11 +20,7 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{literal}
-<script type="text/javascript" src="javascript/close_on_esc.js">
-</script>
-{/literal}
-
+{javascript name=ajax}
 <div id="fiche">
   
   <div class="center">
diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl
index 227f20d..c7040e4 100644
--- a/templates/profile/general.tpl
+++ b/templates/profile/general.tpl
@@ -346,7 +346,7 @@
         <span class="comm">Commentaire ? ICQ ? etc...</span>
       </td>
       <td class="dcold">
-        <script type="text/javascript" src="javascript/ajax.js"></script>
+        {javascript name=ajax}
         <div id="ft_preview" style="display: none"></div>
         <textarea name="freetext" id="freetext" rows="3" cols="29" >{$freetext}</textarea>
         <br/>
diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl
index 2a49a73..9b12bdd 100644
--- a/templates/skin/common.header.tpl
+++ b/templates/skin/common.header.tpl
@@ -53,10 +53,10 @@
     {foreach from=$xorg_js item=js}
     <script type="text/javascript" src="javascript/{$js}"></script>
     {/foreach}
-    <script type="text/javascript" src="javascript/overlib.js"></script>
-    <script type="text/javascript" src="javascript/md5.js"></script>
-    <script type="text/javascript" src="javascript/sha1.js"></script>
-    <script type="text/javascript" src="javascript/secure_hash.js"></script>
+    {javascript name=overlib}
+    {javascript name=md5}
+    {javascript name=sha1}
+    {javascript name=secure_hash}
 
     {if $xorg_rss}
     <link rel="alternate" type="application/rss+xml" title="{$xorg_rss.title}" href="{$xorg_rss.href}" />
diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index e082b2d..e272e7a 100644
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -47,8 +47,8 @@
     {foreach from=$xorg_js item=js}
     <script type="text/javascript" src="javascript/{$js}"></script>
     {/foreach}
-    <script type="text/javascript" src="javascript/overlib.js"></script>
-    
+    {javascript name=overlib}
+
     {if $xorg_rss}
     <link rel="alternate" type="application/rss+xml" title="{$xorg_rss.title}" href="{$xorg_rss.href}" />
     {/if}
@@ -213,7 +213,7 @@
                 <div>Me connecter :</div>
                 <a class='gp' href="login/{if $platal->pl_self() eq 'exit'}index{else}{$platal->pl_self()}{/if}">polytechnicien</a>
                 {if $platal->pl_self() neq 'exit'}
-                  <script type="text/javascript" src="javascript/jquery.js"></script>
+                  {javascript name=jquery}
                   <script type="text/javascript" src="login/autologin/{$platal->pl_self()}?forceXml=1"></script>
                 {/if}
               {/if}