# HG changeset patch
# User Raphael Velt <raph.velt@gmail.com>
# Date 1334337593 -7200
# Node ID f655dafb741eb83c08b168e8a6dfa6866032edf1
# Parent  79b222c29887837446c4eef2b63ca9dea1f3f83b
added www2012

diff -r 79b222c29887 -r f655dafb741e web/common.php
--- a/web/common.php	Thu Apr 12 17:55:56 2012 +0200
+++ b/web/common.php	Fri Apr 13 19:19:53 2012 +0200
@@ -13,7 +13,7 @@
 /**
 * Base configuration
 */
-$C_default_rep = 'edito-reseaux-sociaux';
+$C_default_rep = 'www2012';
 $C_feedback_form_url = 'https://spreadsheets.google.com/spreadsheet/viewform?hl=en_US&formkey=dDZILVdXVHRzd0xhWGVZXzkweHN2RGc6MQ#gid=0';
 
 $archives_list = array(
diff -r 79b222c29887 -r f655dafb741e web/polemicaltimeline.php
--- a/web/polemicaltimeline.php	Thu Apr 12 17:55:56 2012 +0200
+++ b/web/polemicaltimeline.php	Fri Apr 13 19:19:53 2012 +0200
@@ -97,15 +97,17 @@
                 width: 650
             },
             widgets: [
-            {type: "PolemicWidget",
-               requires: [{
-                type: "TooltipWidget",
-                width: 180,
-                height: 160,
-                metadata : {type:'empty'
-                }
-               }],
-              height: 5
+            {
+                type: "PolemicWidget",
+                requires: [{
+                    type: "TooltipWidget",
+                    width: 180,
+                    height: 160,
+                    metadata : {
+                        type:'empty'
+                    }
+                }],
+                height: 5
             },
             {type: "SliderWidget"},        
             {type: "PlayerWidget", // please note that type refers directly to the constructor of the widget.
@@ -130,13 +132,13 @@
         <?php if (isset($config['hashtag'])) echo "excludeWords: ".json_encode(array($config['hashtag'])).","; ?>
             excludePattern: /^@/
         },{
-                        type: "TraceWidget",
-                     //   js_console : true,
-                        url: "http://traces.advene.org:5000/",
-                        requestmode: 'GET',
-                        syncmode: "sync"
-                    }
-            ]
+            type: "TraceWidget",
+         //   js_console : true,
+            url: "http://traces.advene.org:5000/",
+            requestmode: 'GET',
+            syncmode: "sync"
+        }
+        ]
         },
       player:{
           type:'jwplayer',
diff -r 79b222c29887 -r f655dafb741e web/res/js/tracemanager.js
--- a/web/res/js/tracemanager.js	Thu Apr 12 17:55:56 2012 +0200
+++ b/web/res/js/tracemanager.js	Fri Apr 13 19:19:53 2012 +0200
@@ -43,7 +43,7 @@
                      // Swap " (very frequent, which will be
                      // serialized into %22) and ; (rather rare), this
                      // saves some bytes
-                     data = data.replace(/[;"]/g, function(s){ return s == ';' ? '"' : ';'; }).replace(/#/g, '%23');
+                     data = data.replace(/[;"#]/g, function(s){ return s == ';' ? '"' : ( s == '"' ? ';' : '%23'); });
                      // FIXME: check data length (< 2K is safe)
                      var request=$('<img />').error( function() { this.failureCount += 1; })
                          .load( function() { this.failureCount = 0; })
@@ -347,7 +347,7 @@
          list_attribute_types: function() {
              var result = [];
              for (var prop in this.attributes) {
-                 if (this.hasOwnProperty(prop))
+                 if (this.attributes.hasOwnProperty(prop))
                      result.push(prop);
              }
              /* FIXME: we return URIs here instead of AttributeType elements */
@@ -420,7 +420,7 @@
                  "subject": this.subject
              };
              for (var prop in this.attributes) {
-                 if (this.hasOwnProperty(prop))
+                 if (this.attributes.hasOwnProperty(prop))
                      r[prop] = this.attributes[prop];
              }
              return r;
@@ -432,7 +432,6 @@
           */
          toCompactJSON: function() {
              var r = {
-                 "@i": this.id,
                  "@t": (this.trace.shorthands.hasOwnProperty(this.type) ? this.trace.shorthands[this.type] : this.type),
                  "@b": this.begin,
                  "@s": this.subject
@@ -441,8 +440,12 @@
              if (this.begin !== this.end)
                  r["@d"] = this.end - this.begin;
 
+             // Store id only if != ""
+             if (this.id !== "")
+                 r["@i"] = this.id;
+
              for (var prop in this.attributes) {
-                 if (this.hasOwnProperty(prop))
+                 if (this.attributes.hasOwnProperty(prop))
                  {
                      var v = this.attributes[prop];
                      r[prop] = this.trace.shorthands.hasOwnProperty(v) ? this.trace.shorthands[v] : v;
diff -r 79b222c29887 -r f655dafb741e web/www2012/config.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/www2012/config.php	Fri Apr 13 19:19:53 2012 +0200
@@ -0,0 +1,59 @@
+<?php
+$config = array(
+   	'hashtag'    => '#www2012',
+   	'date'   => '16-20.04.2012',
+   	'heure'   => '09:00-17:30',
+   	'place'   => 'Lyon',
+
+   	'title' => "World Wide Web Conference 2012",
+	'abstract'   => "World Wide Web Conference 2012<br/>du 16 au 20 avril 2012<br/>Lyon",
+   	'description'=> "
+<h3>Keynotes</h3>
+<ul>
+    <li>
+        <p>Wednesday 18 April, 11:00</p>
+        <p><b>Tim Berners-Lee</b>, graduate of Oxford University, inventor of the World Wide Web, an internet-based hypermedia initiative for global information sharing while at CERN, the European Particle Physics Laboratory, in 1989.</p>
+    </li>
+    <li>
+        <p>Thursday 19 April, 11:00</p>
+        <p><b>Neelie Kroes</b>, Vice President of the European Commission and European Digital Agenda Commissioner</p>
+    </li>
+    <li>
+        <p>Thursday 19 April, 09:00</p>
+        <p><b>Chris Welty</b>, Research Scientist at the IBM T.J. Watson Research Center in New York.</p>
+    </li>
+    <li>
+        <p>Friday 20 April, 09:30</p>
+        <p><b>Bernard Stiegler</b>, director of IRI (Innovation and Research Institute) at the Georges Pompidou Center in Paris, Professorial Fellow at the Centre for Cultural Studies at Goldsmith College in London and professor at the University of Technology of Compiègne where he teaches philosophy.</p>
+    </li>
+</ul>
+<h3>Detailed program :</h3>
+<p><a href='http://www2012.wwwconference.org/program/detailed-program/' target='_blank'>http://www2012.wwwconference.org/program/detailed-program/</a>
+   	",
+   	'link' => 'http://www2012.wwwconference.org/program/provisional-program/',
+   	'keywords'   => 'WWW, World Wide Web, WWW2012, Lyon, Tim Berners-Lee, Neelie Kroes, Bernard Stiegler, Chris Welty, conference',
+   	'rep' => basename(__DIR__),
+   	'partenaires'=> "<a href='http://www.iw3c2.org/' class='footerLink' target='_blank'>IW3C2</a>
+    | <a href='http://www.w3c.org/' class='footerLink' target='_blank'>World Wide Web Consortium</a>
+    | <a href='http://www.universite-lyon.fr/' class='footerLink' target='_blank'>Université de Lyon</a>
+   	| <a href='http://www.iri.centrepompidou.fr/' class='footerLink' target='_blank'>IRI</a>",
+
+    'client_visual' => 'images/www_live_screen.jpg',// 480 × 320 pixels
+    
+ 	'head_logo' => 'images/head_logo_www.png', // 171 × 63 pixels
+ 	
+  	'slide_background' => 'images/www_slider.jpg', // 606 × 282 pixels
+    
+  	'archive_img' => 'images/www_archive.jpg', // 270 × 150 pixels
+
+ 	'archive_title' => "WWW 2012",
+ 	'archive_description' => 'par <a href="http://www.iw3c2.org/" target="_blank">IW3C2</a> à Lyon.<br/>du 16 au 20 avril 2012',
+
+    // After the event
+	'metadata'    => "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/cljson/id/5510ecc4-5565-11e1-ac23-00145ea49a02",
+	'duration'   => 6640378,
+	'player'        => "res/metadataplayer/src/js/LdtPlayer.js",
+	'div_height'    => 700,
+	'player_width'  => 650,
+	'player_height' => 488,
+);
\ No newline at end of file
diff -r 79b222c29887 -r f655dafb741e web/www2012/images/head_logo_www.png
Binary file web/www2012/images/head_logo_www.png has changed
diff -r 79b222c29887 -r f655dafb741e web/www2012/images/www_archive.jpg
Binary file web/www2012/images/www_archive.jpg has changed
diff -r 79b222c29887 -r f655dafb741e web/www2012/images/www_live_screen.jpg
Binary file web/www2012/images/www_live_screen.jpg has changed
diff -r 79b222c29887 -r f655dafb741e web/www2012/images/www_slider.jpg
Binary file web/www2012/images/www_slider.jpg has changed
diff -r 79b222c29887 -r f655dafb741e web/www2012/index.php
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/www2012/index.php	Fri Apr 13 19:19:53 2012 +0200
@@ -0,0 +1,6 @@
+<?php
+// Permanent redirection
+header("HTTP/1.1 301 Moved Permanently");
+header("Location: client.php");
+exit();
+?>
\ No newline at end of file