From adaf759270d7222a4879a7e3adba2713dc86d8ad Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Sat, 5 Jun 2010 04:05:57 -0400 Subject: sostler prod commit --- static/css/dump.css | 193 +++++++++++++++++++++-- static/css/header.css | 22 ++- static/form_login/front.css | 9 +- static/furieindex.html | 150 ++++++++++++++++++ static/img/bg.dither.gif | Bin 0 -> 52 bytes static/img/dumppixelhover.png | Bin 0 -> 509 bytes static/img/link.gif | Bin 0 -> 228 bytes static/img/previewdump.png | Bin 0 -> 4216 bytes static/index.html | 350 ++++++++++++++++++++++++++++++++---------- static/js/invalid_domains.js | 1 + static/js/pichat.js | 4 +- static/newindex.html | 329 --------------------------------------- template/banner.st | 26 +++- template/nigga.st | 135 ++++++++++++++++ template/profile.st | 171 +++++++-------------- template/profile_dump.st | 4 +- template/share_buttons.st | 3 + template/single_message.st | 27 ++-- template/tagged_dumps.st | 8 +- 19 files changed, 864 insertions(+), 568 deletions(-) create mode 100755 static/furieindex.html create mode 100644 static/img/bg.dither.gif create mode 100644 static/img/dumppixelhover.png create mode 100644 static/img/link.gif create mode 100644 static/img/previewdump.png mode change 100755 => 100644 static/index.html delete mode 100644 static/newindex.html create mode 100644 template/nigga.st diff --git a/static/css/dump.css b/static/css/dump.css index e5c22de..9c8b945 100755 --- a/static/css/dump.css +++ b/static/css/dump.css @@ -88,7 +88,7 @@ bottom:76; position:fixed; width:100%; bottom:-8px; -line-height:3.1; +line-height:1.6; font-size:11px; word-spacing:6px; height:28px; @@ -117,7 +117,7 @@ top:50px; bottom:65px; position:fixed; width: 99.6%; - background-color:#FFF; + background-color:#fff; left:0.2%; z-index:5; } @@ -189,6 +189,25 @@ border-right:0px; font-size:12px; color:#000; } +#prevbutton { + position:absolute; + display:inline-block; + width:120px; +height:35px; +background-position:center; +right:125px; +top:0; +font-weight:bold; +background-color:#eff5fb; +padding-bottom:1; + text-align:center; + z-index:100; + cursor:pointer; + font-size:12px; + color:#000; +border:1px solid #000;border-right:0px; +} + #webcam-button-upload{ border-top-right-radius:10px; -webkit-border-top-right-radius:5px;background-color:#eff5fb; @@ -211,6 +230,29 @@ padding-bottom:1; font-size:12px; color:#000; } +#nextbutton{ + border-top-right-radius:10px; + -webkit-border-top-right-radius:5px; + -moz-border-radius-topright:5px; + border-bottom-right-radius:5px; + -webkit-border-bottom-right-radius:5px; + -moz-border-radius-bottomright:5px; + position:absolute; + display:inline-block; + width:120px; +height:35px; +font-weight:bold; +background-position:center; +right:5px;background-color:#eff5fb; +border:1px solid #000; +top:0; +padding-bottom:1; + text-align:center; + z-index:100; + cursor:pointer; + font-size:12px; + color:#000; +} #webcam-button-snap{ border-top-right-radius:10px; -webkit-border-top-right-radius:5px; @@ -416,7 +458,7 @@ border:1px solid blue; border-top-left-radius:5px; border-top-right-radius:5px; -webkit-border-top-left-radius:5px; - background-color:#FFF; + background-color:#transparent; -webkit-border-top-right-radius:5px; -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px; @@ -434,9 +476,11 @@ border-bottom:2px solid #c8cbce; -moz-box-shadow: 3px 3px 4px #c8cbce; filter: progid:DXImageTransform.Microsoft.dropShadow(color=#c8cbce, offX=3, offY=4, positive=true); text-overflow:ellipsis; -/* opacity:0.87; */ +/* opacity:0.75;*/ z-index:18; text-align: left; +background-image:url(/static/img/bg.dither.gif); + } #userList a:hover{color:#ffffff;} .username{height:30px; @@ -453,8 +497,26 @@ display:block; width:100%; height:100%; color:#000; text-decoration:none; + } .username a:hover { +text-shadow: none; +display:block; +width:100%; +height:100%; +background-image:url(/static/img/moverc.png); +background-repeat:repeat-x; +color:#fff; +text-decoration:none; +background-color:#f3f3f3; + border-top-right-radius:5px; + -webkit-border-top-right-radius:5px; + -moz-border-radius-topright:5px; + border-bottom-right-radius:5px; + -webkit-border-bottom-right-radius:5px; + -moz-border-radius-bottomright:5px; +} +#userlist a:hover { display:block; width:100%; height:100%; @@ -524,6 +586,89 @@ background-color:#f3f3f3; width:auto; } +#userListp { + overflow-x: hidden; + overflow-y:auto; + max-height: 70%; + margin: 0px; + position: absolute; + padding: 5px; + top:25px; + min-width: 210px; + width:11%; + float:right; + right: 4.5%; + font-family: Arial, Helvetica, sans-serif; + font-size: 14px; + font-weight:420; + border-top-left-radius:5px; + border-top-right-radius:5px; + -webkit-border-top-left-radius:5px; + background-color:#transparent; + -webkit-border-top-right-radius:5px; + -moz-border-radius-topleft:5px; + -moz-border-radius-topright:5px; + border-bottom-left-radius:5px; + border-bottom-right-radius:5px; + -webkit-border-bottom-left-radius:5px; + -webkit-border-bottom-right-radius:5px; + -moz-border-radius-bottomleft:5px; + -moz-border-radius-bottomright:5px; +border-right:2px solid #c8cbce; +border-bottom:2px solid #c8cbce; + + box-shadow: 3px 4px 4px #c8cbce; +-webkit-box-shadow: 3px 4px 4px #c8cbce; +-moz-box-shadow: 3px 3px 4px #c8cbce; +filter: progid:DXImageTransform.Microsoft.dropShadow(color=#c8cbce, offX=3, offY=4, positive=true); + text-overflow:ellipsis; +/* opacity:0.75;*/ + z-index:18; + text-align: left; +background-image:url(/static/img/bg.dither.gif); +background-color:#fff; + +} +#userListp img{ + + max-width:30px; + width: expression(this.width > 30 ? 30: true); + max-height:30px; + height: expression(this.width > 30 ? 30: true); + max-width:30px; + float:right; + right:1px; + z-index:77; + height:30px; + 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; +} +#userlistp a:hover { +display:block; +width:100%; +height:100%; +background-image:url(/static/img/moverc.png); +background-repeat:repeat-x; +color:#fff; +text-decoration:none; +background-color:#f3f3f3; + border-top-right-radius:5px; + -webkit-border-top-right-radius:5px; + -moz-border-radius-topright:5px; + border-bottom-right-radius:5px; + -webkit-border-bottom-right-radius:5px; + -moz-border-radius-bottomright:5px; +} #mgsavatar{ left:0; } @@ -586,6 +731,15 @@ overflow:auto !important; #chatrap{ +} +#messagePanep { +top:50px; +bottom:65px; + position:fixed; + width: 99.6%; + background-color:#fff; +left:0.2%; + z-index:5; } #edit-toggle{ position:absolute; @@ -782,6 +936,10 @@ background-color:#fff; -moz-border-radius-bottomleft:5px; -moz-border-radius-bottomright:5px; +} +#profiletxt img{ +width:16px; +height:16px; } #pnav a { font-size: 30px; @@ -838,25 +996,34 @@ color:000; } .logged-dump img{ - max-width:600px; + max-width:400px; width: expression(this.width > 600 ? 600: true); - max-height:600px; + max-height:400px; + height: expression(this.width > 600 ? 600: true); + border:0px; + z-index:4; +} +#messageList img{ + max-width:400px; + width: expression(this.width > 600 ? 600: true); + max-height:400px; height: expression(this.width > 600 ? 600: true); border:0px; z-index:4; } .logged-dump{ -width:600px; - max-width:600px; + +background-color:#f0f9ff; text-overflow: ellipsis-word; padding: 18px 18px 6px 18px; font-family: Arial, Helvetica, sans-serif; font-size: 12px; text-transform: uppercase; + +margin-left:3px; line-height:15px; - background-color:#fff; -border-top:0px solid #000; -margin-top:20; +border-top:1px solid #ccc; + z-index:4; line-height:20px; text-align: left; @@ -956,7 +1123,9 @@ z-index:5555; } .dlogged-dump{ - width:600px; + min-width:600px; + max-width:600px; +width:600px; width:auto; text-overflow: ellipsis-word; padding: 18px; diff --git a/static/css/header.css b/static/css/header.css index 493f4d4..fd189f1 100755 --- a/static/css/header.css +++ b/static/css/header.css @@ -14,8 +14,8 @@ margin: 0px auto -1px auto; top:-1px; height:49px; - position:fixed; -background-color:#fff; + position:fixed;background-image:url(/static/img/bg.dither.gif); +background-color:#eee; border:1px solid #000; width:100%; min-width:600px; @@ -84,6 +84,11 @@ background-color:#eff5fb; } #logout7 a:hover{font-size:10px; color:#000; text-shadow: 0px 1px 0px #fff; +} +#toplogin{ +margin-top:8px; +margin-right:5px; + } .white a:link { @@ -140,17 +145,16 @@ border-left:1px solid #999;*/ width:auto; } #registerlink{ - top:-5px; font-size: 16px; -height:22; word-spacing:2; -color:#fff; - +line-height:2.4; +font-weight:bold; } #registerlink img{ display:none; } + .no-cursor { cursor: none; } .invisible { display: none !important; } #cursor-big { position: absolute; z-index: 1000; } @@ -187,6 +191,7 @@ img.chat-thumb { .buttons{ cursor:pointer; + } .buttons .share { opacity: 0.8; @@ -204,10 +209,11 @@ image-rendering: -moz-crisp-edges; margin-top: 0px; height: 27px; width: 27px; - right: 5px; - top: 3px; + left:110px; + bottom: 9px; display: block; } + .thumb.favorite { position: absolute; margin-left: 0px; diff --git a/static/form_login/front.css b/static/form_login/front.css index 7b662d6..05d23ac 100644 --- a/static/form_login/front.css +++ b/static/form_login/front.css @@ -100,10 +100,8 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#ccc, offX=3, offY=4, #signin_menu input[type=text], #signin_menu input[type=password] { display:block; - -moz-border-radius:4px; - -webkit-border-radius:4px; - font-size:13px; - margin:0 0 5px;border:1px solid; + font-size:25px; + margin:0 0 5px; padding:5px; width:203px; } @@ -123,9 +121,8 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#ccc, offX=3, offY=4, #signin-submitform { display:inline-block; width:90px; - height:30px; + height:35px; font-size:20px; -border:1px solid #999; background-image:url(/static/img/btngrad1.png); font-weight:bold; word-spacing:7; diff --git a/static/furieindex.html b/static/furieindex.html new file mode 100755 index 0000000..bcf44c9 --- /dev/null +++ b/static/furieindex.html @@ -0,0 +1,150 @@ + + + + + + + dump.fm + + + + + + + + + + + + + + + + +dump.fm + + + +
+
+
+ +

