From ab3c66a6db7c4c2dbc3795c3b11132a535a3aeb3 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Sun, 30 Dec 2012 20:03:59 -0500 Subject: new fullscreen page --- src/site.clj | 2 +- static/js/register.js | 8 +- template/fullscreen.st | 345 +++++++++++++++++++++++++++++-------------------- 3 files changed, 212 insertions(+), 143 deletions(-) diff --git a/src/site.clj b/src/site.clj index df15342..a736562 100644 --- a/src/site.clj +++ b/src/site.clj @@ -724,7 +724,7 @@ WHERE user_id IN (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")) diff --git a/static/js/register.js b/static/js/register.js index 0f5bb1f..ff93b0b 100755 --- a/static/js/register.js +++ b/static/js/register.js @@ -5,11 +5,11 @@ function validateEmail(email) { } function submitRegistration() { - var nick = $('#nickInput').val(); - var email = $('#emailInput').val(); + var nick = $('#regNickInput').val(); + var email = $('#regEmailInput').val(); var terms = $('#terms').val(); - var password = $('#passwordInput').val() || ""; - var password2 = $('#passwordInput2').val() || ""; + var password = $('#regPasswordInput').val() || ""; + var password2 = $('#regPasswordInput2').val() || ""; if (nick.length < 3 || nick.length > 12) { alert("Nicks must be between 3 and 12 characters long."); diff --git a/template/fullscreen.st b/template/fullscreen.st index 9556bf2..cd3a3cf 100644 --- a/template/fullscreen.st +++ b/template/fullscreen.st @@ -4,6 +4,10 @@ + $if(user_nick)$ + $else$ + + $endif$ - + + $if(user_nick)$ - $else$ -
-
-

this is dump.fm, the first ever real-time image sharing website. behind me is a fullscreen feed of whats currently going on. - if you're a member of the club, sign in bellow. if not feel free to close this window and enjoy the sick pix.

-
-

username :

-

password :

-

- remember me?

+
x +
+

+ this is dump.fm, the first ever real-time image sharing website. + behind this is a fullscreen feed of whats currently being posted. + Register to join the club. + +

username

+

password

+

+ remember me?

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

+ + +

+ + +

+ + +

+ + +

+ +

+
$endif$
+ function choice(a) { return a[Math.floor(Math.random()*a.length)] } + var urls = [ + "http://dumpfm.s3.amazonaws.com/images/20100601/1275428508049-dumpfm-foot-oie_oie_overlay-1.gif", + "http://dumpfm.s3.amazonaws.com/images/20100928/1285728674225-dumpfm-timb-running.unicorn.gif", + "http://dumpfm.s3.amazonaws.com/images/20100726/1280119193796-dumpfm-enso-human-condition.gif", + "http://dumpfm.s3.amazonaws.com/images/20100521/1274415795577-dumpfm-ucnv-mx.gif", + "http://dump.fm/images/replaced/20100912/crabmonster.gif", + "http://dump.fm/images/20110927/1317105622918-dumpfm-peachfist-test8scam.gif", + "http://dump.fm/images/20110323/1300915179773-dumpfm-blingscience-fishtank.gif", + "http://dump.fm/images/20110418/1303108538834-dumpfm-LAVARLAMAR-lettuce_lavarlamar.gif", + "http://i.asdf.us/im/84/gradient_horse_1318306378_1322355741_ryz_1337322355_ryz.gif", + "http://dumpfm.s3.amazonaws.com/images/20110724/1311552093462-dumpfm-hologrampa-1291586335941-dumpfm-jeeeelings-cat_face_wink_hologrampa-lettuce.gif", + "http://i.asdf.us/im/be/tt7620731fltt_1315431978.gif" + ] + document.getElementById("big-image").innerHTML = "" + initFullscreen() + jQuery(startChatUpdater) + jQuery("#reglink").click(function(e){ + e.preventDefault(); + jQuery("#loginbox").hide(); + jQuery("#registerbox").show().addClass("b"); + initRegister() + return false; + }); + $if(user_nick)$ + $else$ + $endif$ + $google_analytics()$ -- cgit v1.2.3-70-g09d2