From 0f8f1b234276514560e6df3bb6f6bac56fa9807d Mon Sep 17 00:00:00 2001
From: dumpfmprod <dumpfmprod@ubuntu.(none)>
Date: Wed, 24 Feb 2010 08:09:42 -0500
Subject: Commit template changes

---
 template/log.st | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'template/log.st')
diff --git a/template/log.st b/template/log.st
index 0a12550..425a0fb 100755
--- a/template/log.st
+++ b/template/log.st
@@ -1,6 +1,6 @@
 <html>
   <head>
-    <title>$roomname$ Log</title>
+    <title>dump.fm log</title>
     $head()$
        <link rel="stylesheet" type="text/css" href="/static/profile.css">
     <style>
-- 
cgit v1.2.3-70-g09d2


From 4aaeea62170be62bb7dfef953a7b0b447196e18a Mon Sep 17 00:00:00 2001
From: dumpfmprod <dumpfmprod@ubuntu.(none)>
Date: Thu, 25 Feb 2010 08:25:23 -0500
Subject: Added PROD changes

---
 static/log.css          | 354 ++++++++++++++++++++++++++++++++++++++++++++++++
 static/profile.css      |  57 +++++++-
 static/right.gif        | Bin 0 -> 74 bytes
 static/webcam/webcam.js |   2 +-
 template/chat.st        |   2 +-
 template/log.st         |   5 +-
 template/logged_dump.st |   2 +-
 template/profile.st     |   9 +-
 8 files changed, 418 insertions(+), 13 deletions(-)
 create mode 100644 static/log.css
 create mode 100644 static/right.gif

(limited to 'template/log.st')

