Pushing

author: Scott Ostler <sostler@ubuntu.(none)> 2009-12-21 23:49:18 -0500
committer: Scott Ostler <sostler@ubuntu.(none)> 2009-12-21 23:49:18 -0500
commit: c59927b378092f437896381698ebc8d4a4243492 (patch)
tree: 9548dd47ed45d80db294e176cd1d25964a53404b /static
parent: abf97ed31da3b08e7757981ab63b5aa28aa76f79 (diff)
4 files changed, 177 insertions, 418 deletions
diff --git a/static/header.css b/static/header.css
new file mode 100644
index 0000000..e2357c4
--- /dev/null
+++ b/static/header.css
@@ -0,0 +1,78 @@
+.white a:link {
+	text-decoration: none;
+	
+	color: #fff;
+}
+.white a:visited {
+	text-decoration: none;
+	
+	color: #fff;
+}
+.white a:hover {
+	text-decoration: none;
+	text-shadow: -1px 1px 1px #ccc;
+	
+	
+	color: #FFF;
+}
+.white a:active {
+	text-decoration: none;
+	
+	
+	color: #fff;
+}
+#header7{
+	background-image:url(/static/dblue2.png);
+	background-attachment:inherit;
+	margin: 0px auto -1px auto;
+	top: 0px;
+	width:100%;
+	left: 0px;
+	height: 69px;
+}
+#bar7{
+	top:35px;
+	position:absolute;
+	font-family: Arial, Helvetica, sans-serif;
+	width: 500px;
+	font-size: 18px;
+	left: 150px;
+	margin-left: 2%;
+	margin-right: 8%;
+	letter-spacing: -1px;
+	z-index: 999;
+}
+#logout7{
+	top:5px;
+	position:relative;
+	font-size:12px;
+	margin-right: 10px;
+	float:right;
+	z-index: 999;
+	font-family: Arial, Helvetica, sans-serif;
+	font-weight: normal;
+}
+#logo7{
+	top:20px;
+	margin-left: 1%;
+	margin-right: 10%;
+	z-index:1000;
+	float:left;
+}
+#rapper7{
+	top: 0px;
+	left:0px;
+	position:absolute;
+	width: 100%;
+	height: 78px;
+	z-index: 1000;
+}
+.btnav {  border: 0px #000000 solid;} 
+body {
+	
+	background-color:#e3e3e3;
+	
+	 background-position:center;
+	 z-index:0;
+	
+}
diff --git a/static/index.html b/static/index.html
index 82e9eb4..4615d9f 100755
--- a/static/index.html
+++ b/static/index.html
@@ -1,23 +1,17 @@
-<<<<<<< HEAD:static/index.html
-</html>
-
-<head>
-=======
-<html>
-  <head>
->>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:static/index.html
+</html><head>
     <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script>
     <script type="text/javascript" src="static/sha1.js"></script>
     <script type="text/javascript" src="static/home.js"></script>
-    <script type="text/javascript" src="static/background.js"></script>
+            <script type="text/javascript" src="static/background.js"></script>
     <script> 
       $(document).ready(initHome);
     </script>         
     <link rel="stylesheet" type="text/css" href="static/reset.css">
-<<<<<<< HEAD:static/index.html
         <link rel="shortcut icon" href="static/favicon.ico">
         
     <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"><title>dump.fm</title></head>
+
+
 <style type="text/css">
 <!--
 .white a:link {
@@ -154,10 +148,13 @@ body {
 .feild {
 	height:40px;
 	width:300px;
-	border:3px #ccc;
+	border:3px #000;
 	background:#e3e3e3;
 	margin:10px;
+	color:#000;
+	
 	font-size:30px;
+	
 }
 .txt {
 	font-family:Arial, Helvetica, sans-serif;
@@ -172,188 +169,31 @@ body {
 	font-size:18px;
 	
 }
-=======
-    <link rel="shortcut icon" href="static/favicon.ico">
-    <style type="text/css">
-      <!--
-         .white a:link {
-         text-decoration: none;
-         text-shadow: -1px 1px 1px #ccc;
-         color: #504F61;
-         }
-         .white a:visited {
-         text-decoration: none;
-         text-shadow: -1px 1px 1px #ccc;
-         color: #504F61;
-         }
-         .white a:hover {
-         text-decoration: none;
-         text-shadow: -1px 1px 1px #ccc;
-         background-color:#e3e3e3;
-         
-         color: #fff;
-         }
-         .white a:active {
-         text-decoration: none;
-         text-shadow: -1px 1px 1px #ccc;
-         color: #504F61;
-         }
-         #header7{
-         background-color:#666;
-         background-image:url(/static/dblue2.png);
-         background-attachment:fixed;
-         margin: 0px auto -1px auto;
-         top: 0px;
-         width:100%;
-         left: 0px;
-         height: 60px;
-         }
-         #bar7{
-         top:32px;
-         position:absolute;
-         font-family: Arial, Helvetica, sans-serif;
-         font-weight: bold;
-         width: 500px;
-         font-size: 20px;
-         left: 170px;
-         margin-left: 10%;
-         margin-right: 8%;
-         letter-spacing: -1px;
-         z-index: 999;
-         }
-         #main {
-         background-position:center;
-         width:500px;
-         margin: 0px auto -1px auto;
-         top:150px;
-         height:380px;
-         z-index:2;
-         opacity:0.9;
-         border-top-left-radius:10px;
-         border-top-right-radius:10px;
-         -webkit-border-top-left-radius:10px;
-         -webkit-border-top-right-radius:10px;
-         -moz-border-radius-topleft:10px;
-         -moz-border-radius-topright:10px;
-         border-bottom-left-radius:10px;
-         border-bottom-right-radius:10px;
-         -webkit-border-bottom-left-radius:10px;
-         -webkit-border-bottom-right-radius:10px;
-         -moz-border-radius-bottomleft:10px;
-         -moz-border-radius-bottomright:10px;
-         border:solid 4px #F5F5F5;
-         position: relative;
-         background-color: #FFF;
-         background-position:center;
-         background-repeat:no-repeat;
-         }
-         #logout7{
-         top:5px;
-         position:relative;
-         font-size:13px;
-         margin-right: 10px;
-         float:right;
-         z-index: 999;
-         font-family: "Times New Roman", Times, serif;
-         }
-         #logo7{
-         top:20px;
-         margin-left: 10%;
-         margin-right: 10%;
-         z-index:1000;
-         float:left;
-         }
-         #rapper7{
-         top: 0px;
-         left:0px;
-         position:absolute;
-         width: 100%;
-         height: 78px;
-         z-index: 1000;
-         }
-         #bottombar{
-         top: 69px;
-         left:0px;
-         position:absolute;
-         width: 100%;
-         height: 20px;
-         z-index: 1000;
-         }
-         p {
-         font-family: Arial, Helvetica, sans-serif;
-         font-size: 24px;
-         }
-         td {
-         font-family: Arial, Helvetica, sans-serif;
-         letter-spacing:-1px;
-         font-size: 12px;
-         color: #000000;
-         }
-         .btnav {  border: 0px #000000 solid;} 
-         body {
-         
-         background-color:#e3e3e3;
-         
-         background-image:url(static/brokenlink.gif);
-         background-position:center;
-         
-         background-repeat:no-repeat;
-         overflow:hidden;
-         }
-         .submit {
-         
-         
-         text-shadow: -1px 1px 1px #ccc;
-         
-         font-size:15px;
-         }
-         .feild {
-         height:40px;
-         width:300px;
-         border:3px #ccc;
-         background:#e3e3e3;
-         margin:10px;
-         font-size:30px;
-         }
-         .txt {
-         font-family:Arial, Helvetica, sans-serif;
-         font-size:12px;
-         text-shadow: -1px 1px 1px #ccc;
-         }
-         .line {
-         font-family:Arial, Helvetica, sans-serif;
-         
-         letter-spacing: -1px;
-         color:#000;
-         font-size:18px;
-         
-         }
->>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:static/index.html
-
+#nickInput {color:#000;
+}
 
