summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xstatic/css/dump.css92
-rw-r--r--static/js/invalid_domains.js2
-rw-r--r--static/js/pichat.js9
-rw-r--r--template/banner.st24
-rw-r--r--template/fullscreen.st5
-rw-r--r--template/rooms/chat.st44
6 files changed, 52 insertions, 124 deletions
diff --git a/static/css/dump.css b/static/css/dump.css
index aa393c4..5a6c0de 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -610,12 +610,12 @@ a:active {
color: #fff;
}
#dcontent{
- z-index: 3;
+
overflow: auto;
min-width:600px;
}
#content{
- z-index: 3;
+
overflow: auto;
}
@@ -636,15 +636,7 @@ font-size:15;
color:#000;
}
-#tinychat-wrapper{
-z-index:55;
-width:700px;
-right:30px;height:350px;
-position:absolute;
-bottom:76;
-}
-#tinychat-wrapper object{
-}
+
#footerc
{
text-align:center;
@@ -710,7 +702,7 @@ bottom:65px;
width: 99.6%;
background-color:#fff;
left:0.2%;
- z-index:5;
+
}
#messagePane a:hover {
@@ -739,14 +731,12 @@ left:0.2%;
#msgInputDiv {
position:relative;
min-width:500px;
- z-index:100;
left:3px;
bottom: -5px;
width: 100%;
}
#msgInput {
- z-index:100;
left:-3px;border:1px solid #000;
position:relative;border-right:0px;
height:35px;
@@ -756,7 +746,7 @@ font-size:20px;
}
.msgInput {
min-width:500px;width:100%;
- z-index:100;background-color:#eff5fb;
+ background-color:#eff5fb;
}
#msginputrapper{
margin-right:374;
@@ -772,7 +762,6 @@ right:285px;
font-size:20px;background-color:#eff5fb;
top:0;
text-align:center;
- z-index:100;
border:1px solid #000;
border-right:0px;
cursor:pointer;
@@ -824,27 +813,7 @@ padding-bottom:1;
font-size:12px;
color:#000;
}
-#cyberiawebcam-button-upload{
- border-top-right-radius:10px;
- -webkit-border-top-right-radius:5px;background-color:#eff5fb;
- -moz-border-radius-topright:5px;
- border-bottom-right-radius:5px;
- -webkit-border-bottom-right-radius:5px;
- -moz-border-radius-bottomright:5px;
- position:absolute;
- display:inline-block;
- width:100%;
-height:35px;
-background-position:center;
-right:5px;
-border:1px solid #000;
-top:0;
-padding-bottom:1;
- text-align:center;
- cursor:pointer;
- font-size:12px;
- color:#000;
-}
+
#nextbutton{
border:1px solid #000;
border-top-right-radius:10px;
@@ -885,36 +854,13 @@ right:5px;
top:0;
padding-bottom:4;
text-align:center;
- z-index:100;
- cursor:pointer;
-background-color:#ccc;
- font-size:17px;
- color:#fff;
-border:1px solid #000;
-}
-#cyberiawebcam-button-snap{
- 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;
- position:absolute;
- display:inline-block;
- width:100%;
-height:35px;
-background-position:center;
-right:5px;
-top:0;
-padding-bottom:4;
- text-align:center;
- z-index:100;
cursor:pointer;
background-color:#ccc;
font-size:17px;
color:#fff;
border:1px solid #000;
}
+
#webcam-button-snap.blink{
color:#4f4;
}
@@ -953,7 +899,7 @@ top:0;
background-color:#eff5fb;
padding-bottom:1;
text-align:center;
- z-index:100;
+
cursor:pointer;
font-size:12px;
color:#000;
@@ -966,12 +912,7 @@ border:1px solid #000;border-right:0px;
height: expression(this.width > 400 ? 400: true);
max-width:400px;
margin:-2;
- z-index: 1;
opacity:1;
- -webkit-transition: opacity;
- -webkit-transition-timing-function: ease-out;
- -webkit-transition-duration: 500ms;
-
}
.msgDiv {
@@ -993,7 +934,6 @@ background-position:top right;
top:0;
padding-bottom:1;
text-align:center;
- z-index:100;
cursor:pointer;
font-size:12px;
color:#fff;
@@ -1451,7 +1391,6 @@ display:inline-block;
margin-bottom:10;
margin-left:-2;
text-align:center;
- z-index:100;
font-size:16px;
color:#fff;
text-shadow:1px 1px 3px #000;
@@ -2147,7 +2086,18 @@ text-align: justify; text-justify: newspaper
-webkit-box-shadow: 0 3px 10px #110000;
}
- #dis_welcome #dis_content {
+
+ #signintxt {
+ line-height: 1em;
+ position:absolute;
+ font: 17px Helvetica, Arial, Sans-Serif;
+ text-align: center;
+ }
+ #signintxt a {
+ color: #3B5998;
+ }
+ #signintxt a:hover { text-decoration: underline; }
+ #dis_welcome #dis_content {
display: none;
}
#dis_content a {
@@ -2183,6 +2133,6 @@ background-color:#fff;
color:#000; text-shadow: 0px 1px 0px #fff;
}
#pwreset a{
-margin-left:23px;
+margin-left:20px;color:#66AACC;
font-size:11px;
} \ No newline at end of file
diff --git a/static/js/invalid_domains.js b/static/js/invalid_domains.js
index bdddf26..ea1c1c5 100644
--- a/static/js/invalid_domains.js
+++ b/static/js/invalid_domains.js
@@ -64,7 +64,7 @@ var InvalidDomains = [
"http://fortunecity.com",
"http://geneology2.com",
"http://www.geneology2.com",
- "genealogy2.com",
+ "genealogy2.com",
"http://img.waffleimages.com",
"http://www.worldofstock.com",
"http://aphrodite.cooltext.com",
diff --git a/static/js/pichat.js b/static/js/pichat.js
index 4f8b47b..9287cc1 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -224,7 +224,8 @@ function buildMsgContent(content) {
// isLoading doesn't get passed the right thing by $.map in addMessages
function buildMessageDiv(msg, isLoading) {
var nick = escapeHtml(msg.nick);
-// if (nick == 'frakbuddy' && Nick != 'frakbuddy') return;
+ if (nick == 'frakbuddy' && Nick != 'frakbuddy') return;
+ if (nick == 'FAUXreal' && Nick != 'FAUXreal') return;
removeOldMessages()
var msgId = ('msg_id' in msg) ? 'id="message-' + msg.msg_id + '"' : '';
var loadingClass = isLoading ? ' loading' : '';
@@ -1224,13 +1225,11 @@ function onBlur() {
}
function titleUpdater() {
- if (HasFocus || UnseenMsgCounter == 0 || $('title').text() != OrigTitle) {
- $('title').text(OrigTitle);
- } else {
+ if (UnseenMsgCounter > 0) {
var plural = UnseenMsgCounter > 1 ? 's' : '';
$('title').text(UnseenMsgCounter + ' new dump' + plural + '! | ' + OrigTitle);
}
- setTimeout(titleUpdater, 2000);
+ setTimeout(titleUpdater, 4000);
}
function startTitleUpdater() {
diff --git a/template/banner.st b/template/banner.st
index cedb99d..0e56e8c 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -32,22 +32,22 @@
- <div id="toptools">
+ <div id="toptools">
<form name="Tools" >
<select class="toolsmenu" name="menu" onChange="location=document.Tools.menu.options[document.Tools.menu.selectedIndex].value;">
<option>Tools</option>
<option value="http://bon.gs/tile/" target="_blank">Tile Tool</option>
-<option value="http://dump.fm/chat/oie">Online Image Editor</option>
-<option value="http://dump.fm/chat/dwi">Deal With It Maker</option>
-<option value="http://dump.fm/chat/pixlr">Pixlr(image editor)</option>
-<option value="http://dump.fm/chat/arcade">Arcade Font Maker</option>
-<option value="http://dump.fm/chat/flamingtxt">Flaming Text(and more)</option>
-<option value="http://dump.fm/chat/glitter">Glitter Text</option>
-<option value="http://dump.fm/chat/glitter2">Glitter Text 2</option>
-<option value="http://dump.fm/chat/celeb">Celebrity Photo</option>
-<option value="http://dump.fm/chat/signgenerator">Sign Generator</option>
-<option value="http://dump.fm/chat/20years">In 20 Years</option>
-<option value="http://dump.fm/chat/flag">Flag Maker</option>
+<option value="http://dump.fm/m/oie">Online Image Editor</option>
+<!-- <option value="http://dump.fm/m/dwi">Deal With It Maker</option> -->
+<option value="http://dump.fm/m/pixlr">Pixlr(image editor)</option>
+<option value="http://dump.fm/m/arcade">Arcade Font Maker</option>
+<option value="http://dump.fm/m/flamingtxt">Flaming Text(and more)</option>
+<option value="http://dump.fm/m/glitter">Glitter Text</option>
+<option value="http://dump.fm/m/glitter2">Glitter Text 2</option>
+<option value="http://dump.fm/m/celeb">Celebrity Photo</option>
+<option value="http://dump.fm/m/signgenerator">Sign Generator</option>
+<option value="http://dump.fm/m/20years">In 20 Years</option>
+<option value="http://dump.fm/m/flag">Flag Maker</option>
</select>
diff --git a/template/fullscreen.st b/template/fullscreen.st
index 0ae2952..0c64b4f 100644
--- a/template/fullscreen.st
+++ b/template/fullscreen.st
@@ -76,6 +76,9 @@ margin-right:0;
height:35px;
}
+img { image-rendering: -moz-crisp-edges; }
+
+
</style>
</head>
<body>
@@ -102,4 +105,4 @@ Timestamp = $timestamp$;
initFullscreen()
</script>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/template/rooms/chat.st b/template/rooms/chat.st
index 19f32d4..06ff031 100644
--- a/template/rooms/chat.st
+++ b/template/rooms/chat.st
@@ -72,21 +72,17 @@ $if(dis)$
$else$
$banner()$
$if(!user_nick)$
-<!--
-<div id="dis_content" name="content">
- <p>
- 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 now</a></strong>.
- </p>
-</div>-->
+
<div id="dis_welcome"><center>
- <a href="/"><img src="$domain$/static/img/dumppixellarge3.png"></a>
+<img src="$domain$/static/img/dumppixellarge3.png">
- <div id="midtxt"><a href="/">dump.fm</a> 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!
- </div>
- <br><br>
- 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 now</a></strong>.
- </center>
+ <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>!
+ </span> </center> </div>
</div>
+
<link href="/static/css/pages.css" rel="stylesheet" type="text/css" media="screen" />
<link href="/static/css/header.css" rel="stylesheet" type="text/css" media="screen" />
<script type="text/javascript" src="/static/js/win.js"></script>
@@ -96,13 +92,11 @@ $else$
</script>
<style>
.divDragTitle {
- border: 1px solid #CCC;
- border-top: 1px solid #666;
- left:50%!important; background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x;
+ left:50%!important;
margin-left: -250px!important;
}
.divDragContent {
-
+z-index:666;
left:50%!important;
margin-left: -250px!important;
@@ -176,25 +170,7 @@ $else$
</div><div id="effects-msg"class="invisible">click on your face for effects!</div>
</div>
$endif$
- $if(isadmin)$
-<div id="tinychat" style="display:none;">
-<object classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=8,0,0,0" width="785" height="800" id="tinyembed" align="top">
-<param name="allowScriptAccess" value="sameDomain" />
-<param name="allowFullScreen" value="true" />
-<param name="movie" value="http://tinychat.com/tinyembed.swf" />
-
-<param name="menu" value="false" />
-<param name="quality" value="high" />
-<param name="scale" value="50%" />
-<param name="salign" value="t" />
-<param name="wmode" value="transparent" />
-<param name="flashvars" value="roomVar=idontgetit" />
-
-<embed src="http://tinychat.com/tinyembed.swf" menu="false" quality="high" scale="noscale" salign="t" wmode="transparent" FlashVars="roomVar=anyroomsname" width="785" height="800" name="tinyembed" align="top" allowScriptAccess="sameDomain" allowFullScreen="false" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" />
-</object>
-</div>
-$endif$
</div>
</div>
</div>
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-10 09:58:06 +0000