Merge branch 'master' of github.com:ZeusWPI/Tab

This commit is contained in:
Ilion Beyst 2015-09-09 17:55:22 +02:00
commit 160e68b1a5

View file

@ -7,14 +7,17 @@
= javascript_include_tag 'application', 'data-turbolinks-track' => true = javascript_include_tag 'application', 'data-turbolinks-track' => true
= csrf_meta_tags = csrf_meta_tags
%body %body
.pure-menu.pure-menu-horizontal .pure-g
%ul.pure-menu-list .pure-u-1
- if current_user .pure-menu.pure-menu-horizontal
%li.pure-menu-item %ul.pure-menu-list
= link_to current_user.name.capitalize, current_user, class: "pure-menu-link" - if current_user
%li.pure-menu-item %li.pure-menu-item
= link_to "New Transaction", new_transaction_path, class: "pure-menu-link" = link_to current_user.name.capitalize, current_user, class: "pure-menu-link"
- else %li.pure-menu-item
= link_to "Sign in", user_omniauth_authorize_path(:zeuswpi), class: "pure-menu-link" unless current_user = link_to "New Transaction", new_transaction_path, class: "pure-menu-link"
= render 'partials/flash' - else
= yield = link_to "Sign in", user_omniauth_authorize_path(:zeuswpi), class: "pure-menu-link" unless current_user
.pure-u-1
= render 'partials/flash'
= yield