Permalink
Browse files

Pushing front end files

  • Loading branch information...
1 parent e7b5e2d commit ba8bdde6134b6847807f48ac8db4cdf63157fc0c @omjolie omjolie committed May 12, 2012
Showing with 30 additions and 20 deletions.
  1. +12 −4 app/assets/stylesheets/rageriffic.css
  2. +17 −15 app/views/rounds/play.html.erb
  3. +1 −1 app/views/rounds/show.html.erb
@@ -32,15 +32,15 @@ h1 {
text-align: center;
}
-#title {
+.title {
padding-top: 50px;
}
-#title img{
+.title img{
height: 135px;
}
-#title, form, #maincontent, #camerainterface, #status {
+.title, form, #maincontent, #camerainterface, #status {
text-align: center;
margin: 20px;
}
@@ -164,11 +164,15 @@ input {
text-align: center;
}
-#rageface, #webcamcontainer object, #winnerfacecontainer {
+#rageface, #webcamcontainer object, #winnerfacecontainer, #userimage {
height: 90%;
width: 80%;
}
+#XwebcamXobjectX {
+ display: none;
+}
+
#ragefacecontainer {
background-image: url('ragefacebg.png');
@@ -186,3 +190,7 @@ input {
margin-left: auto;
margin-right: auto;
}
+
+.hidden {
+ display: none;
+}
@@ -2,28 +2,30 @@
<html>
<head>
<title>Rageriffic</title>
- <%= stylesheet_link_tag "rageriffic.css" %>
- <%= javascript_include_tag "javascripts/dynamic_content.js" %>
- <script type="text/javascript" src = "http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+ <%= stylesheet_link_tag "rageriffic.css" %>
+ <script type="text/javascript" src = "http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+ <%= javascript_include_tag "dynamic_content.js" %>
+ <%=javascript_include_tag "jquery.webcam.js" %>
+ <%=javascript_include_tag "test.js" %>
</head>
<body>
<div id = "contentcontainer">
- <div id="title"><%= image_tag "welcome.png" %></div>
+ <div id = "welcome" class="title"><%= image_tag "welcome.png" %></div>
+ <div id = "logo" class="title hidden"><%= image_tag "ragerifficlogo.png" %></div>
<div id="camerainterface">
- <div class="imagediv">
- <h1 class="h1words">waiting for others to join</h1>
- <h1 class="h1words">be vain for a little bit</h1>
- <div class = "usersize" id = "webcamcontainer">
- <object id="webcam-object" width="320" height="240" data="../../../public/jscam_canvas_only.swf" type="application/x-shockwave-flash">
- <param value="../../../public/jscam_canvas_only.swf" name="movie">
- <param value="mode=callback&quality=85" name="FlashVars">
- </object>
- </div>
- </div>
+ </div>
- <button id="startbutton" class = "button"></button>
+ <div class="imagediv">
+ <h1>waiting for others to join</h1>
+ <h1>be vain for a little bit</h1>
+ <div class = "usersize" id = "webcamcontainer">
+ <object id="webcam-object" width="320" height="240" data="../../../public/jscam_canvas_only.swf" type="application/x-shockwave-flash">
+ <param value="../../../public/jscam_canvas_only.swf" name="movie">
+ <param value="mode=callback&quality=85" name="FlashVars">
+ </object>
+ </div>
</div>
<div id="userscount"
@@ -8,7 +8,7 @@
<body>
<div id = "contentcontainer">
- <div id="title"><%= image_tag "welcome.png" %></div>
+ <div id="welcome" class = "title"><%= image_tag "welcome.png" %></div>
<div class="imagediv">
<h1 class="imagetitle">selected rage face</h1>

0 comments on commit ba8bdde

Please sign in to comment.