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

reverse bootstrap upgrade

Browse Source
This commit is contained in:
Andreas Stephanides
2019-05-13 20:29:53 +02:00
parent 5fd5ab51f8
commit 38e26de48c
15 changed files with 238 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,9 +1,14 @@
<div class="navbar navbar-expand-lg navbar-light">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
<span class="navbar-toggler-icon"></span>
<div class="navbar-collapse collapse">
<ul class="navbar-nav mr-auto nav-pills nav-stacked">
<div class="navbar">
<div class="navbar-inner">
<div class="container">
<!-- <a class="brand" href="#"><% t 'home.mtitle'%></a>-->
<a class ="btn btn-navbar" data-toggle="collapse" data-parent="#menudiv" data-target=".nav-collapse">
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
<div class="nav-collapse collapse">
<ul class="nav nav-pills nav-stacked">
<li><%= link_to I18n.t(:home,:scope=>'home' ), home_index_path %>
</li>
<li><%= link_to I18n.t(:news,:scope=>'home' ),rubriken_path %></li>
@@ -23,7 +28,7 @@
</ul>
<ul class="nav nav-pills nav-stacked pull-right">
<li>
<!--<a href="#" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" > <%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%><b class="caret"></b></a>-->
<!-- Split button -->
<div class="btn-group navbar-btn">
<button type="button" class="btn btn-link dropdown-toggle" data-hover="dropdown" aria-expanded="false">
@@ -38,20 +43,9 @@
<li><%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> </li>
</ul></div>
</li>
<li>
<% if not user_signed_in? %>
<% if Rails.env.development? %>
<%# link_to I18n.t('home.login'), user_developer_omniauth_authorize_path %>
<%= render 'layouts/login' %>
<% else %>
<%= link_to ffi1_icon("academic") + I18n.t('home.login'), user_ldap_omniauth_authorize_path(:ldap) %>
<% end %>
<% else %>
<%= render 'layouts/login' %>
<% end %>
</li><li>
<%# link_to ffi1_icon("academic") + I18n.t('home.login'), user_omniauth_authorize_path(:ldap) %>
<%# render 'layouts/login' %>
</li></ul>
<!--<span class="pull-right"><%if I18n.locale == :en %>
@@ -61,7 +55,9 @@
<%end %>
</span>-->
</div>
</div>
</div>
</div>