sostler prod commit

8 files changed, 148 insertions, 62 deletions

diff --git a/static/css/dump.css b/static/css/dump.css
index eca6f08..6b40263 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -25,6 +25,8 @@ table, caption, tbody, tfoot, thead, tr, th, td {
 body {
 	line-height: 1;
 	background-color:#fff;
+	font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Arial, sans-serif;
+  font-size: 13px;  line-height: 1.5em;
 	margin:0;
 
 }
@@ -104,21 +106,15 @@ color:#000;font-family:verdana;background-color:#ffffff;	font-family: Monaco, "C
 }
 
 #dumplist{
-top:0px:width:100%;padding:0px;background-color:#fff;
-color:#000;font-size:60%;text-transform:uppercase;text-decoration: none;
-border-bottom:1px solid #999;text-align:left;text-indent:350px;
-padding-right:44px;line-height:1.1;background-color:#eff5fb;overflow:hidden;position:fixed;height:10px;width:100%;
+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;
 /*margin-left:40%;
 	border-bottom-left-radius:5px;
 	-webkit-border-bottom-left-radius:5px;
 	-moz-border-radius-bottomleft:5px;text-decoration: none;
 border-left:1px solid #999;*/
 }
-#dumplist a{color:#000;font-size:100%;text-transform:uppercase;text-decoration: none;
-}
-#dumplist a:hover{color:#f0e;text-decoration: none;
-
-}
 .no-cursor { cursor: none; }
 .invisible { display: none !important; }
 #cursor-big { position: absolute; z-index: 1000; }
@@ -480,6 +476,7 @@ top:0px;
 bottom:65px;
 	position:fixed;
 	width: 99.6%;
+	font-size:110%;
 	background-color:#fff;
 left:0.2%;
 
@@ -2021,6 +2018,16 @@ z-index:20000000;
 
 }
 
+#login-container {
+  float: right;
+margin-right:14px;
+color:#fff;
+	position: fixed;
+top:4px;	
+z-index:20000000;
+
+}
+
 #login-container a:link, a:visited {
 	color:#000;
 	text-decoration:none;
