[GNUnet-SVN] [taler-www] branch master updated: fix ugly language bar

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository www.

The following commit(s) were added to refs/heads/master by this push:
     new cbed8db  fix ugly language bar
cbed8db is described below

commit cbed8db6dceafe1838d33b710bfc288c2bd9b85d
Author: Florian Dold <address@hidden>
AuthorDate: Tue Feb 14 23:31:06 2017 +0100

    fix ugly language bar
---
 common/navigation.j2.inc | 34 +++++++++++++++++++++++++---------
 web-common               |  2 +-
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc
index ab513e4..a1bda4b 100644
--- a/common/navigation.j2.inc
+++ b/common/navigation.j2.inc
@@ -17,15 +17,31 @@
             <li class="m_investors"><a href="{{ 
url_localized('investors.html') }}">{{ _("Investors") }}</a></li>
             <li class="m_developers"><a href="{{ 
url_localized('developers.html') }}">{{ _("Developers") }}</a></li>
             <li class="m_about"><a href="{{ url_localized('about.html') }}">{{ 
_("About&nbsp;us") }}</a></li>
+            <li>
+              <div class="dropdown">
+                <button class="btn btn-default dropdown-toggle" type="button" 
id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" 
aria-expanded="true">
+                  <img src="{{ url('images/'+lang+'.png') }}"/></img>
+                  <span class="caret"></span>
+                </button>
+                <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                  <li>
+                   <a href="{{ self_localized('en') }}"><img src="{{ 
url('images/gb.png') }}" height="15" width="23" alt="English">English</a>
+                  </li>
+                  <li>
+                   <a href="{{ self_localized('de') }}"><img src="{{ 
url('images/de.png') }}" height="15" width="25" alt="Deutsch">Deutsch</a>
+                  </li>
+                  <li>
+                   <a href="{{ self_localized('fr') }}"><img src="{{ 
url('images/fr.png') }}" height="15" width="22" alt="Français">Français</a>
+                  </li>
+                  <li>
+                   <a href="{{ self_localized('it') }}"><img src="{{ 
url('images/it.png') }}" height="15" width="22" alt="Italiano">Italiano</a>
+                  </li>
+                  <li>
+                   <a href="{{ self_localized('es') }}"><img src="{{ 
url('images/es.png') }}" height="15" width="23" alt="Español">Español</a>
+                  </li>
+                </ul>
+              </div>
+            </li>
           </ul>
         </div>
       </div>
-       <div class="navbar navbar-default navbar-fixed-bottom" 
role="navigation">
-         <div class="container lang-slector">
-           <a href="{{ self_localized('en') }}"><img src="{{ 
url('images/gb.png') }}" height="15" width="23" alt="English"></a>
-           <a href="{{ self_localized('de') }}"><img src="{{ 
url('images/de.png') }}" height="15" width="25" alt="Deutsch"></a>
-           <a href="{{ self_localized('fr') }}"><img src="{{ 
url('images/fr.png') }}" height="15" width="22" alt="Français"></a>
-           <a href="{{ self_localized('it') }}"><img src="{{ 
url('images/it.png') }}" height="15" width="22" alt="Italiano"></a>
-           <a href="{{ self_localized('es') }}"><img src="{{ 
url('images/es.png') }}" height="15" width="23" alt="Español"></a>
-         </div>
-       </div>
diff --git a/web-common b/web-common
index 80f1e27..dc9d5ab 160000
--- a/web-common
+++ b/web-common
@@ -1 +1 @@
-Subproject commit 80f1e2708dbe4b19349244b611a6167b4b7a98c9
+Subproject commit dc9d5ab2308fef7cdd1e8c95fbf4fdd51bed7bfb

-- 
To stop receiving notification emails like this one, please contact
address@hidden