andis/fetsite
1
0
Fork 0
forked from bofh/fetsite
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into prep_upgrade

Browse Source
This commit is contained in:
Andreas Stephanides
2019-01-05 16:20:37 +01:00
parent ff20774889 52ffe0c701
commit 67bfa0f699
6 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/devise/sessions/new.html.erb
View File

@@ -24,6 +24,4 @@
<div><%= f.submit "Sign in" %></div>
<% end %>
<%= render "devise/shared/links" %>

17
app/views/layouts/menu.html.erb
View File

@@ -43,9 +43,20 @@
<li><%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> </li>
</ul></div>
</li><li>
<%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
<%# render 'layouts/login' %>
</li>
<li>
<% if not user_signed_in? %>
<% if Rails.env.development? %>
<%# link_to I18n.t('home.login'), user_omniauth_authorize_path(:developer) %>
<%= render 'layouts/login' %>
<% else %>
<%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
<% end %>
<% else %>
<%= render 'layouts/login' %>
<% end %>
</li></ul>
<!--<span class="pull-right"><%if I18n.locale == :en %>