sostler prod commit

5 files changed, 6 insertions, 6 deletions

diff --git a/docs/reserved_nicks.txt b/docs/reserved_nicks.txt
index 17e443a..7285642 100644
--- a/docs/reserved_nicks.txt
+++ b/docs/reserved_nicks.txt
@@ -21,6 +21,8 @@ dis-register
 dump
 dumpfm
 error
+event
+events
 fame
 favicon
 feed
diff --git a/static/js/fullscreen.js b/static/js/fullscreen.js
index 192f92a..374fd90 100644
--- a/static/js/fullscreen.js
+++ b/static/js/fullscreen.js
@@ -38,13 +38,11 @@ function clickImage(img) {
     if (!$(img).hasClass('fullscreen-favorite')) {
         FavedMap[msg_id] = true;
         $('#fav-indicator').show();
-        console.log('faving ' + msg_id);
         Tag.add(msg_id, "favorite");
         $(img).addClass("fullscreen-favorite");
     } else {
         delete FavedMap[msg_id];
         $('#fav-indicator').hide();
-        console.log('defaving ' + msg_id);
         Tag.rm(msg_id, "favorite");
         $(img).removeClass("fullscreen-favorite");
     }
@@ -104,6 +102,8 @@ function initLogin() {
 }
 
 function showLogin() {
+    $('#nickInput').val('');
+    $('#passwordInput').val('');
     $('#loginbox').show().center().center();
     $('#username').focus();
     $('input').removeAttr('disabled');
@@ -157,7 +157,6 @@ function login() {
     }); 
 })(jQuery);
 
-// me (scottbot) (dumpco 2010 ltd inc)
 (function($) {
     $.fn.extend({
         ridgificate: function() {
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 18e438a..36e4087 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -764,7 +764,6 @@ function setupUploadAvatar(elementId) {
         }
 	
         var s = '<img id="dashavatarPic" src="' + r + '" />';
-	console.log('setting avatar img to ' + s);
         $('#dashavatar').html(s).show();
     };
     new AjaxUpload(elementId, {
diff --git a/template/banner.st b/template/banner.st
index d032a19..6083678 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -97,7 +97,7 @@
       <div id="logout7" class="white">   
         <div align="center">
           <form id="logout" action="/logout" method="POST">
-	    <a href="#" onclick="pageTracker._trackEvent('button', 'logout'); jQuery('#logout').submit(); return false">Logout</a>
+	    <a href="#" onclick="jQuery('#logout').submit(); return false">Logout</a>
           </form>
         </div>
       </div>    
diff --git a/template/fullscreen.st b/template/fullscreen.st
index 2f8aab2..ec98b8e 100644
--- a/template/fullscreen.st
+++ b/template/fullscreen.st
@@ -127,7 +127,7 @@
 
     <div id="memelogo">
       <a href="http://dump.fm"><img src="http://dump.fm/static/img/dumppixelhover.png" class="memelogo"></a>
-      <br><br>
+      <br>
       <div class="sublogo">
       $if(user_nick)$
       click to fav