added jquery

mcotton · Feb 26, 2011 · cd0e044 · cd0e044
1 parent 6e23e80
commit cd0e044
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 19 deletions.
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
@@ -43,15 +43,15 @@ p  { margin: 0 0 15px; line-height: 1.7em; }
 	-MS-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
 }
 
-#left { float: left; width: 550px; margin: 0 0 10px; text-align: justify; }
+#left { float: left; width: 350px; margin: 0 0 10px; text-align: justify; }
 	#left h2 { color: #52A9BA; }
 		#left h2 a { border-bottom: 1px dotted #ACCADE; padding: 0 0 3px; }
 		#left .more { color: #7EA4BC; }
 	.subtitle { font-weight: bold; font-style: italic; font-size: 1.1em; margin: 0 0 4px; } 
 	.date { background: #fff; padding: 5px 0; border-right: 1px solid #D3EAFA; border-bottom: 1px solid #D3EAFA; color: #ccc; float: left; width: 55px; margin: 7px 12px 5px 0; text-align: center; }
 	.date span { font-size: 1.6em; }
 
-#side { float: right; width: 300px; margin: 0 0 30px; font-size: .9em; }
+#side { float: right; width: 500px; margin: 0 0 30px; font-size: .9em; }
 	#side h3 { color: #ccc; margin: 0 0 6px 5px; height: 16px; }
 
 .boxtop { background: url(/images/box.gif) no-repeat top; padding: 2px 0; }

diff --git a/views/demo.ejs b/views/demo.ejs
@@ -1,21 +1,13 @@
 <div class="clear"></div>
 
 		<div id="left">
-            <div class="boxtop"></div>
+				    <object width="320" height="240">
-				<div class="box">
-				    <object width="300" height="200">
 <param name="movie" value="/images/webcam.swf">
-<embed src="/images/webcam.swf" width="300" height="200">
+<embed src="/images/webcam.swf" width="320" height="240">
 </embed>
 </object>
-				</div>
-				<div class="boxbottom"></div>
 		</div>
 
 		<div id="side">
-				<div class="boxtop"></div>
+				    <embed src="/images/girl1.m4v" autostart="false"  width="320" height="240"></embed>
-				<div class="box">
-				    <embed src="/images/girl1.m4v" autostart="true" /></embed>
-				</div>
-				<div class="boxbottom"></div>
         </div>
diff --git a/views/index.ejs b/views/index.ejs
@@ -9,13 +9,9 @@
 			     <li>Get to know their personalities quicker</li>
 			 </ul>
 			</p>
-			<p><a class="more" href="signup">Sign Up</a> <a class="more" href="demo">Demo</a> </p>
+			<p><a class="more" href="/signup"><img src='/images/signup.png'></a><a class="more" href="/demo"><img src='/images/demo.png'></a> </p>
 		</div>
 
 		<div id="side">
-				<div class="boxtop"></div>
-				<div class="box">
 				<iframe title="YouTube video player" width="480" height="390" src="http://www.youtube.com/embed/_Mv0ZCG9Evw" frameborder="0" allowfullscreen></iframe>
-				</div>
-				<div class="boxbottom"></div>
         </div>
diff --git a/views/layout.ejs b/views/layout.ejs
@@ -8,6 +8,8 @@
 	<meta name="robots" content="index, follow" />
 	<link rel="stylesheet" type="text/css" media="screen" href="/stylesheets/style.css" />
 	<title>DateRoulette - no dicks allowed</title>
+	<script src='/javascript/jquery.js'></script>
+	<script src='/javascript/media.js'></script>
 </head>
 <body>
 	<div class="wrap background">
@@ -32,7 +34,11 @@
 
 		<p id="ad">This site is for entertainment purposes only.  If you meet the love of your life that is a bonus.</p>
 	</div>
+	<script>
+	$(document).ready({
 	
-
+	   alert('DOM is ready');
+	
+	})
 </body>
 </html>