dump.fm hall of fame

From 12dda08addf3bb7d61e07a592827b8bc8156a587 Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Mon, 25 Oct 2010 22:18:50 -0400 Subject: Add roomlist sort order --- template/roomlist.st | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/template/roomlist.st b/template/roomlist.st index 22000d3..3a844cf 100644 --- a/template/roomlist.st +++ b/template/roomlist.st @@ -13,7 +13,10 @@ body { font-family: Monaco, "Courier New", Courier, monospace; } -- cgit v1.2.3-70-g09d2 From 1f1378031e0f643011e22942ed6005d4000d015d Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Mon, 1 Nov 2010 17:05:53 -0400 Subject: sostler prod commit --- scripts/emailposter.py | 2 +- src/site.clj | 7 -- static/319/bigspin.jpg | Bin 0 -> 235640 bytes static/319/irhell.html | 4 +- static/319/mapstyle.js | 123 +++++++++++++++++++++++++++++ static/319/res.html | 60 +++++++++++--- static/css/dump.css | 2 +- static/css/mgmt.css | 4 +- static/js/fullscreenmgmt.js | 185 ++++++++++++++++++++++++++++++++++++++++++++ static/js/pichat.js | 4 +- template/banner.st | 4 +- template/fame2.st | 43 ++++++++++ template/mgmtfull.st | 146 ++++++++++++++++++++++++++++++++++ template/rooms/chat.st | 2 +- template/rooms/mgmt.st | 7 -- 15 files changed, 559 insertions(+), 34 deletions(-) create mode 100644 static/319/bigspin.jpg create mode 100644 static/319/mapstyle.js create mode 100644 static/js/fullscreenmgmt.js create mode 100644 template/fame2.st create mode 100644 template/mgmtfull.st diff --git a/scripts/emailposter.py b/scripts/emailposter.py index d380ffd..b1dddf2 100644 --- a/scripts/emailposter.py +++ b/scripts/emailposter.py @@ -58,7 +58,7 @@ def is_image(name): def upload_image(fname, data): resp = post_multipart('dump.fm', '/upload/photo', - [['room','dumpfm']], + [['room', 'dumpfm']], [['image', fname, data]]) print resp diff --git a/src/site.clj b/src/site.clj index 58d7dac..3029f6a 100644 --- a/src/site.clj +++ b/src/site.clj @@ -785,15 +785,9 @@ WHERE u.user_id = ANY(?)" (resp-success msg-id))))) -(defn is-bad-mgmt? [params request] - (and (= (lower-case (params :room)) "mgmt") - (not - (= (lower-case (get (:headers request) "referer")) "http://dump.fm/mgmt/idontgetit")))) - (defn validated-msg [session params request] (cond (not (validate-room-access (params :room) session)) (resp-error "UNKNOWN_ROOM") - (is-bad-mgmt? params request) (resp-error "INVALID") :else (msg session params))) ;; Browser @@ -1218,7 +1212,6 @@ WHERE u.user_id = ANY(?)" (not image) [200 "INVALID_REQUEST"] mute [200 (format-mute mute)] (not has-access) [200 "UNKNOWN_ROOM"] - (is-bad-mgmt? params request) [200 "INVALID_REQUEST"] :else (do-upload session image (lookup-room room-key))))) (defn upload-photo [session params] diff --git a/static/319/bigspin.jpg b/static/319/bigspin.jpg new file mode 100644 index 0000000..c1e13fb Binary files /dev/null and b/static/319/bigspin.jpg differ diff --git a/static/319/irhell.html b/static/319/irhell.html index 64a541e..f0f5b68 100644 --- a/static/319/irhell.html +++ b/static/319/irhell.html @@ -82,8 +82,8 @@ a:hover{text-decoration:none;color:blue;} Parties in Mexico City and Brooklyn will be connected through dump.fm

RAVE DEN BY *******THUNDERHORSE*******

