From 420353a562942a7b4045464cc3981ec18bdabe33 Mon Sep 17 00:00:00 2001 From: timb Date: Fri, 15 Jan 2010 17:33:12 -0800 Subject: added login form to banner --- template/form_login.st | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 template/form_login.st (limited to 'template/form_login.st') diff --git a/template/form_login.st b/template/form_login.st new file mode 100644 index 0000000..b90834f --- /dev/null +++ b/template/form_login.st @@ -0,0 +1,40 @@ +
+ +
+
+ + +

+

+ + +

+

+ +

+
+
+
+ + \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 188f1e79227fabfd46bf0feff460516414395364 Mon Sep 17 00:00:00 2001 From: timb Date: Fri, 15 Jan 2010 18:57:43 -0800 Subject: fixed up the default value for the login form fields and moved most of the javascript into static/js --- static/home.js | 36 --- static/index.html | 17 +- static/js/home.js | 58 ++++ static/js/pichat.js | 244 +++++++++++++++++ static/js/sha1.js | 330 +++++++++++++++++++++++ static/js/underscore-min.js | 16 ++ static/js/underscore.js | 637 ++++++++++++++++++++++++++++++++++++++++++++ static/pichat.js | 244 ----------------- static/sha1.js | 330 ----------------------- template/form_login.st | 4 +- template/head.st | 5 +- 11 files changed, 1294 insertions(+), 627 deletions(-) delete mode 100755 static/home.js create mode 100755 static/js/home.js create mode 100755 static/js/pichat.js create mode 100755 static/js/sha1.js create mode 100644 static/js/underscore-min.js create mode 100644 static/js/underscore.js delete mode 100755 static/pichat.js delete mode 100755 static/sha1.js (limited to 'template/form_login.st') diff --git a/static/home.js b/static/home.js deleted file mode 100755 index 7ced9da..0000000 --- a/static/home.js +++ /dev/null @@ -1,36 +0,0 @@ -function ifEnter(fn) { - return function(e) { - if (e.keyCode == 13) { fn(); } - }; -} - -function initHome() { - $('#passwordInput').keyup(ifEnter(login)); - $('#loginSubmit').click(login); -} - -function login() { - $('#passwordInput, #loginSubmit').blur(); - var nick = $('#nickInput').val(); - var password = $('#passwordInput').val(); - var hash = hex_sha1(nick + '$' + password + '$dumpfm'); - - var onSuccess = function(json) { - location.href = "/chat"; - }; - - var onError = function(resp, textStatus, errorThrown) { - alert("Error logging in!"); - }; - - $.ajax({ - type: 'GET', - timeout: 5000, - url: 'login', - data: {'nick': nick, ts: '', 'hash': hash }, - cache: false, - dataType: 'json', - success: onSuccess, - error: onError - }); -}; \ No newline at end of file diff --git a/static/index.html b/static/index.html index 0ed1671..cb1852b 100755 --- a/static/index.html +++ b/static/index.html @@ -1,7 +1,8 @@ - - + + + + - - + + + -- cgit v1.2.3-70-g09d2 From ba5bfc7892f8bfb6448d741291de1b0e51d8885b Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Tue, 19 Jan 2010 00:03:59 -0500 Subject: timb adding ryder's banner changes --- static/form_login/front.css | 34 +++++++++++++++++++++++++++------- static/header.css | 11 ++++++----- template/banner.st | 16 +++++++--------- template/form_login.st | 8 +++++++- 4 files changed, 47 insertions(+), 22 deletions(-) (limited to 'template/form_login.st') diff --git a/static/form_login/front.css b/static/form_login/front.css index 46cbc4c..ea767b0 100644 --- a/static/form_login/front.css +++ b/static/form_login/front.css @@ -2,11 +2,19 @@ float: right; /*width:780px; margin:0 auto;*/ +right:2; +color:#fff; position: relative; +top:-6; +filter:alpha(opacity=90); + -moz-opacity:0.9; + -khtml-opacity: 0.9; + opacity: 0.9; + } #login-container a:link, a:visited { - color:#27b; + color:#f0e; text-decoration:none; } #login-container .topnav { @@ -14,18 +22,23 @@ font-size:11px; line-height:23px; text-align:right; + } #login-container .topnav a.signin { - background:#88bbd4; - padding:4px 6px 6px; + + padding:4px 3 3px 6px; text-decoration:none; - font-weight:bold; +border:1px solid #; +background-color:#f0e; + font-weight:; color:#fff; -webkit-border-radius:4px; -moz-border-radius:4px; border-radius:4px; *background:transparent url("images/signin-nav-bg-ie.png") no-repeat 0 0; - *padding:4px 12px 6px; + *padding:4px 12px 6px; filter:alpha(opacity=80); + + } #login-container .topnav a.signin:hover { background:#59B; @@ -49,7 +62,11 @@ a.signin span { #login-container .topnav a.menu-open { background:#ddeef6!important; color:#666!important; - outline:none; + outline:none;box-shadow: 3px 2px 2px #ccc; +-webkit-box-shadow: 3px 2px 2px #ccc; +-moz-box-shadow: 3px 2px 2px #ccc; +filter: progid:DXImageTransform.Microsoft.dropShadow(color=#ccc, offX=3, offY=4, positive=true); + } a.signin.menu-open span { @@ -78,7 +95,10 @@ a.signin.menu-open span { margin-right: 0px; *margin-right: -1px; color:#789; - font-size:11px; + font-size:11px; box-shadow: 3px 2px 2px #ccc; +-webkit-box-shadow: 3px 2px 2px #ccc; +-moz-box-shadow: 3px 2px 2px #ccc; +filter: progid:DXImageTransform.Microsoft.dropShadow(color=#ccc, offX=3, offY=4, positive=true); } #signin_menu input[type=text], #signin_menu input[type=password] { diff --git a/static/header.css b/static/header.css index e4a09a3..a128095 100755 --- a/static/header.css +++ b/static/header.css @@ -10,8 +10,8 @@ color: #fff; } #strapline{position:absolute; -top:1; -right:10%; +top:6; +right:20%; } .white a:hover { text-decoration: none; @@ -46,7 +46,7 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#036aca, offX=3, offY } #bar7{ - top:30px; + top:25px; position:absolute; font-family: Arial, Helvetica, sans-serif; @@ -58,12 +58,13 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#036aca, offX=3, offY z-index: 999; } #logout7{ - top:5px; + top:2px; position:relative; font-size:12px; - margin-right: 10px; + margin-right: 5px; float:right; z-index: 999; + line-height:1.5; font-family: Arial, Helvetica, sans-serif; font-weight: normal; } diff --git a/template/banner.st b/template/banner.st index 1a54489..9e92d8c 100755 --- a/template/banner.st +++ b/template/banner.st @@ -10,25 +10,23 @@
$if(user_nick)$  - ★ Profile ★ | - $else$ Register | + Profile + $else$ Register $endif$ - Room A | - Log - | Browser Tool + Room A + Log + Browser Tool $if(isadmin)$ - | ★ VIP ★ + ★ VIP ★ $endif$
- $if(user_nick)$
-
Logout +
$if(user_nick)$ Logout $else$ $form_login()$ $endif$
- $else$ $form_login()$ $endif$

diff --git a/template/form_login.st b/template/form_login.st index 5c164fe..aee9283 100644 --- a/template/form_login.st +++ b/template/form_login.st @@ -1,7 +1,13 @@
- +
Have an account?
+

+ +

+


+

+

-- cgit v1.2.3-70-g09d2