From e9dcb2bc4bb1b915e02eff3823d6006b052df13d Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Thu, 27 May 2010 14:17:15 -0400 Subject: sostler prod commit --- docs/feeds.csv | 133 +++++- static/css/dump.css | 2 +- static/css/header.css | 6 +- static/css/index.css | 11 +- static/css/pages.css | 2 +- static/form_login/front.css | 30 +- static/form_login/images/toggle_down_light.png | Bin 277 -> 1178 bytes static/img/calm.gif | Bin 1304 -> 1414 bytes static/index.html | 3 +- static/index2.html | 545 +++++++++++++++++++++---- static/js/invalid_domains.js | 5 +- template/banner.st | 6 +- template/chat.st | 5 +- template/directory.st | 20 +- template/form_login.st | 10 +- template/mail/welcome.st | 4 +- template/tinychat.st | 4 +- 17 files changed, 659 insertions(+), 127 deletions(-) diff --git a/docs/feeds.csv b/docs/feeds.csv index cd47256..ed6dfdf 100644 --- a/docs/feeds.csv +++ b/docs/feeds.csv @@ -31,7 +31,7 @@ art,,http://youmakemesohappy.blogspot.com/feeds/posts/default,, art,,http://hotchicksatartopenings.tumblr.com/rss,, art,,http://deliciousghost.com/feed/,, art,,feed://http//theworldsbestever.com/feed/,, -art,,http://www.flong.com/blog/feed,, +art,,http://www.flong.com/blog/feed,,gabifventes@gmail.com art,,http://feeds2.feedburner.com/fallonandrosof/,,"robertafallon@gmail.com,libbyrosof@gmail.com" art,,http://liverpoolartcritic.com/feed/,, art,,http://artpatrol.blogspot.com/feeds/posts/default,,artpatrolblog@gmail.com @@ -44,6 +44,21 @@ art,,http://feeds2.feedburner.com/todayandtomorrow_net,,info@todayandtomorrow.ne art,,http://www.booooooom.com/feed/,,http://www.booooooom.com/canadian-photography-art-blog-contact-jeff-hamada-booooooom/ art,,http://www.fecalface.com/SF/index.php?option=com_rss&feed=RSS2.0&no_html=1,,http://www.fecalface.com/SF/index.php?option=com_contact art,,http://ryderripps.tumblr.com/rss,, +art,,http://davemisled.tumblr.com/rss,,davemisled@gmail.com +art,,,, +art,,,, +art,,,, +art,,,, +art,,,, +art,,,, +art,,,, +art,,,, +art,,,, +art,,,, +art,,,, +art,,,, +art,,,, +art,,,, art,,,, art,,,, art,,,, @@ -78,15 +93,20 @@ design,,http://m.ammoth.us/blog/feed/,, design,,http://ilikeandlike.blogspot.com/feeds/posts/default,, design,,"http://etsyfavorites.tumblr.com/rss ",, -design,,http://www.davidkaneda.com/rss,, -design,,http://subcreation.tumblr.com/rss,, -design,,http://www.formfiftyfive.com/wp-rss2.php,, -design,,http://blog.hellopanos.co.uk/rss,, -design,,http://lindseygrande.tumblr.com/rss,, -design,,http://bendrawslife.tumblr.com/rss,, +design,,http://www.davidkaneda.com/rss,,"garrison.becca@gmail.com +" +design,,http://subcreation.tumblr.com/rss,,lolpatd@yahoo.com +design,,http://www.formfiftyfive.com/wp-rss2.php,,"anthony.william.thornton@gmail.com +" +design,,http://blog.hellopanos.co.uk/rss,,victorymouth@gmail.com +design,,http://lindseygrande.tumblr.com/rss,,"eojmartinez@gmail.com +" +design,,http://bendrawslife.tumblr.com/rss,,"pmosele@gmail.com +" design,,"http://danmeth.com/rss ",, -design,,,, +design,,http://kelleymcnutt.tumblr.com/rss,,"kemcnutt@gmail.com +" design,,,, design,,,, design,,,, @@ -132,7 +152,7 @@ fashion,,http://www.nymag.com/newyork/rss/,,contactus@nymag.com fashion,,http://jakandjil.com/blog/?feed=rss2,,"APARK@THECOLLECTIVESHIFT.COM,TOMMY.TON@JAKANDJIL.COM" fashion,,,,mail@copenhagenstreetstyle.dk fashion,,http://feeds2.feedburner.com/coveted,,hello@thecoveted.net -fashion,,http://dailydrop.com/feed/,, +fashion,,http://dailydrop.com/feed/,,melissa.paget@gmail.com fashion,,,,"knighttcat@gmail.com " fashion,,,, @@ -190,4 +210,97 @@ gossip,,,, gossip,,,, gossip,,,, gossip,,,, -gossip,,,, \ No newline at end of file +gossip,,,, +boys,,http://zreveals.blogspot.com/feeds/posts/default,,"Zreveals@gmail.com +" +boys,,http://queerpirate.tumblr.com/rss,,http://queerpirate.tumblr.com/ask +boys,,http://lifeiskinky.tumblr.com/rss,,http://lifeiskinky.tumblr.com/ask +boys,,http://troyisnaked.tumblr.com/rss,,http://troyisnaked.tumblr.com/ask +boys,,http://fusion75.tumblr.com/rss,,ncfusion75@gmail.com +boys,,http://spunkyhunks.tumblr.com/rss,,tswwyb@gmail.com +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +boys,,,, +paper,,feed://www.papermag.com/rss.xml,,wordup@papermag.com +,,,, +xxx,,http://snusk.tumblr.com/rss,,snusktumblr@gmail.com +xxx,,http://nylons.tumblr.com/rss,,sabrinamorgan@gmail.com +xxx,,http://thatsfuckingart.tumblr.com/rss,,fcknart@gmail.com +xxx,,http://libraryvixen.tumblr.com/rss,,vixen@libraryvixen.com +xxx,,http://dalventre.tumblr.com/rss,,daventre2@gmail.com +xxx,,http://chagrin.tumblr.com/rss,,chagrin.tumblr@gmail.com +xxx,,http://squidintestines.tumblr.com/rss,,squidintestines@gmail.com +xxx,,http://xemxija.tumblr.com/rss,,xemxija62@gmail.com +xxx,,http://psychespet.tumblr.com/rss,, +xxx,,http://dailyporno.tumblr.com/rss,,http://dailyporno.tumblr.com/ask +xxx,,http://porn4fun.tumblr.com/rss,,esseeffe1988@gmail.com +xxx,,http://dirtypicturesturnmeon.tumblr.com/rss,,dirtypicturesblog@googlemail.com +xxx,,http://mtlamoureuse.tumblr.com/rss,, +xxx,,http://burningsea.tumblr.com/rss,,burningsea@me.com +xxx,,http://breathtakers.tumblr.com/rss,,breathtakers.tumblr@gmail.com +xxx,,http://sampler.tumblr.com/rss,,smplrr@gmail.com +xxx,,http://ixthianapolis.tumblr.com/rss,,badpr0ntumblr@gmail.com +xxx,,http://masturbatewithme.tumblr.com/rss,,masturbatewithme@gmail.com +xxx,,http://clubporn.tumblr.com/rss,, +xxx,,http://deepervalley.tumblr.com/rss,,deepervalley@gmail.com +xxx,,http://happycouples.tumblr.com,,Howardschilling@gmail.com +xxx,,http://mysnowwhyte.tumblr.com/rss,, +xxx,,http://comeover.tumblr.com/rss,,beautifulanddepraved@gmail.com +xxx,,http://beautifulanddepraved.tumblr.com/rss,, +xxx,,,, +xxx,,,, +xxx,,,, +xxx,,,, +xxx,,,, +xxx,,,, +xxx,,,, +xxx,,,, +xxx,,,, +xxx,,,, +xxx,,,, +xxx,,,, +xxx,,,, +xxx,,,, +xxx,,,, +bieber,,http://justinbieberfansite.blogspot.com/feeds/posts/default,,fansofjustin@gmail.com +bieber,,http://lesbianswholooklikejustinbieber.tumblr.com/rss,, +bieber,,http://fvckyeahjustinbieber.tumblr.com/rss,, +bieber,,,, +bieber,,,, +bieber,,,, +bieber,,,, +bieber,,,, +toes,,http://blog.footsiebabes.com/feed?nats=MDowOjIx,, +toes,,http://feeds.feedburner.com/StockingsWife,, +toes,,,, +toes,,,, \ No newline at end of file diff --git a/static/css/dump.css b/static/css/dump.css index c61c4fa..0d3538e 100755 --- a/static/css/dump.css +++ b/static/css/dump.css @@ -396,7 +396,7 @@ 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.87; */ z-index:18; text-align: left; } diff --git a/static/css/header.css b/static/css/header.css index d6134b3..7729cf2 100755 --- a/static/css/header.css +++ b/static/css/header.css @@ -31,7 +31,7 @@ left:-1px;background-image:url(/static/img/blgrad.png); word-spacing:-1; font-size: 16px; height:22; -width:455px; + text-indent:14px; line-height:1.9; left: 150px; @@ -117,7 +117,7 @@ text-shadow: -0.5px -0.5px 0px #f0e; top:0px:width:100%;padding:0px;background-color:#fff; color:#000;font-size:60%;text-transform:uppercase;text-decoration: none; border-bottom:1px solid #999;text-align:right; -padding-right:90px;line-height:1.1; +padding-right:70px;line-height:1.1; /*margin-left:40%; border-bottom-left-radius:5px; -webkit-border-bottom-left-radius:5px; @@ -142,10 +142,8 @@ width:auto; } #registerlink{ top:-5px; - position:absolute; font-size: 16px; height:22; -left:5px; word-spacing:2; color:#fff; diff --git a/static/css/index.css b/static/css/index.css index 9210f8f..05a4545 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -187,7 +187,9 @@ cursor:pointer; text-shadow:1px 1px 3px #000; z-index:20; - -moz-border-radius: 5px;*/ +border-radius: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; } input { height:40px; @@ -261,7 +263,7 @@ margin-bottom:7px; #furie3 { position: absolute; left:294px; - top:260px; + margin-top:250px; z-index: 10; } @@ -280,15 +282,14 @@ padding-top:20px;margin: 0 auto 0 auto; */ #talkaboutus{ position:relative; -z-index:20; -top:-30px; +z-index:-10; height:0px; margin: 0 auto 0 auto; } #slider { position:relative; -z-index:20; +z-index:-1; //See the "style-pack" below for image background:url(images/loading.gif) no-repeat 50% 50%; } diff --git a/static/css/pages.css b/static/css/pages.css index 875a9c3..8a050b9 100644 --- a/static/css/pages.css +++ b/static/css/pages.css @@ -36,7 +36,7 @@ height:28px; } #footer a { - font-size: 11px; + font-size: 11px; text-decoration: none; color: #000; } #footer a:link { diff --git a/static/form_login/front.css b/static/form_login/front.css index 8973e90..7b662d6 100644 --- a/static/form_login/front.css +++ b/static/form_login/front.css @@ -29,7 +29,7 @@ filter:alpha(opacity=90); text-shadow: #000 0px 0px 0px; padding:5px 5px 5px 5px; text-decoration:none; - background-color:#ddeef6; + background-color:#eee; -webkit-border-radius:4px;font-size:11px; -moz-border-radius:4px; border-radius:4px; @@ -120,7 +120,35 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#ccc, offX=3, offY=4, #signin_menu p a { color:#27B!important; } +#signin-submitform { + display:inline-block; + width:90px; + height:30px; + font-size:20px; +border:1px solid #999; + background-image:url(/static/img/btngrad1.png); + font-weight:bold; + word-spacing:7; + margin-top:-5px; +cursor:pointer; + text-align:center; + z-index:100; + font-size:16px; + color:#fff; + border-radius: 5px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + text-shadow:1px 1px 3px #000; +z-index:20; +} +#furie3 { + position: absolute; + left:294px; + margin-top:250px; + z-index: 10; + +} #loginSubmit::-moz-focus-inner { padding:0; border:0; diff --git a/static/form_login/images/toggle_down_light.png b/static/form_login/images/toggle_down_light.png index d354161..882f3c4 100644 Binary files a/static/form_login/images/toggle_down_light.png and b/static/form_login/images/toggle_down_light.png differ diff --git a/static/img/calm.gif b/static/img/calm.gif index c7cc71f..b237915 100644 Binary files a/static/img/calm.gif and b/static/img/calm.gif differ diff --git a/static/index.html b/static/index.html index 62f00e2..bcf44c9 100755 --- a/static/index.html +++ b/static/index.html @@ -25,7 +25,6 @@ - - - - + - + - - - - - -dump.fm - - + + + + +dump.fm + + + +
+
+

