summaryrefslogtreecommitdiff
path: root/static
diff options
context:
space:
mode:
authorsostler <sbostler@gmail.com>2010-03-21 23:01:13 -0400
committersostler <sbostler@gmail.com>2010-03-21 23:01:13 -0400
commit1c2f320c2b14089250f5e7b7790f40dc3a2908fc (patch)
treeda0df4614a38f0555cf0312bce962d8c8fb243bd /static
parent72a35872990d8c5d322eedf2dedb87b5d67e1aae (diff)
parentb66a1d52c276b5599605621b91922745a48ca6d7 (diff)
Resolved TODO conflict
Diffstat (limited to 'static')
-rwxr-xr-xstatic/index.html131
-rwxr-xr-xstatic/js/home.js28
2 files changed, 78 insertions, 81 deletions
diff --git a/static/index.html b/static/index.html
index da98e29..e8ec712 100755
--- a/static/index.html
+++ b/static/index.html
@@ -1,40 +1,13 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-"http://www.w3.org/TR/html4/strict.dtd">
-
-<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/sha1.js"></script>
-<script type="text/javascript" src="/static/js/home.js"></script>
-<script>
-$(document).ready(initLoginForm);
-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];}
-}
-</script>
-<link rel="stylesheet" type="text/css" href="static/reset.css">
- <link rel="shortcut icon" href="static/favicon.ico">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<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/sha1.js"></script>
+ <script type="text/javascript" src="/static/js/home.js"></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">
-
-
+ <style type="text/css">
body {
background:#EEF2FF url(/static/fade-blue.png) top center repeat-x;
@@ -171,57 +144,53 @@ label {
</style>
</head>
<body>
-
-<div id="main" align="center">
-
- <img src="/static/flyhorse.gif" id="horse" />
- <img src="/static/guaranteed_customer_satisfaction.gif" id="customer" />
-
- <div id="registerbox">
- <div id="logo-and-text">
- <a href="/"><img src="/static/dumpmod1.png"></a>
- <p align="center" class="line">Talk with pictures!</p>
- <div align="right" class="txt">
- <br>
- <div align="center">Right now dump.fm is invite only...<br>
- If you have a registration code, <a href="/register" style="text-decoration:none;">click here!</a> <br>
+ <div id="main" align="center">
+
+ <img src="/static/flyhorse.gif" id="horse" />
+ <img src="/static/guaranteed_customer_satisfaction.gif" id="customer" />
+
+ <div id="registerbox">
+ <div id="logo-and-text">
+ <a href="/"><img src="/static/dumpmod1.png"></a>
+ <p align="center" class="line">Talk with pictures!</p>
+ <div align="right" class="txt">
+ <br>
+ <div align="center">Right now dump.fm is invite only...<br>
+ If you have a registration code, <a href="/register" style="text-decoration:none;">click here!</a> <br>
+ </div>
</div>
</div>
+ <input type="text" id="nickInput" size="17" />
+ <input id="passwordInputLabel" name="passwordInputLabel" size="17" type="text" class="invisible">
+ <input type="password" id="passwordInput" size="17" /><br />
+ <input id="signin-submit" value="Sign In" />
+ <div id="remember"><label>
+ <input checked="checked" type="checkbox" name="rememberme" id="remembermeInput" />
+ Remember Me
+ </label></div>
</div>
- <input type="text" id="nickInput" size="17" />
- <input id="passwordInputLabel" name="passwordInputLabel" size="17" type="text" class="invisible">
- <input type="password" id="passwordInput" size="17" /><br />
-
-
- <!-- <br /><a id="signin-submit">Sign In</a> -->
- <input id="signin-submit" value="Sign In" />
- <div id="remember"><label>
- <input checked="checked" type="checkbox" name="rememberme" id="remembermeInput" />
- Remember Me
- </label></div>
</div>
-</div>
-<div id="info" align="right">
- <img src="/static/vxhtml.gif">
- <img src="/static/aol_suck.gif">
+ <div id="info" align="right">
+ <img src="/static/vxhtml.gif">
+ <img src="/static/aol_suck.gif">
<img src="/static/html_3_2.gif">
- <img src="/static/geocities.gif">
- <img src="/static/valid_html.gif">
-</div>
-
-<div id="preload">
- <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
-</div>
+ <img src="/static/geocities.gif">
+ <img src="/static/valid_html.gif">
+ </div>
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-12364576-1");
-pageTracker._trackPageview();
-} catch(err) {}</script>
+ <div id="preload">
+ <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
+ </div>
+ <script type="text/javascript">
+ var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+ </script>
+ <script type="text/javascript">
+ try {
+ var pageTracker = _gat._getTracker("UA-12364576-1");
+ pageTracker._trackPageview();
+ } catch(err) {}
+ </script>
</body>
</html>
diff --git a/static/js/home.js b/static/js/home.js
index e9be833..072617a 100755
--- a/static/js/home.js
+++ b/static/js/home.js
@@ -171,3 +171,31 @@ function login() {
error: onError
});
};
+
+
+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];
+ }
+}
+