whateverHEADmaster

Merge branch 'master' of http://git.ghghgh.us/dumpfm_mirror

15 files changed, 34 insertions, 34 deletions

diff --git a/template/rooms/VIP.st b/template/rooms/VIP.st
index 5e41e52..e9e6996 100644..100755
--- a/template/rooms/VIP.st
+++ b/template/rooms/VIP.st
@@ -49,7 +49,7 @@
       $if(user_nick)$ //
       $else$
       function showAlert() {
-      alert('Join dump.fm @ http://dump.fm/register');
+      alert('Join dump.fm @ http://hump.fm/register');
       }
 
       $endif$
@@ -77,7 +77,7 @@
         <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload,  or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love.
           <br><br>
           <span id="signintxt">
-            you already have an account, <strong><a href="http://dump.fm/login" class="signin">sign in</a></strong>. If not, <strong><a href="http://dump.fm/register">register</a></strong>!
+            you already have an account, <strong><a href="http://hump.fm/login" class="signin">sign in</a></strong>. If not, <strong><a href="http://hump.fm/register">register</a></strong>!
           </span>
       </center>
       </div>
@@ -144,7 +144,7 @@
         <li><a href="$domain$/users">New Users</a></li>
         <li><a href="$domain$/users/lastlog">Last seen users</a></li>
         <li><a href="$domain$/mutes">Mutes</a></li>
-        <li><a href="http://dump.fm/static/shinobi/">Registration</a></li>
+        <li><a href="http://hump.fm/static/shinobi/">Registration</a></li>
         <li><a href="http://temp.dump.fm/">Temp</a></li>
         <li><a href="https://docs.google.com/document/d/1w4P__Qs9PB2setcgoDW9XlCnf_-e0xO4OLt6bHw5yJk/edit?usp=drive_web">Mod Hax</a></li>
       </ul>
diff --git a/template/rooms/artornot.st b/template/rooms/artornot.st
index 80e73f7..0945797 100644..100755
--- a/template/rooms/artornot.st
+++ b/template/rooms/artornot.st
@@ -49,7 +49,7 @@
       $if(user_nick)$ //
       $else$
       function showAlert() {
-      alert('Join dump.fm @ http://dump.fm/register');
+      alert('Join dump.fm @ http://hump.fm/register');
       }
 
       $endif$
@@ -77,7 +77,7 @@
         <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload,  or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love.
           <br><br>
           <span id="signintxt">
-            you already have an account, <strong><a href="http://dump.fm/login" class="signin">sign in</a></strong>. If not, <strong><a href="http://dump.fm/register">register</a></strong>!
+            you already have an account, <strong><a href="http://hump.fm/login" class="signin">sign in</a></strong>. If not, <strong><a href="http://hump.fm/register">register</a></strong>!
           </span>
       </center>
       </div>
diff --git a/template/rooms/atrium.st b/template/rooms/atrium.st
index bde33eb..338ebef 100644..100755
--- a/template/rooms/atrium.st
+++ b/template/rooms/atrium.st
@@ -49,7 +49,7 @@
       $if(user_nick)$ //
       $else$
       function showAlert() {
-      alert('Join dump.fm @ http://dump.fm/register');
+      alert('Join dump.fm @ http://hump.fm/register');
       }
 
       $endif$
@@ -77,7 +77,7 @@
         <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload,  or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love.
           <br><br>
           <span id="signintxt">
-           If you already have an account <strong><a href="http://dump.fm/login" class="signin">sign in</a></strong> If not <strong><a href="http://dump.fm/register">register</a></strong>!
+           If you already have an account <strong><a href="http://hump.fm/login" class="signin">sign in</a></strong> If not <strong><a href="http://hump.fm/register">register</a></strong>!
           </span>
       </center>
       </div>
diff --git a/template/rooms/butt.st b/template/rooms/butt.st
index e97390e..e97390e 100644..100755
--- a/template/rooms/butt.st
+++ b/template/rooms/butt.st
diff --git a/template/rooms/chat.down.st b/template/rooms/chat.down.st
index ef1b267..ef1b267 100644..100755
--- a/template/rooms/chat.down.st
+++ b/template/rooms/chat.down.st
diff --git a/template/rooms/chat.st b/template/rooms/chat.st
index 80e82dd..0278943 100644..100755
--- a/template/rooms/chat.st
+++ b/template/rooms/chat.st
@@ -50,7 +50,7 @@
       $if(user_nick)$ //
       $else$
       function showAlert() {
-      alert('Join dump.fm @ http://dump.fm/register');
+      alert('Join dump.fm @ http://hump.fm/register');
       }
 
       $endif$