diff --git a/static/log.css b/static/log.css
new file mode 100644
index 0000000..7dc2483
--- /dev/null
+++ b/static/log.css
@@ -0,0 +1,354 @@
+    #profile {
+	float: right;
+	padding: 20px;
+width:180;
+	position:absolute;
+	top:29px;
+left:545;
+	margin-top:34px;
+background-color:#fff;
+
+	
+	text-overflow: ellipsis-word;
+	background-position:top;
+	z-index:999;
+	min-height:600px;
+
+	
+	line-height:1.5;
+      }
+#profile h3{
+margin-top:12;
+line-height:2;
+color:#fff;
+text-shadow: blue -2px -2px 0, red 2px 2px 0, green -6px 4px 0;
+}
+#profile h2{
+text-indent:-10;
+margin-top:-7;
+margin-bottom:15;
+}
+#logavatar{
+margin-left:-90;
+height:25;
+background-image:url(/static/right.giff);
+width:70;
+	background-repeat:no-repeat;
+	background-position:50 2;
+margin-top:-22;
+
+}
+#logavatar img{
+
+
+}
+#lolbanner{
+position:absolute;
+top:5;
+margin-left:22;
+}
+#chatrap{
+  width:610;
+
+  margin-left:auto;
+  margin-right: auto ;
+
+#cats{
+background-image:url(/static/dumpcats2.png);
+}
+	
+
+}
+#pnav{position:absolute;
+padding-left:270;
+margin-top:0;
+background-position:top;
+font-weight:bold;
+margin-left:0;
+text-align:left;
+
+
+
+}
+#pnavo{
+margin-top:-18;
+padding:2;
+width:105;
+letter-spacing:-2;
+text-indent:6;
+	background-image:url(/static/grad2.png);
+height:32;
+text-transform:capitalize;
+	background-image:url(/static/upload.png);
+
+
+}
+#pnavn{
+position:absolute;
+top:-1;
+left:395;
+letter-spacing:-2;
+text-indent:5;
+width:96;
+height:32;
+padding:2;
+border:1px;
+	background-image:url(/static/upload.png);
+
+
+}
+#pnav a {
+	font-size: 30px;
+	color:#fff;
+text-transform:lowercase;
+text-shadow: blue -2px -2px 0, red 2px 2px 0, green -6px 4px 0;
+}
+pnav a:link {
+	text-decoration: none;
+color:fff;
+}
+a:visited {
+	text-decoration: none;
+	color: #000;
+}
+#pnav a:hover {
+	text-decoration: none;
+	color: #fff;
+text-shadow: blue 2px 2px 0, red -20px -2px 0, green 6px 4px 0;
+
+
+}
+a:active {
+	text-decoration: none;
+	color: #000;
+}
+#footer
+{
+	text-align:center;
+	position:relative;
+	width:100%;
+	bottom:-50px;
+line-height:3.8;
+	font-size:12px;
+word-spacing:12px;
+margin-left:6;
+height:28px;
+	color: #000;
+
+}
+#footer a {
+	font-size: 11px;
+	color: #000;
+
+}
+#footer a:link {
+	text-decoration: none;
+	font-size: 10px;
+color:000;
+}
+#footer a:hover {
+	text-decoration:none;
+	font-size: 11px;
+	color: #f0e;
+}
+
+#log
+{
+	position:absolute;
+	
+	top:57px;
+	padding-top: 25px;
+
+	
+	
+}
+#posts {
+	
+	
+	
+}
+.logged-dump img{
+    max-width:500px;
+    width: expression(this.width > 500 ? 500: true);
+    max-height:400px;
+    height: expression(this.width > 500 ? 500: true);
+	border:0px;
+	z-index:4;
+	
+   
+  
+}
+.logged-dump{ 
+
+    max-width:500px;
+text-overflow: ellipsis-word;
+	padding: 18px;
+	font-family: Arial, Helvetica, sans-serif;
+	font-size: 12px;
+	text-transform: uppercase;
+	line-height:15px;
+	background-color:#fff;
+border:1px solid #eee;
+	border-top-left-radius:15px;
+	border-top-right-radius:15px;
+	-webkit-border-top-left-radius:15px;
+	-webkit-border-top-right-radius:15px;
+	-moz-border-radius-topleft:15px;
+	-moz-border-radius-topright:15px;
+	border-bottom-left-radius:15px;
+	border-bottom-right-radius:15px;
+	-webkit-border-bottom-left-radius:15px;
+	-webkit-border-bottom-right-radius:15px;
+	-moz-border-radius-bottomleft:15px;
+	-moz-border-radius-bottomright:15px;
+margin-top:20;
+	z-index:4;
+
+	line-height:20px;
+	text-align: left;
+
+	
+}
+      .editable {
+         color: #0AA;
+      }
+      .editing {
+         color: #F0F;
+      }
+      div#avatar {
+	overflow: hidden;
+	text-overflow: ellipsis;
+
+	padding-bottom:20px;
+      }
+	#contact {
+
+		
+	
+		  text-overflow: ellipsis-word;
+	  }
+	    #bio {
+
+	text-overflow: ellipsis-word;
+	  }
+
+	input.inplace_field {
+		width: 100%;	
+	}
+
+	textarea.inplace_field {
+		width: 100%;
+		height: 50px;
+	}
+
+	  h2 {
+
+	letter-spacing:-1px;
+color:#087cff;
+	height:40px;
+	font-size:24px;
+	font-family:Arial, Helvetica, sans-serif;
+	font-weight:bold;
+	text-transform:capitalize;
+	
+
+	text-shadow: 1px 3px 3px #c8cbce;
+}
+
+
+      img#avatarPic {
+         max-height:250px;
+		 border-top-left-radius:5px;
+	border-top-right-radius:5px;
+	-webkit-border-top-left-radius:5px;
+	-webkit-border-top-right-radius:5px;
+	-moz-border-radius-topleft:5px;
+	-moz-border-radius-topright:5px;
+	border-bottom-left-radius:5px;
+	border-bottom-right-radius:5px;
+	-webkit-border-bottom-left-radius:5px;
+	-webkit-border-bottom-right-radius:5px;
+	-moz-border-radius-bottomleft:5px;
+	-moz-border-radius-bottomright:5px;
+      }
+
+   
+      #newuser
+     {
+	border-top-left-radius:15px;
+	border-top-right-radius:15px;
+	-webkit-border-top-left-radius:15px;
+	-webkit-border-top-right-radius:15px;
+	-moz-border-radius-topleft:15px;
+	-moz-border-radius-topright:15px;
+	border-bottom-left-radius:15px;
+	border-bottom-right-radius:15px;
+	-webkit-border-bottom-left-radius:15px;
+	-webkit-border-bottom-right-radius:15px;
+	-moz-border-radius-bottomleft:15px;
+	-moz-border-radius-bottomright:15px;
+	box-shadow: 0 0 10px #d8dbde, 0px 0px 10px #d8dbde;
+  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 10px #d8dbde;
+  -moz-box-shadow: 0 0 10px #d8dbde, 0px 0px 10px #d8dbde;
+padding:20;
+line-height:1.5;
+height:auto;
+margin-top:-100px;
+     width:600;
+
+	background-image:url(/static/dumpcats2.png);
+margin-left:40}
+
+     #newuser a{font-size:28;
+line-height:3;
+	text-shadow: 1px 1px 1px #000;
+letter-spacing:-1;
+color:#f0e;
+
+
+}
+
+#newuser h1{font-size:20;
+letter-spacing:-2;
+color:#fff;
+text-indent:250;	text-shadow: 1px 1px 1px #000;
+display:none;
+text-transform:uppercase;
+
+}
+#newuser h3{font-size:18;
+letter-spacing:-1;
+color:#000;
+	text-shadow: 1px 1px 1px #ccc;
+text-transform:uppercase;
+
+}
+#newuser h2{font-size:35;
+margin-top:-10;
+color:#000;
+	text-shadow: 0px 2px px #f0e;
+text-transform:lowercase;
+letter-spacing:5;
+text-align:center;
+
+}     
+#date{
+font-size:60%;
+}
+#headerbar{
+top:80;
+	background-image:url(/static/welcomebar.gif);
+}
+.invisible { display: none !important; }
+body,td,th {
+	font-family: Arial, Helvetica, sans-serif;
+	background-color:#ffffee;
+	background-image:url(/static/chanbg.png);
+	background-repeat:repeat-x;
+	background-position:1 10;
+background-attachment:fixed;
+		margin: 0;
+	
+
+	
+}@charset "UTF-8";
diff --git a/static/profile.css b/static/profile.css
index 7594dab..143aa79 100755
--- a/static/profile.css
+++ b/static/profile.css
@@ -1,14 +1,18 @@
     #profile {
 	float: right;
 	padding: 20px;
