From 157c865f7486cd4ed684d2bf90c8a03d5b2164b5 Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Sat, 12 Feb 2011 21:00:54 -0500 Subject: sostler prod commit --- docs/reserved_nicks.txt | 1 + static/css/dump.css | 23 +- static/img/sassoonlogol.gif | Bin 0 -> 12865 bytes static/img/sassoonlogos.gif | Bin 0 -> 14059 bytes static/js/jquery.masonry.min.js | 12 + template/banner.st | 9 +- template/form_login.st | 4 +- template/head.st | 8 +- template/log_dump.st | 2 +- template/newlog.st | 416 ++++++++++++++++++++++++++++++++ template/rooms/chat.st | 1 + template/rooms/frontpage.st | 136 +++++++++++ template/simplerlog.st | 519 ++++++++++++++++++++++++++++++++++++++++ 13 files changed, 1103 insertions(+), 28 deletions(-) create mode 100644 static/img/sassoonlogol.gif create mode 100644 static/img/sassoonlogos.gif create mode 100644 static/js/jquery.masonry.min.js create mode 100644 template/newlog.st create mode 100644 template/rooms/frontpage.st create mode 100644 template/simplerlog.st diff --git a/docs/reserved_nicks.txt b/docs/reserved_nicks.txt index d4c881e..0fd649e 100644 --- a/docs/reserved_nicks.txt +++ b/docs/reserved_nicks.txt @@ -76,6 +76,7 @@ room rooms roomlist search +selfharm shop stickers swag diff --git a/static/css/dump.css b/static/css/dump.css index 27bf99a..17b208c 100755 --- a/static/css/dump.css +++ b/static/css/dump.css @@ -24,6 +24,9 @@ table, caption, tbody, tfoot, thead, tr, th, td { } body { line-height: 1; + background-color:#fff; + margin:0; + } ol, ul { list-style: none; @@ -569,17 +572,6 @@ a.msg-image-zoom img.zoom-icon:hover { /* pichat.css */ -body { - -background-color:#fff; - margin:0; - - background-repeat:repeat-x; - background-position:top; -overflow:hidden; - -} - a { font-size: 12px; color: #000; @@ -1372,12 +1364,10 @@ font-size:120%; color:#000;color:#000; } -#adsenseprofile{ -position:fixed;top:490; -left:20; -} + #chatrap{ margin-left:245px; +overflow:hidden; } #uploadp{ @@ -1528,6 +1518,7 @@ color:000; .logged-dump { background-color:#fff; text-overflow: ellipsis-word; + padding: 0px 18px 6px 18px; margin-top: 18px; font-family: Arial, Helvetica, sans-serif; @@ -2092,7 +2083,7 @@ text-align: justify; text-justify: newspaper } #dis_frame { height: 300px; - overflow-x: hidden; + overflow-x: auto; width: 100%; } #dis_content { diff --git a/static/img/sassoonlogol.gif b/static/img/sassoonlogol.gif new file mode 100644 index 0000000..95a92e1 Binary files /dev/null and b/static/img/sassoonlogol.gif differ diff --git a/static/img/sassoonlogos.gif b/static/img/sassoonlogos.gif new file mode 100644 index 0000000..193ba60 Binary files /dev/null and b/static/img/sassoonlogos.gif differ diff --git a/static/js/jquery.masonry.min.js b/static/js/jquery.masonry.min.js new file mode 100644 index 0000000..f6e8a82 --- /dev/null +++ b/static/js/jquery.masonry.min.js @@ -0,0 +1,12 @@ +/************************************************* +** jQuery Masonry version 1.3.2 +** Copyright David DeSandro, licensed MIT +** http://desandro.com/resources/jquery-masonry +**************************************************/ +(function(e){var n=e.event,o;n.special.smartresize={setup:function(){e(this).bind("resize",n.special.smartresize.handler)},teardown:function(){e(this).unbind("resize",n.special.smartresize.handler)},handler:function(j,l){var g=this,d=arguments;j.type="smartresize";o&&clearTimeout(o);o=setTimeout(function(){jQuery.event.handle.apply(g,d)},l==="execAsap"?0:100)}};e.fn.smartresize=function(j){return j?this.bind("smartresize",j):this.trigger("smartresize",["execAsap"])};e.fn.masonry=function(j,l){var g= +{getBricks:function(d,b,a){var c=a.itemSelector===undefined;b.$bricks=a.appendedContent===undefined?c?d.children():d.find(a.itemSelector):c?a.appendedContent:a.appendedContent.filter(a.itemSelector)},placeBrick:function(d,b,a,c,h){b=Math.min.apply(Math,a);for(var i=b+d.outerHeight(true),f=a.length,k=f,m=c.colCount+1-f;f--;)if(a[f]==b)k=f;d.applyStyle({left:c.colW*k+c.posLeft,top:b},e.extend(true,{},h.animationOptions));for(f=0;f Hall of Fame - Image Search + Favs + Image Search--> @@ -54,9 +54,11 @@ + - + + $else$ Register $endif$ @@ -109,7 +111,6 @@ $endif$ -
diff --git a/template/form_login.st b/template/form_login.st index ab9e4f1..eb30cc6 100644 --- a/template/form_login.st +++ b/template/form_login.st @@ -1,5 +1,5 @@
-
+

@@ -9,7 +9,7 @@


- +

$dump.content$
+
$dump.content$
$share_buttons()$
diff --git a/template/newlog.st b/template/newlog.st new file mode 100644 index 0000000..8cf2465 --- /dev/null +++ b/template/newlog.st @@ -0,0 +1,416 @@ + + + + dump.fm log + + + + + + + + + + + + + +$if(!user_nick)$ + + +$endif$ +$if(isadmin)$ + + + + +$endif$ + + + + + + + + + + + + + + + + + + + + + + + +
+
$roomkey$ log
+ + $if(dumps)$ + + + $dumps: { d | $log_dump(dump=d)$ }$ + + $if(json_tags)$ + + $endif$ + $else$ + No dumps! + $endif$ +
+ +
+ + $if(prev)$ + + $else$ + + $endif$ + + $if(next)$ + + $else$ + + $endif$ + +
+ + +

+ +
+$google_analytics()$ +$debug_log()$ + + + + diff --git a/template/rooms/chat.st b/template/rooms/chat.st index a8269a6..f8829ca 100644 --- a/template/rooms/chat.st +++ b/template/rooms/chat.st @@ -135,6 +135,7 @@
$footer()$
+
$preload()$ diff --git a/template/rooms/frontpage.st b/template/rooms/frontpage.st new file mode 100644 index 0000000..065cef0 --- /dev/null +++ b/template/rooms/frontpage.st @@ -0,0 +1,136 @@ + + + + + $head()$ + $roomname$ dump.fm + + + + + $if(user_nick)$ + + $endif$ + + + + + $if(dis)$ + $banner_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! + +
+
+ + + + + + + + $endif$ + $endif$ + + +
+ + +
+ +
+ +

Hall Of Fame

+
+ +
+ $if(dumps)$ + + $dumps: { d | $fame_dump(dump=d)$ }$ + + $else$ + No dumps! + $endif$ +
+ +
+ $footer()$ +
+
+
+ + + diff --git a/template/simplerlog.st b/template/simplerlog.st new file mode 100644 index 0000000..92b2abf --- /dev/null +++ b/template/simplerlog.st @@ -0,0 +1,519 @@ + + + + dump.fm log + + + + + + + + + + + + + +$if(!user_nick)$ + + +$endif$ +$if(isadmin)$ + + + + + +$endif$ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
$roomkey$ log +

+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! +
+ + $if(dumps)$ + + + $dumps: { d | $log_dump(dump=d)$ }$ + + $if(json_tags)$ + + $endif$ + $else$ + No dumps! + $endif$ +
+ +
+ + $if(prev)$ + + $else$ + + $endif$ + + $if(next)$ + + $else$ + + $endif$ + +
+ + +

+ + +$google_analytics()$ +$debug_log()$ + + +
+
+ + close +
+
+
+ + + +Loading... + + + -- cgit v1.2.3-70-g09d2