summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-03-03 13:55:25 -0500
committerDavisLWebb <davislwebb@ymail.com>2014-03-03 13:55:25 -0500
commit26964a54fffb5501ba505c229361ae6a100ed099 (patch)
treebbd7446185c46e8706150fe17ef48c9c8be08a03 /app/views
parent3425bfd0f56495b7d8d9f86ac740fcf90f0fbfdb (diff)
parent8c0cd2f7c5d3152c1674cd730d649a787a8eb67c (diff)
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views')
-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
3 files changed, 5 insertions, 3 deletions
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 %>