@@ -2103,7 +2110,7 @@ a.signin.menu-open span {cursor:pointer;
 	color:#789;
 	font-size:11px;		box-shadow: 3px 2px 2px #ccc;
 -webkit-box-shadow: 3px 2px 2px #ccc;
-z-index:50000000;
+z-index:50000000;line-height:12px;
 -moz-box-shadow: 3px 2px 2px #ccc;
 filter: progid:DXImageTransform.Microsoft.dropShadow(color=#ccc, offX=3, offY=4, positive=true);	
 }
@@ -2132,9 +2139,15 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#ccc, offX=3, offY=4,
 	display:inline-block;
 	width:90px;
   height:35px;
-  font-size:20px;
-  background-image:url('http://dump.fm/static/img/btngrad1.png');
-  background-color:#4691e5;
+    background:#448ed4; border:1px ridged #fff;
+    background:-moz-linear-gradient(top, #fff, #448ed4 50%, #448ed4 51%, #fff);
+    background:-webkit-gradient(linear, left top, left bottom, from(#fff), color-stop(50%, #448ed4), color-stop(51%, #448ed4), to(#fff));
+    text-decoration:none;
+    -moz-border-radius:4px;
+    -webkit-border-radius:4px;
+    -moz-box-shadow:#777 0 0 0 1px;
+    -webkit-box-shadow:#777 0 0 0 1px;
+    text-shadow:rgba(0,0,0,.4) 0 1px 0;
   font-weight:bold;
   word-spacing:7;
  margin-top:-5px;
@@ -2143,11 +2156,6 @@ cursor:pointer;
 	z-index:100;
 	font-size:16px;
 	color:#fff;
-	border-radius: 5px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	text-shadow:1px 1px 3px #000;
-z-index:20;
 }
 
 #furie3 {
diff --git a/static/js/fullscreen.js b/static/js/fullscreen.js
index dde23f3..f99d48b 100644
--- a/static/js/fullscreen.js
+++ b/static/js/fullscreen.js
@@ -56,10 +56,6 @@ function displayImage(){
         $('#fav-indicator').show();
     else
         $('#fav-indicator').hide();
-    if (DoPrint !== undefined && DoPrint) {
-		jsPrintSetup.setSilentPrint(true);
-        jsPrintSetup.print();
-	}
 }
 
 function refresh() {
diff --git a/template/banner.st b/template/banner.st
index 31f7595..5927a62 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -69,7 +69,13 @@
 
 
 
-   
+     <div id="dumplist">
+
+        $if(user_nick)$
+        <a href="http://dump.fm/fullscreen">checkout dump.fm in full-screen </a> - <a href="http://abcdef4.dump.fm/">MYSTERY ROOM!!!!!!!! </a> $else$ <style>#dumplist{z-index:-1!important;}</style> $endif$	
+        $if(isadmin)$ - <a href="http://vip.dump.fm/">NAUGHTY BOYS DELIGHT </a>
+        $endif$
+      </div>
    
 
       
@@ -90,11 +96,12 @@
 
 
 </div>
+
+    </div>
   <div id="inpage-search-results" >
         <div id="search-controls">
           <span id="search-message"></span>
           <a id="search-control-close" href="javascript:Search.close()">close</a>
         </div>
         <div id="search-results-images"></div>
-      </div>
-    </div>
+      </div>
\ No newline at end of file
diff --git a/template/frontpage.st b/template/frontpage.st
index b6cb58a..f75f9db 100644
--- a/template/frontpage.st
+++ b/template/frontpage.st
@@ -1,6 +1,13 @@
 <html>
   <head>
-  
+  <script type="text/javascript">
+function refreshing()
+{
+frm=document.getElementsByName("posts")[0];
+frm.src=frm.src;
+setTimeout("refreshing()",300000);
+}
+</script>
     <title>dump.fm</title>
     
     
@@ -42,6 +49,23 @@ $endif$
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 body{margin:0px;    background-image:url(http://dump.fm/static/img/bg.dither.gif);	background-color:#e2e2e2;/*background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x;
 	background-repeat:repeat-x;
 	background-position:top;*/background-attachment:fixed;min-width:900px;  font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Arial, sans-serif;
@@ -60,11 +84,32 @@ img{border:0px;}
 #posts{overflow:hidden;max-width:100%;font-family: Monaco, "Courier New", Courier, monospace;color:#333;font-size:8px;height:auto;padding:1px;margin-top:45px;}
 #posts a{text-decoration:none;	font-family:Arial, Helvetica, sans-serif;letter-spacing:0px;color:#f0e;}
 #posts a:hover{color:#333;text-decoration:none;}
-#sideinfo{ text-align:justify;color:#333; padding:12px;margin:7px;font-size:20px;float:left;min-height:210px;width:230px;border:1px inset #f1f1f1; border-radius:3px;-webkit-border-radius:3px;-moz-border-radius: 3px;background-color:white;font-family: 'HelveticaNeue-Light','Helvetica Neue Light','Helvetica Neue',Arial,Helvetica,sans-serif;font-weight:bold; line-height:23px;}
+#sideinfo{ color:#333; padding:12px;margin:7px;font-size:47px;float:left;min-height:210px;width:240px;border:1px inset #f1f1f1; border-radius:3px;-webkit-border-radius:3px;-moz-border-radius: 3px;background-color:white;font-family: 'HelveticaNeue-Light','Helvetica Neue Light','Helvetica Neue',Arial,Helvetica,sans-serif;font-weight:bold; line-height:55px;}
+.alttxt{font-size:18px;line-height:20px;}
 .logged-dump{border:1px inset #f1f1f1; border-radius:3px;-webkit-border-radius:3px;-moz-border-radius: 3px;font-family:Arial, Helvetica, sans-serif;float:left;max-width:250px;min-width:230px;padding:7px;margin:7px;background-color:white}
 .logged-dump img{max-width:240px;max-height:240px;padding-top:3px;   }
-.buttons img{height:12px;float:left;padding-right:6px;padding-top:5px;cursor:pointer;display:none;}
+     
+      $if(user_nick)$
+
+.buttons img{z-index:4;float:left;padding-top:5px;cursor:pointer;}
+$else$
+.buttons img{display:none;z-index:4;float:left;padding-top:5px;cursor:pointer;}
+$endif$
 .buttons .share{cursor:pointer;display:none;}
+img.thumb {
+bottom:3px;
+image-rendering: -moz-crisp-edges;
+z-index:4;
+}
+
+.thumb.favorite {
+  position: absolute;
+  margin-left: 40px;
+  margin-top: 0px;
+  height: 27px;
+  width: 27px;z-index:4;
+  display: inline-block;
+}
 #posts hr{display:none;}
 #pgbuttons{position:fixed;bottom:6px;right:0px;/*border-top:1px ridge #333;*/min-width:70px;padding:5px;}
 #pgbuttons a{text-decoration:none;}
@@ -88,7 +133,7 @@ img{border:0px;}
     -moz-box-shadow:#777 0 0 0 1px;
     -webkit-box-shadow:#777 0 0 0 1px;
     text-shadow:rgba(0,0,0,.4) 0 1px 0;}
-#hallscore{margin-right:-20px;color:#fff;text-align:center;margin-top:-20px;float:right;font-size:40px;z-index:1;padding:6px;background-image:url('/static/img/hallheart.png');background-position:top left;font-family: 'HelveticaNeue-Light','Helvetica Neue Light','Helvetica Neue',Arial,Helvetica,sans-serif;font-weight:100;height:50px;width:50px;text-shadow:-1px 1px 0px #000;line-height:37px;text-indent:5px;
+#hallscore{margin-right:-20px;color:#fff;text-align:center;margin-top:-20px;float:right;font-size:40px;z-index:1;padding:6px;background-image:url('/static/img/hallheart.png');background-position:top left;font-style: oblique;font-weight:100;height:50px;width:50px;text-shadow:-1px 1px 0px #000;line-height:37px;text-indent:4px;
    }
 #hallnick{font-size:16px;}
 
@@ -184,7 +229,7 @@ a.signin.menu-open span {cursor:pointer;
 	color:#789;
 	font-size:11px;		box-shadow: 3px 2px 2px #ccc;
 -webkit-box-shadow: 3px 2px 2px #ccc;
-z-index:50000000;
+z-index:50000000;line-height:12px;
 -moz-box-shadow: 3px 2px 2px #ccc;
 filter: progid:DXImageTransform.Microsoft.dropShadow(color=#ccc, offX=3, offY=4, positive=true);	
 }
@@ -213,9 +258,15 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#ccc, offX=3, offY=4,
 	display:inline-block;
 	width:90px;
   height:35px;
-  font-size:20px;
-  background-image:url('http://dump.fm/static/img/btngrad1.png');
-  background-color:#4691e5;
+    background:#448ed4; border:1px ridged #fff;
+    background:-moz-linear-gradient(top, #fff, #448ed4 50%, #448ed4 51%, #fff);
+    background:-webkit-gradient(linear, left top, left bottom, from(#fff), color-stop(50%, #448ed4), color-stop(51%, #448ed4), to(#fff));
+    text-decoration:none;
+    -moz-border-radius:4px;
+    -webkit-border-radius:4px;
+    -moz-box-shadow:#777 0 0 0 1px;
+    -webkit-box-shadow:#777 0 0 0 1px;
+    text-shadow:rgba(0,0,0,.4) 0 1px 0;
   font-weight:bold;
   word-spacing:7;
  margin-top:-5px;
@@ -224,11 +275,6 @@ cursor:pointer;
 	z-index:100;
 	font-size:16px;
 	color:#fff;
-	border-radius: 5px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	text-shadow:1px 1px 3px #000;
-z-index:20;
 }
 
 #furie3 {
@@ -255,7 +301,7 @@ a#disregister {
 			cursor: pointer;
 			line-height: 1em;z-index:3;
 			padding: 25px 10px 40px;
-			margin-top: -2px;margin-left: -2px;
+			margin-top: -2px;
 			float:right;
 			-webkit-transform: rotate(9deg);
 			-moz-transform: rotate(9deg);
@@ -269,7 +315,7 @@ a#disregister {
     border-left-color: #FFF057;
     -webkit-box-shadow:#a0a0a0 3px 4px 4px; 
     -moz-box-shadow: #a0a0a0 3px 4px 4px; /* FF 3.5+ */
-            text-shadow: 1px 1px 3px #AAA; margin-right:35px;
+            text-shadow: 1px 1px 3px #AAA; margin-right:20px;
 		}
  a#disregister:hover {
 
@@ -345,6 +391,25 @@ margin:7px;
   padding: 4px;
 }
 
+     
+ 
+        DIV#posts.loading {
+            background: url(/images/spinner.gif) no-repeat center center;
+        }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 </style>
 
@@ -365,6 +430,7 @@ jQuery(window).load(function(){
 
 
 	});
+
 </script> 
 
     
@@ -372,7 +438,7 @@ jQuery(window).load(function(){
 
     
   </head>
- <body>
+ <body onload="refreshing()">
  
  <!--
  <iframe src="http://dump.fm/fullscreen"style="overflow:hidden;width:100%;height:100%;border:0px;z-index:-1;position:fixed;top:0px;left:0px;"></iframe>
@@ -384,9 +450,9 @@ jQuery(window).load(function(){
 
 	
         $if(!user_nick)$
-	  <a href="$domain$"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a>
+	  <a href="$domain$/chat"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a>
           $else$
-	  <a href="$domain$"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a>
+	  <a href="$domain$/chat"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a>
 
 	    $endif$
 	    
@@ -407,7 +473,7 @@ jQuery(window).load(function(){
     <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe>
             
 	        $else$
-	                   
+	                   <!--
 <div id="toplinks">	 
                 <a href="$domain$/about" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;">
 	          <img src="$domain$/static/img/thumbs/profilebaricon.png"/> About </a>           
@@ -416,7 +482,7 @@ jQuery(window).load(function(){
 	        </a>
 <a href="$domain$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> 
     <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Tags</a>
-</div>
+</div>-->
     <iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&amp;layout=button_count&amp;show_faces=false&amp;width=450&amp;action=like&amp;font=tahoma&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe>
            <a href="http://dump.fm/register" id="disregister">Register!</a>
 	        $endif$     
@@ -453,17 +519,24 @@ jQuery(window).load(function(){
 <!--END BANNER-->
 
 
-<div id="posts" class="clickable clearfix">
+<div id="posts" name="posts"class="clickable clearfix">
   <div id="sideinfo">
     $if(user_nick)$
-    <strong><a href="$domain$/chat">JOIN CHAT</a></strong>
+    <b><a href="$domain$/chat">JOIN CHAT!</a></b>
     <div id="hallnick">
       <iframe src="$domain$/fullscreen" style="overflow:hidden;width:240px;height:200px;border:0px;"></iframe> 
     </div>
     $else$
-    Here are today's top images from dump.fm
-    <br /> <br />
-    Join the conversation!<strong><a href="$domain$/login" class="signin">sign in</a></strong> or <strong><a href="$domain$/register">register</a></strong>
+    
+    
+ Currently hot on <a href="$domain$/chat">dump.fm</a>
+    <!--
+       <div id="hallnick">
+      <iframe src="$domain$/fullscreen" style="overflow:hidden;width:240px;height:200px;border:0px;"></iframe> 
+    </div>
+-->
+    <div class="alttxt"><br>Join the conversation!<strong><br><br><a href="$domain$/login" class="signin">sign in</a></strong> or <strong><a href="$domain$/register">register!</a></strong>
+    </div>
     $endif$
   </div>
      
diff --git a/template/fullscreen.st b/template/fullscreen.st
index 911addb..9ccf0c1 100644
--- a/template/fullscreen.st
+++ b/template/fullscreen.st
@@ -69,9 +69,9 @@
           display: none;
           position: fixed;
           z-index: 999;
-          height: 150px;
-          width: 150px; 
-          left: 20px;
+          height: 50px;
+          width: 50px; 
+          right: 20px;
           top: 20px;
       }
       #errormsg {
@@ -126,18 +126,19 @@
      </div>
 
     <div id="memelogo">
-      <a href="http://dump.fm"><img src="http://dump.fm/static/img/dumppixelhover.png" class="memelogo"></a>
+  
       <br>
       <div class="sublogo">
       $if(user_nick)$
-      click to fav
+       <img src="/static/img/thumbs/heart.gif">click to fav
       $else$
+<a href="http://dump.fm"><img src="http://dump.fm/static/img/dumppixelhover.png" class="memelogo"></a>
       <a href="#" onclick="showLogin(); return false;">LOGIN</a> | <a href="$domain$/register">REGISTER</a>
       $endif$
       </div>
     </div>
     <div id="big-image">waiting 4 new image from dump.fm.............</div>
-    <img src="/static/img/thumbs/heartfaved.gif" id="fav-indicator">
+    <img src="http://dump.fm/static/img/thumbs/heartfaved.gif" id="fav-indicator">
     <script>
       initFullscreen()
     </script>
diff --git a/template/hall_log_dump.st b/template/hall_log_dump.st
index b912297..0056e6f 100644
--- a/template/hall_log_dump.st
+++ b/template/hall_log_dump.st
@@ -5,8 +5,9 @@ $else$
 $endif$
 
 
- <a href="/$dump.nick$"><b id="hallnick">$dump.nick$</a> </b>$if(dump.score)$   <span id="hallscore">$dump.score$</span>$endif$
+ <a href="/$dump.nick$"><b id="hallnick">$dump.nick$</a> </b>$if(dump.score)$   <span id="hallscore" onclick="Tag.favorite(this)">$dump.score$</span>$endif$
 <div class="content" data-category="posts">$dump.content$</div>
 <hr />
+
 $share_buttons()$
 </div>
diff --git a/template/messagepane.st b/template/messagepane.st
index 7b54228..1005679 100644
--- a/template/messagepane.st
+++ b/template/messagepane.st
@@ -31,7 +31,7 @@
     <hr />
   </div>
 
-  $if(user_nick)$
+$if(user_nick)$
   <div id="msgInputDiv">
     <div id="msginputrapper">
       <input id="msgInput" class="msgInput" type="input" />
diff --git a/template/userlog.st b/template/userlog.st
index 4e67c82..1dacade 100644
--- a/template/userlog.st
+++ b/template/userlog.st
@@ -25,15 +25,15 @@
         <div id="msgInputDiv">
 	  <div id="msginputrapper"> 
             $if(prev)$
-            <a href="$prev$"><input id="prevbutton" value="<- Prev" readonly="true"></a>
+            <a href="$prev$"><input id="prevbutton" value="<- Prev" readonly="true"type="button"></a>
 	    $else$
-	    <input id="prevbutton" readonly="true">
+	    <input id="prevbutton" readonly="true"type="button">
 	    $endif$
 
             $if(next)$
-            <a href="$next$">  <input id="nextbutton" value="Next ->" readonly="true"></a>
+            <a href="$next$">  <input id="nextbutton" value="Next ->" readonly="true"type="button"></a>
 	    $else$
-	    <input id="nextbutton" value="nomodumps" readonly="true">
+	    <input id="nextbutton" value="nomodumps" readonly="true"type="button">
 	    $endif$
           </div>
 	  <div id="footerc">