From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 7 Jun 2008 08:15:04 +0000 (+0200)
Subject: Load jquery.js on all pages.
X-Git-Tag: core/1.0.0~124
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=4b4b4b6767a02a1262a3d77ff632ff1290f70e48;p=platal.git

Load jquery.js on all pages.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/classes/platalpage.php b/classes/platalpage.php
index f3661d7..4072a0a 100644
--- a/classes/platalpage.php
+++ b/classes/platalpage.php
@@ -58,6 +58,7 @@ abstract class PlatalPage extends Smarty
         }
         $this->register_prefilter('at_to_globals');
         $this->addJsLink('xorg.js');
+        $this->addJsLink('jquery.js');
     }
 
     // }}}
diff --git a/modules/profile.php b/modules/profile.php
index b75fbe0..55afef4 100644
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -307,6 +307,7 @@ class ProfileModule extends PLModule
         $page->addJsLink('applis.js');
         $page->addJsLink('grades.js');
         $page->addJsLink('profile.js');
+        $page->addJsLink('jquery.autocomplete.js');
         $wiz = new PlWizard('Profil', 'core/plwizard.tpl', true, true);
         require_once dirname(__FILE__) . '/profile/page.inc.php';
         $wiz->addPage('ProfileGeneral', 'Général', 'general');
diff --git a/modules/search.php b/modules/search.php
index 74d785f..1a98912 100644
--- a/modules/search.php
+++ b/modules/search.php
@@ -166,6 +166,7 @@ class SearchModule extends PLModule
         require_once 'geoloc.inc.php';
         require_once dirname(__FILE__) . '/search/search.inc.php';
         $page->assign('advanced',1);
+        $page->addJsLink('jquery.autocomplete.js');
 
         if (!Env::has('rechercher') && $action != 'geoloc') {
             $this->form_prepare();
diff --git a/templates/admin/valider.tpl b/templates/admin/valider.tpl
index 67ad572..df42a75 100644
--- a/templates/admin/valider.tpl
+++ b/templates/admin/valider.tpl
@@ -20,7 +20,6 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{javascript name="jquery"}
 <script type="text/javascript">//<![CDATA[
 {literal}
 function toggleField(name, id, obj) {
diff --git a/templates/core/plwizard.tpl b/templates/core/plwizard.tpl
index da75308..ace9510 100644
--- a/templates/core/plwizard.tpl
+++ b/templates/core/plwizard.tpl
@@ -19,8 +19,6 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-{javascript name="jquery"}
-{javascript name="jquery.autocomplete"}
 
 <script type="text/javascript">//<![CDATA[
   {if ($stateless || $id gt $current) && $wiz_ajax}
diff --git a/templates/emails/redirect.tpl b/templates/emails/redirect.tpl
index b14da71..3634ebf 100644
--- a/templates/emails/redirect.tpl
+++ b/templates/emails/redirect.tpl
@@ -124,7 +124,6 @@
 
     {/literal}
   //]]></script>
-  {javascript name="jquery"}
   {test_email}
   <div id="redirect-msg" style="position:absolute;"></div><br />
   <div class="center">
diff --git a/templates/emails/send.tpl b/templates/emails/send.tpl
index 1a3095f..8b5cada 100644
--- a/templates/emails/send.tpl
+++ b/templates/emails/send.tpl
@@ -22,7 +22,6 @@
 
 <h1>Envoyer un mail</h1>
 
-{javascript name="jquery"}
 <script type="text/javascript">//<![CDATA[
   {literal}
   function _selectAll(id) {
diff --git a/templates/lists/moderate.tpl b/templates/lists/moderate.tpl
index 7b25dcc..7bd86d0 100644
--- a/templates/lists/moderate.tpl
+++ b/templates/lists/moderate.tpl
@@ -77,7 +77,6 @@
   l'<a href="{$platal->ns}lists/options/{$platal->argv[1]}#antispam">antispam</a>.
 </p>
 
-{javascript name="jquery"}
 <script type="text/javascript">//<![CDATA[
 {literal}
 var toggleState = false;
diff --git a/templates/search/adv.form.tpl b/templates/search/adv.form.tpl
index 1a5e272..6f36626 100644
--- a/templates/search/adv.form.tpl
+++ b/templates/search/adv.form.tpl
@@ -22,8 +22,6 @@
 
 <h1>Recherche dans l'annuaire</h1>
 
-{javascript name="jquery"}
-{javascript name="jquery.autocomplete"}
 <script type="text/javascript">// <!--
   var baseurl = platal_baseurl + "search/";
   {literal}
diff --git a/templates/search/quick.tpl b/templates/search/quick.tpl
index a844adc..ff85d43 100644
--- a/templates/search/quick.tpl
+++ b/templates/search/quick.tpl
@@ -121,7 +121,6 @@ notre base de données.
 </p>
 </div>
 
-{javascript name=jquery}
 <script type="text/javascript">//<![CDATA[
   {literal}
   if (!canAddSearchEngine()) {
diff --git a/templates/survey/edit_question.tpl b/templates/survey/edit_question.tpl
index 3c3a64a..30b1c5c 100644
--- a/templates/survey/edit_question.tpl
+++ b/templates/survey/edit_question.tpl
@@ -28,7 +28,6 @@
       <td class="titre">Commentaire</td>
       <td><textarea name="survey_question[comment]" rows="5" cols="60">{$survey_current.comment}</textarea></td>
     </tr>
-    {javascript name=jquery} 
     <script type="text/javascript">//<![CDATA[ 
       var id = new Array();
       id['choices'] = {$survey_current.choices|@count};
diff --git a/templates/survey/edit_root.tpl b/templates/survey/edit_root.tpl
index 38661c4..26d1df2 100644
--- a/templates/survey/edit_root.tpl
+++ b/templates/survey/edit_root.tpl
@@ -34,7 +34,6 @@
         {valid_date name="survey_question[end]" value=$survey_current.end to=90}
       </td>
     </tr>
-    {javascript name=jquery}
     <script type="text/javascript">//<![CDATA[
       {literal}
       $(document).ready(function() {
diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index e4b929c..a62d9d4 100644
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -194,7 +194,6 @@
                 <div>Me connecter&nbsp;:</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'}
-                  {javascript name=jquery}
                   <!-- <script type="text/javascript" src="login/autologin/{$platal->pl_self()}?forceXml=1"></script> -->
                 {/if}
               {/if}