summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/ajax.js5
-rw-r--r--app/views/layouts/application.html.erb4
-rw-r--r--app/views/tournaments/index.html.erb2
-rw-r--r--app/views/tournaments/new.html.erb2
4 files changed, 8 insertions, 5 deletions
diff --git a/app/assets/javascripts/ajax.js b/app/assets/javascripts/ajax.js
index 2b2bb3e..475dddc 100644
--- a/app/assets/javascripts/ajax.js
+++ b/app/assets/javascripts/ajax.js
@@ -3,9 +3,10 @@ function populate() {
//make a form element
var e = document.getElementById("tournament_id");
var gameType = e.options[e.selectedIndex].text;
- if (gameType != "") {
+ if (gameType != "Select a Game Type") {
+ alert(gameType + " was Selected!");
//populate optionArray
-
+ //select * from tournament_settings where gametype = GameType
for(var option in optionArray){
//identify the number of
;
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 67848f6..b36c0c5 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -23,7 +23,9 @@
<li> <%= current_user.user_name.upcase %> </li>
<% end %>
<li>
- <%= link_to "Sign out", signout_path, method: "delete" %>
+ <%= if signed_in? do %>
+ <%= link_to "Sign out", signout_path, method: "delete" %>
+ <% end; end %>
</li>
</header>
</div>
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb
index 73b064e..6006cad 100644
--- a/app/views/tournaments/index.html.erb
+++ b/app/views/tournaments/index.html.erb
@@ -24,4 +24,4 @@
<br>
-<%= link_to 'New Tournament', new_tournament_path %>
+<%= link_to 'New Tournament', new_tournament_path, :class => "btn btn-warning btn-lg" %>
diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb
index de80fb7..dee18fb 100644
--- a/app/views/tournaments/new.html.erb
+++ b/app/views/tournaments/new.html.erb
@@ -7,6 +7,6 @@
</div>
<br /><br />
<p id=jumbo-buttons>
-<%= link_to 'Create Tournament', "create", :class => "btn btn-warning btn-lg", :role => "submit" %>
+<%= link_to 'Create Tournament', "#", :class => "btn btn-warning btn-lg" %>
<%= link_to 'Back', tournaments_path %>