@@ -72,14 +72,14 @@
     $else$
     $banner()$
     $if(!user_nick)$
-    <script>window.location.href = "http://dump.fm/"</script>
+    <script>window.location.href = "http://hump.fm/"</script>
     <div id="dis_welcome">
       <center>
         <img src="$domain$/static/img/dumppixellarge3.png">
         <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload,  or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love.
           <br><br>
           <span id="signintxt">
-           If you already have an account <strong><a href="http://dump.fm/login" class="signin">sign in</a></strong> If not <strong><a href="http://dump.fm/register">register</a></strong>!
+           If you already have an account <strong><a href="http://hump.fm/login" class="signin">sign in</a></strong> If not <strong><a href="http://hump.fm/register">register</a></strong>!
           </span>
       </center>
       </div>
diff --git a/template/rooms/dump2.st b/template/rooms/dump2.st
index 27df0ac..658854d 100644..100755
--- a/template/rooms/dump2.st
+++ b/template/rooms/dump2.st
@@ -49,7 +49,7 @@
       $if(user_nick)$ //
       $else$
       function showAlert() {
-      alert('Join dump.fm @ http://dump.fm/register');
+      alert('Join dump.fm @ http://hump.fm/register');
       }
 
       $endif$
@@ -82,11 +82,11 @@
       }
       
       #welcome-rapper span:nth-child(5){
