From f6ce303d7bd2943d46dafddab4a538fde49042c0 Mon Sep 17 00:00:00 2001 From: Georg Hopp Date: Wed, 2 Oct 2013 20:31:31 +0100 Subject: [PATCH] load partials via javascript, so I do not need the server at all. closes #35 --- assets/html/_footer.html | 5 ++ assets/html/_login.html | 9 ++++ assets/html/_menu.html | 13 +++++ assets/html/_signup.html | 15 ++++++ assets/html/_statusline.html | 18 +++++++ assets/html/_title.html | 11 +++++ assets/html/author.html | 62 +++-------------------- assets/html/documentation.html | 63 +++--------------------- assets/html/download.html | 32 +++--------- assets/html/foo.html | 13 ----- assets/html/main.html | 63 +++--------------------- assets/html/robots.txt | 0 assets/js/init.js | 89 +++++++++++++++++++--------------- assets/style/taskrambler.css | 21 +++++--- 14 files changed, 160 insertions(+), 254 deletions(-) create mode 100644 assets/html/_footer.html create mode 100644 assets/html/_login.html create mode 100644 assets/html/_menu.html create mode 100644 assets/html/_signup.html create mode 100644 assets/html/_statusline.html create mode 100644 assets/html/_title.html delete mode 100644 assets/html/foo.html delete mode 100644 assets/html/robots.txt diff --git a/assets/html/_footer.html b/assets/html/_footer.html new file mode 100644 index 0000000..556098f --- /dev/null +++ b/assets/html/_footer.html @@ -0,0 +1,5 @@ +
+© 2013 Georg Hopp - +contact-email + + diff --git a/assets/html/_login.html b/assets/html/_login.html new file mode 100644 index 0000000..688bb1c --- /dev/null +++ b/assets/html/_login.html @@ -0,0 +1,9 @@ +
+ +
+ +
+ +
+ + diff --git a/assets/html/_menu.html b/assets/html/_menu.html new file mode 100644 index 0000000..833209a --- /dev/null +++ b/assets/html/_menu.html @@ -0,0 +1,13 @@ + + + diff --git a/assets/html/_signup.html b/assets/html/_signup.html new file mode 100644 index 0000000..166f176 --- /dev/null +++ b/assets/html/_signup.html @@ -0,0 +1,15 @@ +
+ +
+ +
+ +
+ +
+ +
+ +
+ + diff --git a/assets/html/_statusline.html b/assets/html/_statusline.html new file mode 100644 index 0000000..2187b45 --- /dev/null +++ b/assets/html/_statusline.html @@ -0,0 +1,18 @@ + + + +
Session ID: + + diff --git a/assets/html/_title.html b/assets/html/_title.html new file mode 100644 index 0000000..5334ed1 --- /dev/null +++ b/assets/html/_title.html @@ -0,0 +1,11 @@ + +
+

Task

+
+ +
+

Rambler

+
+ + + diff --git a/assets/html/author.html b/assets/html/author.html index 8c36983..087f54a 100644 --- a/assets/html/author.html +++ b/assets/html/author.html @@ -15,44 +15,20 @@ +
+
+ +
+
+
-
    -
  • -
    - Session: -
    -
    • -
  • -
  • -
-
Session ID:
@@ -99,32 +75,6 @@ contact-email
- -
-
- -
- -
- -
-
- -
-
- -
- -
- -
- -
- -
- -
-
diff --git a/assets/html/documentation.html b/assets/html/documentation.html index e3bdd10..2f2b8ca 100644 --- a/assets/html/documentation.html +++ b/assets/html/documentation.html @@ -15,45 +15,20 @@ +
+
+ +
+
+
-
    -
  • -
    - Session: -
    -
    • -
  • -
  • -
-
Session ID:
@@ -146,32 +121,6 @@ contact-email
- -
-
- -
- -
- -
-
- -
-
- -
- -
- -
- -
- -
- -
-
diff --git a/assets/html/download.html b/assets/html/download.html index bd83fe8..d237a01 100644 --- a/assets/html/download.html +++ b/assets/html/download.html @@ -15,6 +15,12 @@ +
+
+ +
+
+
- -
-
- -
- -
- -
-
- -
-
- -
- -
- -
- -
- -
- -
-
diff --git a/assets/html/foo.html b/assets/html/foo.html deleted file mode 100644 index b48b623..0000000 --- a/assets/html/foo.html +++ /dev/null @@ -1,13 +0,0 @@ - - - - - This is just foo - - -