watch a lil movie +

+
+ +
+ + + +
+ +
+
+ +
+ + +
+
+ Lost password?
+
+ + +
+ +
+ +
+ +
+
+ + + +
+

+
+ +
+ +
+ + +
+ +
+ + + + + diff --git a/static/img/bg.dither.gif b/static/img/bg.dither.gif new file mode 100644 index 0000000..670df08 Binary files /dev/null and b/static/img/bg.dither.gif differ diff --git a/static/img/dumppixelhover.png b/static/img/dumppixelhover.png new file mode 100644 index 0000000..77f18a8 Binary files /dev/null and b/static/img/dumppixelhover.png differ diff --git a/static/img/link.gif b/static/img/link.gif new file mode 100644 index 0000000..9cc8784 Binary files /dev/null and b/static/img/link.gif differ diff --git a/static/img/previewdump.png b/static/img/previewdump.png new file mode 100644 index 0000000..7d0d526 Binary files /dev/null and b/static/img/previewdump.png differ diff --git a/static/index.html b/static/index.html old mode 100755 new mode 100644 index bcf44c9..a62c761 --- a/static/index.html +++ b/static/index.html @@ -1,31 +1,14 @@ - - - - - - dump.fm + + dump.fm - + + @@ -53,49 +36,281 @@ jQuery(window).load(function() { }); }); - + -
-
+
+ -

