test edits

author: dumpfmprod <dumpfmprod@ubuntu.(none)> 2012-12-30 17:50:25 -0500
committer: dumpfmprod <dumpfmprod@ubuntu.(none)> 2012-12-30 17:50:25 -0500
commit: 384fe470ce77bf7c81294f8b62d535129fefd4dd (patch)
tree: 591052fc54f10d35ed9c92728ec10f15b325f228
parent: eb1668da860f5b3a7076800dc78e0fb982888c5d (diff)
1 files changed, 232 insertions, 205 deletions
diff --git a/template/rooms/dumptest.st b/template/rooms/dumptest.st
index 25b9c17..0002070 100644
--- a/template/rooms/dumptest.st
+++ b/template/rooms/dumptest.st
@@ -1,218 +1,245 @@
+<html>
 <!--/*
 
-   _____          ___           ___           ___         ___         ___     
-   /  /::\        /__/\         /__/\         /  /\       /  /\       /__/\    
-   /  /:/\:\       \  \:\       |  |::\       /  /::\     /  /:/_     |  |::\   
-   /  /:/  \:\       \  \:\      |  |:|:\     /  /:/\:\   /  /:/ /\    |  |:|:\  
-   /__/:/ \__\:|  ___  \  \:\   __|__|:|\:\   /  /:/~/:/  /  /:/ /:/  __|__|:|\:\ 
-   \  \:\ /  /:/ /__/\  \__\:\ /__/::::| \:\ /__/:/ /:/  /__/:/ /:/  /__/::::| \:\
-   \  \:\  /:/  \  \:\ /  /:/ \  \:\~~\__\/ \  \:\/:/   \  \:\/:/   \  \:\~~\__\/
-   \  \:\/:/    \  \:\  /:/   \  \:\        \  \::/     \  \::/     \  \:\      
-   \  \::/      \  \:\/:/     \  \:\        \  \:\      \  \:\      \  \:\     
-   \__\/        \  \::/       \  \:\        \  \:\      \  \:\      \  \:\    
-   \__\/         \__\/         \__\/        \__\/       \__\/       \___\/
+_____          ___           ___           ___         ___         ___     
+/  /::\        /__/\         /__/\         /  /\       /  /\       /__/\    
+/  /:/\:\       \  \:\       |  |::\       /  /::\     /  /:/_     |  |::\   
+/  /:/  \:\       \  \:\      |  |:|:\     /  /:/\:\   /  /:/ /\    |  |:|:\  
+/__/:/ \__\:|  ___  \  \:\   __|__|:|\:\   /  /:/~/:/  /  /:/ /:/  __|__|:|\:\ 
+\  \:\ /  /:/ /__/\  \__\:\ /__/::::| \:\ /__/:/ /:/  /__/:/ /:/  /__/::::| \:\
+\  \:\  /:/  \  \:\ /  /:/ \  \:\~~\__\/ \  \:\/:/   \  \:\/:/   \  \:\~~\__\/
+\  \:\/:/    \  \:\  /:/   \  \:\        \  \::/     \  \::/     \  \:\      
+\  \::/      \  \:\/:/     \  \:\        \  \:\      \  \:\      \  \:\     
+\__\/        \  \::/       \  \:\        \  \:\      \  \:\      \  \:\    
+\__\/         \__\/         \__\/        \__\/       \__\/       \___\/
 
-   (c)2011 dump.fm -->
+(c)2011 dump.fm -->
 
-<html>
-  <head>
-    $head()$
-    <title>$roomname$ dump.fm</title>
+	$if(user_nick)$
+<head>
+	$head()$
+	<title>$roomname$ dump.fm</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>
-		<script src="$domain$/static/js/fullscreen.js"></script>
-    $if(user_nick)$
-    <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script>
-    $endif$
-    <script>
-      jQuery(document).ready(initChat);
-      var Nick = $json_user_nick$;
-      var Room = $json_room_key$;
-      var Timestamp = $timestamp$;
-      $if(isadmin)$
-      var IsAdmin = true;
-      $else$
-      var IsAdmin = false;
-      $endif$
-      if (Nick) {
-      jQuery(document).ready(function() { setupUpload('upload', Room); });
-      }
-      function showAlert() { alert('MUST LOGIN'); }
-      var newwindow;
-      function pop(url) {
-      newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0');
-      if (window.focus) {newwindow.focus()}
-      }
-      jQuery(Away.startTitleUpdater);
-      jQuery(initChatMsgs);
-      $if(user_nick)$ //
-      $else$
-      function showAlert() {
-      alert('Join dump.fm @ http://dump.fm/register');
-      }
+	<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>
+	<script src="$domain$/static/js/fullscreen.js"></script>
+	$if(user_nick)$
+	<script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script>
+	$endif$
+	<script>
+	jQuery(document).ready(initChat);
+	var Nick = $json_user_nick$;
+	var Room = $json_room_key$;
+	var Timestamp = $timestamp$;
+	$if(isadmin)$
+	var IsAdmin = true;
+	$else$
+	var IsAdmin = false;
+	$endif$
+	if (Nick) {
+		jQuery(document).ready(function() { setupUpload('upload', Room); });
+	}
+	function showAlert() { alert('MUST LOGIN'); }
+	var newwindow;
+	function pop(url) {
+		newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0');
+		if (window.focus) {newwindow.focus()}
+	}
+	jQuery(Away.startTitleUpdater);
+	jQuery(initChatMsgs);
+	$if(user_nick)$ //
+	$else$
+	function showAlert() {
+		alert('Join dump.fm @ http://dump.fm/register');
+	}
 
-      $endif$
-    </script>
-    <style>
-      #chat-wrapper {
-      position: absolute;
-      z-index: 1000000;
-      right: 100px;
-      bottom: 100px;
-      height: 40px;
-      width: 300px;
-      };
-    </style>
-  </head>
-  <body>
-    $if(!user_nick)$
-		    <style>
-		      html, body, div, img { margin: 0; padding: 0; border: 0; overflow: hidden; font-family: Monaco, "Courier New", Courier, monospace; }
-		      input {
-		          font-family: Monaco, "Courier New", Courier, monospace;
-		      }
-		      #big-image img {
-		          width: 100%; height: 100%;
-		          cursor: pointer;
-		          box-sizing: border-box; -webkit-box-sizing: border-box; -moz-box-sizing: border-box;
-		      }
-		      #loginbox {
-		background: white;
-		z-index: 999;
+	$endif$
+	</script>
+	<style>
+	#chat-wrapper {
 		position: absolute;
-		font-size: 20%;
-		width: 335px;
-		height: 220px;
-		margin-left: -170px;
-		left: 50%;
-		border: 1px solid;
-		padding: 2%;
-		top: 20%;
-		text-align: justify;
-		-moz-box-shadow: -1px 1px #000,-2px 2px #000,-3px 3px #000,-4px 4px #000,-5px 5px #000,-6px 6px #000;
-		-webkit-box-shadow: -1px 1px black,-2px 2px black,-3px 3px black,-4px 4px black,-5px 5px black,-6px 6px black;
-		box-shadow: -1px 1px black,-2px 2px black,-3px 3px black,-4px 4px black,-5px 5px black,-6px 6px black;
+		z-index: 1000000;
+		right: 100px;
+		bottom: 100px;
+		height: 40px;
+		width: 300px;
+	};
+	</style>
+</head>
+
+	$else$
+	<head>
+		$head()$
+		<title>$roomname$ dump.fm</title>
+		<script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script>
+		<script src="$domain$/static/js/fullscreen.js"></script>
+		<script>
+		jQuery(document).ready(initChat);
+		</script>
+		<script>jQuery(initLogin)</script>
+		<script>initFullscreen()</script>
+		<style>
+		html, body, div, img { margin: 0; padding: 0; border: 0; overflow: hidden; font-family: Monaco, "Courier New", Courier, monospace; }
+		input {
+			font-family: Monaco, "Courier New", Courier, monospace;
+		}
+		#big-image img {
+			width: 100%; height: 100%;
+			cursor: pointer;
+			box-sizing: border-box; -webkit-box-sizing: border-box; -moz-box-sizing: border-box;
+		}
+		#loginbox {
+			background: rgba(255,255,255,0.8);
+			z-index: 999;
+			position: absolute;
+			width: 400px;
+			margin-left: -200px;
+			left: 50%;
+			padding: 10px;
+			top: 20%;
+			text-align: justify;
+			font-size:12px;
+		}
+		#loginbox img{
+			max-width:100%;
+		}
+		#logininner {
+			width: 30em;
+			height: 20em;
+			position: relative;
+		}
+		#infocol {
+			width: 50%;
+			float: left;
+			position: relative;
+		}
+		#formcontainer {
+			padding: 0;
+			width: 80%;
+			position: relative;
+		}
+		#piccol {
+			width: 50%;
+			float: right;
+			position: relative;
+		}
+		#loginimg {
+			width: 75%;
+			margin-top: 20%;
+		}
+		#spinner { display: none; }
+		#forgetpw a{
+			font-size: 80%;
+			margin-top: -15px;
+			position: absolute
+		}
+		#fav-indicator {
+			display: none;
+			position: fixed;
+			z-index: 999;
+			height: 50px;
+			width: 50px; 
+			right: 20px;
+			top: 20px;
+		}
+		#loginbox a.bluelink{
+			color:#00F;
+		}
+		#loginbox p.block1{
+			margin:7px 0;
+			width:347px;
+		}
+		#errormsg {
+			position: relative;
+			color: red;
+			text-align: center;
+		}
+		input {max-width: 100px;
+			-moz-box-shadow: -1px 1px #000,-2px 2px #000,-3px 3px #000,-4px 4px #000,-5px 5px #000,-6px 6px #000;
+			-webkit-box-shadow: -1px 1px black,-2px 2px black,-3px 3px black,-4px 4px black,-5px 5px black,-6px 6px black;
+			box-shadow: -1px 1px black,-2px 2px black,-3px 3px black,-4px 4px black,-5px 5px black,-6px 6px black;
+			border: 1px solid;
+			margin-left:10px;
 		}
-		      #logininner {
-		          width: 30em;
-		          height: 20em;
-		          position: relative;
-		      }
-		      #infocol {
-		          width: 50%;
-		          float: left;
-		          position: relative;
-		      }
-		      #formcontainer {
-		          padding: 0;
-		          width: 80%;
-		          position: relative;
-		      }
-		      #piccol {
-		          width: 50%;
-		          float: right;
-		          position: relative;
-		      }
-		      #loginimg {
-		          width: 75%;
-		          margin-top: 20%;
-		      }
-		      #spinner { display: none; }
-		      #forgetpw {
-		          left: 5px;
-		          bottom: 5px;
-		          font-size: 80%;
-		      }
-		      #fav-indicator {
-		          display: none;
-		          position: fixed;
-		          z-index: 999;
-		          height: 50px;
-		          width: 50px; 
-		          right: 20px;
-		          top: 20px;
-		      }
-		      #errormsg {
-		          position: relative;
-		          color: red;
-		          text-align: center;
-		          margin-top: 250px;
-		      }
-		      input {max-width: 100px;
-		-moz-box-shadow: -1px 1px #000,-2px 2px #000,-3px 3px #000,-4px 4px #000,-5px 5px #000,-6px 6px #000;
-		-webkit-box-shadow: -1px 1px black,-2px 2px black,-3px 3px black,-4px 4px black,-5px 5px black,-6px 6px black;
-		box-shadow: -1px 1px black,-2px 2px black,-3px 3px black,-4px 4px black,-5px 5px black,-6px 6px black;
-		border: 1px solid;}
-		input:hover {
-			-moz-box-shadow: -1px 1px #000,-2px 2px #000,-3px 3px #000;
-			-webkit-box-shadow: -1px 1px #000,-2px 2px #000,-3px 3px #000;
-			box-shadow: -1px 1px #000,-2px 2px #000,-3px 3px #000,inset -2px 2px 2px #333;
-			margin-top: 2px;
-			margin-left: -2px;}
-			input:active {
-			-moz-box-shadow: 0px 0px white;
-			-webkit-box-shadow: 0px 0px white;
-			box-shadow: -1px 1px #000,0px 0px white;
-			margin-top: 2px;
-			margin-left: -4px;
-			box-shadow: inset -3px 3px 4px #333;
-			cursor: pointer;}
 		#remembermeInput {
 			margin-top: 0; margin-left: 0;
 		}
-		      #big-image{font-size:20px;text-align: left; text-justify: newspaper;    color:#000}
-		      #memelogo { position: fixed; z-index: 999; bottom: 30px; right: 80px; }
-		      .sublogo { font-family: Monaco, "Courier New", Courier, monospace; }
-		      a { color:#000 }
-		      #toplogo{position: fixed;display:none;
-		top: 0;
-		left: 0;}
-		#big-image {cursor:url('http://dump.fm/static/img/thumbs/heartfaved.gif'), pointer}
-		    </style>
-		<script>jQuery(initLogin)</script>
-				<script>
-		      initFullscreen()
-		    </script>
-   	<div class="notloggedin">
+		#loginbox form p{
+			font-size:16px;
+			margin-bottom:5px;
+		}
+		#loginbox form p:first-child{
+			margin-top:5px;
+		}
+		#loginbox .close {
+			float:right;
+		}
+
+		#big-image{font-size:20px;text-align: left; text-justify: newspaper;    color:#000}
+		#memelogo { position: fixed; z-index: 999; bottom: 30px; right: 80px; }
+		.sublogo { font-family: Monaco, "Courier New", Courier, monospace; }
+		#toplogo{position: fixed;display:none;
+			top: 0;
+			left: 0;}
+			#big-image {cursor:url('http://dump.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').hide(); return false;">x</a>
+				<img src="http://dump.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>
+						<p>password <input id="passwordInput" type="password"></p>
+						<p>
+							remember me? <input id="remembermeInput" type="checkbox" checked="true"> <input type="submit" value="LOGIN"></p>
+							<img id="spinner" src="/static/img/spinner.gif">
+						</form>
+						<div id="errormsg"></div>
+						<div id="forgetpw"><a href="$domain$/reset">forgot password?</a></div>
+					</div>
 
-		</div>
-    $endif$
+				</div>
+				$endif$
 
-$if(user_nick)$
-    $banner()$
-    <div id="chatrap">
-      <div id="dcontent">
-        <div id="messagetabs"></div>
-          $messagepane()$
-        <script>
-          var Recips = $recips$;
-        </script>
-      </div>
-    </div>
-    <div id="palette">
-      <div id="palette-thumbs"></div>
-    </div>
-    <div id="chatbuttons">
-      <div id="textbutton">
-        <span>show text?</span>
-        <input type="checkbox">
-      </div>
-      <div id="imgbutton">
-        <span>show imgs?</span>
-        <input type="checkbox">
-      </div>
-      <div id="clearbutton">
-        <span>clear screen</span>
-        <input type="checkbox">
-      </div>
-    </div>
-    <div id="footerc">
-      $footer()$
-    </div>
-$endif$
-    </div>
-    $preload()$
-  </body>
-</html>
+				$if(user_nick)$
+				$banner()$
+				<div id="chatrap">
+					<div id="dcontent">
+						<div id="messagetabs"></div>
+						$messagepane()$
+						<script>
+						var Recips = $recips$;
+						</script>
+					</div>
+				</div>
+				<div id="palette">
+					<div id="palette-thumbs"></div>
+				</div>
+				<div id="chatbuttons">
+					<div id="textbutton">
+						<span>show text?</span>
+						<input type="checkbox">
+					</div>
+					<div id="imgbutton">
+						<span>show imgs?</span>
+						<input type="checkbox">
+					</div>
+					<div id="clearbutton">
+						<span>clear screen</span>
+						<input type="checkbox">
+					</div>
+				</div>
+				<div id="footerc">
+					$footer()$
+				</div>
+				$endif$
+			</div>
+			$preload()$
+		</body>
+		</html>
author	dumpfmprod <dumpfmprod@ubuntu.(none)>	2012-12-30 17:50:25 -0500
committer	dumpfmprod <dumpfmprod@ubuntu.(none)>	2012-12-30 17:50:25 -0500
commit	384fe470ce77bf7c81294f8b62d535129fefd4dd (patch)
tree	591052fc54f10d35ed9c92728ec10f15b325f228
parent	eb1668da860f5b3a7076800dc78e0fb982888c5d (diff)