-      background:url(http://dump.fm/images/20121011/1349988916417-dumpfm-natasaurus-goes8_hg.gif)no-repeat center;
+      background:url(http://hump.fm/images/20121011/1349988916417-dumpfm-natasaurus-goes8_hg.gif)no-repeat center;
       background-size:cover;
       }
       #welcome-rapper span:nth-child(2){
-      background:url(http://dump.fm/images/20121001/1349067392929-dumpfm-kiptok-fuckyousmall.png)no-repeat center;
+      background:url(http://hump.fm/images/20121001/1349067392929-dumpfm-kiptok-fuckyousmall.png)no-repeat center;
       background-size:cover;
       }
       #welcome-rapper span:nth-child(4){
@@ -108,7 +108,7 @@
     $if(!user_nick)$
     <div id="welcome-rapper">
     <span>
-    <iframe src="http://dump.fm/fullscreen"></iframe>
+    <iframe src="http://hump.fm/fullscreen"></iframe>
     </span>
     <span>
         <h1>
@@ -136,7 +136,7 @@
         <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload,  or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love.
           <br><br>
           <span id="signintxt">
-           If you already have an account <strong><a href="http://dump.fm/login" class="signin">sign in</a></strong> If not <strong><a href="http://dump.fm/register">register</a></strong>!
+           If you already have an account <strong><a href="http://hump.fm/login" class="signin">sign in</a></strong> If not <strong><a href="http://hump.fm/register">register</a></strong>!
           </span>
       </center>
       </div>
diff --git a/template/rooms/dumptest.st b/template/rooms/dumptest.st
index f041c1b..d87b90c 100644..100755
--- a/template/rooms/dumptest.st
+++ b/template/rooms/dumptest.st
@@ -51,7 +51,7 @@ _____          ___           ___           ___         ___         ___
 	$if(user_nick)$ //
 	$else$
 	function showAlert() {
-		alert('Join dump.fm @ http://dump.fm/register');
+		alert('Join dump.fm @ http://hump.fm/register');
 	}
 
 	$endif$
@@ -98,7 +98,7 @@ _____          ___           ___           ___         ___         ___
 		$if(user_nick)$ //
 		$else$
 		function showAlert() {
-			alert('Join dump.fm @ http://dump.fm/register');
+			alert('Join dump.fm @ http://hump.fm/register');
 		}
 
 		$endif$
@@ -213,14 +213,14 @@ _____          ___           ___           ___         ___         ___
 		#toplogo{position: fixed;display:none;
 			top: 0;
 			left: 0;}
-			#big-image {cursor:url('http://dump.fm/static/img/thumbs/heartfaved.gif'), pointer}
+			#big-image {cursor:url('http://hump.fm/static/img/thumbs/heartfaved.gif'), pointer}
 			</style>
 	</head>
 		<body>
 		<div class="notloggedin">
 			<div id="big-image"></div>
 			<div id="loginbox"> <a href="#" class="close"onclick="jQuery('#loginbox').fadeOut(); return false;">x</a>
-				<img src="http://dump.fm/static/dumplogo.png"><br>
+				<img src="http://hump.fm/static/dumplogo.png"><br>
 				<p class="block1"> this is dump.fm, the first ever real-time image sharing website. behind this is a fullscreen feed of whats currently being posted. <a href="/register"class="bluelink">Register</a> to join the club.
 					<form onsubmit="login(); return false;" class="log-in">
 						<p>username <input id="nickInput"></p>
diff --git a/template/rooms/frontpage.st b/template/rooms/frontpage.st
index 065cef0..bba255a 100644..100755
--- a/template/rooms/frontpage.st
+++ b/template/rooms/frontpage.st
@@ -49,7 +49,7 @@
       $if(user_nick)$ //
       $else$
       function showAlert() {
-      alert('Join dump.fm @ http://dump.fm/register');
+      alert('Join dump.fm @ http://hump.fm/register');
       }
 
       $endif$
@@ -77,7 +77,7 @@
         <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload,  or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love.
           <br><br>
           <span id="signintxt">
-           If you already have an account <strong><a href="http://dump.fm/login" class="signin">sign in</a></strong> If not <strong><a href="http://dump.fm/register">register</a></strong>!
+           If you already have an account <strong><a href="http://hump.fm/login" class="signin">sign in</a></strong> If not <strong><a href="http://hump.fm/register">register</a></strong>!
           </span>
       </center>
       </div>
@@ -112,7 +112,7 @@
       <div id="messagePaneh">
         
         <div id="userListp">
-        <img src="http://dump.fm/static/img/halloffametrophy.gif" id="halltrophy">
+        <img src="http://hump.fm/static/img/halloffametrophy.gif" id="halltrophy">
           <h2>Hall Of Fame </h2>
         </div>
         
diff --git a/template/rooms/fullscreen.st b/template/rooms/fullscreen.st
index 6046b7e..6d60bd1 100644..100755
--- a/template/rooms/fullscreen.st
+++ b/template/rooms/fullscreen.st
@@ -115,7 +115,7 @@ input:hover {
       #toplogo{position: fixed;display:none;
 top: 0;
 left: 0;}
-#big-image {cursor:url('http://dump.fm/static/img/thumbs/heartfaved.gif'), pointer}
+#big-image {cursor:url('http://hump.fm/static/img/thumbs/heartfaved.gif'), pointer}
     </style>
     <script>jQuery(initLogin)</script>
   </head>
@@ -138,7 +138,7 @@ left: 0;}
              </form>
          <div id="errormsg"></div>
          <div id="forgetpw"><a href="$domain$/reset">forgot password?</a></div>
-          <a href="/chat"id="toplogo"><img src="http://wiki.bennington.edu/mediawiki/images/9/9e/Dumplogo.gif"></a> <img src="http://dump.fm/static/img/thumbs/heartfaved.gif" id="fav-indicator">
+          <a href="/chat"id="toplogo"><img src="http://wiki.bennington.edu/mediawiki/images/9/9e/Dumplogo.gif"></a> <img src="http://hump.fm/static/img/thumbs/heartfaved.gif" id="fav-indicator">
 	</div>
       $else$
          <div id="loginbox">
diff --git a/template/rooms/fullscreen2.st b/template/rooms/fullscreen2.st
index 6046b7e..6d60bd1 100644..100755
--- a/template/rooms/fullscreen2.st
+++ b/template/rooms/fullscreen2.st
@@ -115,7 +115,7 @@ input:hover {
       #toplogo{position: fixed;display:none;
 top: 0;
 left: 0;}
-#big-image {cursor:url('http://dump.fm/static/img/thumbs/heartfaved.gif'), pointer}
+#big-image {cursor:url('http://hump.fm/static/img/thumbs/heartfaved.gif'), pointer}
     </style>
     <script>jQuery(initLogin)</script>
   </head>
@@ -138,7 +138,7 @@ left: 0;}
              </form>
          <div id="errormsg"></div>
          <div id="forgetpw"><a href="$domain$/reset">forgot password?</a></div>
