From 8a060741d64cb0693b867c050faeb466c23e7b54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20Oudot?= <clement@oodo.net>
Date: Tue, 5 Jan 2016 13:12:32 +0000
Subject: [PATCH] Move languages and version in a dropdown menu (#820)

---
 lemonldap-ng-manager/site/static/languages/en.json |  1 +
 lemonldap-ng-manager/site/static/languages/fr.json |  1 +
 lemonldap-ng-manager/site/templates/menubar.tpl    | 12 ++++++++++--
 lemonldap-ng-manager/site/templates/scripts.tpl    |  4 ++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/lemonldap-ng-manager/site/static/languages/en.json b/lemonldap-ng-manager/site/static/languages/en.json
index a3022fcdf..5a1635b5d 100644
--- a/lemonldap-ng-manager/site/static/languages/en.json
+++ b/lemonldap-ng-manager/site/static/languages/en.json
@@ -226,6 +226,7 @@
   "keys": "Keys",
   "keyname": "Key name",
   "keyPassword": "Key password",
+  "languages": "Languages",
   "latest": "Latest",
   "ldap": "LDAP",
   "ldapAuthnLevel": "Authentication level",
diff --git a/lemonldap-ng-manager/site/static/languages/fr.json b/lemonldap-ng-manager/site/static/languages/fr.json
index 376bb2647..de18b5513 100644
--- a/lemonldap-ng-manager/site/static/languages/fr.json
+++ b/lemonldap-ng-manager/site/static/languages/fr.json
@@ -226,6 +226,7 @@
   "keys": "Clefs",
   "keyname": "Nom de clef",
   "keyPassword": "Mot de passe de la clef",
+  "languages": "Langues",
   "latest": "Dernière",
   "ldap": "LDAP",
   "ldapAuthnLevel": "Niveau d'authentification",
diff --git a/lemonldap-ng-manager/site/templates/menubar.tpl b/lemonldap-ng-manager/site/templates/menubar.tpl
index da74d4e62..69275659e 100644
--- a/lemonldap-ng-manager/site/templates/menubar.tpl
+++ b/lemonldap-ng-manager/site/templates/menubar.tpl
@@ -22,10 +22,18 @@
         </div>
         <ul class="hidden-xs nav navbar-nav">
           <li ng-repeat="link in links"><a href="{{link.target}}"><strong><i class="glyphicon glyphicon-link"></i> {{translate(link.title)}}</strong></a></li>
-          <li><a name="version">{{translate('version')}} : <TMPL_VAR NAME="VERSION"></a></li>
         </ul>
         <ul class="hidden-xs nav navbar-nav navbar-right">
-          <li ng-include="'languages.html'"/>
+          <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Menu <span class="caret"></span></a>
+            <ul class="dropdown-menu">
+              <li class="dropdown-header">{{translate('languages')}}</li>
+              <li ng-include="'languages.html'"/>
+              <li role="separator" class="divider"></li>
+              <li class="dropdown-header">{{translate('version')}}</li>
+              <li><a name="version"><TMPL_VAR NAME="VERSION"></a></li>
+            </ul>
+          </li>
         </ul>
       </div>
     </nav>
diff --git a/lemonldap-ng-manager/site/templates/scripts.tpl b/lemonldap-ng-manager/site/templates/scripts.tpl
index 4ee12b885..61f36ebd6 100644
--- a/lemonldap-ng-manager/site/templates/scripts.tpl
+++ b/lemonldap-ng-manager/site/templates/scripts.tpl
@@ -9,11 +9,11 @@
 
   <!-- Language choice -->
   <script type="text/ng-template" id="languages.html">
-    <span class="link navbar-brand">
+    <a name="languages" class="link">
       <span ng-repeat="lang in availableLanguages">
         <img ng-src="<TMPL_VAR NAME="STATIC_PREFIX">logos/{{lang}}.png" width="16px" height="11px" ng-click="getLanguage(lang)"/>
       </span>
-    </span>
+    </a>
   </script>