From 557e5795e9f5f2503072b3becd48dc75e364faf6 Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Mon, 23 Aug 2010 23:05:37 -0400 Subject: sostler prod commit --- docs/feeds.csv | 5 +- static/css/dump.css | 45 ++++------- static/css/pages.css | 8 +- template/about_us.st | 2 +- template/banner.st | 3 +- template/dealwithit.st | 2 +- template/doublerainbow.st | 2 +- template/form_login.st | 8 +- template/him.st | 2 +- template/perezhilton.st | 2 +- template/pogs.st | 2 +- template/rooms/VIP.st | 192 ++++++++++++++++++++++++++++++++++++++++++++++ template/rooms/chat.st | 20 ++++- template/slimer.st | 2 +- template/spinningkid.st | 2 +- template/thisguy.st | 2 +- template/weedpile.st | 2 +- 17 files changed, 255 insertions(+), 46 deletions(-) create mode 100644 template/rooms/VIP.st diff --git a/docs/feeds.csv b/docs/feeds.csv index 2ca6aae..8d88c89 100644 --- a/docs/feeds.csv +++ b/docs/feeds.csv @@ -282,4 +282,7 @@ "thedailywhat",,"http://thedailywh.at/rss",,,, "fatlab",,"http://fffff.at/rss",,,, "dis",,"http://feeds.feedburner.com/dismagazine",,,, -"peoplewholiketochatalot",,"http://justshutty.tumblr.com/rss",,,, +"avatars",,"http://feeds.feedburner.com/dismagazine",,,, +"knowyourmeme",,"http://blog.knowyourmeme.com/rss",,,, +"ffffound",,"http://ffffound.tumblr.com/rss",,,, +"ffffound",,"http://feeds2.feedburner.com/FfffoundcomDailyDigest",,,, diff --git a/static/css/dump.css b/static/css/dump.css index 3f0dea9..aa393c4 100755 --- a/static/css/dump.css +++ b/static/css/dump.css @@ -1,7 +1,7 @@ /* reset.css From http://meyerweb.com/eric/tools/css/reset/ v1.0 | 20080212 */ - + html, body, div, span, applet, object, iframe, @@ -173,9 +173,10 @@ margin-top:4; vertical-align: top; } #bar7 a{ - text-decoration: none; + text-decoration: none; font-family: Monaco, "Courier New", Courier, monospace; + font-size:13; -padding:6px; +padding:4px; cursor:pointer; color: #000; @@ -183,7 +184,7 @@ cursor:pointer; } #bar7 a:hover{ text-decoration: none; -padding:6px;background-color:#fff; +padding:4px;background-color:#fff; color: #000; } @@ -225,8 +226,8 @@ margin-left:-15px; } .toolsmenu{ -width:80px; -color:#000;font-family:verdana;background-color:#ffffff; +width:80px;margin-left:4px; +color:#000;font-family:verdana;background-color:#ffffff; font-family: Monaco, "Courier New", Courier, monospace; } .white a:link { text-decoration: none; @@ -647,7 +648,7 @@ bottom:76; #footerc { text-align:center; - position:fixed; + position:fixed; font-family: Monaco, "Courier New", Courier, monospace; width:100%; bottom:-8px; line-height:1.6; @@ -659,7 +660,7 @@ height:28px; } #footerc a { font-size: 11px; - color: #000; + color: #000;font-family: Monaco, "Courier New", Courier, monospace; } #footerc a:link { text-decoration: none; @@ -675,7 +676,7 @@ color:000; #footerp { text-align:center; - position:fixed; + position:fixed; font-family: Monaco, "Courier New", Courier, monospace; width:100%; bottom:0px; @@ -688,7 +689,7 @@ height:28px; } #footerp a { font-size: 11px; text-decoration: none; - color: #000; + color: #000; font-family: Monaco, "Courier New", Courier, monospace; } #footerp a:link { text-decoration: none; @@ -1516,10 +1517,6 @@ background-color:#fff; width:16px; height:16px; } -/* don't show permalink button on permalink pages */ -body.permalink .buttons .permalink { - display: none; -} #pnav a { @@ -2137,12 +2134,12 @@ text-align: justify; text-justify: newspaper height: auto; padding: 20px; position: absolute; - left: 0; + line-height: 1em; right: 0; text-align: center; left:50%; - margin-left: -250px; + margin-left: -260px; width:460px; /*top: 547px;*/ z-index: 8; @@ -2158,18 +2155,6 @@ text-align: justify; text-justify: newspaper } #dis_content a:hover { text-decoration: underline; } -.divDragTitle { - border: 1px solid #CCC; - border-top: 1px solid #666; - left:50%!important; background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x; - margin-left: -250px!important; -} -.divDragContent { - - left:50%!important; - margin-left: -250px!important; - -} #dissearchbox { top: 20px; @@ -2197,3 +2182,7 @@ background-color:#fff; #dislogout7 a:hover{font-size:10px; color:#000; text-shadow: 0px 1px 0px #fff; } +#pwreset a{ +margin-left:23px; +font-size:11px; +} \ No newline at end of file diff --git a/static/css/pages.css b/static/css/pages.css index db5a056..7dbdc8d 100644 --- a/static/css/pages.css +++ b/static/css/pages.css @@ -182,8 +182,8 @@ background-attachment:fixed; #content { font-family: Arial, Helvetica, sans-serif; background-color:#fff; - background-repeat:repeat-x; - background-position:1 10; + background-repeat:repeat-x;overflow:hidden; + background-position:1 10;text-align: justify; text-justify: newspaper; background-attachment:fixed; margin: 0; @@ -306,6 +306,10 @@ color:#000; font-weight:normal; text-shadow: 1px 1px 1px #fff; +} +#content h5{ +overflow:hidden; +text-align: justify; } #content a { color:#333; diff --git a/template/about_us.st b/template/about_us.st index c731c77..694287c 100644 --- a/template/about_us.st +++ b/template/about_us.st @@ -21,7 +21,7 @@ jQuery(function() background-attachment:fixed;" onload=" javascript:CreateDropdownWindow('about the site', '360px', true, 'news', 70, 75); javascript:CreateDropdownWindow('about the team', '380px', true, 'link', 500, 60); - javascript:CreateDropdownWindow('contact us', '360px', true, 'contact', 100, 395); + javascript:CreateDropdownWindow('contact us', '360px', true, 'contact', 70, 385); "> diff --git a/template/banner.st b/template/banner.st index 7ab45a6..cedb99d 100644 --- a/template/banner.st +++ b/template/banner.st @@ -83,8 +83,9 @@ $endif$
+ $if(user_nick)$ -SUPPORT DUMP.FM! BUY SOME STICKERS!!- dis magazine new style options $else$ Talk with pictures! $endif$ + checkout dump.fm in full-screen - SUPPORT DUMP.FM! BUY SOME STICKERS!!- dis magazine new style options $else$ Talk with pictures! $endif$ $if(isadmin)$ - NAUGHTY BOYS DELIGHT $endif$ diff --git a/template/dealwithit.st b/template/dealwithit.st index 296ca31..15db09f 100644 --- a/template/dealwithit.st +++ b/template/dealwithit.st @@ -129,7 +129,7 @@ font-size:100%;}
-
deal with it on dump.fm

