summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Ostler <scottbot9000@gmail.com>2010-11-02 19:55:35 -0400
committerScott Ostler <scottbot9000@gmail.com>2010-11-02 19:55:35 -0400
commite2e82dc608862c0c72e0d45599f2768665edf7dd (patch)
treebaad5d86f85c230afd6c61c40e6d3d7e4cd3f1c9
parent73443969b5e98713e1bd36b0b524f60b77a0ad53 (diff)
parent1f1378031e0f643011e22942ed6005d4000d015d (diff)
Merge src/site.clj conflict
-rw-r--r--scripts/emailposter.py2
-rw-r--r--src/site.clj14
-rw-r--r--static/319/bigspin.jpgbin0 -> 235640 bytes
-rw-r--r--static/319/irhell.html4
-rw-r--r--static/319/mapstyle.js123
-rw-r--r--static/319/res.html60
-rwxr-xr-xstatic/css/dump.css2
-rw-r--r--static/css/mgmt.css4
-rw-r--r--static/js/fullscreenmgmt.js185
-rw-r--r--static/js/pichat.js4
-rw-r--r--template/banner.st4
-rw-r--r--template/fame2.st43
-rw-r--r--template/mgmtfull.st146
-rw-r--r--template/roomlist.st5
-rw-r--r--template/rooms/chat.st2
-rw-r--r--template/rooms/mgmt.st7
16 files changed, 567 insertions, 38 deletions
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 53c0fa7..a1f5c08 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
@@ -824,7 +818,7 @@ WHERE u.user_id = ANY(?)"
(let [roomkey (room :key)
st (fetch-template "log" session)
logger (make-time-logger)
- offset (maybe-parse-int offset 0)
+ offset (maybe-parse-int offset 0)
dump-offset (* offset *dumps-per-page*)
image-only (and (not (room :admin_only))
(not= (params :show) "all"))
@@ -848,7 +842,6 @@ WHERE u.user_id = ANY(?)"
(.setAttribute st "roomname" (room :name))
(.setAttribute st "debug_log_items" (logger))
(.toString st)))
-
(defn validated-log [session room-key offset params]
(if-vip
@@ -1221,7 +1214,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]
@@ -1517,4 +1509,6 @@ WHERE u.user_id = ANY(?)"
;(if (not= *server-url* "http://dump.fm")
; (start! random-poster))
-
+
+
+
diff --git a/static/319/bigspin.jpg b/static/319/bigspin.jpg
new file mode 100644
index 0000000..c1e13fb
--- /dev/null
+++ b/static/319/bigspin.jpg
Binary files 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 <a href="http://dump.fm">dump.fm</a><br><BR>
RAVE DEN BY *******<a href="http://thunderhorsevideo.com/">THUNDERHORSE</a>*******
<br><BR>
-Brooklyn Performances by -- <a href="http://www.anamanaguchi.com/">Anamanaguchi</a> - <a href="http://www.myspace.com/brenmarsomeday">Brenmar</a> - <a href="http://www.nullsleep.com/">Nullsleep</a> - <a href="http://www.myspace.com/xxphysicaltherapyxx">Physical Therapy</a> - <a href="http://www.myspace.com/unsolvedmysteries">Jon Lynn (Unsolved Mysteries)</a> - <a href="http://www.myspace.com/laurelhalo">Laurel Halo</a> - <a href="http://www.myspace.com/blissedoutnyc">BLISSED OUT</a> - <a href="http://soundcloud.com/magick-mountain">Magick Mountain</a> - <a href="http://www.myspace.com/brotherladypantz">DJ Brother Ladypantz</a> - <a href="http://www.soundcloud.com/oscouro">Oscouro</a> - <a href="http://www.upagainstthewallmotherfucker.com/">Flash Porno</a>
-Mexico City Performances by -- <a href="http://www.myspace.com/iiigatekeeperiii">GATEKEEPER</a> - <a href="http://www.myspace.com/tmtmtmby">DoubleDigits</a> - <a href="http://www.myspace.com/nakanakamusic">Ñaka Ñaka</a>
+Brooklyn Performances by -- <a href="http://www.anamanaguchi.com/">Anamanaguchi</a> - <a href="http://www.myspace.com/brenmarsomeday">Brenmar</a> - <a href="http://www.nullsleep.com/">Nullsleep</a> - <a href="http://www.myspace.com/xxphysicaltherapyxx">Physical Therapy</a> - <a href="http://www.myspace.com/unsolvedmysteries">Jon Lynn (Unsolved Mysteries)</a> - <a href="http://www.myspace.com/laurelhalo">Laurel Halo</a> - <a href="http://www.myspace.com/blissedoutnyc">BLISSED OUT</a> - <a href="http://soundcloud.com/magick-mountain">Magick Mountain</a> - <a href="http://www.myspace.com/brotherladypantz">DJ Brother Ladypantz</a> - <a href="http://www.myspace.com/themirrorgate">MIRRORGATE</a> - <a href="http://www.upagainstthewallmotherfucker.com/">Flash Porno</a> - <a href="http://www.myspace.com/djelevatorman">ELEVATORMAN</a>
+Mexico City Performances by -- <a href="http://www.myspace.com/iiigatekeeperiii">GATEKEEPER</a> - <a href="http://www.myspace.com/tmtmtmby">DoubleDigits</a> - <a href="http://www.myspace.com/nakanakamusic">Ñaka Ñaka</a> <a href="http://www.myspace.com/rrritualzzz">†‡†</a> - DAMAGE
<br>
</span>
<span class="lindsay"></span>
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 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<style>
- body { margin:0; padding:0px;overflow: hidden; width:100%;height:100%;}
+
+
+ body { margin:0; padding:0px;overflow: hidden; width:100%;height:100%;font-size:130%;}
#pyramid1{ -webkit-animation-name: rotateThis;
-webkit-animation-duration:2s;
-webkit-animation-iteration-count:infinite;
@@ -12,17 +14,17 @@
@-webkit-keyframes rotateThis {
from {-webkit-transform:scale(0.5) rotate(0deg);}
to {-webkit-transform:scale(0.5) rotate(360deg);}
-}
+}
#flyer img{width:100%;height100%;}
#flyer{position:absolute;}
#maintxt{position:absolute;margin-top:20px;left:20px;
font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;
font-weight: 3000;color:#fff;width:300px;
-font-size:32px;text-shadow:-1px 1px 0px #000;}
+font-size:32px;text-shadow:-1px 1px 5px #000;}
#total{position:absolute;width:100%;height:100%;}
#gamma{position:absolute;top:15%;right:7%;z-index:2;}
#printer{position:absolute;bottom:20%;right:-8%;z-index:2;opacity:0.8;}
-#lucy{position:absolute;bottom:13%;left:18%;z-index:1;}
+#lucy{position:absolute;bottom:13%;left:18%;z-index:0;}
#dylan{position:absolute;bottom:33%;right:-8%;z-index:-1;}
#moody{position:absolute;top:29%;left:-10%;z-index:-1;}
#ball{position:absolute;top:-29%;left:-10%;opacity:0.7;}
@@ -69,14 +71,54 @@ a:hover{text-decoration:none;color:blue;}
</div>
<div id="maintxt">
<img src="logo.png"id="logo"><br>
-<span class="subtxt">The exhibition will continue for a week. Artists will be sleep/food deprived, with only computers, paint and some other materials..<br><br>
-<span class="lindsay"></span>
+<span class="subtxt">
+<div id=":zj" style="width:420px;">
-<h2><!--<span class="opening"><BLINK>___OPENING___</BLINK></span><br>-->EVERYDAY October 23-29, 1pm - 8pm<br>OPEN 24H. TO MEMBERS OF THE DUMP.FM COMMUNITY! <br><br><a href="http://319scholes.org/"> >>>319 Scholes St. Brooklyn<<< </a><a href="http://maps.google.com/maps?q=map%20319%20scholes&oe=utf-8&rls=org.mozilla:en-US:official&client=firefox-a&um=1&ie=UTF-8&sa=N&hl=en&tab=wl#">(map)</a><br><br>This residency/experience/show will end in an epic Halloween party.. click continue to continue..</h2>
+ <div><strong>
+ <div><a href="http://319scholes.org/" >319 Scholes</a> hosts <a href="http://dump.fm/irl/" >DUMP.FM IRL</a>, a week-long exhibit and gathering for image-based chat site, <a href="http://dump.fm/" >dump.fm</a>.  </div>
+ </strong></div>
+<span style="font-size:130%;">curated by lindsay howard</span>
+ <div><br />
+ </div>
+ <div><strong>Monday October 25th</strong> - 9:00pm-11:00pm   </div>
+ <div><strong>
+ <div> dump.fm artists collaborate live in Brooklyn to provide visuals for MGMT show in Orlando, viewable online at <a href="http://dump.fm/mgmt" target="_blank">dump.fm/mgmt</a>. </div>
+ </strong></div>
+ <div><strong>
+ <div><br />
+ </div>
+ </strong></div>
+ <div><strong>
+ <div> Tuesday October 26th</div>
+ </strong></div>
+ <div><strong>
+ <div> </div>
+ </strong>
+ <div>4:00pm    Real Time with Felix Lee </div>
+ </div>
+ <div><br />
+ </div>
+ <div><strong>Wednesday October 27th</strong></div>
+ <div>8:00pm-11:00pm  dump.fm founder Ryder Ripps featured in Speed Show <a href="http://fffff.at/speed-show-4/" target="_blank">http://fffff.at/speed-show-4/</a> </div>
+ <div>(90 Bowery Internet Cafe, NY 10013)</div>
+ <div><br />
+ </div>
+ <div><strong>Thursday October 28th</strong></div>
+ <div>8:00pm-1:00am   dump.fm IRL open house // live performances // <a href="http://dump.fm" target="_blank">dump.fm</a> fullscreen</div>
+ <div><br />
+ </div>
+<div><strong>Saturday October 30th</strong></div>
+ <div style="width:500px;">10pm &nbsp; dump.fm IRHELL... CLICK CONTINUE TO CONTINUE!
+ </div>
+</div>
+ <div>
+ </div><br>
+ <div style="width:500px;">All events at 319 Scholes unless otherwise noted.</div>
+ <div><br />
+ </div>
-<h3>
+<br><br>
-</h3>
</div>
<div id="arrow">
<a href="http://dump.fm/irhell"> continue>>>>></a>
diff --git a/static/css/dump.css b/static/css/dump.css
index c787dae..df3e55e 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -1260,7 +1260,7 @@ bottom:65px;
width: 99.6%;
background-color:#fff;
left:0.2%;
- z-index:5;
+ z-index:;
}
#edit-toggle{
position:absolute;
diff --git a/static/css/mgmt.css b/static/css/mgmt.css
index e63a078..1a9edc3 100644
--- a/static/css/mgmt.css
+++ b/static/css/mgmt.css
@@ -3,7 +3,7 @@
v1.0 | 20080212 */
-.fulltxt{position:fixed;bottom:0;right:5;}
+.fulltxt{position:fixed;bottom:0;right:20;}
html, body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code,
@@ -242,7 +242,7 @@ color:#000;font-family:verdana;background-color:#ffffff; font-family: Monaco, "C
margin-left: 10px;
z-index:1050; text-decoration: none;
float:left;
- margin-top:-1px;
+ margin-top:-1px;position:fixed;background-image:url(/static/img/bg.dither.gif);
}
#logo7 a{font-size:22px;
font-family: 'HelveticaNeue-Light','Helvetica Neue Light','Helvetica Neue',Arial,Helvetica,sans-serif;
diff --git a/static/js/fullscreenmgmt.js b/static/js/fullscreenmgmt.js
new file mode 100644
index 0000000..6137238
--- /dev/null
+++ b/static/js/fullscreenmgmt.js
@@ -0,0 +1,185 @@
+function initFullscreen(){
+ Room = "mgmt";
+ refresh();
+ ImageCache = [];
+ SeenImages = {};
+ FavedMap = {};
+ $('#tools-button').click(toolsToggle);
+}
+function toolsToggle(){
+ if ($("#msgInputDiv").css("display") == "none")
+ toolsShow()
+ else
+ toolsHide()
+}
+function toolsShow(){
+ $("#msgInputDiv").css("display", "block")
+
+}
+function toolsHide(){
+ $("#msgInputDiv").css("display", "none")
+}
+
+function scanMessagesForImages(messages){
+ for(var m=0; m<messages.length; m++) {
+ var images = getImagesAsArray(messages[m].content)
+ for (var i = 0; i<images.length; i++){
+ NextImage = new Image()
+ NextImage.onload = displayImage
+ NextImage.src = images[i]
+ NextImage.msg_id = messages[m].msg_id;
+ }
+ }
+}
+
+function clickImage(img) {
+ if (!LoggedIn) return;
+ var msg_id = $(img).attr('msg_id');
+ if (!$(img).hasClass('fullscreen-favorite')) {
+ FavedMap[msg_id] = true;
+ $('#fav-indicator').show();
+ Tag.add(msg_id, "favorite");
+ $(img).addClass("fullscreen-favorite");
+ track('UI', 'FullscreenFav');
+ } else {
+ delete FavedMap[msg_id];
+ $('#fav-indicator').hide();
+ Tag.rm(msg_id, "favorite");
+ $(img).removeClass("fullscreen-favorite");
+ track('UI', 'FullscreenDeFav');
+ }
+}
+
+function displayImage(){
+ $("#big-image").html('<img src="'+this.src+'" msg_id = "' + this.msg_id + '" onclick="clickImage(this)">');
+ if (FavedMap[this.msg_id])
+ $('#fav-indicator').show();
+ else
+ $('#fav-indicator').hide();
+}
+
+function refresh() {
+ var onSuccess = function(json) {
+ try {
+ if (json.messages && json.messages.length)
+ scanMessagesForImages(json.messages);
+ Timestamp = json.timestamp;
+ } catch(e) {
+
+ }
+ setTimeout(refresh, 1000);
+ };
+
+ var onError = function(resp, textStatus, errorThrown) {
+ setTimeout(refresh, 4000);
+ };
+
+ $.ajax({
+ type: 'GET',
+ timeout: 5000,
+ url: '/refresh',
+ data: { 'room': Room, 'since': Timestamp },
+ cache: false,
+ dataType: 'json',
+ success: onSuccess,
+ error: onError
+ });
+}
+
+function initLogin() {
+ $('#logininner').ridgificate('2px solid #dd0000',
+ '2px solid #fe6230',
+ '2px solid #fef600',
+ '2px solid #00bc00',
+ '2px solid #009bfe',
+ '2px solid #000083',
+ '2px solid #30009b',
+ '2px solid #dd0000',
+ '2px solid #fe6230',
+ '2px solid #fef600',
+ '2px solid #00bc00',
+ '2px solid #009bfe',
+ '2px solid #000083',
+ '2px solid #30009b');
+}
+
+function showLogin() {
+ $('#nickInput').val('');
+ $('#passwordInput').val('');
+ $('#loginbox').show().center().center();
+ $('#username').focus();
+ $('input').removeAttr('disabled');
+}
+
+function login() {
+ $('#spinner').show();
+ $('input').attr('disabled', 'disabled');
+ var nick = $('#nickInput').val();
+ var password = $('#passwordInput').val();
+ var rememberme = $('#remembermeInput').attr('checked') ? 'yes' : '';
+ var hash = hex_sha1(nick + '$' + password + '$dumpfm');
+
+ var onSuccess = function(json) {
+ if (typeof pageTracker !== 'undefined') {
+ pageTracker._setCustomVar(1, "logged-in", nick);
+ }
+ LoggedIn = true;
+ $('#loginbox').hide();
+ $('.sublogo').text('click to fav');
+ };
+
+ var onError = function(resp, textStatus, errorThrown) {
+ $('#spinner').hide();
+ $('input').removeAttr('disabled');
+ $('#errormsg').text("Couldn't log you in :( Bad password?");
+ }
+
+ $.ajax({
+ type: 'POST',
+ timeout: 5000,
+ url: '/login',
+ data: {'nick': nick, ts: '', 'hash': hash, 'rememberme': rememberme},
+ cache: false,
+ dataType: 'json',
+ success: onSuccess,
+ error: onError
+ });
+}
+
+// http://plugins.jquery.com/project/autocenter
+(function($){
+ $.fn.extend({
+ center: function () {
+ return this.each(function() {
+ var top = ($(window).height() - $(this).outerHeight()) / 2;
+ var left = ($(window).width() - $(this).outerWidth()) / 2;
+ $(this).css({position:'absolute', margin:0, top: (top > 0 ? top : 0)+'px', left: (left > 0 ? left : 0)+'px'});
+ });
+ }
+ });
+})(jQuery);
+
+(function($) {
+ $.fn.extend({
+ ridgificate: function() {
+ var ridges = arguments;
+ return this.each(function() {
+ for (var i = 0; i < ridges.length; i++) {
+ $(this).wrap('<div style="border: ' + ridges[i] + '">');
+ }
+ });
+ }});
+})(jQuery);
+
+var LogoFadeDelay = 3000;
+var PrevMouseCoord = [-1, -1];
+
+$(function() {
+ $(document).mousemove(function(e) {
+ if (e.pageX == PrevMouseCoord[0] && e.pageY == PrevMouseCoord[1])
+ return;
+ PrevMouseCoord = [e.pageX, e.pageY];
+ $('#memelogo').stop(true, false).animate({opacity: 1.0}, "fast").delay(LogoFadeDelay).animate({opacity: 0}, "slow");
+ });
+ $('#memelogo').delay(LogoFadeDelay).animate({opacity: 0}, "slow");
+}); \ No newline at end of file
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 5713531..6a6d962 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -567,7 +567,7 @@ function refresh() {
console.error(e);
}
}
- setTimeout(refresh, 1000);
+ setTimeout(refresh, 3000);
};
var onError = function(resp, textStatus, errorThrown) {
var msg = $.trim(resp.responseText);
@@ -576,7 +576,7 @@ function refresh() {
if (IsAdmin && window.console) {
console.error(resp, textStatus, errorThrown);
}
- setTimeout(refresh, 4000);
+ setTimeout(refresh, 1000);
};
$.ajax({
diff --git a/template/banner.st b/template/banner.st
index edf6a95..615256f 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -86,8 +86,8 @@
<div id="dumplist">
$if(user_nick)$
- <a href="http://dump.fm/fullscreen">checkout dump.fm in full-screen - </a> $else$ <style>#dumplist{z-index:-1!important;}</style> $endif$
- $if(isadmin)$ <a href="http://vip.dump.fm/">NAUGHTY BOYS DELIGHT </a>
+ <a href="http://dump.fm/fullscreen">checkout dump.fm in full-screen </a> $else$ <style>#dumplist{z-index:-1!important;}</style> $endif$
+ $if(isadmin)$ - <a href="http://vip.dump.fm/">NAUGHTY BOYS DELIGHT </a>
$endif$
</div>
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 @@
+<html>
+ <head>
+ <title>dump.fm hall of fame</title>
+ $head()$
+ <script>
+ jQuery(document).ready(initLog);
+ </script>
+ </head>
+ <body>
+ $banner()$
+ <div id="content">
+
+
+ <div id="messagePaneh">
+
+ <div id="userListp">
+ <img src="http://dump.fm/static/img/halloffametrophy.gif" id="halltrophy">
+ <h2>Hall Of Fame </h2><br><h3>updated hourly</h3> <br>
+ <form name="halltime"> <B> VIEW BY </B>
+<select style="font-size:14px;color:#000;font-family:verdana;background-color:#ffffff;font-weight:bold;" name="menu" onChange="location=document.halltime.menu.options[document.halltime.menu.selectedIndex].value;">
+<option value="#">DAY</option>
+<option value="#">WEEK</option>
+<option value="http://">ALL TIME</option>
+</select>
+</form>
+ </div>
+ <div id="messageList">
+ $if(dumps)$
+ <span class="content">
+ $dumps: { d | $fame_dump(dump=d)$ }$
+ </span>
+ $else$
+ No dumps!
+ $endif$
+ </div>
+
+ <div id="footerc">
+ $footer()$
+ </div>
+ </div>
+ </div>
+ </body>
+</html>
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 @@
+<html>
+ <head>
+ <title>dump.fm</title>
+ <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
+ <script src="$domain$/static/js/pichat.js"></script>
+ <script src="$domain$/static/js/fullscreenmgmt.js"></script>
+ <script>
+ var LoggedIn = $if(user_nick)$true$else$false$endif$;
+ var Timestamp = $timestamp$;
+ var newwindow;
+ function pop(url) {
+ newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0');
+ if (window.focus) {newwindow.focus()}
+ }
+ jQuery(startChatUpdater);
+ </script>
+ <style>
+ html, body, div, img { margin: 0; padding: 0; border: 0; overflow: hidden; font-family: Monaco, "Courier New", Courier, monospace; }
+ input {
+ font-family: Monaco, "Courier New", Courier, monospace;
+ }
+ #big-image img {
+ width: 100%; height: 100%;
+ cursor: pointer;
+ box-sizing: border-box; -webkit-box-sizing: border-box; -moz-box-sizing: border-box;
+ }
+ #loginbox {
+ background: white;
+ z-index: 999;
+ position: absolute;
+ display: none;
+ }
+ #logininner {
+ width: 30em;
+ height: 20em;
+ position: relative;
+ }
+ #infocol {
+ width: 50%;
+ float: left;
+ position: relative;
+ }
+ #formcontainer {
+ padding: 0;
+ margin-top: 20%;
+ width: 80%;
+ position: relative;
+ }
+ #nickInput, #passwordInput {
+ width: 100%;
+ }
+ #piccol {
+ width: 50%;
+ float: right;
+ position: relative;
+ }
+ #loginimg {
+ width: 75%;
+ margin-top: 20%;
+ }
+ #spinner { display: none; }
+ #forgetpw {
+ position: absolute;
+ left: 5px;
+ bottom: 5px;
+ font-size: 80%;
+ }
+ #fav-indicator {
+ display: none;
+ position: fixed;
+ z-index: 999;
+ height: 150px;
+ width: 150px;
+ left: 20px;
+ top: 20px;
+ }
+ #errormsg {
+ position: relative;
+ color: red;
+ text-align: center;
+ margin-top: 250px;
+ }
+
+ #loginclose {
+ position: absolute;
+ right: 3px;
+ top: 3px;
+ }
+ #big-image{font-size:120px;text-align: justify; text-justify: newspaper; text-shadow: 1px 1px #eee, 2px 2px #f0e, 3px 3px #eee,4px 4px #f0e,5px 5px #eee, 3px 3px #eee,4px 4px #f0e,5px 5px #eee,6px 6px #f0e,6px 6px #eee,7px 7px #f0e,7px 7px #eee,8px 8px #f0e,8px 8px #eee,9px 9px #f0e,9px 9px #eee; color:#fff}
+ #memelogo { position: fixed; z-index: 999; bottom: 30px; right: 80px; }
+ .sublogo { font-family: Monaco, "Courier New", Courier, monospace; }
+ a { color:#000 }
+ </style>
+ <script>jQuery(initLogin)</script>
+ </head>
+ <body>
+ <div id="loginbox">
+ <div id="logininner">
+ <div id="infocol">
+ <center>
+ <div id="formcontainer">
+ <form onsubmit="login(); return false;">
+ <div align="left">username</div>
+ <div><input id="nickInput"></div>
+ <br>
+ <div align="left">password</div>
+ <div><input id="passwordInput" type="password"></div>
+ <div align="right" style="font-size: 80%">remember me? <input id="remembermeInput" type="checkbox" checked="true"></div>
+ <br>
+ <div>
+ <center><input type="submit" value="LOGIN"></center>
+ <img id="spinner" src="/static/img/spinner.gif">
+ </div>
+ </form>
+ </div>
+ </center>
+ </div>
+ <div id="piccol">
+ <center><img id="loginimg" src="/static/img/danceman.gif"></center>
+ <center><i>join the party</i></center>
+ </div>
+ <div id="errormsg"></div>
+ <div id="forgetpw"><a href="$domain$/reset">forgot password?</a></div>
+ <div id="loginclose"><a href="#" onclick="jQuery('#loginbox').hide(); return false;">X</a></div>
+ </div>
+ </div>
+
+ <div id="memelogo">
+ <a href="http://dump.fm"><img src="http://dump.fm/static/img/dumppixelhover.png" class="memelogo"></a>
+ <br>
+ <div class="sublogo">
+ $if(user_nick)$
+ click to fav
+ $else$
+ <a href="#" onclick="showLogin(); return false;">LOGIN</a> | <a href="$domain$/register">REGISTER</a>
+ $endif$
+ </div>
+ </div>
+ <div id="big-image">waiting 4 new image from dump.fm.............</div>
+ <img src="/static/img/thumbs/heartfaved.gif" id="fav-indicator">
+ <script>
+ initFullscreen()
+ </script>
+ $google_analytics()$
+ </body>
+</html>
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; }
</style>
<script>
- jQuery(function() { jQuery('.tablesorter').tablesorter({}); });
+ jQuery(function() { jQuery('.tablesorter').tablesorter({
+ sortList: [[4, 1]]
+ });
+ });
</script>
</head>
<body>
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 @@
<div id="midtxt">dump.fm lets you <i>talk with pictures!</i> 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.
<br><br>
<span id="signintxt">
- you already have an account, <strong><a href="http://dump.fm/login" class="signin">sign in</a></strong>. If not, <strong><a href="http://dump.fm/register">register</a></strong>!
+ If you already have an account <strong><a href="http://dump.fm/login" class="signin">sign in</a></strong> If not <strong><a href="http://dump.fm/register">register</a></strong>!
</span>
</center>
</div>
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 @@
<link rel="stylesheet" type="text/css" href="$domain$/static/css/mgmt.css">
<script>Domain = "$domain$"</script>
-$if(!user_nick)$
-<link href="$domain$/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css">
-<script type="text/javascript" src="$domain$/static/js/popup.js"></script>
-
-
-$endif$
-
$if(isadmin)$
<link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css"
type="text/css" media="all" />