-Brooklyn Performances by -- Anamanaguchi - Brenmar - Nullsleep - Physical Therapy - Jon Lynn (Unsolved Mysteries) - Laurel Halo - BLISSED OUT - Magick Mountain - DJ Brother Ladypantz - Oscouro - Flash Porno -Mexico City Performances by -- GATEKEEPER - DoubleDigits - Ñaka Ñaka +Brooklyn Performances by -- Anamanaguchi - Brenmar - Nullsleep - Physical Therapy - Jon Lynn (Unsolved Mysteries) - Laurel Halo - BLISSED OUT - Magick Mountain - DJ Brother Ladypantz - MIRRORGATE - Flash Porno - ELEVATORMAN +Mexico City Performances by -- GATEKEEPER - DoubleDigits - Ñaka Ñaka †‡† - DAMAGE
diff --git a/static/319/mapstyle.js b/static/319/mapstyle.js new file mode 100644 index 0000000..bb1ff01 --- /dev/null +++ b/static/319/mapstyle.js @@ -0,0 +1,123 @@ +var electroStyle = [ + { + featureType: "all", + elementType: "all", + stylers: [ + { invert_lightness: true } + ] + }, { + featureType: "administrative.country", + elementType: "geometry", + stylers: [ + { visibility: "off"} + ] + }, { + featureType: "landscape", + elementType: "all", + stylers: [ + { visibility: "off" } + ] + },{ + featureType: "poi", + elementType: "all", + stylers: [ + { visibility: "off" } + ] + },{ + featureType: "road", + elementType: "all", + stylers: [ + { hue: "#ffff00", lightness: 100, saturation: 1000, gamma: 10} + ] + },{ + featureType: "transit", + elementType: "all", + stylers: [ + { hue: "#ffff00", lightness: 300, saturation: 100, gamma: 10 } + ] + },{ + featureType: "water", + elementType: "labels", + stylers: [ + { visibility: "off" } + ] + },{ + featureType: "water", + elementType: "geometry", + stylers: [ + { lightness: 20 } + ] + }, { + featureType: "all", + elementType: "labels", + stylers: [ + { visibility: "off" } + ] + } +] + +var Data = [ + { img: "http://i29.photobucket.com/albums/c268/denny_816/mia.jpg", + location: [30.16175, -97.443502], + link: "http://i29.photobucket.com/albums/c268/denny_816/mia.jpg" + }, + { img: "http://okfoc.us/mia/maps/getshit.png", + location: [37.0625,-95.677068], + link: "http://ithinkyoumightgetshitforthat.com/" + }, + { img: "http://okfoc.us/mia/maps/boat.png", + location: [43.406045,-78.821411], + link: "http://4thepeopleontheboat.com/" + }, + { img: "http://okfoc.us/mia/maps/fb.png", + location: [40.732826,-73.993992], + link: "http://facebookgooglemyspaceyoutube.com/" + }, + { img: "http://okfoc.us/mia/maps/lilpeople.png", + location: [37.0625,-95.677068], + link: "http://yesthelittlepeoplewillneverwinbuttheycanfuckshitup.com/" + }, + { img: "http://okfoc.us/mia/maps/bedroom.png", + location: [34.041281,-118.138733], + link: "http://bedroomtothehallwaytotheroadtotheworld.com/" + }, + +]; + +function markify(url) { + return "http://service.simile-widgets.org/painter/painter?renderer=map-marker&shape=circle&alpha=0.7&width=60&height=60&background=FF9000&label=&icon=" + url + "&iconX=0&iconY=0&pinHeight=6&pinWidth=6&.png"; +} + + +function initialize() { + + var latlng = new google.maps.LatLng(30.16175,-97.443502); + var myOptions = { + zoom: 3, + center: latlng, + disableDefaultUI: true, + mapTypeId: google.maps.MapTypeId.ROADMAP + }; + var map = new google.maps.Map(document.getElementById("map_canvas"), + myOptions); + var electroMapOptions = { + name: "ElectroType" + }; + var electroType = new google.maps.StyledMapType(electroStyle, electroMapOptions); + + map.mapTypes.set('electro', electroType); + map.setMapTypeId('electro'); + + for (var i in Data) { + var d = Data[i]; + var marker = new google.maps.Marker({ + position: new google.maps.LatLng(d.location[0], d.location[1]), + map: map, + icon: markify(d.img) + }); + google.maps.event.addListener(marker, 'click', function() { + + }); + } +} + diff --git a/static/319/res.html b/static/319/res.html index e7a0cce..22ddb71 100644 --- a/static/319/res.html +++ b/static/319/res.html @@ -4,7 +4,9 @@ $endif$ - $if(isadmin)$ NAUGHTY BOYS DELIGHT + checkout dump.fm in full-screen $else$ $endif$ + $if(isadmin)$ - NAUGHTY BOYS DELIGHT $endif$ diff --git a/template/fame2.st b/template/fame2.st new file mode 100644 index 0000000..89739cd --- /dev/null +++ b/template/fame2.st @@ -0,0 +1,43 @@ + + + dump.fm hall of fame + $head()$ + + + + $banner()$ +

+ + +

+ +

Hall Of Fame

updated hourly

+ +

+ $if(dumps)$ + + $dumps: { d | $fame_dump(dump=d)$ }$ + + $else$ + No dumps! + $endif$ +

+ +

+ $footer()$ +

+ + diff --git a/template/mgmtfull.st b/template/mgmtfull.st new file mode 100644 index 0000000..86e62fa --- /dev/null +++ b/template/mgmtfull.st @@ -0,0 +1,146 @@ + + + dump.fm + + + + + + + + +

+ +

+ join the party +

forgot password?

+ +

+
+

+ $if(user_nick)$ + click to fav + $else$ + LOGIN | REGISTER + $endif$ +

waiting 4 new image from dump.fm.............

+ + $google_analytics()$ + + diff --git a/template/rooms/chat.st b/template/rooms/chat.st index 7a8df88..b96456a 100644 --- a/template/rooms/chat.st +++ b/template/rooms/chat.st @@ -77,7 +77,7 @@

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.

- you already have an account, sign in. If not, register! + If you already have an account sign in If not register!

diff --git a/template/rooms/mgmt.st b/template/rooms/mgmt.st index 480fe46..dc7060b 100644 --- a/template/rooms/mgmt.st +++ b/template/rooms/mgmt.st @@ -25,13 +25,6 @@ -$if(!user_nick)$ - - - - -$endif$ - $if(isadmin)$ -- cgit v1.2.3-70-g09d2