Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 1 commit
  • 7 files changed
  • 0 commit comments
  • 1 contributor
Commits on Apr 08, 2012
@aaronpk aaronpk Make the admin forms a little nicer looking, added some explanatory t…
…ext and clarified some buttons.
988462e
View
7 views/admin/games/_address.erb
@@ -1,5 +1,6 @@
<form id="address_form" onsubmit="GameMap.goToAddress($('#google_maps_address').val()); $('#game_address').val($('#google_maps_address').val()); return false;">
-Address (not required: used to find a location quickly):
-<br><input id="google_maps_address" value="<%= h @game.address %>">
-<input type="submit" value="Find">
+<h3>Choose your City</h3>
+Address or City (not required, used to quickly center the map)
+<br><input id="google_maps_address" value="<%= h @game.address %>" type="text">
+<input type="submit" value="Find" class="btn">
</form>
View
11 views/admin/games/_form.erb
@@ -37,13 +37,14 @@
</script>
-Name of the Game:
-<br>
-<input name="game[name]" type="text" value="<%= h @game.name %>">
-<br>
+<h3>Name of the Game</h3>
+<p><input name="game[name]" type="text" value="<%= h @game.name %>"></p>
+
<br>
-Where is it (go to where you want the game to be centered, and zoom to the zoom level you want):
<br>
+<h3>Where is it?</h3>
+<p>Move the map to where you want the game to be centered, and zoom to the zoom level you want. This will set the initial position of the game board when viewing the game.</p>
+
<div id="map_canvas" style="width:50%; height:50%"></div>
<input id="latitude" name="game[latitude]" type="hidden" value="<%= h @game.latitude %>">
View
5 views/admin/games/index.erb
@@ -18,6 +18,7 @@
<th>Status</th>
<th>Players</th>
<th>Points</th>
+ <th colspan="5">&nbsp;</th>
</tr>
<% @games.each do |game| %>
<tr>
@@ -28,7 +29,7 @@
<td><%= h game.players.count %></td>
<td><%= h game.total_points %></td>
<td><a href="/admin/games/<%= game.id %>/edit">Setup</a></td>
- <td><a href="/admin/games/<%= game.id %>/mapeditor">Edit Points</a></td>
+ <td><a href="/admin/games/<%= game.id %>/mapeditor">Edit Game</a></td>
<td>&nbsp;&nbsp;&nbsp;<a href="/admin/games/<%= game.id %>/end_game" onclick="<%= onclick_put 'This will END THE GAME. Are you sure?' %>">End Game</a></td>
<td>&nbsp;&nbsp;&nbsp;<a href="/admin/games/<%= game.id %>/reset" onclick="<%= onclick_put 'This will RESET ALL THE POINTS for this game. Are you -really- sure?' %>">Reset Points</a></td>
<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<a href="/admin/games/<%= game.id %>" onclick="<%= onclick_delete %>">Delete</a></td>
@@ -38,4 +39,4 @@
<% end %>
<br><br>
-<a href="/admin/games/new">Create New Game</a>
+<a href="/admin/games/new" class="btn">Create New Game</a>
View
16 views/admin/games/mapeditor.erb
@@ -481,22 +481,24 @@ $(function(){
});
</script>
+<link rel="stylesheet" href="http://twitter.github.com/bootstrap/1.3.0/bootstrap.min.css">
</head>
<body>
<div id="lineToolbar">
<div style="padding: 3px;">
- <input type="button" value="New Line" id="newLine" />
- <input type="button" value="Cancel Line" id="editingCancel" disabled="disabled" />
- <input type="button" value="Close" onclick="window.location = '/admin/games';"/>
+ <input type="button" value="New Line" id="newLine" class="btn" />
+ <input type="button" value="Cancel Line" id="editingCancel" disabled="disabled" class="btn" />
+ <input type="button" value="Done" onclick="window.location = '/admin/games';" class="btn" />
+ <p>Right-click anywhere to place a point, or use the above tools.</p>
</div>
</div>
<div style="display: none;" id="pointToolbar"><div style="width: 180px; padding-top: 10px;">
<div style="float: right;">
- <input type="button" class="editPointDelete" style="font-size: 9pt;" value="Delete" />
+ <input type="button" class="editPointDelete btn" style="font-size: 9pt;" value="Delete" />
</div>
<div class="coin coin-10 selected" id="coin-10"></div>
@@ -504,11 +506,11 @@ $(function(){
<div class="coin coin-30" id="coin-30"></div>
<div class="coin coin-50" id="coin-50"></div>
- <div><br><br>
+<!-- <div><br><br>
<small>Coin text (optional):</small><input type="text" class="coin_text" value="" style="width: 120px;" maxlength="140" />
- <input type="button" class="editPointSave" style="font-size: 9pt; display: none;" value="Save" />
+ <input type="button" class="editPointSave btn" style="font-size: 9pt; display: none;" value="Save" />
</div>
-
+ -->
</div></div>
<div id="map" style="width: 100%; height: 600px;"></div>
View
4 views/admin/games/new.erb
@@ -3,6 +3,6 @@
<%= partial :'admin/games/_address' %>
<form action="/admin/games" method="POST">
- <%= partial :'admin/games/_form' %>
- <input value="Create" type="submit">
+ <p><%= partial :'admin/games/_form' %></p>
+ <p><input value="Create" type="submit" class="btn"></p>
</form>
View
4 views/admin/layout.erb
@@ -9,6 +9,8 @@
<link rel="stylesheet" href="http://twitter.github.com/bootstrap/1.3.0/bootstrap.min.css">
</head>
<body>
- <%= yield %>
+ <div class="container">
+ <%= yield %>
+ </div>
</body>
</html>
View
4 views/index.erb
@@ -60,10 +60,10 @@
<footer>
<p class="right">MapAttack is a real-time location-based GPS game powered by the <a href="http://geoloqi.com">Geoloqi</a> platform. <a href="http://geoloqi.com" style="float: right; margin-top: 3px; margin-left: 3px;"><img src="/img/loqi-16px.png" width="16" height="16" /></a></p>
- <p class="left">Credits: <a href="http://aaronparecki.com">Aaron Parecki</a> // <a href="http://caseorganic.com">Amber Case</a> // <a href="http://kyledrake.net">Kyle Drake</a> // <a href="http://patrickarlt.com/">Patrick Arlt</a> // <a href="http://brianledger.com/">Brian Ledger</a></p>
+ <p class="left">Credits: <a href="http://aaronparecki.com">Aaron Parecki</a> // <a href="http://caseorganic.com">Amber Case</a> // <a href="http://kyledrake.net">Kyle Drake</a> // <a href="http://patrickarlt.com/">Patrick Arlt</a></p>
</footer>
- </div> <!-- wrapper -->
+ </div> <!-- wrapper -->
<input type="hidden" id="layer_id" value="<%= @game.layer_id %>" />
<input type="hidden" id="user_id" value="<%= @user_id %>" />
<input type="hidden" id="user_team" value="<%= @user_team %>" />

No commit comments for this range

Something went wrong with that request. Please try again.