From deb8ccf47d3d085c2a19ebbc06d3e08459189a5d Mon Sep 17 00:00:00 2001
From: Thomas Blazek <tblazek@nt.tuwien.ac.at>
Date: Tue, 27 Jan 2015 10:58:45 +0100
Subject: [PATCH] started working on menu

---
 app/assets/javascripts/application.js       |  3 +--
 app/assets/stylesheets/application.css.scss |  3 ++-
 app/views/layouts/menu.html.erb             | 17 +++++++++++++----
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 7dbcce6..205d208 100755
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -18,7 +18,6 @@
 // require jquery.ui.gallery
 // require jquery.sortable
 // require jquery-ui
-//= require_tree .
 //= require tinymce-jquery
 //= require bootstrap
 //= require bootstrap/colorpicker
@@ -26,7 +25,7 @@
 //= require jquery-fileupload
 // require jquery.remotipart
 //= require jquery.datetimepicker
-
+//= require_tree .
 
 function insertAttachment(url,name) {
     var ext = url.split('.').pop().toLowerCase();
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 34fa42c..c588fef 100755
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -145,4 +145,5 @@ min-width:100%;
 background:44F;
 }
 
-@import 'galleries';
\ No newline at end of file
+@import 'galleries';
+
diff --git a/app/views/layouts/menu.html.erb b/app/views/layouts/menu.html.erb
index 68455b1..5f3640b 100644
--- a/app/views/layouts/menu.html.erb
+++ b/app/views/layouts/menu.html.erb
@@ -27,14 +27,22 @@
 	  </li><% end %>
 	</ul>
 	<ul class="nav nav-pills nav-stacked pull-right">
-	<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>
-	<ul class="dropdown-menu">	 
+	<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">
+	      <%= 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/gb.png") + " English" ,switch_locale_url(:en)%> </li>
 	
-	</ul>
+	</ul></div>
 	</li>
 	<%= render 'layouts/login' %>
 </ul>
@@ -51,3 +59,4 @@
     </div>
   </div>
 </div>
+