From e43ad2a34034b6eb8414cf0ddf1e33eb19123a65 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 30 Oct 2010 16:11:45 +0200
Subject: [PATCH] Upgrade jquery for next release.

jQuery from 1.4.2 to 1.4.3
jQuery UI: from 1.6 to 1.8.5 (minified)

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 Makefile                               |  8 ++++----
 modules/admin.php                      |  1 +
 templates/admin/user.tpl               | 10 +++++-----
 templates/skin/common.title.header.tpl | 14 +++++++++-----
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 1fa6d71..8448a58 100644
--- a/Makefile
+++ b/Makefile
@@ -173,12 +173,12 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
 ##
 ## jquery
 ##
-JQUERY_VERSION=1.4.2
+JQUERY_VERSION=1.4.3
 JQUERY_PLUGINS=color form
 JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS)))
 
-JQUERY_UI_VERSION=1.6
-JQUERY_UI=core tabs
+JQUERY_UI_VERSION=1.8.5
+JQUERY_UI=core tabs widget
 JQUERY_UI_PATHES=$(addprefix htdocs/javascript/jquery.ui.,$(addsuffix .js,$(JQUERY_UI)))
 
 JSTREE_VERSION=1.0rc2
@@ -202,7 +202,7 @@ $(JQUERY_PLUGINS_PATHES):
 	@-rm htdocs/javascript/jquery.ui*.$*.js
 	@$(download)
 
-htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js: DOWNLOAD_SRC = http://jquery-ui.googlecode.com/svn/tags/$(JQUERY_UI_VERSION)/ui/ui.$*.js
+htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js: DOWNLOAD_SRC = http://jquery-ui.googlecode.com/svn/tags/$(JQUERY_UI_VERSION)/ui/minified/jquery.ui.$*.min.js
 htdocs/javascript/jquery.ui-$(JQUERY_UI_VERSION).%.js:
 	@$(download)
 
diff --git a/modules/admin.php b/modules/admin.php
index 38d3f65..ccfc0e7 100644
--- a/modules/admin.php
+++ b/modules/admin.php
@@ -692,6 +692,7 @@ class AdminModule extends PLModule
 
 
         $page->addJsLink('jquery.ui.core.js');
+        $page->addJsLink('jquery.ui.widget.js');
         $page->addJsLink('jquery.ui.tabs.js');
         $page->addJsLink('password.js');
 
diff --git a/templates/admin/user.tpl b/templates/admin/user.tpl
index 3a20e9d..9e6e91d 100644
--- a/templates/admin/user.tpl
+++ b/templates/admin/user.tpl
@@ -94,7 +94,7 @@ function ban_read()
 }
 
 $(document).ready(function() {
-  $('#tabs > ul').tabs();
+  $('#tabs').tabs();
   $('.ui-tabs-nav li').width('24%')
     .click(function() { $(this).children('a').click() });
 });
@@ -105,10 +105,10 @@ $(document).ready(function() {
 
 <div id="tabs">
   <ul style="margin-top: 0">
-    <li><a href="{$platal->pl_self()}#account"><span >Compte de {$user->login()}</span></a></li>
-    <li><a href="{$platal->pl_self()}#emails"><span>Emails</span></a></li>
-    <li><a href="{$platal->pl_self()}#authext"><span>OpenID</span></a></li>
-    <li><a href="{$platal->pl_self()}#forums"><span>Forums</span></a></li>
+    <li><a href="#account"><span>Compte de {$user->login()}</span></a></li>
+    <li><a href="#emails"><span>Emails</span></a></li>
+    <li><a href="#authext"><span>OpenID</span></a></li>
+    <li><a href="#forums"><span>Forums</span></a></li>
   </ul>
 </div>
 
diff --git a/templates/skin/common.title.header.tpl b/templates/skin/common.title.header.tpl
index b78620c..4075c5b 100644
--- a/templates/skin/common.title.header.tpl
+++ b/templates/skin/common.title.header.tpl
@@ -19,14 +19,18 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
+          <script type="text/javascript">
+            //<![CDATA[
+            {literal}
+            $(document).ready(function() {
+                $("#date-heure").html(getNow());
+            });
+            {/literal}
+            //]]>
+          </script>
           <table>
             <tr>
               <td class="date-heure">
-                <script type="text/javascript">
-                  <!--
-                  document.write(getNow());
-                  //-->
-                </script>
               </td>
               <td class="inscrits">
                 {$globals->core->NbIns|number_format} polytechniciens sur le web
-- 
2.1.4