summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorguntasgrewal <guntasgrewal@gmail.com>2014-03-04 18:53:04 -0500
committerguntasgrewal <guntasgrewal@gmail.com>2014-03-04 18:53:04 -0500
commitaebb2153938d884ac2c2f3516f682c987b4805ca (patch)
tree369b54c3b1f495ee7f54d06691c00f9ff26e3df5 /app/views
parent66d5669dbcc042317ca5d10759276ea5813f7081 (diff)
parent4cdd4e361ad691d524f9ee6163b40ef78d9938c4 (diff)
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views')
-rw-r--r--app/views/common/_signout.html.erb5
-rw-r--r--app/views/layouts/application.html.erb9
2 files changed, 9 insertions, 5 deletions
diff --git a/app/views/common/_signout.html.erb b/app/views/common/_signout.html.erb
new file mode 100644
index 0000000..2bdda0c
--- /dev/null
+++ b/app/views/common/_signout.html.erb
@@ -0,0 +1,5 @@
+<%=
+form_tag(sessions_path+"/current", method: "delete") do
+ submit_tag("Sign out", :class => "signout")
+end
+%>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index cb4a3d6..75a9d4e 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -19,12 +19,11 @@
<div id="log-buttons">
<% if signed_in? %>
- <%= current_user.user_name.upcase %>
- <%= link_to "Sign out", "/signout", method: "delete", :class => "signout", :role => "button" %>
+ <%= link_to current_user.user_name, current_user, :class => "user" %>
+ <%= render "common/signout" %>
<% else %>
- <%= link_to "Log in", new_session_path, :class => "signin", :role => "button" %>
- <%= link_to "Sign up", new_user_path, :class => "signup", :role => "button"
- %>
+ <%= link_to "Log in", new_session_path, :class => "signin" %>
+ <%= link_to "Sign up", new_user_path, :class => "signup" %>
<% end %>
</div>
</nav></header>