From 69804274b58e3b59831bedbe50ff8618de784b88 Mon Sep 17 00:00:00 2001 From: tim b Date: Sat, 3 Jul 2010 18:38:01 -0700 Subject: context specific cookie domain --- db/0-create.psql | 2 ++ src/config.clj | 13 +++++++------ src/site.clj | 12 ++++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/db/0-create.psql b/db/0-create.psql index 5016aa2..39e2bf3 100644 --- a/db/0-create.psql +++ b/db/0-create.psql @@ -118,6 +118,7 @@ CREATE TABLE invalid_feed_images ( CREATE INDEX invalid_feed_images_idx ON invalid_feed_images (image_url); +-- dont add this yet CREATE TABLE avatars ( avatar_id SERIAL PRIMARY KEY, user_id NOT NULL REFERENCES users, @@ -131,6 +132,7 @@ CREATE TABLE avatars ( th integer ); +-- dont add this yet CREATE TABLE images ( image_id SERIAL PRIMARY KEY, diff --git a/src/config.clj b/src/config.clj index f09daf8..15834cb 100644 --- a/src/config.clj +++ b/src/config.clj @@ -3,17 +3,18 @@ ;; Configuration -(def *cookie-domain* ".dump.fm") +(def *server-user* (System/getProperty "user.name")) +;; (if (= (System/getProperty "user.name") "dumpfmprod") (def *server-url* - (if (= (System/getProperty "user.name") "dumpfmprod") + (if (= *server-user* "dumpfmprod") "http://dump.fm" "http://localhost:8080")) -(def *deployed* - (if (= (System/getProperty "user.name") "dumpfmprod") - :prod - :local)) +(def *cookie-domain* + (if (= *server-user* "timb") + "" + ".dump.fm")) (def *root-directory* (System/getProperty "user.dir")) (def *image-directory* "images") diff --git a/src/site.clj b/src/site.clj index 6af0ebd..04ebecb 100644 --- a/src/site.clj +++ b/src/site.clj @@ -267,12 +267,12 @@ (make-login-token db-user) (clear-login-token *login-token-key*)) ip (get-ip request)] - (if db-user - (do - (log-login (db-user :user_id) ip) - [(session-assoc-from-db db-user) - login-cookie - (resp-success "OK")] + (if db-user + (do + (log-login (db-user :user_id) ip) + [(session-assoc-from-db db-user) + login-cookie + (resp-success "OK")] ) (resp-error "BAD_LOGIN")))) -- cgit v1.2.3-70-g09d2 From 9c321907a9f755949c760f62703fb0d00e61e415 Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Sat, 3 Jul 2010 22:02:57 -0400 Subject: Updated log format --- conf/nginx.conf | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/conf/nginx.conf b/conf/nginx.conf index 306c6ee..4d54b39 100644 --- a/conf/nginx.conf +++ b/conf/nginx.conf @@ -10,8 +10,10 @@ events { http { include /etc/nginx/mime.types; - access_log /home/dumpfmprod/prod/log/nginx/access.log; - + log_format hyphen '$remote_addr | $time_local | ' + '"$request" | $pipe | $status | $request_time | $content_length | $bytes_sent | $body_bytes_sent | ' + '"$http_referer" | "$http_user_agent"'; + access_log /home/dumpfmprod/prod/log/nginx/access.log hyphen; sendfile on; #tcp_nopush on; -- cgit v1.2.3-70-g09d2 From 57b4ecea5e20f4746c23911a6cc85508e0509536 Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Sat, 3 Jul 2010 22:03:45 -0400 Subject: sostler prod commit --- static/cal.html | 13 ++- static/css/dump.css | 6 +- static/img/thumbs/heartfavedsm.gif | Bin 0 -> 488 bytes static/index.html | 4 +- static/js/invalid_domains.js | 1 + static/js/pichat.js | 2 +- static/search/browser.css | 2 +- static/search/browser.html | 4 +- template/banner.st | 5 +- template/dealwithit.st | 2 +- template/popular.st | 4 +- template/popular_dump.st | 6 +- template/profile.st | 2 +- template/slothgoth.st | 2 +- template/spaceboys.st | 148 +++++++++++++++++++++++ template/weedpile.st | 232 +++++++++++++++++++++++++++++++++++++ 16 files changed, 410 insertions(+), 23 deletions(-) create mode 100644 static/img/thumbs/heartfavedsm.gif create mode 100644 template/spaceboys.st create mode 100644 template/weedpile.st diff --git a/static/cal.html b/static/cal.html index d00d32b..5aa8ed8 100644 --- a/static/cal.html +++ b/static/cal.html @@ -15,7 +15,9 @@ background-attachment:fixed; td{padding:3px;border:1px dotted black; } - +.doneday{ +background-color:#ccc; +} @@ -35,16 +37,15 @@ Saturday  
 
 
-1
+1
HOMEBOYS IN SPACE!
-
EXAMPLE HERE! +
VIEW RESULTS!!
-2 +2
WEED PILES! -
-
TEMPLATE HERE! +

VIEW RESULTS!!
3
PHOTOSHOP STUFF WITH diff --git a/static/css/dump.css b/static/css/dump.css index d7bd447..b941464 100755 --- a/static/css/dump.css +++ b/static/css/dump.css @@ -1038,7 +1038,7 @@ background-color:#f3f3f3; -moz-border-radius-bottomright:5px; } #userList img{ - +display:none; max-width:30px; width: expression(this.width > 30 ? 30: true); max-height:30px; @@ -1930,3 +1930,7 @@ border:2px solid #000; .contentWrap{ background-color:#fff; } +.faver-list{ +max-width:80%; +font-size:20px;font-weight:bold;word-spacing:-3px; +} \ No newline at end of file diff --git a/static/img/thumbs/heartfavedsm.gif b/static/img/thumbs/heartfavedsm.gif new file mode 100644 index 0000000..bac39fa Binary files /dev/null and b/static/img/thumbs/heartfavedsm.gif differ diff --git a/static/index.html b/static/index.html index 8529890..091045b 100644 --- a/static/index.html +++ b/static/index.html @@ -300,9 +300,9 @@ padding:5px;
HOME OF THE SLOTHGOTH!!
- +
-HOME OF DEAL WITH IT!! +HOME OF WEED PILES!!
diff --git a/static/js/invalid_domains.js b/static/js/invalid_domains.js index a7d207c..3cc0103 100644 --- a/static/js/invalid_domains.js +++ b/static/js/invalid_domains.js @@ -68,6 +68,7 @@ var InvalidDomains = [ "http://www.worldofstock.com", "http://aphrodite.cooltext.com", "http://www.iconarchive.com", + "www.fddarchive.com", "http://www.onemetal.com", "http://static.funnyjunk.com", "http://www.whimsical-wits.com", diff --git a/static/js/pichat.js b/static/js/pichat.js index 91e44a7..6d02f25 100644 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -18,7 +18,7 @@ Imgs = { Anim = { "chatThumbBig": {"width": "54px", "height": "54px", "right": "0px", "bottom": "2px"}, - "chatThumbTiny": {"width": "8px", "height": "8px", "right": "8px", "bottom": "8px"}, + "chatThumbTiny": {"width": "16px", "height": "16px", "right": "8px", "bottom": "8px"}, "chatThumb": {"width": "16px", "height": "16px", "right": "4px", "bottom": "4px"}, "logThumb": {"width": "27px", "height": "27px", "marginRight": "0px", "marginTop": "0px"}, "logThumbBig": {"width": "64px", "height": "64px", "marginRight": "-2px", "marginTop": "-2px"} diff --git a/static/search/browser.css b/static/search/browser.css index e5755e6..44355a6 100755 --- a/static/search/browser.css +++ b/static/search/browser.css @@ -31,7 +31,7 @@ input#submit{ width:100px; height:28px; font-size:20px; -background-image:url(/static/bg-btn-blue.png); +background-image:url(/static/img/bg-btn-blue.png); text-align:center; z-index:100; cursor:pointer; diff --git a/static/search/browser.html b/static/search/browser.html index 98cfd45..4620b49 100755 --- a/static/search/browser.html +++ b/static/search/browser.html @@ -6,8 +6,8 @@ - - + + diff --git a/template/banner.st b/template/banner.st index ead29f2..9630bd2 100644 --- a/template/banner.st +++ b/template/banner.st @@ -12,8 +12,8 @@
$if(user_nick)$ - Calendar - Log + + Profile @@ -23,6 +23,7 @@ Hall of Fame + Calendar Favs Image Search diff --git a/template/dealwithit.st b/template/dealwithit.st index 19f0127..360d527 100644 --- a/template/dealwithit.st +++ b/template/dealwithit.st @@ -88,7 +88,7 @@ text-decoration:none; + + + + + + +
Homeboys in Space on dump.fm

A Collection of images of 'Homeboys in Space' from July 1, 2010.

Return Home

+ + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + +
+
+ + + + \ No newline at end of file diff --git a/template/weedpile.st b/template/weedpile.st new file mode 100644 index 0000000..4ea8e7f --- /dev/null +++ b/template/weedpile.st @@ -0,0 +1,232 @@ + + + + + dump.fm - weed pile + + + + + + + + + +
+ +
Weed Pile on dump.fm

A Collection of images involving 'Weed Pile' from July 2, 2010.

Check out upcomming dump themes

Return Home

+ $if(!user_nick)$
dump.fm lets you share images in realtime.
Click here to register!
$endif$ + +
+ +
+
+
+
+
+ +
+
+
+
+
+ + +
+
+
+
+
+
+
+

+
+
+
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + +
+
+ + + + \ No newline at end of file -- cgit v1.2.3-70-g09d2