-        -->
-    </style>
-    <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-  </head>
 
 
-  <body>
-    <div id="rapper7">
-      <div id="header7">
+-->
+</style>
 
-        <div id="bottombar"></div>
-        <div align="center">
-          <p><img src="static/wordlogo2.gif" width="500" height="239"><br>
-          </p>
-        </div>
-        <div class="white"></div>
-        <div align="center"><br /></div>
-      </div>
+<body>
+<div id="rapper7">
+<div id="header7">
+    <div id="bottombar"></div>
+    <div align="center">
+        <p><img src="static/wordlogo2.gif" width="500" height="239"><br>
+        </p>
     </div>
+
+    <div class="white"></div>
+    <div align="center"><br /></div>
+</div>
+</div>
 </div>
 <div id="main" align="center">
 
-  <p align="center"><br /> 
+            <p align="center"><br /> 
   </p> 
   <div id="registerbox">
     <p align="right" class="line">&nbsp;</p>
@@ -362,10 +202,16 @@ body {
     <h1 align="center">&nbsp;</h1>
     <h1 align="center"><br />
       u
-      <input type="text" class="feild"id="nickInput" size="17" /> 
+      <input type="text" class="feild"id="nickInput" size="17" name="txt" value="username"
+onfocus="if(this.beenchanged!=true){ this.value = ''}"
+onblur="if(this.beenchanged!=true) { this.value='username' }"
+onchange="this.beenchanged = true;"/> 
       <br />
       p
-      <input type="password" class="feild" id="passwordInput" size="17" />
+      <input type="password" class="feild" id="passwordInput" size="17"name="txt" value="password"
+onfocus="if(this.beenchanged!=true){ this.value = ''}"
+onblur="if(this.beenchanged!=true) { this.value='passwordpasswordd' }"
+onchange="this.beenchanged = true;"/>
     </h1>
     <h1 align="center">      <br />                  
       <input type="submit" class="submit" id="loginSubmit" value="Log In" /> 
@@ -373,23 +219,19 @@ body {
     <p align="center">&nbsp;</p>
     <p>&nbsp;</p>
     <div align="right" class="txt">
-      <div align="center"><span class="txt"><a href="/register" class="txt">Register</a></span></div>
+      <div align="center"><span class="txt"><a href="http://dump.fm/register" class="txt">Register</a></span></div>
     </div>
     <div align="center"></div>
   </div>
 </div>
-</div></div> 
+    </div></div> 
 
 </div>
-</h1>
-</div>
+              </h1>
+              </div>
 </div>
 
 <div style="position: fixed; bottom: 3px; right: 3px; font-size: xx-small; z-index: 10;"><button onclick="getBackground()" title="Rotate background image" style="font-size: xx-small;">+</button></div>
 
 </body>
-<<<<<<< HEAD:static/index.html
-</html>
-=======
-</html>
->>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:static/index.html
+</html>
+\ No newline at end of file
diff --git a/static/pichat.css b/static/pichat.css
index a91c0f5..7130dd7 100644
--- a/static/pichat.css
+++ b/static/pichat.css
@@ -5,6 +5,26 @@ body {
 	background-color:#e3e3e3;
 	
 }
+a {
+	font-size: 12px;
+	color: #000;
+}
+a:link {
+	text-decoration: none;
+}
+a:visited {
+	text-decoration: none;
+	color: #000;
+}
+a:hover {
+	text-decoration: underline;
+	color:#000;
+	
+}
+a:active {
+	text-decoration: none;
+	color: #000;
+}
 
 #content{
     z-index: 3;
@@ -32,7 +52,7 @@ body {
 	background-repeat:repeat-x;
 	background-position:top;
 	height:30px;
-	color: #CCC;
+	color: #000;
 	line-height: 2;
 }
 
@@ -86,6 +106,7 @@ bottom:6px;
     width: 100%;
 
     margin-top: 15px;
+	left:0px;
     position:relative;
 		border:2px solid #999;
 height:36px;
@@ -154,7 +175,7 @@ top:15px;
 	position: absolute;
 	padding: 5px;
 	top:70px;
-	width: 130px;
+	width: 150px;
 	float:right;
 	right: 40px;
 	font-family: Arial, Helvetica, sans-serif;
@@ -180,13 +201,44 @@ top:15px;
 	z-index:18;
 	text-align: left;
 }
-.username{height:32px;
+.username{height:30px;
 margin-top:2px;
 line-height:20px;
+text-indent:4px;
 min-width:90px;
 overflow:hidden;
 
 }
+.username a { 
+display:block; 
+width:100%; 
+height:100%; 
+text-decoration:none; 
+}  
+.username a:hover { 
+display:block; 
+width:100%;
+
+
+height:100%;
+color:#000;
+
+text-decoration:none;
+background-color:#f5f5f5;
+
+
+	border-top-right-radius:5px;
+	
+	-webkit-border-top-right-radius:5px;
+	
+	-moz-border-radius-topright:5px;
+	
+	border-bottom-right-radius:5px;
+	
+	-webkit-border-bottom-right-radius:5px;
+	
+	-moz-border-radius-bottomright:5px;
+}  
 #userList img{
     max-width:30px;
     width: expression(this.width > 30 ? 30: true);
@@ -196,7 +248,7 @@ overflow:hidden;
 	float:right;
 	right:1px;
 	z-index:77;
-	height:50px;
+	height:30px;
 	
 	border-top-left-radius:5px;
 	border-top-right-radius:5px;
@@ -243,13 +295,7 @@ overflow:hidden;
 	width:auto;
 	
 }
-#lillogo {
-    bottom:0px;
-    position:absolute;
-    padding:1px;
-    right:7px;
-    line-height: 12px;	
-}
+
 #binfo {
     font-family: Arial, Helvetica, sans-serif;
     font-size: 11px;
