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

started working on menu

Browse Source
This commit is contained in:
Thomas Blazek
2015-01-27 10:58:45 +01:00
parent 6f52496a7a
commit deb8ccf47d
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/application.js
View File

@@ -18,7 +18,6 @@
// require jquery.ui.gallery // require jquery.ui.gallery
// require jquery.sortable // require jquery.sortable
// require jquery-ui // require jquery-ui
//= require_tree .
//= require tinymce-jquery //= require tinymce-jquery
//= require bootstrap //= require bootstrap
//= require bootstrap/colorpicker //= require bootstrap/colorpicker
@@ -26,7 +25,7 @@
//= require jquery-fileupload //= require jquery-fileupload
// require jquery.remotipart // require jquery.remotipart
//= require jquery.datetimepicker //= require jquery.datetimepicker
//= require_tree .
function insertAttachment(url,name) { function insertAttachment(url,name) {
var ext = url.split('.').pop().toLowerCase(); var ext = url.split('.').pop().toLowerCase();

1
app/assets/stylesheets/application.css.scss
View File

@@ -146,3 +146,4 @@ background:44F;
} }
@import 'galleries'; @import 'galleries';

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

@@ -27,14 +27,22 @@
</li><% end %> </li><% end %>
</ul> </ul>
<ul class="nav nav-pills nav-stacked pull-right"> <ul class="nav nav-pills nav-stacked pull-right">
<li class="dropdown"> <li>
<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" data-hover="dropdown" > <%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%><b class="caret"></b></a>-->
<ul class="dropdown-menu"> <!-- Split button -->
<div class="btn-group navbar-btn">
<button type="button" class="btn btn-link dropdown-toggle" data-hover="dropdown" aria-expanded="false">
<%= image_tag("/flaggen/png/"+I18n.locale.to_s+".png") + " " +I18n.t('sprache',:scope=>'home')%>
</button>
<button type="button" class="btn btn-link dropdown-toggle" data-hover="dropdown" data-toggle="dropdown" >
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
<li><%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%> </li> <li><%= link_to image_tag("/flaggen/png/at.png") + " Deutsch" ,switch_locale_url(:de)%> </li>
<li><%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> </li> <li><%= link_to image_tag("/flaggen/png/gb.png") + " English" ,switch_locale_url(:en)%> </li>
</ul> </ul></div>
</li> </li>
<%= render 'layouts/login' %> <%= render 'layouts/login' %>
</ul> </ul>
@@ -51,3 +59,4 @@
</div> </div>
</div> </div>
</div> </div>