ghopp
/
taskrambler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

reflect current changes in main.html (and styles and javascript)

release0.1.5
Georg Hopp 12 years ago
parent
c70d626931
commit
a1e5811def
6 changed files with 105 additions and 68 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 26
      assets/html/example.html
  2. 45
      assets/html/main.html
  3. 27
      assets/js/init.js
  4. 45
      assets/js/session.js
  5. 22
      assets/style/taskrambler.css

26
assets/html/example.html
View File

@ -67,32 +67,6 @@
<canvas width="100px" height="3px"></canvas> <canvas width="100px" height="3px"></canvas>
</div> </div>
<div id="login" class="hide">
<form>
<label for="username">username</label>
<input type="text" name="username" /><br />
<label for="password">password</label>
<input type="password" name="password" /><br />
<input type="submit" />
</form>
</div>
<div id="signup" class="hide">
<form>
<label for="firstname">firstname</label>
<input type="text" name="firstname" /><br />
<label for="surname">surname</label>
<input type="text" name="surname" /><br />
<label for="mail">email</label>
<input type="text" name="email" /><br />
<label for="password">password</label>
<input type="password" name="password" /><br />
<label for="pwrepeat">password (again)</label>
<input type="password" name="pwrepeat" /><br />
<input type="submit" />
</form>
</div>
<div id="randval" class="hide"> <div id="randval" class="hide">
<span class="small"> <span class="small">
Value created at: <br /> Value created at: <br />

45
assets/html/main.html
View File

@ -5,6 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head> <head>
<title>Taskrambler</title> <title>Taskrambler</title>
<link rel="stylesheet" type="text/css" href="/style/common.css">
<link rel="stylesheet" type="text/css" href="/style/taskrambler.css"> <link rel="stylesheet" type="text/css" href="/style/taskrambler.css">
<link rel="shortcut icon" href="/favicon.ico?v=2" /> <link rel="shortcut icon" href="/favicon.ico?v=2" />
<script type="text/javascript" src="/js/jquery.js"></script> <script type="text/javascript" src="/js/jquery.js"></script>
@ -15,6 +16,19 @@
<body> <body>
<div id="page"> <div id="page">
<div id="statusline">
<ul>
<li>
<div id="sessinfo">
Session: <canvas width="100px" height="5px"></canvas>
</div>
</li>
<li id="user"></li>
<li id="version"></li>
</ul>
<br />Session ID: <span id="sessid"></span>
</div>
<div id="title"> <div id="title">
<a href="/main.html"> <a href="/main.html">
<div class="left"> <div class="left">
@ -27,8 +41,6 @@
</a> </a>
</div> </div>
<span id="version"></span>
<div id="menu"> <div id="menu">
<ul> <ul>
<li class="menuedge"></li> <li class="menuedge"></li>
@ -36,6 +48,8 @@
<li><a href="/documentation.html">documentation</a></li> <li><a href="/documentation.html">documentation</a></li>
<li><a href="/download.html">download</a></li> <li><a href="/download.html">download</a></li>
<li><a href="/example.html">example</a></li> <li><a href="/example.html">example</a></li>
<li><span>signup</span></li>
<li><span>login</span></li>
<li class="menuedge"></li> <li class="menuedge"></li>
<div></div> <div></div>
</ul> </ul>
@ -233,6 +247,33 @@
<a href="mailto:georg@steffers.org">contact-email</a> <a href="mailto:georg@steffers.org">contact-email</a>
</div> </div>
</div> </div>
<div id="login" class="hide">
<form>
<label for="username">username</label>
<input type="text" name="username" /><br />
<label for="password">password</label>
<input type="password" name="password" /><br />
<input type="submit" />
</form>
</div>
<div id="signup" class="hide">
<form>
<label for="firstname">firstname</label>
<input type="text" name="firstname" /><br />
<label for="surname">surname</label>
<input type="text" name="surname" /><br />
<label for="mail">email</label>
<input type="text" name="email" /><br />
<label for="password">password</label>
<input type="password" name="password" /><br />
<label for="pwrepeat">password (again)</label>
<input type="password" name="pwrepeat" /><br />
<input type="submit" />
</form>
</div>
</body> </body>
</html> </html>

27
assets/js/init.js
View File

