consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes conflicts

Browse Source
This commit is contained in:
Alberto Garcia Cabeza
2015-08-08 13:28:29 +02:00
parent fdfef95595 90a3dcdc16
commit c048f25941
38 changed files with 562 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/views/devise/menu/_login_items.html.erb
View File

@@ -1,14 +1,17 @@
<ul class="right">
<% if user_signed_in? %>
<li>
<%= link_to(t("devise_views.menu.login_items.logout"), destroy_user_session_path, method: :delete) %>
</li>
<% else %>
<li>
<%= link_to(t("devise_views.menu.login_items.login"), new_user_session_path) %>
</li>
<li class="active">
<%= link_to(t("devise_views.menu.login_items.signup"), new_user_registration_path) %>
</li>
<% end %>
<% if user_signed_in? %>
<li>
<%= link_to(t("layouts.header.my_account_link"), account_path) %>
</li>
<li>
<%= link_to(t("devise_views.menu.login_items.logout"), destroy_user_session_path, method: :delete) %>
</li>
<% else %>
<li>
<%= link_to(t("devise_views.menu.login_items.login"), new_user_session_path) %>
</li>
<li>
<%= link_to(t("devise_views.menu.login_items.signup"), new_user_registration_path, class: "button radius small") %>
</li>
<% end %>
</ul>