summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortimb <timb@mb.home>2010-04-01 00:36:24 -0700
committertimb <timb@mb.home>2010-04-01 00:36:24 -0700
commit8d0e1e9aa4505ccaf0c77583fc2654806d17e8df (patch)
tree2a38caf5af80bf9588cd2b933277f23734f76862
parentea2af32328972dc8b415fc2efc3669052f5d1b58 (diff)
commits so i can merge
Diffstat
-rwxr-xr-xtemplate/chat.st40
-rwxr-xr-xtemplate/head.st35
-rwxr-xr-xtemplate/profile.st8
3 files changed, 17 insertions, 66 deletions
diff --git a/template/chat.st b/template/chat.st
index 57af392..090c9e5 100755
--- a/template/chat.st
+++ b/template/chat.st
@@ -2,29 +2,26 @@
<head>
<title>dump.fm</title>
$head()$
- $if(user_avatar)$
-
- $else$
- <link rel="stylesheet" type="text/css" href="/static/dumpnewuser.css">
- $endif$
+ $if(!user_avatar)$
+ <link rel="stylesheet" type="text/css" href="/static/css/dumpnewuser.css">
+ $endif$
+ <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
<script type="text/javascript" src="/static/webcam/webcam.js"></script>
- <script type="text/javascript" src="/static/js/tooltip.js"></script>
+ <script type="text/javascript" src="/static/js/tooltip.js"></script>
+ <script type="text/javascript" src="/static/away.js"></script>
+ <script type="text/javascript" src="/static/js/ajaxupload.js"></script>
<script>
jQuery(document).ready(initChat);
var Nick = $json_user_nick$;
var Room = $json_room_key$;
var Timestamp = $timestamp$;
- function showAlert() {
- alert('MUST LOGIN');
-}
+ function showAlert() { alert('MUST LOGIN'); }
$if(isadmin)$
var IsAdmin = true;
$else$
var IsAdmin = false;
$endif$
</script>
- <script src="/static/away.js"></script>
- <script src="/static/js/ajaxupload.js"></script>
<script>
if (Nick) {
jQuery(document).ready(function() {
@@ -75,7 +72,6 @@ function pop(url)
<hr />
</div>
$if(user_avatar)$
- <link rel="stylesheet" type="text/css" href="/static/dump.css">
<div id="msgInputDiv">
<div id="msginputrapper"> <input id="msgInput" class="msgInput" type="input" /> </div>
<input id="msgSubmit" type="submit" value="Send"
@@ -87,35 +83,21 @@ function pop(url)
</div>
$else$
- <link rel="stylesheet" type="text/css" href="/static/dump.css">
<div id="msgInputDiv">
<div id="msginputrapper"> <input id="msgInput" class="msgInput" type="input" /> </div>
<input id="msgSubmit" type="submit" value="Send"onClick="showAlert();"
/>
<input id="upload" value="Upload" type="submit"onClick="showAlert();">
<input id="webcam-button-upload" value="Webcam" type="submit"onClick="showAlert();">
- <input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink"onClick="showAlert();">
+ <input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink" onClick="showAlert();">
<div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"onClick="showAlert();"><img src="/static/trophyicon.gif"></a></div>
</div>
</div>
</div>
</div>
-
- </div>
- <div id="newuserwrap">
- <div id="posthelp"><img src="/static/posthere.png"></div>
- <div id="webcamhelp"><img src="/static/webcamhelp.png"></div>
- <div id="userlisthelp"><img src="/static/userlisthelp.png"></div>
- <div id="imageboard"><img src="/static/imageboard.png"></div>
- <div id="uploadstuff"><img src="/static/uploadstuff.png"></div>
- <div id="signinblurb"><img src="/static/signinblurb.png"></div>
-
- <div id="beingpostednow"><img src="/static/beingpostednow.png"></div>
- <script>
- jQuery(document).ready(function(){ setTimeout( function(){ jQuery("#newuserwrap div").hide(1000) }, 100000 ) })
- </script>
- </div> $endif$
+ $new_user_bubbles()$
+ $endif$
<div id="footerc">
<p>
$footer()$
diff --git a/template/head.st b/template/head.st
index 7ba802d..af2eda6 100755
--- a/template/head.st
+++ b/template/head.st
@@ -1,47 +1,20 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-
-<script type="text/javascript" src="/static/jquery-1.3.2.min.js"></script>
+<script type="text/javascript" src="/static/jquery-1.4.2.min.js"></script>
<!-- <script type="text/javascript" src="/static/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/pichat.js"></script>
<script type="text/javascript" src="/static/js/jquery.lavalamp.js"></script>
<script type="text/javascript" src="/static/js/jquery.easing.1.1.js"></script>
-<link rel="stylesheet" type="text/css" href="/static/reset.css">
-<link rel="stylesheet" type="text/css" href="/static/header.css">
+<link rel="stylesheet" type="text/css" href="/static/css/reset.css">
+<link rel="stylesheet" type="text/css" href="/static/css/header.css">
$if(!user_nick)$
<link href="/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css">
$endif$
<link rel="shortcut icon" href="/static/favicon.ico">
<script type="text/javascript">
-<!--
-function MM_swapImgRestore() { //v3.0
- var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
-}
-
-function MM_preloadImages() { //v3.0
- var d=document;if(d.images){ if(!d.MM_p) d.MM_p=new Array();var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++) if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
-}
-
-function MM_findObj(n, d) { //v4.01
- var p,i,x; if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
- d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
- if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
- for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
- if(!x && d.getElementById) x=d.getElementById(n); return x;
-}
-
-function MM_swapImage() { //v3.0
- var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
- if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
-}
-//-->
-
jQuery(document).ready(function () { MM_preloadImages('/static/mouseover.gif'); });
-
- jQuery(function() { jQuery("#banner-menu").lavaLamp({ fx: "backout", speed: 700 })});
-
+jQuery(function() { jQuery("#banner-menu").lavaLamp({ fx: "backout", speed: 700 })});
</script>
diff --git a/template/profile.st b/template/profile.st
index 7a3944f..e4dd467 100755
--- a/template/profile.st
+++ b/template/profile.st
@@ -1,14 +1,10 @@
-
<html>
<head>
<title>$nick$'s dump.fm</title>
$head()$
- <link rel="stylesheet" type="text/css" media="screen"
- href="/static/profile.css">
- <script src="/static/jquery.editinplace.1.0.1.packed.js"
- type="text/javascript"></script>
+ <link rel="stylesheet" type="text/css" media="screen" href="/static/css/profile.css">
+ <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script>
<script src="/static/js/ajaxupload.js"></script>
- <script type="text/javascript" src="/static/jquery.editinplace.1.0.1.packed.js"></script>
<script>
jQuery(document).ready(initProfile);
</script>
generated by cgit v1.2.3-70-g09d2 (git 2.51.0) at 2025-12-10 11:49:09 +0000