-width:180;
+width:auto;
 	position:absolute;
 	top:29px;
 left:545;
+max-width:230;
 	margin-top:34px;
 background-color:#fff;
 
-	
+	overflow: hidden;
+	text-overflow: ellipsis;
+
+	height:auto;
 	text-overflow: ellipsis-word;
 	background-position:top;
 	z-index:999;
@@ -17,6 +21,11 @@ background-color:#fff;
 	
 	line-height:1.5;
       }
+#lolbanner{
+position:absolute;
+top:5;
+margin-left:22;
+}
 #profile h3{
 margin-top:12;
 line-height:2;
@@ -28,16 +37,33 @@ text-indent:-10;
 margin-top:-7;
 margin-bottom:15;
 }
+#logavatar{
+margin-left:-49;
+height:22;
 
+margin-top:-22;
+
+}
+#logavatar img{
+    max-width:20px;
+    width: expression(this.width > 20 ? 20: true);
+    max-height:20px;
+    height: expression(this.width > 20 ? 20: true);
+    max-width:20px;
+margin-top:0;
+	box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #d8dbde;
+  -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #d8dbde;
+  -moz-box-shadow: 0 0 10px #d8dbde, 2px 2px 5px #d8dbde;
+}
 #chatrap{
-  width:720;
+  width:610;
 
   margin-left:auto;
   margin-right: auto ;
+
 #cats{
 background-image:url(/static/dumpcats2.png);
 }
-
 	
 
 }
@@ -51,6 +77,27 @@ text-align:left;
 
 
 
