From ca3f4e31bbbd6c8cff3d0d2041fe1cc91c2c6b92 Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Sat, 20 Mar 2010 22:48:23 -0400 Subject: COMMIT PROD --- template/about_us.st | 4 +-- template/banner.st | 19 +++++++++++--- template/chat.st | 25 ++++++++++++++++++- template/goodies.st | 70 ++++++++++++++++++++++++++++++++++++++++++++++++---- template/head.st | 1 + template/preload.st | 8 ++++++ template/profile.st | 3 ++- 7 files changed, 117 insertions(+), 13 deletions(-) (limited to 'template') diff --git a/template/about_us.st b/template/about_us.st index 23265c4..cb7205f 100644 --- a/template/about_us.st +++ b/template/about_us.st @@ -26,7 +26,7 @@ jQuery(function() background-attachment:fixed;" onload=" javascript:CreateDropdownWindow('about the site', '360px', true, 'news', 70, 75); javascript:CreateDropdownWindow('about the team', '380px', true, 'link', 500, 60); - javascript:CreateDropdownWindow('contact us', '360px', true, 'contact', 100, 375); + javascript:CreateDropdownWindow('contact us', '360px', true, 'contact', 100, 395); "> @@ -39,7 +39,7 @@ background-attachment:fixed;" onload="


-DUMP.FM is a experiment in communication and web surfing; allowing pictures to be used to talk in realtime. Users can send image URLs, upload locally from their hard drive or post a pic right from their webcam. Every image posted gets stored in your DUMP.FM log, similarly, a log is kept of the entire collaboration. +DUMP.FM is a exciting tool for the internets; allowing pictures to be used for realtime communication and collaboration. Users can send image URLs (which display instantly in the chat), upload locally from their hard drive or post a pics right from their webcam. Every image gets stored in your DUMP.FM log, similarly, a log is kept of the entire collaboration.

diff --git a/template/banner.st b/template/banner.st index aa5ae50..f4d74f9 100755 --- a/template/banner.st +++ b/template/banner.st @@ -1,3 +1,7 @@ + + + +
@@ -19,10 +23,16 @@
  • Directory
  • Image Search
    • - $else$    - -
    -
    + $else$ + + + + $endif$
    @@ -51,3 +61,4 @@ + \ No newline at end of file diff --git a/template/chat.st b/template/chat.st index f44c383..5bff94c 100755 --- a/template/chat.st +++ b/template/chat.st @@ -2,7 +2,11 @@ dump.fm $head()$ + $if(user_nick)$ + $else$ + + $endif$ + + + + + + + + - WE GOT NO GOODIES YET!!!!!!!!!!!!!!!!!!!!!!! - + $banner()$ +
    +
    +
    + +
    +
    +
    + +
    +
    +
    + +
    + +
    +
    +
    + + + + + +
    +

    + $footer()$

    +

    +

    +
    - - \ No newline at end of file + + diff --git a/template/head.st b/template/head.st index da1c3f5..f650579 100755 --- a/template/head.st +++ b/template/head.st @@ -43,3 +43,4 @@ jQuery(document).ready(function () { MM_preloadImages('/static/mouseover.gif'); jQuery(function() { jQuery("#banner-menu").lavaLamp({ fx: "backout", speed: 700 })}); +$preload()$ diff --git a/template/preload.st b/template/preload.st index 1f51935..24f7e7c 100644 --- a/template/preload.st +++ b/template/preload.st @@ -1,4 +1,12 @@
    + + + + + + + +
    \ No newline at end of file diff --git a/template/profile.st b/template/profile.st index bca6a8b..a559164 100755 --- a/template/profile.st +++ b/template/profile.st @@ -1,3 +1,4 @@ + $nick$'s dump.fm @@ -144,6 +145,6 @@ -$preload()$ + -- cgit v1.2.3-70-g09d2 From 5a94d94fef2748cc6d22cebbcd0b1eb85d0b7798 Mon Sep 17 00:00:00 2001 From: sostler Date: Sun, 21 Mar 2010 00:56:06 -0400 Subject: Added room names to profiles --- src/site.clj | 2 +- template/log.st | 45 +++++----- template/log_dump.st | 18 ++++ template/profile.st | 222 +++++++++++++++++++++++------------------------ template/profile_dump.st | 18 ++++ 5 files changed, 166 insertions(+), 139 deletions(-) create mode 100644 template/log_dump.st create mode 100644 template/profile_dump.st (limited to 'template') diff --git a/src/site.clj b/src/site.clj index 39509a9..b6d0ee9 100755 --- a/src/site.clj +++ b/src/site.clj @@ -188,7 +188,7 @@ (defn fetch-messages-by-nick ([nick image-only] (fetch-messages-by-nick nick image-only 0)) ([nick image-only offset] - (let [query (str "SELECT m.content, m.created_on, m.message_id, u.nick, u.avatar + (let [query (str "SELECT m.content, m.created_on, m.message_id, u.nick, u.avatar, r.key FROM messages m, users u, rooms r WHERE m.user_id = u.user_id AND u.nick = ? AND r.room_id = m.room_id AND r.admin_only = false " diff --git a/template/log.st b/template/log.st index 145f8c6..45de47e 100755 --- a/template/log.st +++ b/template/log.st @@ -2,50 +2,45 @@ dump.fm log $head()$ - + $banner()$ -
    - - +

    -
    +
    -
    - $if(dumps)$ - $dumps: { d | $logged_dump(dump=d)$ }$ - $else$ - No dumps! - $endif$ -
    - - $if(next)$ - +
    + $if(dumps)$ + $dumps: { d | $log_dump(dump=d)$ }$ + $else$ + No dumps! $endif$ +
    -   - $if(prev)$ - - $endif$ + $if(next)$ + + $endif$ +   + $if(prev)$ + + $endif$ -

    +

    -
    - - +
    - +
    + diff --git a/template/log_dump.st b/template/log_dump.st new file mode 100644 index 0000000..49aab4b --- /dev/null +++ b/template/log_dump.st @@ -0,0 +1,18 @@ +
    +
    + $dump.created_on$ -- by $dump.nick$ +
    + +
    + + $if(dump.avatar)$ + + $else$ + + $endif$ + +
    +
    $dump.content$
    +
    + $share_buttons()$ +
    diff --git a/template/profile.st b/template/profile.st index bca6a8b..377346f 100755 --- a/template/profile.st +++ b/template/profile.st @@ -7,143 +7,139 @@ - - - - + - + $banner()$
    -
    +

    - +
    - $if(dumps)$ - -
    - + $if(dumps)$ +
    +
    + + $dumps:{ d | $profile_dump(dump=d)$ }$ +
    - $dumps:{ d | $logged_dump(dump=d)$ }$ -
    +

    $nick$

    + $if(avatar)$ + + $else$ + + $endif$ + + $if(is_home)$ + + $endif$ + +

    contact info

    + $if(contact)$ +
    $contact$
    + $else$ +
    + $endif$ +
    + +

    bio

    + $if(bio)$ +
    $bio$
    + $else$ +
    + $endif$ + + $if(is_home)$ +
    + + $endif$ + +
    +
    +
    +
    -

    $nick$

    - $if(avatar)$ - - $else$ - - $endif$ - - $if(is_home)$ - - $endif$ - -

    contact info

    - $if(contact)$ -
    $contact$
    - $else$ -
    - $endif$ -
    - -

    bio

    - $if(bio)$ -
    $bio$
    $else$ -
    +

     

    +

     

    +

     

    +

     

    +

     

    +

     

    +
    +

    Welcome to dump.fm

    +

    + +

    Step ❶

    +

    ☟ Find a sweet image for your avatar, paste the URL below ☟

    + $if(avatar)$ + + $else$ + + $endif$ + + $if(is_home)$ +
    +
    $avatar$
    + + +
    + $endif$ + +

    Step ❷

    +

    ☟ Enter some contact info below ☟

    +
    $contact$
    +
    + +

    Step ❸

    +

    ☟ Enter some personal info below ☟

    +
    $bio$
    +
    +

    Step ❹

    + +

    Join the ♣ and start posting pictures!

    +

     

    +

     

    +

     

    +

     

    +

     

    +

     

    $endif$ + +

     

    +
    - $if(is_home)$ -
    - - $endif$ - -
    -
    -
    -
    + $if(next)$ + + $endif$ - $else$ -

     

    -

     

    -

     

    -

     

    -

     

    -

     

    -
    -

    Welcome to dump.fm

    -

    - -

    Step ❶

    -

    ☟ Find a sweet image for your avatar, paste the URL below ☟

    - $if(avatar)$ - - $else$ - - $endif$ - - $if(is_home)$ -
    -
    $avatar$
    - - +   + $if(prev)$ + + $endif$ + +

    - $endif$ - -

    Step ❷

    -

    ☟ Enter some contact info below ☟

    -
    $contact$
    -
    - -

    Step ❸

    -

    ☟ Enter some personal info below ☟

    -
    $bio$
    -
    -

    Step ❹

    - -

    Join the ♣ and start posting pictures!

    -

     

    -

     

    -

     

    -

     

    -

     

    -

     

    - $endif$ - -

     

    -
    - - $if(next)$ - - $endif$ -   - $if(prev)$ - - $endif$ - -

    +
    - - -
    -$preload()$ + $preload()$ diff --git a/template/profile_dump.st b/template/profile_dump.st new file mode 100644 index 0000000..52001d6 --- /dev/null +++ b/template/profile_dump.st @@ -0,0 +1,18 @@ +
    +
    + $dump.created_on$ -- in $dump.key$ +
    + +
    + + $if(dump.avatar)$ + + $else$ + + $endif$ + +
    +
    $dump.content$
    +
    + $share_buttons()$ +
    -- cgit v1.2.3-70-g09d2 From 32849ee87f74148b28f8ed890437a84ccc38700e Mon Sep 17 00:00:00 2001 From: timb Date: Sun, 21 Mar 2010 00:18:08 -0700 Subject: get rid of in banner! and duped preload --- template/banner.st | 5 ----- 1 file changed, 5 deletions(-) (limited to 'template') diff --git a/template/banner.st b/template/banner.st index f4d74f9..1d080a1 100755 --- a/template/banner.st +++ b/template/banner.st @@ -57,8 +57,3 @@
    -
    - -
    - - \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 35c929f102a49dce6dd8f61d348394ae227e9496 Mon Sep 17 00:00:00 2001 From: timb Date: Sun, 21 Mar 2010 00:23:38 -0700 Subject: removed from banner --- template/banner.st | 4 ---- template/head.st | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'template') diff --git a/template/banner.st b/template/banner.st index 1d080a1..b58a2b5 100755 --- a/template/banner.st +++ b/template/banner.st @@ -1,7 +1,3 @@ - - - -
    diff --git a/template/head.st b/template/head.st index f650579..fdf5fea 100755 --- a/template/head.st +++ b/template/head.st @@ -42,5 +42,4 @@ jQuery(document).ready(function () { MM_preloadImages('/static/mouseover.gif'); jQuery(function() { jQuery("#banner-menu").lavaLamp({ fx: "backout", speed: 700 })}); - -$preload()$ + \ No newline at end of file -- cgit v1.2.3-70-g09d2 From 9e1070a2e949d54278e675e97d4bff3812b6f317 Mon Sep 17 00:00:00 2001 From: timb Date: Sun, 21 Mar 2010 00:39:49 -0700 Subject: fix giant hand, preload, & make info bubbles fade away --- static/header.css | 8 +------- template/chat.st | 3 +++ template/preload.st | 19 ++++++++++--------- 3 files changed, 14 insertions(+), 16 deletions(-) (limited to 'template') diff --git a/static/header.css b/static/header.css index 25dd736..1c53bf7 100755 --- a/static/header.css +++ b/static/header.css @@ -298,10 +298,4 @@ height:0.1; .no-cursor { cursor: none; } .invisible { display: none !important; } -#cursor-big { position: absolute; z-index: 1000; } -#preload { - position: fixed; - left: -1000px; - display:none; - top: -1000px; -} \ No newline at end of file +#cursor-big { position: absolute; z-index: 1000; } \ No newline at end of file diff --git a/template/chat.st b/template/chat.st index 15d0e3f..e5f8110 100755 --- a/template/chat.st +++ b/template/chat.st @@ -91,6 +91,9 @@ $else$
    +
    diff --git a/template/preload.st b/template/preload.st index 24f7e7c..8963e70 100644 --- a/template/preload.st +++ b/template/preload.st @@ -1,12 +1,13 @@ +
    - - - - - - - - - + + + + + + + + +
    \ No newline at end of file -- cgit v1.2.3-70-g09d2 From c4eaf3b84d33925b735c04cef4d6fac957a09e7f Mon Sep 17 00:00:00 2001 From: timb Date: Sun, 21 Mar 2010 00:49:58 -0700 Subject: more informal sounded better --- template/about_us.st | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'template') diff --git a/template/about_us.st b/template/about_us.st index cb7205f..1ea4df9 100644 --- a/template/about_us.st +++ b/template/about_us.st @@ -54,7 +54,7 @@ DUMP.FM is a exciting tool for the internets; al

    Scott Ostler - clean vocals

    Scott also worked on the development of MIT Exhibit

    Tim Baker - synths, guitars, beats, backing vocals

    -

    Tim was also a core developer of Delicious

    +

    Tim also helped make delicious

    Stefan Moore - beats, fog machine, lights

    Stefan is also one half of That-Go

    -- cgit v1.2.3-70-g09d2 From bb260d1716d10b5550eaecaa8e93519a51d6fa19 Mon Sep 17 00:00:00 2001 From: timb Date: Sun, 21 Mar 2010 01:08:34 -0700 Subject: fix z-index STACKING CONTEXT HIERARCHIES --- static/dumpnewuser.css | 40 ++++++++++++++++++++++------------------ template/chat.st | 25 +++++++++++++------------ 2 files changed, 35 insertions(+), 30 deletions(-) (limited to 'template') diff --git a/static/dumpnewuser.css b/static/dumpnewuser.css index 0eccc89..09ca175 100644 --- a/static/dumpnewuser.css +++ b/static/dumpnewuser.css @@ -12,43 +12,47 @@ overflow:hidden; } #posthelp{ position:fixed; -z-index:666; -bottom:50; -left:110; +z-index:2000; +bottom:50px; +left:110px; } #webcamhelp{ -position:fixed;z-index:8888888; -right:20; -bottom:39; +position:fixed; +z-index:2000; +right:20px; +bottom:39px; } #userlisthelp{ position:fixed; -top:100; -right:300; +top:100px; +right:300px; +z-index:2000; } #imageboard{ position:fixed; -top:20; -left:-10; +top:20px; +left:-10px; +z-index:2000; } #uploadstuff{ position:fixed; display:none; -bottom:40; -right:160; -z-index:99999; +bottom:40px; +right:160px; +z-index:2000; } #signinblurb{ position:absolute; -top:-20; +top:-20px; display:none; -z-index:199999999999999999999; -right:10; +z-index:2000; +right:10px; } #readyjoin{ position:fixed; -top:27; -left:180; +top:27px; +left:180px; +z-index:2000; } a { font-size: 12px; diff --git a/template/chat.st b/template/chat.st index e5f8110..6bdefc8 100755 --- a/template/chat.st +++ b/template/chat.st @@ -83,18 +83,7 @@ function pop(url)
    $else$ -
    -
    -
    -
    -
    -
    -
    -
    - -
    +
    @@ -110,6 +99,18 @@ jQuery(document).ready(function(){ setTimeout( function(){ jQuery("#newuserwrap
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    $endif$

    -- cgit v1.2.3-70-g09d2