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,6 +7,8 @@
= 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-g
.pure-u-1
.pure-menu.pure-menu-horizontal .pure-menu.pure-menu-horizontal
%ul.pure-menu-list %ul.pure-menu-list
- if current_user - if current_user
@ -16,5 +18,6 @@
= link_to "New Transaction", new_transaction_path, class: "pure-menu-link" = link_to "New Transaction", new_transaction_path, class: "pure-menu-link"
- else - else
= link_to "Sign in", user_omniauth_authorize_path(:zeuswpi), class: "pure-menu-link" unless current_user = link_to "Sign in", user_omniauth_authorize_path(:zeuswpi), class: "pure-menu-link" unless current_user
.pure-u-1
= render 'partials/flash' = render 'partials/flash'
= yield = yield