Merge branch 'xorg/maint' into xorg/master

diff --git a/Makefile b/Makefile
index 6a8a175..30bf7ce 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ endef
 
 all: build
 
-build: core conf static banana wiki openid medals jquery maps
+build: core conf static banana wiki openid medals jquery maps raven
 
 check:
        @!(find . -name '*.php' -exec php -l {} ";" | grep -v 'No syntax errors detected')
@@ -170,6 +170,7 @@ $(MEDAL_THUMBNAILS): $(subst /medals/thumb/,/medals/,$(@F))
 ## jquery
 ##
 JQUERY_VERSION=1.5.1
+JQUERY_COLOR_VERSION=2.1.2
 JQUERY_PLUGINS=color form
 JQUERY_PLUGINS_PATHES=$(addprefix htdocs/javascript/jquery.,$(addsuffix .js,$(JQUERY_PLUGINS)))
 
@@ -191,7 +192,7 @@ htdocs/javascript/jquery.xorg.js: htdocs/javascript/jquery.js $(JQUERY_PLUGINS_P
 htdocs/javascript/jquery.ui.xorg.js: $(JQUERY_UI_PATHES) htdocs/javascript/jquery.ui.datepicker-fr.js
        cat $^ > $@
 
-htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://jquery.com/src/$(@F)
+htdocs/javascript/jquery-$(JQUERY_VERSION).min.js: DOWNLOAD_SRC = http://code.jquery.com/$(@F)
 htdocs/javascript/jquery-$(JQUERY_VERSION).min.js:
        @-rm htdocs/javascript/jquery-*.min.js
        @$(download)
@@ -199,9 +200,17 @@ htdocs/javascript/jquery-$(JQUERY_VERSION).min.js:
 htdocs/javascript/jquery.js: htdocs/javascript/jquery-$(JQUERY_VERSION).min.js
        ln -snf $(<F) $@
 
-$(JQUERY_PLUGINS_PATHES): DOWNLOAD_SRC = http://plugins.jquery.com/files/$(@F)_0.txt
-$(JQUERY_PLUGINS_PATHES):
-       @-rm htdocs/javascript/jquery.ui*.$*.js
+htdocs/javascript/jquery.color-$(JQUERY_COLOR_VERSION).min.js: DOWNLOAD_SRC = http://code.jquery.com/color/$(@F)
+htdocs/javascript/jquery.color-$(JQUERY_COLOR_VERSION).min.js:
+       @-rm htdocs/javascript/jquery.color-*.min.js
+       @$(download)
+
+htdocs/javascript/jquery.color.js: htdocs/javascript/jquery.color-$(JQUERY_COLOR_VERSION).min.js
+       ln -snf $(<F) $@
+
+htdocs/javascript/jquery.form.js: DOWNLOAD_SRC = http://malsup.github.com/min/jquery.form.min.js
+htdocs/javascript/jquery.form.js:
+       @-rm htdocs/javascript/jquery.form*.js
        @$(download)
 
 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
@@ -242,9 +251,25 @@ $(JSTREE_PATH):
 ##
 maps: htdocs/javascript/markerclusterer.js
 
-## Try and use taged version asap (from http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/…).
+## Try and use taged version asap (from http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/...).
+## Force to use https to retrieve images
 htdocs/javascript/markerclusterer.js:
-       wget "http://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/src/markerclusterer_compiled.js?r=308" -O htdocs/javascript/markerclusterer.js
+       wget 'http://google-maps-utility-library-v3.googlecode.com/svn/trunk/markerclusterer/src/markerclusterer_compiled.js?r=308' -O $@.tmp -q || ($(RM) $@.tmp; false)
+       sed 's,http\(://google-maps-utility-library-v3.googlecode.com\),https\1,g' < $@.tmp > $@
+       $(RM) $@.tmp
+
+##
+## Raven-js
+##
+RAVEN_VERSION=1.1.2
+raven: $(addprefix htdocs/javascript/raven.,min.js min.map js)
+
+# Documentation: http://raven-js.readthedocs.org/en/latest/install/index.html
+htdocs/javascript/raven.%: DOWNLOAD_SRC = http://cdn.ravenjs.com/$(RAVEN_VERSION)/$(@F)
+htdocs/javascript/raven.%:
+       @-rm $@
+       $(download)
+
 
 ##
 ## lists rpc
@@ -265,8 +290,10 @@ restart-listrpc: stop-listrpc start-listrpc
 
 ################################################################################
 
-.PHONY: build dist clean core http* check test
-.PHONY: wiki build-wiki
+.PHONY: all build dist clean core http* q check test
+.PHONY: wiki build-wiki get-wiki
+.PHONY: openid
 .PHONY: banana banana-sub htdocs/images/banana htdocs/css/banana.css
+.PHONY: medals jquery maps raven
 .PHONY: start-listrpc start-listrpc-fg stop-listrpc restart-listrpc
 .PHONY: up update doc

diff --git a/classes/xnetpage.php b/classes/xnetpage.php
index c124057..1ef1ecd 100644 (file)
--- a/classes/xnetpage.php
+++ b/classes/xnetpage.php
@@ -27,6 +27,7 @@ class XnetPage extends PlPage
 
     public function __construct()
     {
+        global $globals;
         parent::__construct();
 
         $this->register_function('list_all_my_groups', 'list_all_my_groups');
@@ -48,6 +49,9 @@ class XnetPage extends PlPage
         $this->addJsLink('overlib.js');
         $this->addJsLink('core.js');
         $this->addJsLink('xorg.js');
+        if ($globals->core->sentry_js_dsn) {
+            $this->addJsLink('raven.min.js');
+        }
         $this->setTitle('Les associations polytechniciennes');
     }
 

diff --git a/classes/xorgpage.php b/classes/xorgpage.php
index 0baad1e..2ffcf4e 100644 (file)
--- a/classes/xorgpage.php
+++ b/classes/xorgpage.php
@@ -26,6 +26,7 @@ class XorgPage extends PlPage
 
     public function __construct()
     {
+        global $globals;
         parent::__construct();
 
         // Set the default page
@@ -37,6 +38,9 @@ class XorgPage extends PlPage
         $this->addJsLink('overlib.js');
         $this->addJsLink('core.js');
         $this->addJsLink('xorg.js');
+        if ($globals->core->sentry_js_dsn) {
+            $this->addJsLink('raven.min.js');
+        }
         $this->setTitle('le site des élèves et anciens élèves de l\'École polytechnique');
         if (S::logged() && S::user()->checkPerms('admin')) {
             $types = array(S::user()->type);

diff --git a/htdocs/javascript/.gitignore b/htdocs/javascript/.gitignore
index 6c46558..e999ed5 100644 (file)
--- a/htdocs/javascript/.gitignore
+++ b/htdocs/javascript/.gitignore
@@ -9,3 +9,7 @@
 
 # Google Maps auxiliary scripts
 /markerclusterer.js
+
+# Raven-js
+/raven*.js
+/raven.min.map

diff --git a/htdocs/javascript/maps.js b/htdocs/javascript/maps.js
index c31d752..edfd2e9 100644 (file)
--- a/htdocs/javascript/maps.js
+++ b/htdocs/javascript/maps.js
@@ -77,7 +77,7 @@ function ColoredIcon(color)
 {
     this.set('starcolor', null);
     this.set('color', color);
-    this.set('icon', 'http://chart.apis.google.com/chart?chst=d_map_pin_letter&chld=|' + color);
+    this.set('icon', 'https://chart.googleapis.com/chart?chst=d_map_pin_letter&chld=|' + color);
 }
 
 ColoredIcon.prototype = new google.maps.MVCObject();

diff --git a/htdocs/javascript/xorg.js b/htdocs/javascript/xorg.js
index 1785568..fc979d4 100644 (file)
--- a/htdocs/javascript/xorg.js
+++ b/htdocs/javascript/xorg.js
@@ -147,7 +147,7 @@ function addSearchEngine()
 
             return this.overlib({
                 text: text,
-                caption: this.attr('title') || goodies.default_title,
+                caption: this.attr('title') || goodies[type].default_title,
                 close_text: 'Fermer',
                 delay: 800,
                 sticky: true,

diff --git a/modules/xnetevents.php b/modules/xnetevents.php
index 6fca7f3..fd64cf1 100644 (file)
--- a/modules/xnetevents.php
+++ b/modules/xnetevents.php
@@ -371,7 +371,7 @@ class XnetEventsModule extends PLModule
         $all = !Env::v('item_id', false);
 
         $participants = get_event_participants($evt, $item_id, $tri);
-        $title = 'Nom;Prénom;Promotion';
+        $title = 'Nom;Prénom;Promotion;Email';
         if ($admin) {
             $title .=';Société;Poste';
         }
@@ -394,7 +394,7 @@ class XnetEventsModule extends PLModule
         if ($participants) {
             foreach ($participants as $participant) {
                 $user = $participant['user'];
-                $line = $user->lastName() . ';' . $user->firstName() . ';' . $user->promo();
+                $line = $user->lastName() . ';' . $user->firstName() . ';' . $user->promo() . ';' . $user->bestEmail();
                 if ($admin && $user->hasProfile()) {
                     $line .= ';' . $user->profile()->getMainJob()->company->name . ';' . $user->profile()->getMainJob()->description;
                 } else  {

diff --git a/templates/platal/raven.tpl b/templates/platal/raven.tpl
index e33bc08..6c164e3 100644 (file)
--- a/templates/platal/raven.tpl
+++ b/templates/platal/raven.tpl
@@ -21,8 +21,7 @@
 {**************************************************************************}
 
 {if $globals->core->sentry_js_dsn}
-    {* Minified raven *}
-    <script type="text/javascript" src="//d3nslu0hdya83q.cloudfront.net/dist/1.0/raven.min.js"></script>
+    {* Raven.js is included with PlPage::addJsLink('raven.min.js') *}
     <script type="text/javascript">
     {literal}
         var options = {};