--- a/web/polemicaltimeline.php Sun Apr 21 10:07:03 2013 +0200
+++ b/web/polemicaltimeline.php Sun Apr 21 21:54:24 2013 +0200
@@ -108,19 +108,16 @@
_cookiematches = document.cookie.match(/PHPSESSID=([A-Za-z0-9]+)/),
_cookie = (_cookiematches && _cookiematches.length > 1 ? _cookiematches[1] : undefined);
-<?php if ($use_protocol): ?>
var _tracer = tracemanager.init_trace("test", {
- url: "http://traces.advene.org:5000/",
+ url: "http://trail.dev.fabelier.org/",
requestmode: "GET",
syncmode: "sync",
default_subject: "PolemicTweet"
});
_tracer.trace("Pt_LoadPage", {
- url: document.location.href,
- protocol_level: <?php echo $protocol_level; ?>,
- cookie: _cookie
+ cookie: _cookie,
+ url: document.location.href
});
-<?php endif; ?>
IriSP.libFiles.defaultDir = "<?php echo(registry_url('libdir','js'));?>";
IriSP.widgetsDir = "<?php echo(registry_url('ldtwidgets','js'));?>";
@@ -148,6 +145,11 @@
provider: "rtmp",
autostart: true
},
+ { type: "Slider" },
+ {
+ type: "Controller",
+ disable_annotate_btn: true
+ },
<?php if ($protocol_level > 1): ?>
{
type: "Polemic"
@@ -157,17 +159,16 @@
<?php endif; ?>
},
<?php endif; ?>
- { type: "Slider" },
- {
- type: "Controller",
- disable_annotate_btn: true
- },
<?php if ($protocol_level > 1): ?>
{
- type: "MultiSegments"
+ type: "Segments",
+ annotation_type: "chap"
+ },
+ {
+ type: "Annotation",
+ annotation_type: "chap"
},
{ type: "Tweet" },
-<?php if (!$use_protocol): ?>
{
type: "Tagcloud",
container: "TagcloudContainer",
@@ -181,19 +182,16 @@
container: "AnnotationsListContainer"
},
<?php endif; ?>
-<?php endif; ?>
{ type: "Mediafragment"},
-<?php if ($use_protocol): ?>
{
type: "Trace",
tracer: _tracer,
extend: {
cookie: _cookie,
- protocol_level: _protocol_level
+ url: document.location.href
},
- js_console: true
+ js_console: false
}
-<?php endif; ?>
]
};
@@ -367,6 +365,7 @@
<!-- EXPLICATION -->
<div id="mdpgauche">
<ul class="accordeon">
+ <div id="Slideshare"></div>
<li class="acctitre">
<h3><?php echo($translate->_('config__title')); ?></h3>
</li>