--- a/timeline/timeline.html Fri Sep 20 17:34:07 2013 +0200
+++ b/timeline/timeline.html Mon Sep 23 12:42:30 2013 +0200
@@ -7,6 +7,7 @@
<meta name="description" content="" />
<meta name="author" content="Institut de Recherche et d'Innovation (IRI)" />
<link rel="stylesheet" type="text/css" href="lib/jquery-ui.min.css" />
+ <link rel="stylesheet" type="text/css" href="fonts/GoudyOldStyleRegular/stylesheet.css" />
<link rel="stylesheet" type="text/css" href="css/base.css" />
<link rel="stylesheet" type="text/css" href="css/timeline.css" />
<style type="text/css">
@@ -19,17 +20,15 @@
<script type="text/javascript" src="js/timeline.js"> </script>
<script type="text/javascript">
var _tl;
- $/*.getJSON*/(
-/* 'http://anarchy2.solicis.fr/api/back/user?process=orm_entity_authenticate&login=anarchy@solicis.fr&password=anarchy&callback=?',
-*/
+ $.getJSON(
+ 'http://anarchy2.solicis.fr/api/back/user?process=orm_entity_authenticate&login=anarchy@solicis.fr&password=anarchy&callback=?',
function(data) {
-/* var token = data.data[0].token;
+ var token = data.data[0].token;
console.log(token);
-*/
_tl = new Tlns.Classes.Timeline({
email: 'anarchy@solicis.fr',
- token: "token",
- api_endpoint: "data/solicis.json",//"http://anarchy2.solicis.fr/api/cms/content?callback=?",
+ token: token,
+ api_endpoint: "http://anarchy2.solicis.fr/api/cms/content?callback=?",
container: "timeline",
sync_now: false,
central_time: Date.now(),//Date.parse("2013-07-18T00:00:00Z"),
@@ -37,7 +36,7 @@
picto_url: "img/",
url_base: "http://anarchy2.solicis.fr"
});
- });
+ });
</script>
</head>