Mercurial Mercurial > tweet_live / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fusion V04.016
authorNicolas Sauret <nicolas.sauret@iri.centrepompidou.fr>
Wed, 27 May 2015 18:52:34 +0200
changeset 1249 813a89873f94
parent 1248 a56723b35412 (current diff)
parent 1246 c3a5b1c24bc3 (diff)
child 1250 519be4aadeed
Fusion
--- a/web/common.php	Wed May 27 18:44:35 2015 +0200
+++ b/web/common.php	Wed May 27 18:52:34 2015 +0200
@@ -15,8 +15,6 @@
 */
 date_default_timezone_set('UTC');
 
-//$ldt_platform = 'http://ldt.iri.centrepompidou.fr/';
-$ldt_platform = 'http://localhost/~ymh/platform/';
 $project_url_base = 'ldtplatform/ldt/cljson/id/';
 
 $C_default_rep = 'museo-1415-07-traduction';
@@ -61,6 +59,7 @@
     'museo-1415-01-inaugurale', 'museo-1415-02-controverses', 'attention-1415-01-attention-automatisee',
     'museo-1415-03-pedagogies', 'museo-1415-04-reseaux-sociaux-hermeneutiques','edito-1415-02-ressources-documentation-recherche',
     'attention-1415-02-recherche-algo-attention-hermeneutique', 'edito-1415-04-elargissement-communautes-scientifiques', /*'museo-1415-05-interfaces-design',*/
+    'museo-1415-06-multilinguisme', 'museo-1415-07-traduction',
 );
 
 
@@ -403,11 +402,11 @@
 }
 
 function get_metadata_url($metadata) {
-    global $ldt_platform, $project_url_base;
+    global $project_url_base;
     if (preg_match('/^https?:\/\//', $metadata)) {
         return $metadata;
     } else {
-        return $ldt_platform.$project_url_base.$metadata;
+        return LDT_PLATFORM.$project_url_base.$metadata;
     }
 }
 
--- a/web/config.php.tmpl	Wed May 27 18:44:35 2015 +0200
+++ b/web/config.php.tmpl	Wed May 27 18:52:34 2015 +0200
@@ -7,9 +7,9 @@
 
 //define('URL_ROOT', 'http://127.0.0.1/IRI/REPO_TWEET_LIVE/web/');
 define('URL_ROOT', 'http://127.0.0.1/IRI/REPO_TWEET_LIVE/web/');
+define('LDT_PLATFORM' , 'http://ldt.iri.centrepompidou.fr/');
 define('SECRET', '^e)3u&jwy@#156no9lmc1s&$g-x0n@lb=(+xgovk#5^kb)qvkb');
 
 $C_default_registry = 'cdn';
 $C_event_users = array('polemictweet' => 'polemictweet'.date('Y/m/d'));
 
-$ldt_platform = 'http://ldt.iri.centrepompidou.fr/';
--- a/web/museo-1415-06-multilinguisme/config.php	Wed May 27 18:44:35 2015 +0200
+++ b/web/museo-1415-06-multilinguisme/config.php	Wed May 27 18:52:34 2015 +0200
@@ -38,5 +38,5 @@
  	'archive_description' => "par <a href=\"http://www.iri.centrepompidou.fr/\" target=\"_blank\">IRI</a> au Centre Pompidou<br/> le mardi 14 avril 2015 | 17:30 - 20:00",
 
     // After the event
-    'metadata' => ""//"717117ee-ccff-11e4-8b4e-00145ea4a2be"
+    'metadata' => "58a4f1d4-ff0b-11e4-91a9-00145ea4a2be"//"717117ee-ccff-11e4-8b4e-00145ea4a2be"
 );
--- a/web/museo-1415-07-traduction/config.php	Wed May 27 18:44:35 2015 +0200
+++ b/web/museo-1415-07-traduction/config.php	Wed May 27 18:52:34 2015 +0200
@@ -45,5 +45,5 @@
  	'archive_description' => "par <a href=\"http://www.iri.centrepompidou.fr/\" target=\"_blank\">IRI</a> au Centre Pompidou<br/> le mardi 14 avril 2015 | 17:30 - 20:00",
 
     // After the event
-    'metadata' => ""//"717117ee-ccff-11e4-8b4e-00145ea4a2be"
+    'metadata' => "a4e5718e-ff0d-11e4-91a9-00145ea4a2be"//"717117ee-ccff-11e4-8b4e-00145ea4a2be"
 );
--- a/web/museo-1415-07-traduction/index.php	Wed May 27 18:44:35 2015 +0200
+++ b/web/museo-1415-07-traduction/index.php	Wed May 27 18:52:34 2015 +0200
@@ -1,6 +1,6 @@
 <?php
 // Permanent redirection
 header("HTTP/1.1 301 Moved Permanently");
-header("Location: client.php");
+header("Location: polemicaltimeline.php");
 exit();
 ?>
--- a/web/polemicaltimeline.php	Wed May 27 18:44:35 2015 +0200
+++ b/web/polemicaltimeline.php	Wed May 27 18:52:34 2015 +0200
@@ -168,14 +168,13 @@
             },
             {
                 type: "AnnotationsList",
-                //ajax_url : "http://ldt.iri.centrepompidou.fr/ldtplatform/api/ldt/segments/{{media}}/{{begin}}/{{end}}?callback=?",
-                //foreign_url : "http://ldt.iri.centrepompidou.fr/ldtplatform/ldt/front/player/{{media}}/{{project}}/{{annotationType}}#id={{annotation}}",
+                //ajax_url : "<?php echo(LDT_PLATFORM); ?>ldtplatform/api/ldt/segments/{{media}}/{{begin}}/{{end}}?callback=?",
+                //foreign_url : "<?php echo(LDT_PLATFORM); ?>ldtplatform/ldt/front/player/{{media}}/{{project}}/{{annotationType}}#id={{annotation}}",
                 container: "AnnotationsListContainer"
             },
             {
                 type: "CreateAnnotation",
-                //api_endpoint_template: "http://ldt.iri.centrepompidou.fr/ldtplatform/api/ldt/1.0/annotations/",
-                api_endpoint_template: "http://localhost/~ymh/platform/ldtplatform/api/ldt/1.0/annotations/",
+                api_endpoint_template: "<?php echo(LDT_PLATFORM); ?>ldtplatform/api/ldt/1.0/annotations/",
                 api_method: 'POST',
                 after_send_timeout: 8000,
                 show_mic_record: false,
tweet_live