From 56858bed05958b766b818aa037ef3617a33cf3cb Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Wed, 3 Feb 2010 01:20:22 -0500 Subject: Fixed browser-related issue with message counter --- static/js/pichat.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'static/js') diff --git a/static/js/pichat.js b/static/js/pichat.js index fb1c655..48e1e50 100755 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -177,7 +177,7 @@ function refresh() { json.messages, function(m) { return !isDuplicateMessage(m) }); updateUI(messages, json.users); - if (!HasFocus && typeof UnseenMsgCounter !== 'undefined') { + if (typeof UnseenMsgCounter !== 'undefined' && !HasFocus) { UnseenMsgCounter += messages.length; } } catch(e) { -- cgit v1.2.3-70-g09d2 From b0151ef773ca09692f3b672bc756f79e2307cb12 Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Sat, 6 Feb 2010 10:28:27 -0500 Subject: timb adding ryder's changes... --- static/about.html | 277 +++++++++++++++++++++++++++++++++++++++----------- static/browser.css | 6 +- static/header.css | 66 +++++++----- static/home4.gif | Bin 115 -> 125 bytes static/image_draw.gif | Bin 192 -> 169 bytes static/index.html | 54 +++++++--- static/js/home.js | 2 +- static/pichat.css | 18 ++-- static/profile.css | 54 ++++------ static/text.gif | Bin 94 -> 112 bytes template/banner.st | 2 +- template/browser.st | 3 +- template/chat.st | 7 +- template/log.st | 19 ++-- template/profile.st | 4 +- 15 files changed, 352 insertions(+), 160 deletions(-) (limited to 'static/js') diff --git a/static/about.html b/static/about.html index 85adbad..0a0e634 100755 --- a/static/about.html +++ b/static/about.html @@ -1,10 +1,11 @@ - - - - - - - + + + + + + dump.fm + + - -
-
+--> - + -
-
-
-
- -
-
-
$if(user_nick)$  - Profile | - $else$ Register | - $endif$ - Room A - $if(user_nick)$ $endif$
-
+ +
+
+
+
+
+ +
+

-
-
$if(user_nick)$ Logout $else$ Log In$endif$ -
-
-

-
+
-
-

- Ryder Ripps - Lead Vocals
- Scott Ostler - Drum Machines/Vocoder
- Tim Baker - Keytar
- Stefan Moore - Chick Magnet
-
+

+ +

+
+

+ +

Talk with pictures!

+
+
+
dump.fm is fun website that lets people talk to each other using pictures.
+ A team of four dudes are working on it... they are known as Brokencyde....
+
+
+

 

+

+ +

 

+

 

+ +
+

-
- +
+
+ +
- \ No newline at end of file + + + + + diff --git a/static/browser.css b/static/browser.css index 30ea714..1585fcb 100755 --- a/static/browser.css +++ b/static/browser.css @@ -57,12 +57,12 @@ color:000; border: 2px solid #c8cbce; -top:56px; +top:40px; bottom:65px; position:fixed; - width: 99%; + width: 99.4%; background-color:#FFF; -left:0.3%; +left:0.1%; z-index:5; } diff --git a/static/header.css b/static/header.css index 786632d..67b59c7 100755 --- a/static/header.css +++ b/static/header.css @@ -40,53 +40,70 @@ background-repeat:repeat-x; } #bar7{ - top:24px; + top:12px; position:absolute; - font-family: Arial, Helvetica, sans-serif; font-size: 16px; -height:30; +height:22; word-spacing:2; width:365; color:#fff; text-indent:14; -line-height:1.8; - text-shadow: 1px 1px 0px #000; - left: 290px; +line-height:2; + left: 140px; margin-left: 1.2%; margin-right: 8%; letter-spacing:.2px; z-index: 999; } +#bar7 img{ +margin-top:2; +} +#bar7 a{ + text-decoration: none; + text-shadow: 1px 1px 1px #000; + font-size:13; +font-weight:bold; + color: #fff; +} +#bar7 a:hover{ + text-decoration: none; + text-shadow: 1px 1px 1px #000; +font-weight:bold; + color: #fff; +} #logout7{ - top:2px; + top:-2px; position:relative; font-size:12px; - margin-right: 5px; + margin-right: 3px; float:right; z-index: 999; - line-height:1.5; font-family: Arial, Helvetica, sans-serif; font-weight: normal; } -#logout7 a{font-size:12px; +#logout7 a{font-size:11px;text-shadow: 1px 1px 4px #000; } -#logout7 a:hover{font-size:12px; +#logout7 a:hover{font-size:11px; } #logo7{ - margin-left: -2px; + margin-left: 3px; margin-right: 10%; - z-index:1000; + z-index:1050; float:left; - margin-top: -5px; + margin-top: -1px; } -#logo7 a{font-size:60; - text-shadow: 2px 1px 1px #000; +#logo7 a{font-size:40; + + text-shadow: 2px 3px 1px #f0e, 3px -2px 1px #f0e; +letter-spacing:-4; color:#fff; font-weight:bold; } #logo7 a:hover{ - text-shadow: 2px 1px 1px #cce12e; + + text-shadow: 2px 3px 1px #f0e, 3px 3px 1px #fff; + color:#fff; } @@ -127,9 +144,9 @@ width:auto; #landscape{ position:absolute; width:auto; -left:15; -margin-left:25%; -top:-35; + +margin-left:55%; +top:-38; opacity:0.8; z-index:2; } @@ -137,8 +154,8 @@ z-index:2; position:absolute; width:auto; left:190; -margin-left:9%; -top:-14; +margin-left:29%; +top:-19; z-index:3; } @@ -186,7 +203,7 @@ border:px solid #000; height: 26px; position: absolute; z-index: 10; -margin-top2; +margin-top:0; filter: progid:DXImageTransform.Microsoft.dropShadow(color=#c8cbce, offX=3, offY=4, positive=true); border-top-left-radius:5px; border-top-right-radius:5px; @@ -215,5 +232,6 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#c8cbce, offX=3, offY #lastli{ -margin-left:-700; +margin-left:-7000; +height:0.1; } diff --git a/static/home4.gif b/static/home4.gif index 153d3de..baf313f 100644 Binary files a/static/home4.gif and b/static/home4.gif differ diff --git a/static/image_draw.gif b/static/image_draw.gif index f4d91fa..aaf947c 100644 Binary files a/static/image_draw.gif and b/static/image_draw.gif differ diff --git a/static/index.html b/static/index.html index ecb4f82..dd04249 100755 --- a/static/index.html +++ b/static/index.html @@ -36,7 +36,8 @@ function MM_swapImage() { //v3.0 @@ -214,12 +244,12 @@ padding-top:6px; -
+

-
+

Talk with pictures!

@@ -250,7 +280,7 @@ padding-top:6px;
-
+
diff --git a/static/js/home.js b/static/js/home.js index 441a992..fa754ee 100755 --- a/static/js/home.js +++ b/static/js/home.js @@ -163,4 +163,4 @@ function login() { success: onSuccess, error: onError }); -}; \ No newline at end of file +}; diff --git a/static/pichat.css b/static/pichat.css index 21eb798..3886f95 100755 --- a/static/pichat.css +++ b/static/pichat.css @@ -59,12 +59,12 @@ color:000; #messagePane { border: 2px solid #c8cbce; -top:54px; +top:40px; bottom:65px; position:fixed; - width: 99%; + width: 99.3%; background-color:#FFF; -left:0.3%; +left:0.2%; z-index:5; } @@ -100,11 +100,11 @@ bottom:10px; width: 100%; z-index:100; background-color:#FFF; - margin-top: 15px; + margin-top: 16px; left:-3px; position:relative; border:2px solid #c8cbce; -height:36px; +height:35px; font-size:20px; min-width:500px; box-shadow: 2px 3px 4px #eee; @@ -116,7 +116,10 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#eee, offX=3, offY=4, min-width:500px; z-index:100; } +#msginputrapper{ +margin-right:239; +} #msgSubmit { position:absolute; @@ -145,7 +148,7 @@ top:15px; border-bottom-right-radius:5px; -webkit-border-bottom-right-radius:5px; -moz-border-radius-bottomright:5px; - border-radius:2px; + border-radius:5px; position:absolute; display:inline-block; width:120px; @@ -153,7 +156,8 @@ height:35px; background-position:center; right:0; top:15px; -text-indent:4; +padding-bottom:1; +text-indent:3; text-align:center; z-index:100; cursor:pointer; diff --git a/static/profile.css b/static/profile.css index 0c6c71e..f3a2714 100755 --- a/static/profile.css +++ b/static/profile.css @@ -28,8 +28,8 @@ background-color:#fff; } #pnav{position:absolute; -padding-left:150; -margin-top:-10; +padding-left:270; +margin-top:0; background-position:top; font-weight:bold; margin-left:0; @@ -39,58 +39,37 @@ text-align:left; } #pnavo{ -margin-top:20; -border:1px solid #ccc; +margin-top:-18; padding:2; -width:85; +width:105; letter-spacing:-2; -text-indent:2; +text-indent:6; background-image:url(/static/grad2.png); height:32; text-transform:capitalize; - border-top-left-radius:3px; - border-top-right-radius:3px; - -webkit-border-top-left-radius:3px; - -webkit-border-top-right-radius:3px; - -moz-border-radius-topleft:3px; - -moz-border-radius-topright:3px; - border-bottom-left-radius:3px; - border-bottom-right-radius:3px; - -webkit-border-bottom-left-radius:3px; - -webkit-border-bottom-right-radius:3px; - -moz-border-radius-bottomleft:3px; - -moz-border-radius-bottomright:3px; + background-image:url(/static/upload.png); + } #pnavn{ position:absolute; -top:20; -left:285; +top:-1; +left:395; letter-spacing:-2; text-indent:5; width:96; height:32; padding:2; -border:1px solid #ccc; - background-image:url(/static/grad2.png); - border-top-left-radius:3px; - border-top-right-radius:3px; - -webkit-border-top-left-radius:3px; - -webkit-border-top-right-radius:3px; - -moz-border-radius-topleft:3px; - -moz-border-radius-topright:3px; - border-bottom-left-radius:3px; - border-bottom-right-radius:3px; - -webkit-border-bottom-left-radius:3px; - -webkit-border-bottom-right-radius:3px; - -moz-border-radius-bottomleft:3px; - -moz-border-radius-bottomright:3px; +border:1px; + background-image:url(/static/upload.png); + + } #pnav a { font-size: 30px; - color:#000; + color:#fff; text-transform:lowercase; - text-shadow: -1px 1px 0px #fff; +text-shadow: blue -2px -2px 0, red 2px 2px 0, green -6px 4px 0; } pnav a:link { text-decoration: none; @@ -103,7 +82,8 @@ a:visited { #pnav a:hover { text-decoration: none; color: #fff; - text-shadow: -1px 1px 0px #000; +text-shadow: blue 2px 2px 0, red -20px -2px 0, green 6px 4px 0; + } a:active { diff --git a/static/text.gif b/static/text.gif index de915d6..c6958c7 100644 Binary files a/static/text.gif and b/static/text.gif differ diff --git a/template/banner.st b/template/banner.st index e2b816f..a857628 100755 --- a/template/banner.st +++ b/template/banner.st @@ -2,7 +2,7 @@
-
+
diff --git a/template/browser.st b/template/browser.st index 4e99697..75e6294 100755 --- a/template/browser.st +++ b/template/browser.st @@ -14,7 +14,8 @@ var Room = $json_room_key$; var Timestamp = $timestamp$; var PostedMessages = []; - var growlize = true; + var IsAdmin = "$isadmin$"; + var growlize = true; diff --git a/template/chat.st b/template/chat.st index 330a143..223b8ab 100755 --- a/template/chat.st +++ b/template/chat.st @@ -64,8 +64,8 @@
$if(user_nick)$ -
- +
+
@@ -74,7 +74,8 @@
-
+ +

