Merge branch 'master' of github.com:fetsite/fetsite

This commit is contained in:
Andreas Stephanides
2015-01-14 09:08:05 +01:00

View File

@@ -25,7 +25,8 @@
<li> <li>
<%= link_to 'Intern' , intern_home_index_path %> <%= link_to 'Intern' , intern_home_index_path %>
</li><% end %> </li><% end %>
</ul>
<ul class="nav nav-pills nav-stacked pull-right">
<li class="dropdown"> <li class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%><b class="caret"></b></a> <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%><b class="caret"></b></a>
<ul class="dropdown-menu"> <ul class="dropdown-menu">