Fix use of badge in navbar on firefox and add dropdown for language Refs #0026847

4 files changed, 31 insertions, 26 deletions

diff --git a/Gemfile b/Gemfile
index e801e72a2..9db471c8f 100644
--- a/Gemfile
+++ b/Gemfile
@@ -27,7 +27,7 @@ gem "map_layers", "0.0.4"
 gem "georuby-ext", "0.0.5"
 
 # User interface
-gem 'language_engine', '0.0.4'
+gem 'language_engine', '0.0.5'
 gem 'gravatar_image_tag'
 gem 'calendar_helper', "0.2.5"
 gem 'cocoon', "1.1.2"
diff --git a/Gemfile.lock b/Gemfile.lock
index d259795eb..e330c6a1f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -186,7 +186,7 @@ GEM
       jruby-rack (>= 1.1.1)
     json (1.8.1)
     json (1.8.1-java)
-    language_engine (0.0.4)
+    language_engine (0.0.5)
       rails (~> 3.2.18)
     launchy (2.3.0)
       addressable (~> 2.3)
@@ -392,7 +392,7 @@ DEPENDENCIES
   jruby-openssl
   jruby-rack-worker
   json
-  language_engine (= 0.0.4)
+  language_engine (= 0.0.5)
   launchy
   map_layers (= 0.0.4)
   modernizr-rails (~> 2.0.6)
diff --git a/app/assets/stylesheets/main/layout.css.scss b/app/assets/stylesheets/main/layout.css.scss
index 432491ce3..14b364985 100644
--- a/app/assets/stylesheets/main/layout.css.scss
+++ b/app/assets/stylesheets/main/layout.css.scss
@@ -47,22 +47,20 @@ ol.breadcrumb{
         }
     }
 
-    .language{
-        width: 40px;
-    }
-    
-    .language.selected
-    {
-        border-bottom: 1px solid white;
+    .dropdown.languages{
+        .dropdown-menu{ 
+            min-width: 56px;
+        }
     }
 
-    .dropdown-menu{
-        min-width: 230px;
-        
-        .badge{
-            background-color: #DADADA
+    .dropdown.datas{
+        .dropdown-menu{ 
+
+            .badge{
+                background-color: #DADADA
+            }
         }
-    } 
+    }   
 }
 
 #footer{
diff --git a/app/views/shared/_header.erb b/app/views/shared/_header.erb
index 0f14b797e..dc096f80b 100644
--- a/app/views/shared/_header.erb
+++ b/app/views/shared/_header.erb
@@ -31,38 +31,38 @@
             <% end %>
           </ul>
         </li>
-        <li class="dropdown">
+        <li class="dropdown datas">
           <a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= t("layouts.navbar.referential_datas") %><b class="caret"></b></a>
           <ul class="dropdown-menu">
             <li><%= link_to t("layouts.navbar.return_to_dashboard"), referential_path(@referential) %></li>
             <li class="divider"></li>
             <li role="presentation" class="dropdown-header"><%= t("layouts.navbar.select_referential_datas") %></li>
             <li><%= link_to referential_networks_path(@referential) do  %>
-              <%= Referential.human_attribute_name("networks") %><span class="badge pull-right"><%= @referential.networks.size %></span>
+              <span class="pull-left"><%= Referential.human_attribute_name("networks") %></span><span class="badge pull-right"><%= @referential.networks.size %></span>
               <% end %>
             </li>
             <li><%= link_to referential_companies_path(@referential) do  %>
-              <%= Referential.human_attribute_name("companies") %><span class="badge pull-right"><%= @referential.companies.size %></span>
+              <span class="pull-left"><%= Referential.human_attribute_name("companies") %></span><span class="badge pull-right"><%= @referential.companies.size %></span>
               <% end %>
             </li>
             <li><%= link_to referential_group_of_lines_path(@referential) do %>
-              <%= Referential.human_attribute_name("group_of_lines") %><span class="badge pull-right"><%= @referential.group_of_lines.size %></span>
+               <span class="pull-left"><%= Referential.human_attribute_name("group_of_lines") %></span><span class="badge pull-right"><%= @referential.group_of_lines.size %></span>
               <% end %>
             </li>
             <li><%= link_to referential_lines_path(@referential) do %>
-              <%= Referential.human_attribute_name("lines") %><span class="badge pull-right"><%= @referential.lines.size %></span>
+               <span class="pull-left"><%= Referential.human_attribute_name("lines") %></span><span class="badge pull-right"><%= @referential.lines.size %></span>
               <% end %>
             </li>
             <li><%= link_to referential_stop_areas_path(@referential) do %>
-              <%= Referential.human_attribute_name("stop_areas") %><span class="badge pull-right"><%= @referential.stop_areas.size %></span>
+               <span class="pull-left"><%= Referential.human_attribute_name("stop_areas") %></span><span class="badge pull-right"><%= @referential.stop_areas.size %></span>
               <% end %>
             </li>
             <li><%= link_to referential_connection_links_path(@referential) do %>
-              <%= Referential.human_attribute_name("connection_links") %><span class="badge pull-right"><%= @referential.connection_links.size %></span>
+               <span class="pull-left"><%= Referential.human_attribute_name("connection_links") %></span><span class="badge pull-right"><%= @referential.connection_links.size %></span>
               <% end %>
             </li>
             <li><%= link_to referential_time_tables_path(@referential) do %>
-              <%= Referential.human_attribute_name("time_tables") %><span class="badge pull-right"><%= @referential.time_tables.size %></span>
+               <span class="pull-left"><%= Referential.human_attribute_name("time_tables") %></span><span class="badge pull-right"><%= @referential.time_tables.size %></span>
               <% end %>
             </li>
           </ul>
@@ -73,8 +73,15 @@
         <% end %>
       </ul>
       <ul class="nav navbar-nav navbar-right">
-        <li class="<%= language_class('fr') %>"><%= link_to_language :fr %></li>
-        <li class="<%= language_class('en') %>"><%= link_to_language :en %></li>
+        <li class="dropdown languages">
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+            <%= image_tag("language_engine/#{selected_language}_flag.png") %><b class='caret'></b>
+          </a>
+          <ul class="dropdown-menu">
+            <li><%= link_to_language :fr %></li>
+            <li><%= link_to_language :en %></li>
+          </ul>
+        </li>        
         <li><%= link_to t('layouts.help'), help_path, :class =>("current" if help_page?), :target => "_blank" %></li>
         <% if user_signed_in?  %>
         <li class="dropdown">