@@ -328,19 +374,19 @@ overflow:hidden;
 	margin: 0;
 	padding-bottom:105px;
 }
-#footer
+#footerc
 {
 	text-align:center;
 	position:absolute;
 	width:100%;
 	bottom:0px;
-	font-size:12px;
+	font-size:10px;
 	font-family:"Times New Roman", Times, serif;
 	background-image:url(/static/footer.png);
 	background-repeat:repeat-x;
 	background-position:top;
 	height:30px;
-	color: #333;
+	color: #000;
 	line-height: 2;
 }
 #log
@@ -444,67 +490,7 @@ overflow:hidden;
 	padding-bottom:12px;
 	left: -40px;
       }
-.white a:link {
-	text-decoration: none;
-	text-shadow: -1px 1px 1px #ccc;
-	color: #504F61;
-}
-.white a:visited {
-	text-decoration: none;
-	text-shadow: -1px 1px 1px #ccc;
-	color: #504F61;
-}
-.white a:hover {
-	text-decoration: none;
-	text-shadow: -1px 1px 1px #ccc;
-	
-	
-	color: #fff;
-}
-.white a:active {
-	text-decoration: none;
-	text-shadow: -1px 1px 1px #ccc;
-	color: #504F61;
-}
-#header7{
-	background-color:#fff;
-	background-image:url(/static/dblue2.png);
-	background-attachment:inherit;
-	margin: 0px auto -1px auto;
-	top: 0px;
-	width:100%;
-	left: 0px;
-	height: 69px;
-}
-#bar7{
-	top:31px;
-	position:absolute;
-	font-family: Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	width: 500px;
-	font-size: 20px;
-	left: 170px;
-	margin-left: 11%;
-	margin-right: 8%;
-	letter-spacing: -1px;
-	z-index: 999;
-}
 
