diff options
| author | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2011-04-19 10:03:53 -0400 |
|---|---|---|
| committer | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2011-04-19 10:03:53 -0400 |
| commit | f40c5375ba7ce15a78188e21c9f2da63145d4b26 (patch) | |
| tree | a4a4a7cb95633c9306c7f5226f170c0fe06ef5bc | |
| parent | 5ac9bee0dd9d0a3fa146da4f73a42a08e5b94fea (diff) | |
sostler prod commit
| -rw-r--r-- | src/datalayer.clj | 2 | ||||
| -rwxr-xr-x | static/css/dump.css | 2 | ||||
| -rw-r--r-- | static/error/502.html | 3 | ||||
| -rwxr-xr-x | static/js/home.js | 2 | ||||
| -rw-r--r-- | template/hall_log_dump.st | 2 | ||||
| -rw-r--r-- | template/pogs.st | 1 |
6 files changed, 8 insertions, 4 deletions
diff --git a/src/datalayer.clj b/src/datalayer.clj index b602d0b..52d3b0a 100644 --- a/src/datalayer.clj +++ b/src/datalayer.clj @@ -156,7 +156,7 @@ WHERE u.nick = ANY(?)" {symbol (.getElement t) :score (int (.getScore t))}) (catch Exception e - (println "jedis exception" e) + (println (new java.util.Date) "jedis exception" e) []))) (defn fetch-redis-daily-hall [date offset num user-id] diff --git a/static/css/dump.css b/static/css/dump.css index 6b40263..09dd59d 100755 --- a/static/css/dump.css +++ b/static/css/dump.css @@ -108,7 +108,7 @@ color:#000;font-family:verdana;background-color:#ffffff; font-family: Monaco, "C #dumplist{ top:0px:padding:0px; font-size:88%;text-transform:uppercase;text-decoration: none;margin-right:4%; -text-align:left;position:fixed;top:0px;left:18px;line-height:.7;overflow:hidden;height:10px; +text-align:left;position:fixed;top:41px;left:18px;line-height:.7;overflow:hidden;height:10px; /*margin-left:40%; border-bottom-left-radius:5px; -webkit-border-bottom-left-radius:5px; diff --git a/static/error/502.html b/static/error/502.html new file mode 100644 index 0000000..91e74d1 --- /dev/null +++ b/static/error/502.html @@ -0,0 +1,3 @@ +<html> + <body>502</body> +</html> diff --git a/static/js/home.js b/static/js/home.js index 736fc84..9bee6ba 100755 --- a/static/js/home.js +++ b/static/js/home.js @@ -150,7 +150,7 @@ function login() { var hash = hex_sha1(nick + '$' + password + '$dumpfm'); var onSuccess = function(json) { - location.href = location.href; + location.href = '/chat'; if (typeof pageTracker !== 'undefined') { pageTracker._setCustomVar(1, "logged-in", nick); } diff --git a/template/hall_log_dump.st b/template/hall_log_dump.st index 4cd7ba7..d12fecb 100644 --- a/template/hall_log_dump.st +++ b/template/hall_log_dump.st @@ -3,5 +3,7 @@ $if(dump.score)$<span class="hallscore" onclick="Tag.animated_fav(this, '.hallscore', '60px', '40px')">$dump.score$</span>$endif$ <div class="content" data-category="posts">$dump.content$</div> <hr /> + $if(logged_in)$ $frontpage_share_buttons()$ + $endif$ </div> diff --git a/template/pogs.st b/template/pogs.st index 63bc29e..e2f0dbd 100644 --- a/template/pogs.st +++ b/template/pogs.st @@ -216,7 +216,6 @@ font-size:100%;} <img src="http://dump.fm/images/20100706/1278438862410-dumpfm-pixelfuck-Untitled-3.gif"> <img src="http://dump.fm/images/20100706/1278437086903-dumpfm-noisia-digipog-man-face-boring.gif"> <img src="http://dump.fm/images/20100706/1278436783573-dumpfm-noisia-digipog-hypothete-subpixel-favheart.gif"> -<img src="http://dump.fm/images/20100706/1278436627721-dumpfm-noisia-digipog-dr-dieter-daniels.gif"> <img src="http://dump.fm/images/20100706/1278436379077-dumpfm-noisia-digipog-pie-chart.gif"> <img src="http://dump.fm/images/20100706/1278436190174-dumpfm-noisia-digipog-blinking-green-alien-sharp-big-shrunk-what.gif"> <img src="http://dump.fm/images/20100706/1278442797918-dumpfm-ryder-hentipog.gif"> |