@ -3,34 +3,27 @@ var sess = null;
$(document).ready(function() { $(document).ready(function() {
var sval = new ServerVal("#randval"); var sval = new ServerVal("#randval");
sess = new Session("#sessinfo");
// $(window).focus(function() {
// $.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess));
// });
sess = new Session("#sessinfo", "#sessid", "#user");
$.getJSON( $.getJSON(
"/version/", "/version/",
function(data) { function(data) {
$.each(result, function(i, field){
$("#version").empty().append("version: " + field);
});
$("#version").empty().append("version: " + data.version);
} }
); );
$("div#menu ul li:eq(1)").click(function() {
sval.start();
});
$.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess));
$.getJSON("/user/get/", $.proxy(sess.loadUserJSON, sess));
$("div#menu ul li:eq(2)").click(function() {
$.getJSON("/sess/", $.proxy(sess.loadJSON, sess));
$(window).focus(function() {
$.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess));
}); });
$("div#menu ul li:eq(3)").click(function() {
$("div#menu ul li:eq(5)").click(function() {
$("#signup").removeClass("hide"); $("#signup").removeClass("hide");
}); });
$("div#menu ul li:eq(4)").click(function() {
$("div#menu ul li:eq(6)").click(function() {
$("#login").removeClass("hide"); $("#login").removeClass("hide");
}); });
@ -42,7 +35,7 @@ $(document).ready(function() {
event.preventDefault(); event.preventDefault();
$.post("/login/", $.post("/login/",
$("#login form").serialize(), $("#login form").serialize(),
$.proxy(sess.loadJSON, sess));
$.proxy(sess.loadUserJSON, sess));
$("#login").addClass("hide"); $("#login").addClass("hide");
}); });
@ -50,7 +43,7 @@ $(document).ready(function() {
event.preventDefault(); event.preventDefault();
$.post("/signup/", $.post("/signup/",
$("#signup form").serialize(), $("#signup form").serialize(),
$.proxy(sess.loadJSON, sess));
$.proxy(sess.loadUserJSON, sess));
$("#signup").addClass("hide"); $("#signup").addClass("hide");
}); });
}); });

45
assets/js/session.js
View File

@ -1,13 +1,13 @@
function Session(sId)
function Session(sInfo, sId, sUser)
{ {
this.eSid = $(sId + " span");
this.canvas = $(sId + " canvas").get(0);
this.eUser = $(sUser);
this.eId = $(sId);
this.canvas = $(sInfo + " canvas").get(0);
this.context = this.canvas.getContext("2d"); this.context = this.canvas.getContext("2d");
this.id = "none" this.id = "none"
this.timeout = 0; this.timeout = 0;
this.timeleft = 0; this.timeleft = 0;
this.username = "";
this.email = ""; this.email = "";
this.firstname = ""; this.firstname = "";
this.surname = ""; this.surname = "";
@ -16,27 +16,34 @@ function Session(sId)
this.draw(); this.draw();
} }
Session.prototype.loadJSON = function(data)
Session.prototype.loadUserJSON = function(data)
{ {
this.stop();
this.id = ("0" == data.id)? "none" : data.id;
//this.timeout = data.timeout * 10;
//this.timeleft = data.timeleft * 10;
//this.username = data.username;
this.email = data.email; this.email = data.email;
this.firstname = data.firstname; this.firstname = data.firstname;
this.surname = data.surname; this.surname = data.surname;
name = ""; name = "";
this.eSid.empty().append(this.id);
if ('(null)' == this.firstname || '(null)' == this.surname) {
if ('' == this.email) {
name = "not logged in";
} else {
if ('' == this.firstname || '' == this.surname) {
name += this.email; name += this.email;
} else { } else {
name += this.firstname + " " + this.surname; name += this.firstname + " " + this.surname;
} }
$("#main p:eq(1) span:eq(0)").empty().append(name);
}
this.eUser.empty().append(name);
}
Session.prototype.loadJSON = function(data)
{
// this.stop();
this.id = ("0" == data.id)? "none" : data.id;
this.timeout = data.timeout * 10;
this.timeleft = data.timeleft * 10;
this.eId.empty().append(this.id);
this.draw(); this.draw();
if (0 < this.timeleft) if (0 < this.timeleft)
@ -57,7 +64,7 @@ Session.prototype.draw = function()
Session.prototype.start = function() Session.prototype.start = function()
{ {
if (null === this.interval) { if (null === this.interval) {
this.interval = setInterval($.proxy(this.process, this), 100);
this.interval = setInterval($.proxy(this.process, this), 500);
} }
} }
@ -68,7 +75,7 @@ Session.prototype.process = function()
} }
else { else {
this.timeleft--;
this.timeleft-=5;
this.draw(); this.draw();
} }
} }
@ -85,8 +92,8 @@ Session.prototype.stop = function()
this.firstname = ""; this.firstname = "";
this.surname = ""; this.surname = "";
this.eSid.empty().append(this.id);
$("#main p:eq(1) span:eq(0)").empty().append(" " + this.username);
this.eId.empty().append("");
this.eUser.empty().append("not logged in");
this.draw(); this.draw();
} }

22
assets/style/taskrambler.css
View File

@ -126,6 +126,28 @@ div.border div.br {
background: url(/image/rambler-border-br.jpg); background: url(/image/rambler-border-br.jpg);
} }
#statusline {
position: absolute;
margin: 0px;
font-family: old_newspaper;
font-size: 12px;
text-align: right;
}
#statusline ul {
display: inline-block;
width: 780px;
height: 15px;
list-style: none;
padding: 0px;
margin: 0px;
}
#statusline ul li {
display: inline-block;
border-right: 1px solid black;
padding-right: 5px;
}
#page { #page {
top: 50px; top: 50px;

Write Preview
Loading…
Cancel
Save