-#logo7{
-	top:20px;
-	margin-left: 10%;
-	margin-right: 10%;
-	z-index:1000;
-	float:left;
-}
-#rapper7{
-	top: 0px;
-	left:0px;
-	position:absolute;
-	width: 100%;
-	height: 78px;
-	z-index: 1000;
-}
 p {  font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; }
 td {
 	font-family: Arial, Helvetica, sans-serif;
@@ -513,145 +499,3 @@ td {
 	color: #000000;
 }
 .btnav {  border: 0px #000000 solid;} 
-/* Copyright(c)2006 TikiRobot. Software license GPL version 2.
-
-ChatBubble is based on "Even more rounded corners with CSS":
-http://www.schillmania.com/content/projects/even-more-rounded-corners/
-*/
-
-div.CBmsg {
-                  display: table; 
-            margin-bottom: 0.5em;
-}
-
-
-div.CBmsgR {
-                    float: right;
-               text-align: right;
-           }
-           
-div.CBmsgL .CBcontent {
-  padding-left: 12px;
-}
-           
-
-          
-div.CBtxt {
-                  display: table-cell;  
-                 position: relative;
-                   margin: 0px auto;
-                min-width: 8em;
-                max-width: 760px;
-                  z-index: 1;
-              margin-left: 12px;
-           }
-
-div.CBiconL { 
-                  display: table-cell; 
-           vertical-align: bottom;
-            padding-right: 22px; /* 10+12 */
-            
-            }
-
-div.CBiconR {
-                  display: table-cell; 
-           vertical-align: bottom;
-             padding-left: 10px;
-            }
-
-div.CBiconR > img {
-		  padding: 0px;
-		    width: 32px;
-		   height: 32px;
-		}
-
-div.CBiconL > img {
-		  padding: 0px;
-		    width: 32px;
-		   height: 32px;
-		}
-
-.CBblueL .CBcontent,
-.CBblueL .CBt,
-.CBblueL .CBb,
-.CBblueL .CBb div {
- background:transparent url(http://www.dump.fm/static/BubbleBlueL800x1600.png) no-repeat top right;
-}
-
-.CBblueR .CBcontent,
-.CBblueR .CBt,
-.CBblueR .CBb,
-.CBblueR .CBb div {
- background:transparent url(http://www.dump.fm/static/BubbleBlueR800x1600.png) no-repeat top right;
-}
-
-.CBpinkL .CBcontent,
-.CBpinkL .CBt,
-.CBpinkL .CBb,
-.CBpinkL .CBb div {
- background:transparent url(http://www.dump.fm/static/BubblePinkL800x1600.png) no-repeat top right;
-}
-
-.CBpinkR .CBcontent,
-.CBpinkR .CBt,
-.CBpinkR .CBb,
-.CBpinkR .CBb div {
- background:transparent url(http://www.dump.fm/static/BubblePinkR800x1600.png) no-repeat top right;
-}
-
-.CBltgreyL .CBcontent,
-.CBltgreyL .CBt,
-.CBltgreyL .CBb,
-.CBltgreyL .CBb div {
- background:transparent url(http://www.dump.fm/static/BubbleLtGreyL800x1600.png) no-repeat top right;
-}
-
-.CBltgreyR .CBcontent,
-.CBltgreyR .CBt,
-.CBltgreyR .CBb,
-.CBltgreyR .CBb div {
- background:transparent url(http://www.dump.fm/static/BubbleLtGreyR800x1600.png) no-repeat top right;
-}
-
-.CBtxt .CBcontent {
- position:relative;
- zoom:1;
- _overflow-y:hidden;
- padding:5px 12px 0px 0px;
-}
-
-
-.CBtxt .CBt {
- /* top+left vertical slice */
- position:absolute;
- left:0px;
- top:0px;
- width:12px; /* top slice width */
- margin-left:-12px;
- height:100%;
- _height:1600px; /* arbitrary long height, IE 6 */
- background-position:top left;
-}
-
-.CBtxt .CBb {
- /* bottom */
- position:relative;
- width:100%;
-}
-
-.CBtxt .CBb,
-.CBtxt .CBb div {
- height:10px; /* height of bottom cap/shade */
- font-size:1px;
-}
-
-.CBtxt .CBb {
- background-position:bottom right;
-}
-
-.CBtxt .CBb div {
- position:relative;
- width:12px; /* bottom corner width */
- margin-left:-12px;
- background-position:bottom left;
-}
diff --git a/static/pichat.js b/static/pichat.js
index b12041c..87bca75 100755
--- a/static/pichat.js
+++ b/static/pichat.js
@@ -15,12 +15,7 @@ function escapeHtml(txt) {
 }
 
 function buildUserDiv(user) {
-<<<<<<< HEAD:static/pichat.js
-    return '<div class="username"><img src="/static/cat.jpeg" width="50" height="50">' + escapeHtml(user) + '</div>';
-=======
-    var nick = escapeHtml(user);
-    return '<div><a href="/u/' + nick  + '">' + nick + '</a></div>';
->>>>>>> 704efb06cd424de7411f198bc4c6ce6b99a9dcbe:static/pichat.js
+    return '<div class="username"><a href="/u/' + escapeHtml(user) + '"><img src="/static/cat.jpeg" width="50" height="50">' + escapeHtml(user) + '</a></div>';
 }
 
 // http://stackoverflow.com/questions/37684/replace-url-with-html-links-javascript
author	Scott Ostler <sostler@ubuntu.(none)>	2009-12-21 23:49:18 -0500
committer	Scott Ostler <sostler@ubuntu.(none)>	2009-12-21 23:49:18 -0500
commit	c59927b378092f437896381698ebc8d4a4243492 (patch)
tree	9548dd47ed45d80db294e176cd1d25964a53404b /static
parent	abf97ed31da3b08e7757981ab63b5aa28aa76f79 (diff)