sostler prod commit

author: dumpfmprod <dumpfmprod@ubuntu.(none)> 2010-09-03 21:03:39 -0400
committer: dumpfmprod <dumpfmprod@ubuntu.(none)> 2010-09-03 21:03:39 -0400
commit: 622122468f565bfb1c52245affd07413c6aecca6 (patch)
tree: ddeb6cd30be6698ef0fcf539dc9920fe19e1cf7f
parent: 5215fa49a2c64d7c015e638f72bd7c4b280b0beb (diff)
6 files changed, 31 insertions, 43 deletions
diff --git a/static/css/dump.css b/static/css/dump.css
index f37d525..1449167 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -304,6 +304,10 @@ display:none;
 .thumb {
   cursor:pointer;
 }
+ .thumb{
+display:inline-block;
+
+}
 
 img.chat-thumb {
   cursor:pointer;
@@ -333,7 +337,7 @@ img.chat-thumb {
 .buttons{
   cursor:pointer;
 
-
+display:inline-block;
 }
 .buttons .share {
   opacity: 0.8;
@@ -345,15 +349,15 @@ img.chat-thumb {
   /*padding-left: 20px;*/
 }
 img.thumb {
-  position: absolute;
+bottom:10px;
 image-rendering: -moz-crisp-edges;
-  margin-left: 0px;
-  margin-top: 0px;
-  height: 27px;
-  width: 27px;
+
+position:absolute;
+
+
+
   left:110px;
-  bottom: 9px;
-  display: block;
+  display: inline-block;
 }
 
 .thumb.favorite {
@@ -1633,6 +1637,7 @@ width:600px;
     width:auto;
 text-overflow: ellipsis-word;
 	padding: 18px;
+	padding-bottom:7px;
 	font-family: Arial, Helvetica, sans-serif;
 	font-size: 12px;
 	text-transform: uppercase;
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 7611edb..ef45935 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -440,11 +440,7 @@ function isDuplicateMessage(m) {
 function refresh() {
     var onSuccess = function(json) {
         try {
-            if (json.v && (typeof Version == 'undefined' || Version != json.v)) {
-                location.reload();
-            }
-
-            Timestamp = json.timestamp;
+           Timestamp = json.timestamp;
             
             $.map(json.messages, function(msg){ MessageContentCache[msg.msg_id.toString()] = msg.content })
             
@@ -624,7 +620,7 @@ function initChatThumb(){
           $(this).attr("src", Imgs.chatThumb);
           $(this).stop().animate(Anim.chatThumb, 'fast');
         } else {
-          $(this).stop().animate(Anim.chatThumbTiny, 'fast', 'swing',
+          $(this).delay(600).stop().animate(Anim.chatThumbTiny, 'fast', 'swing',
             function(){
               $(this).attr("src", Imgs.chatThumbDot)
               $(this).animate(Anim.chatThumb, 0)
@@ -634,6 +630,7 @@ function initChatThumb(){
   })
 }
 
+
 function paletteToChat(img){
   var chatText = $("#msgInput").val()
   if (chatText.length && chatText[chatText.length - 1] != " ")
@@ -1214,7 +1211,8 @@ var HasFocus = true;
 function onFocus() {
     HasFocus = true;
     UnseenMsgCounter = 0;
-    $('title').text(OrigTitle);
+    // Courtesy http://stackoverflow.com/questions/2952384/changing-the-window-title-when-focussing-the-window-doesnt-work-in-chrome
+    window.setTimeout(function () { $('title').text(OrigTitle); }, 100);
 }
 
 function onBlur() {
diff --git a/template/banner.st b/template/banner.st
index c84ff6a..eb7f0a9 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -85,7 +85,7 @@
     <div id="dumplist">
 
 $if(user_nick)$
-    <a href="http://dump.fm/m/fullscreen">checkout dump.fm in full-screen - </a><a href="http://dump.fm/stickers">SUPPORT DUMP.FM! BUY SOME STICKERS!!</a><a href="http://dis.dump.fm">- dis magazine new style options</a>  $else$ <style>#dumplist{z-index:-1!important;}</style> $endif$ 
+    <a href="http://dump.fm/fullscreen">checkout dump.fm in full-screen - </a><a href="http://dump.fm/stickers">SUPPORT DUMP.FM! BUY SOME STICKERS!!</a><a href="http://dis.dump.fm">- dis magazine new style options</a>  $else$ <style>#dumplist{z-index:-1!important;}</style> $endif$ 
 	
        $if(isadmin)$  -<a href="http://vip.dump.fm/">  NAUGHTY BOYS DELIGHT </a>
 $endif$
diff --git a/template/fullscreen.st b/template/fullscreen.st
index 927ae5d..fc57dc0 100644
--- a/template/fullscreen.st
+++ b/template/fullscreen.st
@@ -2,18 +2,11 @@
 <head>
 $head()$
 <title>dump.fm - fullscreen</title>
-  <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script>
-  <script type="text/javascript" src="$domain$/static/webcam/webcam.js"></script>
-  <script type="text/javascript" src="$domain$/static/js/ajaxupload.js"></script>
-$if(user_nick)$
-  <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script>
-$endif$
 <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
 <script src="$domain$/static/js/pichat.js"></script>
 <script src="$domain$/static/js/fullscreen.js"></script>
  <script>
     jQuery(document).ready(initChat);
-    var Nick = $json_user_nick$;
     var Room = $json_room_key$;
     var Timestamp = $timestamp$;
     var Version = $version$;
@@ -77,33 +70,25 @@ height:35px;
 
 }
 .memelogo{padding:0px;top:0px;position:absolute;}
+#fullscreen-logo {
+
+    position: fixed;
+    z-index: 999;
+    bottom: 60px;
+    right: 200px;
+}
 </style>
 </head>
 <body>
-<a href="http://dump.fm">
+<a id="fullscreen-logo" href="http://dump.fm">
 <img src="http://dump.fm/static/img/dumppixelhover.png"class="memelogo">
 </a>
 <div id="big-image">waiting 4 new image from dump.fm.............</div>
 <div id="controls"></div>
-<!--
-<button id="tools-button"></button>
-           <div id="msgInputDiv">
-              <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" />    </div>   
-                <input id="msgSubmit" type="submit" value="Send"/>
-   
-                <input id="upload" value="Upload" type="submit">
-                <input id="webcam-button-upload" value="Webcam" type="submit">
-                <input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink">  
-                             <button id="palette-button"><img src="/static/img/palette.gif"></button>
-              </div><div id="effects-msg"class="invisible">click on your face for effects!</div>
-          </div></div>
-  
-  
- 
-  <div id="palette"><div id="palette-thumbs"></div></div>-->
 <script>
 Timestamp = $timestamp$;
 initFullscreen()
 </script>
+$google_analytics()$
 </body>
 </html>
 \ No newline at end of file
diff --git a/template/profile.st b/template/profile.st
index 4aa1f63..8d8a019 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -80,7 +80,7 @@
     <div id="dashpix">
 	<a href="http://dump.fm/$nick$/log"><div id="favstxt">$if(is_home)$ your $else$ $nick$'s$endif$ most recent dumps</div></a>
 	<div id="mostrecentdumps">
-	$imgs: { img | <img src="$img$"></img> }$
+	$imgs: { img | <a target="_blank" href="$img$"><img src="$img$"></img></a> }$
 	</div>
               <div id="likebutton">
               <iframe src="http://www.facebook.com/widgets/like.php?href=http://dump.fm/$nick$"
diff --git a/template/share_buttons.st b/template/share_buttons.st
index ca51b23..83c387f 100644
--- a/template/share_buttons.st
+++ b/template/share_buttons.st
@@ -1,4 +1,4 @@
-<div class="buttons">
+<span class="buttons">
   <img src="/static/img/share/tumblricon.png" class="share" onclick="Share.tumblr(this)">
   <img src="/static/img/share/fbbutton.png" class="share" onclick="Share.facebook(this)">
   <img src="/static/img/share/twittericon.png" class="share" onclick="Share.twitter(this)">
@@ -9,4 +9,4 @@ $if(dump.favorited)$
 $else$
   <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)">
 $endif$
-</div>
-\ No newline at end of file
+</span>
+\ No newline at end of file
author	dumpfmprod <dumpfmprod@ubuntu.(none)>	2010-09-03 21:03:39 -0400
committer	dumpfmprod <dumpfmprod@ubuntu.(none)>	2010-09-03 21:03:39 -0400
commit	622122468f565bfb1c52245affd07413c6aecca6 (patch)
tree	ddeb6cd30be6698ef0fcf539dc9920fe19e1cf7f
parent	5215fa49a2c64d7c015e638f72bd7c4b280b0beb (diff)