summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--static/browsertool.gifbin4583 -> 6231 bytes
-rw-r--r--static/cloudbar.pngbin0 -> 56423 bytes
-rw-r--r--static/cloudbar2.pngbin0 -> 27560 bytes
-rw-r--r--static/cloudbar3.pngbin0 -> 88316 bytes
-rwxr-xr-xstatic/header.css6
-rwxr-xr-xstatic/index.html4
-rw-r--r--static/noinfo.pngbin0 -> 52768 bytes
-rwxr-xr-xstatic/pichat.css57
-rwxr-xr-xstatic/profile.css15
-rwxr-xr-xstatic/search/browser.html2
-rw-r--r--static/webcam/register.html233
-rw-r--r--static/webcam/webcam.js3
-rwxr-xr-xtemplate/banner.st2
-rwxr-xr-xtemplate/browser.st2
-rwxr-xr-xtemplate/chat.st31
-rw-r--r--template/form_login.st2
-rwxr-xr-xtemplate/profile.st23
17 files changed, 304 insertions, 76 deletions
diff --git a/static/browsertool.gif b/static/browsertool.gif
index e3dc960..9777d27 100644
--- a/static/browsertool.gif
+++ b/static/browsertool.gif
Binary files differ
diff --git a/static/cloudbar.png b/static/cloudbar.png
new file mode 100644
index 0000000..e4e6893
--- /dev/null
+++ b/static/cloudbar.png
Binary files differ
diff --git a/static/cloudbar2.png b/static/cloudbar2.png
new file mode 100644
index 0000000..ac4d1c8
--- /dev/null
+++ b/static/cloudbar2.png
Binary files differ
diff --git a/static/cloudbar3.png b/static/cloudbar3.png
new file mode 100644
index 0000000..aca0f05
--- /dev/null
+++ b/static/cloudbar3.png
Binary files differ
diff --git a/static/header.css b/static/header.css
index 1aa1d1c..5ad2fbc 100755
--- a/static/header.css
+++ b/static/header.css
@@ -73,17 +73,17 @@ margin-top:2;
color: #fff;
}
#logout7{
- top:-2px;
+ top:-1px;
position:relative;
font-size:12px;
- margin-right: 3px;
+ margin-right: 5px;
float:right;
z-index: 999;
font-family: Arial, Helvetica, sans-serif;
font-weight: normal;
}
-#logout7 a{font-size:11px;text-shadow: 1px 1px 4px #000;
+#logout7 a{font-size:11px;
}
#logout7 a:hover{font-size:11px;
}
diff --git a/static/index.html b/static/index.html
index c3006af..a7e896a 100755
--- a/static/index.html
+++ b/static/index.html
@@ -76,8 +76,8 @@ body {
}
#customer {
position: absolute;
- left: -80px;
- top: -65px;
+ left: -90px;
+ top: -75px;
z-index: 10;
}
diff --git a/static/noinfo.png b/static/noinfo.png
new file mode 100644
index 0000000..a80724a
--- /dev/null
+++ b/static/noinfo.png
Binary files differ
diff --git a/static/pichat.css b/static/pichat.css
index 1e4a4f3..f01a150 100755
--- a/static/pichat.css
+++ b/static/pichat.css
@@ -117,22 +117,16 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#eee, offX=3, offY=4,
z-index:100;
}
#msginputrapper{
-margin-right:359;
+margin-right:374;
}
#msgSubmit {
- border-top-right-radius:10px;
- -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;
- border-radius:5px;
+
position:absolute;
display:inline-block;
width:120px;
height:35px;
-right:240px;
+right:255px;
font-size:20px;
background-image:url(/static/urlbutton.png);
text-indent:27;
@@ -159,7 +153,7 @@ top:15px;
width:120px;
height:35px;
background-position:center;
-right:0;
+right:15;
top:15px;
padding-bottom:1;
text-indent:28;
@@ -186,17 +180,16 @@ background-image:url(/static/cambutton.png);
width:120px;
height:35px;
background-position:center;
-right:0;
+right:15;
top:15px;
-padding-bottom:1;
+padding-bottom:4;
text-align:center;
z-index:100;
cursor:pointer;
background-color:yellow;
- font-size:16px;
+ font-size:17px;
color:#fff;
background-image:url(/static/bg-btn-red.png);
-
text-shadow:1px 1px 3px rgba(0,0,0,1);
}
#webcam-button-snap.blink{
@@ -206,17 +199,37 @@ background-image:url(/static/bg-btn-red.png);
#webcam-button-close { /* 16 x 14 */
position: fixed;
- bottom: 300px; /* 240 + 68 - (16 / 2) */
- right: 313px; /* 320 - (14 / 2) */
+ bottom: 330px; /* 240 + 68 - (16 / 2) */
+ right: 335px; /* 320 - (14 / 2) */
z-index: 5001;
+border:1px solid #000;
+ box-shadow: 3px 4px 4px #c8cbce;
+-webkit-box-shadow: 3px 4px 4px #c8cbce;
+-moz-box-shadow: 3px 4px 4px #c8cbce;
cursor: pointer;
}
#webcam-preview {
position:fixed;
- bottom: 68px;
- right:0;
- z-index:5000
+ bottom: 82;
+opacity:0.9;
+ right:30;
+ box-shadow: 3px 4px 4px #c8cbce;
+-webkit-box-shadow: 3px 4px 4px #c8cbce;
+-moz-box-shadow: 3px 3px 4px #c8cbce;
+ border-top-right-radius:5px;
+ background-color:#FFF;
+ -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;
+border:1px solid #999;
+ z-index:5000;
}
#upload {
border-top-right-radius:10px;
@@ -231,7 +244,7 @@ background-image:url(/static/bg-btn-red.png);
width:120px;
height:35px;
background-position:center;
-right:120;
+right:135;
top:15px;
padding-bottom:1;
text-indent:24;
@@ -268,10 +281,10 @@ margin:-2;
position: absolute;
padding: 5px;
top:85px;
- min-width: 190px;
+ min-width: 200px;
width:11%;
float:right;
- right: 6%;
+ right: 6.2%;
font-family: Arial, Helvetica, sans-serif;
font-size: 14px;
font-weight:420;
diff --git a/static/profile.css b/static/profile.css
index 8aaafa8..8ee09d3 100755
--- a/static/profile.css
+++ b/static/profile.css
@@ -17,6 +17,18 @@ background-color:#fff;
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;
+}
+
#chatrap{
width:720;
@@ -309,6 +321,7 @@ font-size:60%;
top:80;
background-image:url(/static/welcomebar.gif);
}
+.invisible { display: none !important; }
body,td,th {
font-family: Arial, Helvetica, sans-serif;
background-color:#ffffee;
@@ -320,4 +333,4 @@ background-attachment:fixed;
-}@charset "UTF-8"; \ No newline at end of file
+}@charset "UTF-8";
diff --git a/static/search/browser.html b/static/search/browser.html
index c3f4766..11223ca 100755
--- a/static/search/browser.html
+++ b/static/search/browser.html
@@ -107,7 +107,7 @@ background-image:url(/static/bg-btn-blue.png);
<table class="search" width="425" border="0" cellpadding="5" cellspacing="0">
- <a href="#" id="about">optionz</a></div>
+ <a href="#" id="about">options</a></div>
</table>
diff --git a/static/webcam/register.html b/static/webcam/register.html
new file mode 100644
index 0000000..4458f9c
--- /dev/null
+++ b/static/webcam/register.html
@@ -0,0 +1,233 @@
+</html><head>
+ <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
+ <script type="text/javascript" src="/static/js/underscore-min.js"></script>
+ <script type="text/javascript" src="/static/js/sha1.js"></script>
+ <script type="text/javascript" src="static/js/register.js"></script>
+ <script>
+ $(document).ready(initRegister);
+ </script>
+ <link rel="stylesheet" type="text/css" href="static/reset.css">
+
+ <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 {
+ 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;
+}
+#main {
+ background-position:center;
+ width:460px;
+ margin: 0px auto -1px auto;
+ height:400px;
+padding-top:15;
+ 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 2px #000;
+ position: relative;
+ background-color: #FFF;
+ background-position:center;
+ background-repeat:no-repeat;
+ box-shadow: 5px 5px 100px #c8cbce;
+-webkit-box-shadow: 5px 5px 100px #c8cbce;
+-moz-box-shadow: 5px 5px 100px #c8cbce;
+}
+#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:#EEF2FF url(/static/fade-blue.png) top center repeat-x;
+ background-repeat:repeat-x;
+ background-position:top;
+ overflow:hidden;
+margin:8%;
+}
+body a{border:0;
+text-decoration:none;
+}
+.submit {
+
+
+ text-shadow: -1px 1px 1px #ccc;
+
+ font-size:15px;
+}
+.feild {
+ height:40px;
+ width:300px;
+ border:3px #000;
+ background:#e3e3e3;
+ margin:10px;
+ color:#000;
+
+ font-size:30px;
+
+}
+.txt {
+ font-family:Arial, Helvetica, sans-serif;
+ font-size:14px;
+line-height:1.2;
+ text-shadow:1px 1px 0.5px #ccc;
+ word-spacing: 3px;
+}
+ .line {
+ font-family:Arial, Helvetica, sans-serif;
+ letter-spacing: 1px;
+line-height:1;
+ text-shadow:0px 1px 50px #999;
+ color:#000;
+ font-size:19px;
+}
+#nickInput {color:#000;
+}
+.no-cursor { cursor: none; }
+.invisible { display: none !important; }
+#cursor-big { position: absolute; z-index: 1000; }
+
+#submit {
+
+
+ display:inline-block;
+ width:300px;
+height:35px;
+margin-top:-5;
+font-size:14px;
+background-image:url(/static/btngrad1.png);
+margin-left:140;
+top:15px;
+ text-align:center;
+ z-index:100;
+ font-size:18px;
+ color:#fff;
+ text-shadow:1px 1px 1px rgba(0,0,0,1);
+ 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;
+ border:solid 1px #fff;
+}
+
+-->
+
+
+
+
+
+
+
+</style>
+
+<body>
+<div id="rapper7">
+<div id="header7">
+ <div id="bottombar"></div>
+ <div align="center">
+<br>
+ </div>
+
+ <div class="white"></div>
+ <div align="center"><br /></div>
+</div>
+</div>
+</div>
+<div id="main" align="center">
+<h1>
+Sorry, registration is closed, come back tomorrow
+</h1>
+ </div>
+ </div>
+ </div>
+</div>
+
+
+
+</body>
+</html>
diff --git a/static/webcam/webcam.js b/static/webcam/webcam.js
index f5a5536..3e3b4fd 100644
--- a/static/webcam/webcam.js
+++ b/static/webcam/webcam.js
@@ -37,6 +37,9 @@ window.webcam = {
},
uploadCompleted: function(){
+ if (typeof pageTracker !== 'undefined') {
+ pageTracker._trackEvent('Message', 'Webcam', typeof Room !== 'undefined' ? Room : 'UnknownRoom');
+ }
$("#webcam-button-snap").attr("value", "Send Pic")
webcam.reset();
},
diff --git a/template/banner.st b/template/banner.st
index a857628..c67bafa 100755
--- a/template/banner.st
+++ b/template/banner.st
@@ -15,7 +15,7 @@
<li><div id="lastli"><a href="/">.</a></div></li>
<li><a href="/log"><img src="/static/text.gif" > Log</a></li>
<li><a href="/u/$user_nick$"><img src="/static/home4.gif"/> Profile</a></li>
- <li><a href="/browser"><img src="/static/image_draw.gif" /> Browser Tool</a></li>
+ <li><a href="/browser"><img src="/static/image_draw.gif" /> Image Search</a></li>
</ul>
$else$&nbsp; &nbsp;
<a href="/register"><img src="/static/answer_good.gif" />Register</a>
diff --git a/template/browser.st b/template/browser.st
index 26dcb8b..e172d15 100755
--- a/template/browser.st
+++ b/template/browser.st
@@ -1,6 +1,6 @@
<html>
<head>
- <title>dump.fm | Browser Tool Beta</title>
+ <title>dump.fm | Image Search Beta</title>
$head()$
<link rel="stylesheet" type="text/css" href="/static/browser.css">
<script type="text/javascript" src="/static/gritter/js/jquery.gritter.js"></script>
diff --git a/template/chat.st b/template/chat.st
index 4d792ae..2c0f15f 100755
--- a/template/chat.st
+++ b/template/chat.st
@@ -37,37 +37,6 @@
});
}
</script>
- $if(isadminroom)$
- <style>
- .stats {
- background: #FFF;
- z-index: 500000;
- position: fixed;
- top: 450px;
- right: 25px;
- width: 400px;
- border: 1px solid #ccc;
- padding: 1em;
- }
-
- .stats a {
- margin: 0.75em;
- }
-
- .stats a { color: #666; }
- .stats a:hover { color: blue; }
- .stats a.active { text-decoration: underline;
- color: black; }
-
- .stats #statschart { position: relative; margin: 1em; }
- </style>
- <script type="text/javascript"
- src="http://cloud.github.com/downloads/danvk/dygraphs/dygraph-combined.js"></script>
- <script src="/static/js/stats.js"></script>
- <script>
- jQuery(document).ready(initStats);
- </script>
- $endif$
</head>
<body onload="MM_preloadImages('/static/thumbs_up_sm.gif')">
$banner()$
diff --git a/template/form_login.st b/template/form_login.st
index 8b126ff..ad61bbb 100644
--- a/template/form_login.st
+++ b/template/form_login.st
@@ -18,7 +18,7 @@
<p>
<label>
- <input type="checkbox" name="rememberme" id="remembermeInput" />
+ <input type="checkbox" name="rememberme" id="remembermeInput" checked="checked"/>
Remember Me
</label>
</p>
diff --git a/template/profile.st b/template/profile.st
index c3d77e2..04a28fb 100755
--- a/template/profile.st
+++ b/template/profile.st
@@ -10,16 +10,11 @@
<script type="text/javascript" src="/static/jquery.editinplace.1.0.1.packed.js"></script>
<link type="text/css" href="http://jqueryui.com/latest/themes/base/ui.all.css" rel="stylesheet" />
- <script type="text/javascript" src="http://jqueryui.com/latest/ui/ui.core.js"></script>
- <script type="text/javascript" src="http://jqueryui.com/latest/ui/ui.datepicker.js"></script>
+
<script>
jQuery(document).ready(function(){
initProfile();
- jQuery(".linkify").each(function() {
- var text = jQuery(this).text();
- jQuery(this).html(linkify(text));
- });
});
</script>
@@ -46,7 +41,7 @@
$if(avatar)$
<img id="avatarPic" src="$avatar$" width="150px"/>
$else$
- <b id="avatarPic">No avatar</b>
+ <b id="avatarPic"><img src="/static/noinfo.png"></b>
$endif$
$if(is_home)$
@@ -61,20 +56,21 @@
<h3>contact info</h3>
<div id="contact" class="linkify">$contact$</div>
$else$
- <div>No contact info</div>
+ <br><br>
+ <div><img src="/static/noinfo.png"></div>
$endif$
<br>
$if(is_home)$
- <h3>biography</h3>
+ <h3>bio</h3>
<div id="bio" class="editable">$bio$</div>
- $elseif(contact)$
- <h3>biography</h3>
+ $elseif(bio)$
+ <h3>bio</h3>
<div id="bio" class="linkify">$bio$</div>
$else$
- <div>No bio</div>
+ <div><img src="/static/noinfo.png"></div>
$endif$
@@ -144,6 +140,7 @@
$footer()$
</div>
</div>
- </div></div>
+ </div></div></div>
+$preload()$
</body>
</html>