A BIG FAT FOO

- - - - diff --git a/assets/html/main.html b/assets/html/main.html index 30afc74..1666912 100644 --- a/assets/html/main.html +++ b/assets/html/main.html @@ -15,44 +15,20 @@ +
+
+ +
+
+
-
    -
  • -
    - Session: -
    -
    • -
  • -
  • -
-
Session ID:
@@ -247,33 +223,6 @@ contact-email
- -
-
- -
- -
- -
-
- -
-
- -
- -
- -
- -
- -
- -
-
- diff --git a/assets/html/robots.txt b/assets/html/robots.txt deleted file mode 100644 index e69de29..0000000 diff --git a/assets/js/init.js b/assets/js/init.js index b94f280..ae446be 100644 --- a/assets/js/init.js +++ b/assets/js/init.js @@ -1,57 +1,68 @@ var sess = null; $(document).ready(function() { - var sval = new ServerVal("#randval"); + var sval = new ServerVal("#randval"); - sess = new Session("#sessinfo", "#sessid", "#user"); + $("#title").load("/_title.html"); + $("#footer").load("/_footer.html"); - $.getJSON( - "/version/", - function(data) { - $("#version").empty().append("version: " + data.version); - } - ); + $("#menu").load("/_menu.html", function() { + $("div#menu ul li.signup").click(function() { + $("#signup").removeClass("hide"); + }); - $.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess)); - $.getJSON("/user/get/", $.proxy(sess.loadUserJSON, sess)); - - $(window).focus(function() { - $.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess)); + $("div#menu ul li.login").click(function() { + $("#login").removeClass("hide"); + }); }); - $("div#menu ul li.signup").click(function() { - $("#signup").removeClass("hide"); - }); + $("#statusline").load("/_statusline.html", function (){ + sess = new Session("#sessinfo", "#sessid", "#user"); - $("div#menu ul li.login").click(function() { - $("#login").removeClass("hide"); - }); + $.getJSON( + "/version/", + function(data) { + $("#version").empty().append("version: " + data.version); + } + ); - $("div#menu ul li.logout").click(function() { - $.getJSON("/logout/", $.proxy(sess.loadUserJSON, sess)); $.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess)); - }); + $.getJSON("/user/get/", $.proxy(sess.loadUserJSON, sess)); - $("#randval").click(function() { - sval.stop(); - }); + $(window).focus(function() { + $.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess)); + }); - $("#login form").submit(function(event) { - event.preventDefault(); - $.post("/login/", - $("#login form").serialize(), - $.proxy(sess.loadUserJSON, sess)); - $("#login").addClass("hide"); - $.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess)); + $("div#menu ul li.logout").click(function() { + $.getJSON("/logout/", $.proxy(sess.loadUserJSON, sess)); + $.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess)); + }); + + $("#login").load("/_login.html", function (){ + $("#login form").submit(function(event) { + event.preventDefault(); + $.post("/login/", + $("#login form").serialize(), + $.proxy(sess.loadUserJSON, sess)); + $("#login").addClass("hide"); + $.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess)); + }); + }); + + $("#signup").load("/_signup.html", function (){ + $("#signup form").submit(function(event) { + event.preventDefault(); + $.post("/signup/", + $("#signup form").serialize(), + $.proxy(sess.loadUserJSON, sess)); + $("#signup").addClass("hide"); + $.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess)); + }); + }); }); - $("#signup form").submit(function(event) { - event.preventDefault(); - $.post("/signup/", - $("#signup form").serialize(), - $.proxy(sess.loadUserJSON, sess)); - $("#signup").addClass("hide"); - $.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess)); + $("#randval").click(function() { + sval.stop(); }); }); diff --git a/assets/style/taskrambler.css b/assets/style/taskrambler.css index da1e8f6..be664d7 100644 --- a/assets/style/taskrambler.css +++ b/assets/style/taskrambler.css @@ -134,13 +134,22 @@ div.border div.br { text-align: right; } +#statusline iframe { + display: inline-block; + float: left; + border: none; + overflow: hidden; + width: 300px; + height: 30px; +} + #statusline ul { - display: inline-block; - width: 780px; - height: 15px; - list-style: none; - padding: 0px; - margin: 0px; + display: inline-block; + width: 480px; + height: 15px; + list-style: none; + padding: 0px; + margin: 0px; } #statusline ul li {