Merge branch 'master' of ssh://dump.fm/pichat/repo

5 files changed, 105 insertions, 15 deletions

diff --git a/static/css/dump.css b/static/css/dump.css
index 55e3130..27bf99a 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -1733,11 +1733,11 @@ font-size:12px;
 position:absolute;
 top:0px;
 background-color:red;
-padding:5px;
-right:0px;
-	border-bottom-left-radius:5px;
-	-webkit-border-bottom-left-radius:5px;
-	-moz-border-radius-bottomleft:5px;
+padding:3px;
+left:0px;
+	border-bottom-right-radius:5px;
+	-webkit-border-bottom-right-radius:5px;
+	-moz-border-radius-bottomright:5px;
 }
 #dashadminmute a{color:white;}
 #edit-toggle{
@@ -1799,7 +1799,9 @@ margin-left:230px;
 font-family: 'HelveticaNeue-Light','Helvetica Neue Light','Helvetica Neue',Arial,Helvetica,sans-serif; 
 font-size:50px;
 letter-spacing:-2px;
+display:inline-black;
 margin-bottom:10px;
+height:45px;word-wrap:suppress;
 
 }
 #middash h3{
@@ -1845,6 +1847,9 @@ width:550px;
     max-height:100px;
     height: expression(this.width > 50 ? 50: true);
     max-width:150px;
+    		box-shadow: -1px 1px 10px #000;
+  -webkit-box-shadow:-1px 1px 10px #000;
+  -moz-box-shadow: -1px 1px 10px #000;
 }
 
 
@@ -2161,3 +2166,66 @@ color:#000;	text-shadow: 0px 1px 0px #fff;
 margin-left:20px;color:#66AACC;
 font-size:11px;	
 }
+/*MESSAGE STUFF*/
+
+
+a.msgbtn {
+
+	padding:5px;
+top:-7px;
+right:-1px;
+font-weight:500;
+	position: absolute;
+	font-size: 12.5px;
+	background: #fff;
+	color: #000;
+border: 1px dotted #0C8FFF;
+	text-align: center;
+font-family: Monaco, "Courier New", Courier, monospace;	
+	cursor: pointer;
+	margin-left: 50px;
+	margin-top:6px;
+
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	text-decoration: none;
+	border-bottom-left-radius:5px;
+	-webkit-border-bottom-left-radius:5px;
+	-moz-border-radius-bottomleft:5px;
+
+}
+a.msgbtn:active {
+  background:#eee;
+
+}
+#directmsgs { 
+	position: fixed;
+	right: -262px; 
+	width: 245px; 
+padding:7px;
+  background-image:url("/static/img/thumbs/stripes.gif");
+border: 1px dotted #0C8FFF;
+top:50px;
+background-color:#fff; 
+	height: 90%;
+	overflow-x: hidden;
+
+}
+#directmsgs img{
+    max-width:220px;
+    width: expression(this.width > 650 ? 650: true);
+    max-height:400px;
+    height: expression(this.width > 400 ? 400: true);
+margin:5px;
+    		box-shadow: -1px 1px 10px #000;
+  -webkit-box-shadow:-1px 1px 10px #000;
+  -moz-box-shadow: -1px 1px 10px #000;
+
+}	
+#directmsgs h2{
+padding-bottom:10px;
+	font-family: Monaco, "Courier New", Courier, monospace;
+	font-weight: 100;
+font-size:15px;
+}
+#singlemsg{padding:5px;}
\ No newline at end of file
diff --git a/static/js/invalid_domains.js b/static/js/invalid_domains.js
index ea1c1c5..a9ce909 100644
--- a/static/js/invalid_domains.js
+++ b/static/js/invalid_domains.js
@@ -87,5 +87,6 @@ var InvalidDomains = [
     "http://carsdriveingallery.com",
     "http://xxxspacegirls.us",
     "http://www.newlog.com.ar",
-    "villagephotos.com"
+    "villagephotos.com",
+    "hereticpress.com"
 ];
diff --git a/template/banner.st b/template/banner.st
index 6108c9a..691cd48 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -87,7 +87,7 @@
       <div id="dumplist">
 
         $if(user_nick)$
-        <a href="http://dump.fm/fullscreen">checkout dump.fm in full-screen </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://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>
diff --git a/template/fame.st b/template/fame.st
index 4735cab..b389d54 100644
--- a/template/fame.st
+++ b/template/fame.st
@@ -15,7 +15,7 @@
         
         <div id="userListp">
         <img src="http://dump.fm/static/img/halloffametrophy.gif" id="halltrophy">
-          <h2>Hall Of Fame </h2><br><h3>updated hourly</h3>      
+          <h2>Hall Of Fame </h2>
         </div>
         
 	<div id="messageList">
diff --git a/template/profile.st b/template/profile.st
index 3aae2c2..6b54c43 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -10,6 +10,26 @@
     <script>
       jQuery(document).ready(initProfile);
     </script> 
+
+     
+    <script>
+//MESSAGE STUFF
+
+jQuery(document).ready(function() {
+	jQuery('#msgbtn').toggle(
+
+		function(){
+			
+		jQuery("#directmsgs").animate({right: "0px"}, 400);
+		},
+		function()
+		{
+		jQuery("#directmsgs").animate({right: "-263px"}, 400);
+		
+		});
+		});
+		</script>
+
   </head>
   <body class="profiledash">
     $if(avatar)$
@@ -91,22 +111,23 @@
               </div>
 
     </div>
-    $if(isadmin)$
-    <br />
+
+    
+<a href="#"class="msgbtn" id="msgbtn">messages!</a> 
     <div id="directmsgs">
       <h2>Messages</h2>
+ 
         $dms: { dm |
-        <div class="directmsg">
-        <b><a href="/$dm.nick$">$dm.nick$</a></b>
-        <img src="$dm.avatar$" height="20" width="20" />
+ <div id="singlemsg">
+        <b><a href="/$dm.nick$">$dm.nick$</a>:</b>
         <span class="linkify-full">$dm.content$</span>
-      </div>
+        </div>
       }$
     </div>
     <script>
       var Recips = $recips$;
     </script>
-    $endif$
+
     
     </div>
 <div id="footerc">