$footer()$ diff --git a/template/log.st b/template/log.st index abc0477..0a12550 100755 --- a/template/log.st +++ b/template/log.st @@ -28,20 +28,21 @@ $else$ No dumps! $endif$ -

-
+
+ $if(next)$ - <- OLD DUMPS + $endif$ -
-
-    + +   $if(prev)$ - NEW DUMPS -> + $endif$ -

-
+ +

+
+
diff --git a/template/profile.st b/template/profile.st index e71e2bd..a735b2a 100755 --- a/template/profile.st +++ b/template/profile.st @@ -129,12 +129,12 @@
$if(next)$ - + $endif$   $if(prev)$ - + $endif$ -- cgit v1.2.3-70-g09d2 From 0c6d2615d63f0ff7f7d213a6d8fb8b21ef6b7f35 Mon Sep 17 00:00:00 2001 From: timb Date: Sat, 6 Feb 2010 08:37:39 -0800 Subject: disable big hand until it gets fixed --- static/js/home.js | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'static/js') diff --git a/static/js/home.js b/static/js/home.js index fa754ee..af4ee4b 100755 --- a/static/js/home.js +++ b/static/js/home.js @@ -6,15 +6,15 @@ function ifEnter(fn) { function initLoginForm() { - var nick = "#nickInput", nickFiller = "username" - var pass = "#passwordInput", passLabel = "#passwordInputLabel", passFiller = "password" - var submit = "#signin-submit" - - // username input logic: - // set filler text for the login form only if empty - if ($(nick).val() == "") $(nick).val(nickFiller); - - // erase the form text when clicked only if it is filler text, otherwise select it + var nick = "#nickInput", nickFiller = "username" + var pass = "#passwordInput", passLabel = "#passwordInputLabel", passFiller = "password" + var submit = "#signin-submit" + + // username input logic: + // set filler text for the login form only if empty + if ($(nick).val() == "") $(nick).val(nickFiller); + + // erase the form text when clicked only if it is filler text, otherwise select it $(nick).focus(function(){ if($(nick).val() == nickFiller) $(nick).val("") else $(nick).select() @@ -38,8 +38,8 @@ function initLoginForm() { $(pass).addClass("invisible") $(passLabel).removeClass("invisible") } - - // only show password label if input is empty + + // only show password label if input is empty if ($(pass).val() == "") hidePassShowLabel() $(passLabel).click(showPassHideLabel) @@ -48,12 +48,13 @@ function initLoginForm() { $(pass).blur(function(){ if($(pass).val() == "") hidePassShowLabel() }) - - $(nick).keypress(ifEnter(login)); + + $(nick).keypress(ifEnter(login)); $(pass).keypress(ifEnter(login)); $(submit).click(login); - initBigHand(submit) + //disable this until i can figure out the bug on the front page... + //initBigHand(submit) } function initExpandableLoginForm() { -- cgit v1.2.3-70-g09d2 From 1497e77bacf5966ea3852c3ebc87c6d220521228 Mon Sep 17 00:00:00 2001 From: timb Date: Sat, 6 Feb 2010 18:24:21 -0800 Subject: fix hand --- static/index.html | 21 +++++++++++++++++---- static/js/home.js | 48 ++++++++++++++++++++++++++---------------------- static/pichat.css | 6 ++++++ template/chat.st | 2 +- template/footer.st | 2 ++ template/preload.st | 3 +++ 6 files changed, 55 insertions(+), 27 deletions(-) create mode 100644 template/preload.st (limited to 'static/js') diff --git a/static/index.html b/static/index.html index e761927..c492031 100755 --- a/static/index.html +++ b/static/index.html @@ -1,3 +1,5 @@ + @@ -34,12 +36,18 @@ function MM_swapImage() { //v3.0