+}
+#upload{
+display:inline-block;
+	width:181px;
+  height:33px;
+  font-size:20px;
+  background-image:url(/static/btngrad1.png);
+  font-weight:bold;
+  word-spacing:7;
+ margin-top:25px;
+margin-bottom:5;
+margin-left:-2;
+	text-align:center;
+	z-index:100;
+	font-size:16px;
+	color:#fff;
+	text-shadow:1px 1px 3px #000;
+	border-radius: 5px;
+	-webkit-border-radius: 5px;
+	-moz-border-radius: 5px;*/
+	border:solid 1px #eee;
 }
 #pnavo{
 margin-top:-18;
@@ -161,7 +208,7 @@ color:000;
   
 }
 .logged-dump{ 
-
+width:500;
     max-width:500px;
 text-overflow: ellipsis-word;
 	padding: 18px;
diff --git a/static/right.gif b/static/right.gif
new file mode 100644
index 0000000..1196f1b
Binary files /dev/null and b/static/right.gif differ
diff --git a/static/webcam/webcam.js b/static/webcam/webcam.js
index 3e3b4fd..42af499 100644
--- a/static/webcam/webcam.js
+++ b/static/webcam/webcam.js
@@ -27,7 +27,7 @@ window.webcam = {
 	}, // callback hook functions
 	
 	init: function(){
-    webcam.set_api_url( '/upload' );
+    webcam.set_api_url( '/upload/message' );
     webcam.set_swf_url('/static/webcam/webcam.swf')
     webcam.set_quality( 90 );
     webcam.set_shutter_sound(false);
diff --git a/template/chat.st b/template/chat.st
index 2c0f15f..9122c93 100755
--- a/template/chat.st
+++ b/template/chat.st
@@ -49,7 +49,7 @@
           </div>
           <div id="userList">
             $users: { u |
-            <div class="username"><a href="/u/$u.nick$">
+            <div class="username"><a href="/u/$u.nick$" target="_blank">
 		$if(u.avatar)$<img src="$u.avatar$" width="50" height="50">$endif$
                 $u.nick$</a><br>
             </div>
diff --git a/template/log.st b/template/log.st
index 7281e11..65f149e 100755
--- a/template/log.st
+++ b/template/log.st
@@ -2,7 +2,7 @@
   <head>
     <title>dump.fm log</title>
     $head()$
-       <link rel="stylesheet" type="text/css" href="/static/profile.css">
+       <link rel="stylesheet" type="text/css" href="/static/log.css">
     <style>
  
     </style>
@@ -20,6 +20,9 @@
         <br>
 
         <div id="posts">  
+                    <div id="lolbanner">
+            <img src="/static/welcomebanner.gif">
+            </div>
     $if(dumps)$
     $dumps: { d | $logged_dump(dump=d)$ }$
     $else$
diff --git a/template/logged_dump.st b/template/logged_dump.st
index c7cbbd2..86465e3 100755
--- a/template/logged_dump.st
+++ b/template/logged_dump.st
@@ -32,7 +32,7 @@ img{
     </style>
 <div class="logged-dump">
   <div>$dump.created_on$  -- by <b><a href="/u/$dump.nick$">$dump.nick$</a></b></div>
-  <a href="/u/$dump.nick$"><img height="50" width="50" src="$dump.avatar$" /></a>
+  <a href="/u/$dump.nick$"><div id="logavatar"><img height="50" width="50" src="$dump.avatar$" /></div></a>
   <div class="content">$dump.content$</div>
   <hr />
 </div>
diff --git a/template/profile.st b/template/profile.st
index b5d3f38..9f085c6 100755
--- a/template/profile.st
+++ b/template/profile.st
@@ -32,8 +32,9 @@
 
           $if(dumps)$
             $dumps:{ d | $logged_dump(dump=d)$ }$
-            
-            
+            <div id="lolbanner">
+            <img src="/static/welcomebanner.gif">
+            </div>
         <div id="profile">
 
           <h2>$nick$</h2>
@@ -45,8 +46,8 @@
           $endif$
 
           $if(is_home)$
-          <div id="avatar" class="editable">$avatar$</div>
-          <input id="upload" value="Upload" type="submit">
+          <input id="upload" value="Upload Icon" type="submit">
+
           <img id="spinner" src="/static/spinner.gif" style="display: none" />
           $endif$
 
-- 
cgit v1.2.3-70-g09d2