A Collection of images that 'deal with it' by users of dump.fm.

Click Here to download the deal with it photoshop template.

Check out upcoming dump themes

Return Home

+
deal with it on dump.fm

A Collection of images that 'deal with it' by users of dump.fm.

Click Here to download the deal with it photoshop template.

Check out upcoming dump themes

Return Home

$if(!user_nick)$
dump.fm lets you share images in realtime.
Click here to register!
$endif$
diff --git a/template/doublerainbow.st b/template/doublerainbow.st index c876d3f..6c4674f 100644 --- a/template/doublerainbow.st +++ b/template/doublerainbow.st @@ -143,7 +143,7 @@ font-size:100%;}
-
Double Rainbow on dump.fm

A Collection of images of Double Rainbow related images by users of dump.fm on July 14, 2010.

Check out upcoming dump themes

Return Home

+
Double Rainbow on dump.fm

A Collection of images of Double Rainbow related images by users of dump.fm on July 14, 2010.

Check out upcoming dump themes

Return Home

$if(!user_nick)$
dump.fm lets you share images in realtime.
Click here to register!
$endif$
diff --git a/template/form_login.st b/template/form_login.st index 0ca2107..2db9d0b 100644 --- a/template/form_login.st +++ b/template/form_login.st @@ -15,8 +15,12 @@ Remember Me -

- +

+ + Password Reset + + +
diff --git a/template/him.st b/template/him.st index 02e5baf..0eb9b99 100644 --- a/template/him.st +++ b/template/him.st @@ -143,7 +143,7 @@ font-size:100%;}
-
'Him' on dump.fm

A Collection of images of 'him' by users of dump.fm on July 11, 2010.

Check out upcoming dump themes

Return Home

+
'Him' on dump.fm

A Collection of images of 'him' by users of dump.fm on July 11, 2010.

Check out upcoming dump themes

Return Home

$if(!user_nick)$
dump.fm lets you share images in realtime.
Click here to register!
$endif$
diff --git a/template/perezhilton.st b/template/perezhilton.st index f8465fa..8810d27 100644 --- a/template/perezhilton.st +++ b/template/perezhilton.st @@ -143,7 +143,7 @@ font-size:100%;}
-
Perez Hilton on dump.fm

A Collection of images involving Perez Hilton by users of dump.fm on July 12, 2010.

Check out upcoming dump themes

Return Home

+
Perez Hilton on dump.fm

A Collection of images involving Perez Hilton by users of dump.fm on July 12, 2010.

Check out upcoming dump themes

Return Home

$if(!user_nick)$
dump.fm lets you share images in realtime.
Click here to register!
$endif$
diff --git a/template/pogs.st b/template/pogs.st index b189de4..63bc29e 100644 --- a/template/pogs.st +++ b/template/pogs.st @@ -143,7 +143,7 @@ font-size:100%;}
-
Pogs of dump.fm

