added timeline and new bundleparser

Waxolunist · May 7, 2013 · 6d65277 · 6d65277
1 parent 6c7e978
commit 6d65277
Show file tree

Hide file tree

Showing 88 changed files with 10,962 additions and 28 deletions.
diff --git a/client/code/libs/script.me.js b/client/code/libs/script.me.js
@@ -11,7 +11,6 @@ var cc = {
     }
   })(window.location.search),
 
-  //Some uttilitymethods
   forEach: function (list, callback, context) {
     Array.prototype.forEach.call(list, callback, context);
   },
@@ -52,7 +51,11 @@ var cc = {
         var tmpl;
         if (window.ss.tmpl[val]) {
           tmpl = window.ss.tmpl[val];
-          el.innerHTML = tmpl({res: response});
+          var output = tmpl({res: response});
+          //el.innerHTML = tmpl({res: response});
+          var ustmpl = _.template("<% print(" + output + ");%>");
+
+          el.innerHTML = ustmpl({});
           cc.setTargetForExternal();
           return false;
         }

diff --git a/client/code/libs/underscore.js b/client/code/libs/underscore.js
diff --git a/client/templates/projects.item.html b/client/templates/projects.item.html
@@ -0,0 +1 @@
+{{{res.content}}}
diff --git a/client/views/me.jade b/client/views/me.jade
@@ -3,7 +3,6 @@ html(lang="en")
   head
     meta(charset="utf-8")
     meta(name="viewport",content="width=device-width,initial-scale=0.6")
-    link(href='http://fonts.googleapis.com/css?family=Permanent+Marker|Ubuntu',rel='stylesheet',type='text/css')
     != SocketStream
     title Christian Sterzl vCard
   body.container_12
@@ -23,4 +22,4 @@ html(lang="en")
     div.topbar
       a(href="#contact") Contact
       a(href="#circlescms").omega Circlescms
-
+    link(href='http://fonts.googleapis.com/css?family=Permanent+Marker|Ubuntu',rel='stylesheet',type='text/css')
diff --git a/content/assets/lebenslauf.json b/content/assets/lebenslauf.json
@@ -0,0 +1,39 @@
+{
+    "timeline":
+    {
+        "headline":"The Main Timeline Headline Goes here",
+        "type":"default",
+        "text":"<p>Intro body text goes here, some HTML is ok</p>",
+        "asset": {
+            "media":"http://yourdomain_or_socialmedialink_goes_here.jpg",
+            "credit":"Credit Name Goes Here",
+            "caption":"Caption text goes here"
+        },
+        "date": [
+            {
+                "startDate":"2011,12,10",
+                "endDate":"2011,12,11",
+                "headline":"Headline Goes Here",
+                "text":"<p>Body text goes here, some HTML is OK</p>",
+                "tag":"This is Optional",
+                "classname":"optionaluniqueclassnamecanbeaddedhere",
+                "asset": {
+                    "media":"http://twitter.com/ArjunaSoriano/status/164181156147900416",
+                    "thumbnail":"optional-32x32px.jpg",
+                    "credit":"Credit Name Goes Here",
+                    "caption":"Caption text goes here"
+                }
+            }
+        ],
+        "era": [
+            {
+                "startDate":"2011,12,10",
+                "endDate":"2011,12,11",
+                "headline":"Headline Goes Here",
+                "text":"<p>Body text goes here, some HTML is OK</p>",
+                "tag":"This is Optional"
+            }
+
+        ]
+    }
+}
diff --git a/content/assets/timelinejs/css/loading.gif b/content/assets/timelinejs/css/loading.gif