-          <a href="/chat"id="toplogo"><img src="http://wiki.bennington.edu/mediawiki/images/9/9e/Dumplogo.gif"></a> <img src="http://dump.fm/static/img/thumbs/heartfaved.gif" id="fav-indicator">
+          <a href="/chat"id="toplogo"><img src="http://wiki.bennington.edu/mediawiki/images/9/9e/Dumplogo.gif"></a> <img src="http://hump.fm/static/img/thumbs/heartfaved.gif" id="fav-indicator">
 	</div>
       $else$
          <div id="loginbox">
diff --git a/template/rooms/fullscreen_safe_save_011910.st b/template/rooms/fullscreen_safe_save_011910.st
index e69de29..e69de29 100644..100755
--- a/template/rooms/fullscreen_safe_save_011910.st
+++ b/template/rooms/fullscreen_safe_save_011910.st
diff --git a/template/rooms/mgmt.st b/template/rooms/mgmt.st
index b8d4985..afff5fc 100644..100755
--- a/template/rooms/mgmt.st
+++ b/template/rooms/mgmt.st
@@ -39,7 +39,7 @@ $endif$
       
 <!--[if IE]>
 <script>
-window.location = "http://dump.fm/error/ie";
+window.location = "http://hump.fm/error/ie";
 </script>
 <![endif]-->
 
diff --git a/template/rooms/nocss.st b/template/rooms/nocss.st
index 21f0ac0..a1e65f7 100644..100755
--- a/template/rooms/nocss.st
+++ b/template/rooms/nocss.st
@@ -20,8 +20,8 @@
 <meta name="keywords" content="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board, scott ostler, ryder ripps">
 <meta name="description" content="dump.fm - Talk with pictures!" />
 <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
-<link rel="shortcut icon" href="http://dump.fm/static/favicon.ico">
-<link rel="image_src" href="http://dump.fm/static/img/thumbs/heartover.gif" > 
+<link rel="shortcut icon" href="http://hump.fm/static/favicon.ico">
+<link rel="image_src" href="http://hump.fm/static/img/thumbs/heartover.gif" > 
 <!-- <script type="text/javascript" src="$domain$/static/js/jquery-ui-1.8.effects.min.js"></script> -->
 <script type="text/javascript" src="$domain$/static/js/pichat.js"></script>
 
@@ -44,7 +44,7 @@ $endif$
       
 <!--[if IE]>
 <script>
-window.location = "http://dump.fm/error/ie";
+window.location = "http://hump.fm/error/ie";
 </script>
 <![endif]-->
 
@@ -80,7 +80,7 @@ window.location = "http://dump.fm/error/ie";
       $if(user_nick)$ //
       $else$
       function showAlert() {
-      alert('Join dump.fm @ http://dump.fm/register');
+      alert('Join dump.fm @ http://hump.fm/register');
       }
 
       $endif$
@@ -108,7 +108,7 @@ window.location = "http://dump.fm/error/ie";
         <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload,  or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love.
           <br><br>
           <span id="signintxt">
-           If you already have an account <strong><a href="http://dump.fm/login" class="signin">sign in</a></strong> If not <strong><a href="http://dump.fm/register">register</a></strong>!
+           If you already have an account <strong><a href="http://hump.fm/login" class="signin">sign in</a></strong> If not <strong><a href="http://hump.fm/register">register</a></strong>!
           </span>
       </center>
       </div>
diff --git a/template/rooms/vortex.st b/template/rooms/vortex.st
index c15c890..edb046c 100644..100755
--- a/template/rooms/vortex.st
+++ b/template/rooms/vortex.st
@@ -272,9 +272,9 @@ $messages: { m |
 <img src="$m.content$"><span>$m.nick$</span> 
  }$
 
-<div id="infotxt">dump.fm image vortex<br><br>Real-Time Visualization of whats being dumped now.<br><br><a href="http://dump.fm" class="returnlink"> Return Home</a><br><br>
+<div id="infotxt">dump.fm image vortex<br><br>Real-Time Visualization of whats being dumped now.<br><br><a href="http://hump.fm" class="returnlink"> Return Home</a><br><br>
    <div id="likebutton">
-              <iframe src="http://www.facebook.com/widgets/like.php?href=http://dump.fm/chat/vortex"
+              <iframe src="http://www.facebook.com/widgets/like.php?href=http://hump.fm/chat/vortex"
         scrolling="no" frameborder="0"
         style="border:none; width:170px; height:80px"></iframe>
               </div>