A Collection of over 300 digital pogs made by users of dump.fm on July 6, 2010.
This collection is a nod to Mike's Digital Pog Page

Check out upcoming dump themes

Return Home

+
Pogs of dump.fm

A Collection of over 300 digital pogs made by users of dump.fm on July 6, 2010.
This collection is a nod to Mike's Digital Pog Page

Check out upcoming dump themes

Return Home

$if(!user_nick)$
dump.fm lets you share images in realtime.
Click here to register!
$endif$
diff --git a/template/rooms/VIP.st b/template/rooms/VIP.st new file mode 100644 index 0000000..dce74a6 --- /dev/null +++ b/template/rooms/VIP.st @@ -0,0 +1,192 @@ + + + + +$head()$ + VIP BALLER ROOM + + + + +$if(user_nick)$ + +$endif$ + + + + +$if(dis)$ + $banner_dis()$ +$else$ + $banner()$ + $if(!user_nick)$ + +
+

+ If you already have an account, . If not, register now. +

+
+
+ + +
dump.fm lets you talk with pictures! Paste an image url, upload, or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love! +
+
+
+ + + + +$endif$ +$endif$ + + +
+ +
+
+
+
+ +
+ + +$if(user_nick)$ $endif$ +
+
+$messages: { m | +
+ + $m.nick$ + $if(m.favorited)$ + + $else$ + + $endif$ + + $m.content$ +
+}$ +
+
+ + $if(user_nick)$ +
+
+ + + + + + +
+
+$else$ +
+
+ + + + + + +
+
+ $endif$ + $if(isadmin)$ + +$endif$ +
+
+
+
+
+
+ $footer()$ +
+$preload()$ + + diff --git a/template/rooms/chat.st b/template/rooms/chat.st index f4c4162..19f32d4 100644 --- a/template/rooms/chat.st +++ b/template/rooms/chat.st @@ -72,17 +72,19 @@ $if(dis)$ $else$ $banner()$ $if(!user_nick)$ - +
dump.fm lets you talk with pictures! Paste an image url, upload, or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love!
+

+ If you already have an account, . If not, register now.
@@ -92,6 +94,20 @@ $else$ var topZ = 7; CreateDropdownWindow('', '500px', true, 'dis_welcome', 300, 70); + $endif$ $endif$ diff --git a/template/slimer.st b/template/slimer.st index 0fc7979..e49d8a6 100644 --- a/template/slimer.st +++ b/template/slimer.st @@ -143,7 +143,7 @@ font-size:100%;}
-
Slimer on dump.fm

A Collection of images of Slimer (Ghostbusters) by users of dump.fm on July 15, 2010.

Check out upcoming dump themes

Return Home

+
Slimer on dump.fm

A Collection of images of Slimer (Ghostbusters) by users of dump.fm on July 15, 2010.

Check out upcoming dump themes

Return Home

$if(!user_nick)$
dump.fm lets you share images in realtime.
Click here to register!
$endif$
diff --git a/template/spinningkid.st b/template/spinningkid.st index 071e157..6b61792 100644 --- a/template/spinningkid.st +++ b/template/spinningkid.st @@ -143,7 +143,7 @@ font-size:100%;}
-
Spinning Kid on dump.fm

A Collection of images of the 'Spinning Kid' by users of dump.fm on July 12, 2010.

Download the Spinning Kid Photoshop Template

Check out upcoming dump themes

Return Home

+
Spinning Kid on dump.fm

A Collection of images of the 'Spinning Kid' by users of dump.fm on July 12, 2010.

Download the Spinning Kid Photoshop Template

Check out upcoming dump themes

Return Home

$if(!user_nick)$
dump.fm lets you share images in realtime.
Click here to register!
$endif$
diff --git a/template/thisguy.st b/template/thisguy.st index 4d63f96..4b74d9d 100644 --- a/template/thisguy.st +++ b/template/thisguy.st @@ -143,7 +143,7 @@ font-size:100%;}
-
This Guy of dump.fm

A Collection of images of 'this guy' by users of dump.fm (glasspopcorn) on July 3, 2010.

Check out upcoming dump themes

Return Home

+
This Guy of dump.fm

A Collection of images of 'this guy' by users of dump.fm (glasspopcorn) on July 3, 2010.

Check out upcoming dump themes

Return Home

$if(!user_nick)$
dump.fm lets you share images in realtime.
Click here to register!
$endif$
diff --git a/template/weedpile.st b/template/weedpile.st index 97cc610..54d8bac 100644 --- a/template/weedpile.st +++ b/template/weedpile.st @@ -137,7 +137,7 @@ font-size:100%;}
-
Weed Pile on dump.fm

A Collection of images involving 'Weed Pile' from July 2, 2010.

Check out upcoming dump themes

Return Home

+
Weed Pile on dump.fm

A Collection of images involving 'Weed Pile' from July 2, 2010.

Check out upcoming dump themes

Return Home

$if(!user_nick)$
dump.fm lets you share images in realtime.
Click here to register!
$endif$
-- cgit v1.2.3-70-g09d2