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

make login, signup and logout available on all pages

release0.1.5
Georg Hopp 12 years ago
parent
52f6fbc52a
commit
eaeaf47374
7 changed files with 166 additions and 14 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. 49
      assets/html/author.html
  2. 48
      assets/html/documentation.html
  3. 48
      assets/html/download.html
  4. 6
      assets/html/main.html
  5. 11
      assets/js/init.js
  6. 13
      assets/js/session.js
  7. 3
      assets/style/common.css

49
assets/html/author.html
View File

@ -5,12 +5,30 @@
<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 - Author</title> <title>Taskrambler - Author</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/serverval.js"></script>
<script type="text/javascript" src="/js/session.js"></script>
<script type="text/javascript" src="/js/init.js"></script>
</head> </head>
<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">
@ -29,11 +47,12 @@
<li><a href="/author.html">author</a></li> <li><a href="/author.html">author</a></li>
<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 class="signup"><span>signup</span></li>
<li class="login"><span>login</span></li>
<li class="logout hide"><span>logout</span></li>
<li class="menuedge"></li> <li class="menuedge"></li>
<div></div> <div></div>
</ul> </ul>
<div class="clear"></div>
</div> </div>
<div id="main"> <div id="main">
@ -80,6 +99,32 @@
<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>

48
assets/html/documentation.html
View File

@ -5,12 +5,30 @@
<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 - Documentation</title> <title>Taskrambler - Documentation</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/serverval.js"></script>
<script type="text/javascript" src="/js/session.js"></script>
<script type="text/javascript" src="/js/init.js"></script>
</head> </head>
<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">
@ -29,7 +47,9 @@
<li><a href="/author.html">author</a></li> <li><a href="/author.html">author</a></li>
<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 class="signup"><span>signup</span></li>
<li class="login"><span>login</span></li>
<li class="logout hide"><span>logout</span></li>
<li class="menuedge"></li> <li class="menuedge"></li>
<div></div> <div></div>
</ul> </ul>
@ -55,6 +75,32 @@
<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>

48
assets/html/download.html
View File

@ -5,12 +5,30 @@
<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 - Download</title> <title>Taskrambler - Download</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/serverval.js"></script>
<script type="text/javascript" src="/js/session.js"></script>
<script type="text/javascript" src="/js/init.js"></script>
</head> </head>
<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">
@ -29,7 +47,9 @@
<li><a href="/author.html">author</a></li> <li><a href="/author.html">author</a></li>
<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 class="signup"><span>signup</span></li>
<li class="login"><span>login</span></li>
<li class="logout hide"><span>logout</span></li>
<li class="menuedge"></li> <li class="menuedge"></li>
<div></div> <div></div>
</ul> </ul>
@ -85,6 +105,32 @@
<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>

6
assets/html/main.html
View File

@ -47,9 +47,9 @@
<li><a href="/author.html">author</a></li> <li><a href="/author.html">author</a></li>
<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><span>signup</span></li>
<li><span>login</span></li>
<li class="signup"><span>signup</span></li>
<li class="login"><span>login</span></li>
<li class="logout hide"><span>logout</span></li>
<li class="menuedge"></li> <li class="menuedge"></li>
<div></div> <div></div>
</ul> </ul>

11
assets/js/init.js
View File

@ -19,14 +19,19 @@ $(document).ready(function() {
$.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess)); $.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess));
}); });
$("div#menu ul li:eq(5)").click(function() {
$("div#menu ul li.signup").click(function() {
$("#signup").removeClass("hide"); $("#signup").removeClass("hide");
}); });
$("div#menu ul li:eq(6)").click(function() {
$("div#menu ul li.login").click(function() {
$("#login").removeClass("hide"); $("#login").removeClass("hide");
}); });
$("div#menu ul li.logout").click(function() {
$.getJSON("/logout/", $.proxy(sess.loadUserJSON, sess));
$.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess));
});
$("#randval").click(function() { $("#randval").click(function() {
sval.stop(); sval.stop();
}); });
@ -37,6 +42,7 @@ $(document).ready(function() {
$("#login form").serialize(), $("#login form").serialize(),
$.proxy(sess.loadUserJSON, sess)); $.proxy(sess.loadUserJSON, sess));
$("#login").addClass("hide"); $("#login").addClass("hide");
$.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess));
}); });
$("#signup form").submit(function(event) { $("#signup form").submit(function(event) {
@ -45,6 +51,7 @@ $(document).ready(function() {
$("#signup form").serialize(), $("#signup form").serialize(),
$.proxy(sess.loadUserJSON, sess)); $.proxy(sess.loadUserJSON, sess));
$("#signup").addClass("hide"); $("#signup").addClass("hide");
$.getJSON("/sessinfo/", $.proxy(sess.loadJSON, sess));
}); });
}); });

13
assets/js/session.js
View File

@ -13,7 +13,7 @@ function Session(sInfo, sId, sUser)
this.surname = ""; this.surname = "";
this.interval = null; this.interval = null;
this.draw();
//this.draw();
} }
Session.prototype.loadUserJSON = function(data) Session.prototype.loadUserJSON = function(data)
@ -25,13 +25,20 @@ Session.prototype.loadUserJSON = function(data)
name = ""; name = "";
if ('' == this.email) { if ('' == this.email) {
name = "not logged in"; name = "not logged in";
$("li.signup").removeClass("hide");
$("li.login").removeClass("hide");
$("li.logout").addClass("hide");
} else { } else {
if ('' == this.firstname || '' == this.surname) { if ('' == this.firstname || '' == this.surname) {
name += this.email; name += this.email;
} else { } else {
name += this.firstname + " " + this.surname; name += this.firstname + " " + this.surname;
} }
$("li.signup").addClass("hide");
$("li.login").addClass("hide");
$("li.logout").removeClass("hide");
} }
this.eUser.empty().append(name); this.eUser.empty().append(name);
} }
@ -64,7 +71,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), 500);
this.interval = setInterval($.proxy(this.process, this), 1000);
} }
} }
@ -75,7 +82,7 @@ Session.prototype.process = function()
} }
else { else {
this.timeleft-=5;
this.timeleft -= 10;
this.draw(); this.draw();
} }
} }

3
assets/style/common.css
View File

@ -28,8 +28,9 @@ div#login {
border-radius: 10px; border-radius: 10px;
} }
div.hide {
.hide {
top: -500px !important; top: -500px !important;
display: none !important;
} }
.small { .small {

Write Preview
Loading…
Cancel
Save