Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' into player-cap

  • Loading branch information...
commit a3cda575aa14eb870b249ec47e1fa878f577aea3 2 parents c49c995 + bba423d
@rhussmann rhussmann authored
View
10 public/gameboard.html
@@ -28,7 +28,7 @@
<h2>The Classic Titanic Rock &#8217;Em Sock &#8217;Em Ship Battle Game</h2>
</header>
- <div id="gameboard_content"><!-- gitx blows -->
+ <div id="gameboard_content">
<article>
<section class="mod">
@@ -74,12 +74,16 @@
<div id="gameboard_frame">
<section class="mod targetboard">
<h3>May Your Aim Be True</h3>
- <div class="gameboard mod" id="target_board"></div>
+ <div class="mod">
+ <div class="gameboard" id="target_board"></div>
+ </div>
</section>
<section class="mod myboard">
<h3>Pray For Your Fleet</h3>
- <div class="gameboard mod" id="my_board"></div>
+ <div class="mod">
+ <div class="gameboard" id="my_board"></div>
+ </div>
</section>
</div>
View
2  public/index.html
@@ -20,7 +20,7 @@
<a href="#" onClick="APPVIEW.next_page();return false;"><img src="images/main-screen.png" alt="Man the GUNS! Your crew needs you!"></a>
</section>
<section class="buttons">
- <button class="large">Rules</button>
+ <!--<button class="large">Rules</button> No rules brother. -->
<button class="large orangellow" onClick="APPVIEW.next_page();">Play Now!</button>
</section>
<section class="mod about">
View
4 public/js/socket.js
@@ -37,7 +37,7 @@
destroyed : function(message) {
var msg = message.msg;
console.log(msg);
- // TODO: send user to results page : FAILURE
+ global.APPVIEW.next_page();
},
// not implemented
gravatar : function(message) {
@@ -78,7 +78,7 @@
win : function(message) {
var msg = message.msg;
console.log(msg);
- // TODO: send user to results page : WINNER WINNER CHICKEN DINNER
+ global.APPVIEW.next_page();
},
yourturn : function(message) {
var msg = message.msg || "";
View
2  public/login.html
@@ -34,8 +34,10 @@
<label for="uname">Username</label>
<input type="text" id="uname">
+ <!-- :( ran out of time for Gravatarity
<label for="gravatar">Email Address (for Gravatar)</label>
<input type="text" id="gravatar">
+ -->
<!-- Don't need no stinkin' passwords
<label for="pword">Password</label>
View
2  public/results.html
@@ -32,7 +32,7 @@
<h4>Teleject</h4>
<p>Joe Example</p>
- </section><!-- gitx blows -->
+ </section>
<section class="mod results_content">
<h3>Results</h3>
Please sign in to comment.
Something went wrong with that request. Please try again.