watch a lil movie -

-
- -
- - - -
- -
-
+
+
+
+Click here to Register! +
+
+preview dump.fm! +
+
+
+
+
+
dump.fm
+
dump.fm
+
dump.fm
+
dump.fm
+
+
+ + +
+ + +
+ +
+
Already a member?


+

- +
- - -
-
- -
- -
-
- - - +
-

-
-
-
- -
@@ -146,5 +342,5 @@ $(document).ready(function() { pageTracker._trackPageview(); } catch(err) {} - + diff --git a/static/js/invalid_domains.js b/static/js/invalid_domains.js index e23906f..c7788cd 100644 --- a/static/js/invalid_domains.js +++ b/static/js/invalid_domains.js @@ -71,6 +71,7 @@ var InvalidDomains = [ "http://www.oafe.net", "http://www.mrbalihai.com", "http://www.digyourowngrave.com", + "http://tripod.com", "http://www.kaitaia.com", "http://carsdriveingallery.com", "http://xxxspacegirls.us", diff --git a/static/js/pichat.js b/static/js/pichat.js index f130239..48b5e54 100644 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -22,7 +22,7 @@ Anim = { "chatThumbTiny": {"width": "8px", "height": "8px", "right": "8px", "bottom": "8px"}, "chatThumb": {"width": "16px", "height": "16px", "right": "4px", "bottom": "4px"}, "logThumb": {"width": "27px", "height": "27px", "marginRight": "0px", "marginTop": "0px"}, - "logThumbBig": {"width": "64px", "height": "64px", "marginRight": "-20px", "marginTop": "-20px"} + "logThumbBig": {"width": "64px", "height": "64px", "marginRight": "-2px", "marginTop": "-2px"} } // Utils @@ -1014,4 +1014,4 @@ function startTitleUpdater() { $(function() { OrigTitle = $('title').text(); -}); \ No newline at end of file +}); diff --git a/static/newindex.html b/static/newindex.html deleted file mode 100644 index e06d8f7..0000000 --- a/static/newindex.html +++ /dev/null @@ -1,329 +0,0 @@ - - - dump.fm - - - - - - - - - - - - - - - - -
- - -
-
-
-Click here to Register! -
-
-
-
-
-
dump.fm
-
dump.fm
-
dump.fm
-
dump.fm
-
-
- - -
- - -
- -
-
Already a member?


-
- -
- - -
-
- Lost password?
-
-
-
- -
- - -
- -
- - - - - diff --git a/template/banner.st b/template/banner.st index 9ee037a..3339fc2 100644 --- a/template/banner.st +++ b/template/banner.st @@ -2,7 +2,25 @@
-
+
+ + + + +
@@ -20,7 +38,7 @@ $else$ - dump.fm lets you share pictures in real-time. Click here to get started! +The coolest way to share pictures. Click here to get started! $endif$ @@ -32,7 +50,7 @@
-
dump.fm - let pictures do the talking - my favorite pics - - justin bieber $if(isadmin)$ +
dump.fm - let pictures do the talking $if(user_nick)$- my favorite pics - - justin bieber $endif$ $if(isadmin)$ - news - gossip - art - gif - design - fashion @@ -41,7 +59,7 @@
$if(user_nick)$
- $else$
$form_login()$
$endif$ + $else$
$form_login()$
$endif$
diff --git a/template/nigga.st b/template/nigga.st new file mode 100644 index 0000000..4a8ff02 --- /dev/null +++ b/template/nigga.st @@ -0,0 +1,135 @@ + + + $nick$'s dump.fm + $head()$ + + + + + + + + $banner()$ +
+
+
+
+ +
+

+



+ $if(avatar)$ + + $else$

+ + $endif$ + + $nick$


+ $if(score_ent)$ + + fav score: $score$ + $score_ent$ + $endif$ + $if(isadmin)$

+ + $endif$ + + + + + + $if(is_home)$ + + $endif$ + +

contact info

+ $if(contact)$ +

$contact$
+ $else$ +

+ $endif$ +
+ +

bio

+ $if(bio)$ +

$bio$
+ $else$ +

+ $endif$ + + + + + $if(is_home)$ +
+ + $endif$ + +
+ + $nick$'s
Favorite Pix
+ +
+
+
+ +
+
+ + $if(dumps)$ + $dumps:{ d | $profile_dump(dump=d)$ }$ + + + + + + + + $else$ + no dumps + $endif$ +
+ + +
+
+ + $if(prev)$ + + $else$ + + $endif$ + + $if(next)$ + + $else$ + + $endif$ + + + + +
+
+ $footer()$ +
+
+
+ + diff --git a/template/profile.st b/template/profile.st index e530e4a..f648e43 100644 --- a/template/profile.st +++ b/template/profile.st @@ -8,38 +8,39 @@ + - + $banner()$ -
-
-
-
+
+
+
-
-
-
- $if(dumps)$ - $dumps:{ d | $profile_dump(dump=d)$ }$ -
- -

$nick$


+ +
+

$if(is_home)$
$endif$ +

+ $if(avatar)$ + + $else$

+ + $endif$ + + $nick$


$if(score_ent)$ fav score: $score$ $score_ent$ $endif$ - $if(isadmin)$ + $if(isadmin)$

$endif$ - $if(avatar)$ - - $else$ - - $endif$ + + + $if(is_home)$ $endif$ -

contact info

+

contact info

$if(contact)$ -
$contact$
+
$contact$
$else$ -
+


$endif$ -
- -

bio

+ +

bio

$if(bio)$ -
$bio$
+
$bio$
$else$ -
+


$endif$ @@ -68,7 +68,7 @@ $if(is_home)$
- +

$endif$
@@ -78,98 +78,45 @@
- - - $else$ -
-
- $nick$'s first dump.fm post! -
- -
-$if(dump.avatar)$ - -$else$ - -$endif$ -
-$if(dump.favorited)$ - -$else$ - -$endif$ -
-
-$share_buttons()$ -
-
-

$nick$

- - $if(isadmin)$ -
- Mute $nick$!
+ +
+
-
- $endif$ + $if(dumps)$ + $dumps:{ d | $profile_dump(dump=d)$ }$ + + - $if(avatar)$ - - $else$ - - $endif$ - - $if(is_home)$ - - $endif$ - -

contact info

- $if(contact)$ -
$contact$
- $else$ -
- $endif$ -
- -

bio

- $if(bio)$ -
$bio$
- $else$ -
- $endif$ +
+ - $if(is_home)$ -
- - $endif$ -
- - $nick$'s Favorite Pix - -
-
-
+ $else$ + no dumps $endif$ - -

 

-
+
+ - $if(next)$ - - $endif$ +
+
+ + $if(prev)$ + + $else$ + + $endif$ -   - $if(prev)$ - - $endif$ + $if(next)$ + + $else$ + + $endif$ + -

-
- - +
$footer()$
diff --git a/template/profile_dump.st b/template/profile_dump.st index 43d995e..8866ae4 100644 --- a/template/profile_dump.st +++ b/template/profile_dump.st @@ -1,6 +1,6 @@
-
- $dump.created_on$ -- in $dump.key$ +
+ $dump.created_on$ -- in $dump.key$
diff --git a/template/share_buttons.st b/template/share_buttons.st index 02736dc..a251cff 100644 --- a/template/share_buttons.st +++ b/template/share_buttons.st @@ -1,8 +1,11 @@ \ No newline at end of file diff --git a/template/single_message.st b/template/single_message.st index df43eed..ab84668 100644 --- a/template/single_message.st +++ b/template/single_message.st @@ -3,7 +3,7 @@ dump.fm $head()$ - + @@ -12,30 +12,33 @@ $banner()$ -
-
-
-
-
-
-
- +
+
+
+
+ +
+

$message.nick$ $if(message.avatar)$
-
+
+
$endif$
+
+
+ $message.content$
$share_buttons()$
- +
diff --git a/template/tagged_dumps.st b/template/tagged_dumps.st index cbc2f59..ced1ba4 100644 --- a/template/tagged_dumps.st +++ b/template/tagged_dumps.st @@ -12,7 +12,7 @@ $head()$

-
+

$page_title$



@@ -21,14 +21,14 @@ $head()$

-
+
$if(dumps)$ - $dumps: { d |
$log_dump(dump=d)$ + $dumps: { d | $log_dump(dump=d)$ -
}$ +}$ $if(json_tags)$