watch a lil movie

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

Already a member?

+
+ +
+ +
+
+ Lost password?
+
+
@@ -159,16 +544,16 @@ jQuery(window).load(function() {
+
- +

-
diff --git a/static/js/invalid_domains.js b/static/js/invalid_domains.js index b2c703c..313b2c7 100644 --- a/static/js/invalid_domains.js +++ b/static/js/invalid_domains.js @@ -12,7 +12,6 @@ var InvalidDomains = [ "http://images.nintendolife.com", "http://img.bettersoft.de", "http://izismile.com", - "http://izismile.com", "http://izismile.com/img", "http://mytextgraphics.com", "http://nexus404.com", @@ -66,8 +65,10 @@ var InvalidDomains = [ "http://www.geneology2.com", "http://www.onemetal.com", "http://static.funnyjunk.com", + "http://www.whimsical-wits.com", "http://www.kaitaia.com", "http://carsdriveingallery.com", "http://xxxspacegirls.us", - "http://www.newlog.com.ar" + "http://www.newlog.com.ar", + "http://www.lift-4-life.com" ]; \ No newline at end of file diff --git a/template/banner.st b/template/banner.st index 000dfd9..f541393 100644 --- a/template/banner.st +++ b/template/banner.st @@ -20,7 +20,7 @@ $else$ - Join the Conversation! + dump.fm lets you share pictures in real-time. Click here to get started! $endif$ @@ -32,8 +32,8 @@
-
dump.fm:let pictures do the talking$if(isadmin)$ - news - gossip - art - gif - design - fashion +
dump.fm - let pictures do the talking - my favorite pics - - justin bieber $if(isadmin)$ + - news - gossip - art - gif - design - fashion - VIP diff --git a/template/chat.st b/template/chat.st index a45ba4f..fe0abc0 100644 --- a/template/chat.st +++ b/template/chat.st @@ -48,6 +48,8 @@ $endif$ if (window.focus) {newwindow.focus()} } jQuery(document).ready(startTitleUpdater); + +