diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-07-29 21:54:57 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-07-29 21:54:57 +0200 |
commit | 83d6043ba3fb3eb25f489f5a10db7778055ae617 (patch) | |
tree | 855c818d3ca9f00d03516f8cfb8b11f9f0ee447a /common | |
parent | e773fff8a353488d54b394f6926721ccd8f6ae18 (diff) | |
parent | bdc1672325bcd3649c02f9936d2681230a389b7c (diff) | |
download | www-83d6043ba3fb3eb25f489f5a10db7778055ae617.tar.gz www-83d6043ba3fb3eb25f489f5a10db7778055ae617.tar.bz2 www-83d6043ba3fb3eb25f489f5a10db7778055ae617.zip |
resolving merge conflicts
Diffstat (limited to 'common')
-rw-r--r-- | common/navigation.j2.inc | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/common/navigation.j2.inc b/common/navigation.j2.inc index fb1a08dc..8678b25a 100644 --- a/common/navigation.j2.inc +++ b/common/navigation.j2.inc @@ -2,42 +2,42 @@ <div class="container-fluid"> <ul class="nav navbar-nav"> <li class="{{ 'active' if filename == 'index.html' else '' }}"><a class="taler_home" href="index.html">Taler</a></li> - <li class="{{ 'active' if filename == 'citizens.html' else '' }}"><a href="citizens.html">{{ _("Citizens") }}</a></li> - <li class="{{ 'active' if filename == 'merchants.html' else '' }}"><a href="merchants.html">{{ _("Merchants") }}</a></li> + <li class="{{ 'active' if filename == 'citizens.html' else '' }}"><a href="citizens.html">{{ _("Citizens") }} </a></li> + <li class="{{ 'active' if filename == 'merchants.html' else '' }}"><a href="merchants.html">{{ _("Merchants") }} </a></li> <li class="{{ 'active' if filename == 'governments.html' else '' }}"><a href="governments.html">{{ _("Governments") }}</a></li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">{{ _("Resources") }} <span class="caret"></span></a> <ul class="dropdown-menu"> - <li><a href="architecture.html">{{ _("System Architecture") }} </a></li> + <li><a href="architecture.html">{{ _("System Architecture") }}</a></li> <li><a href="faq.html">{{ _("FAQ") }}</a></li> <li><a href="glossary.html">{{ _("Glossary") }}</a></li> - <li><a href="developers.html">{{ _("Developer Introduction") }}</a></li> - <li><a href="copyright.html">{{ _("Copyright for Contributors") }}</a></li> + <li><a href="developers.html">{{ _("Developer Introduction") }} </a></li> + <li><a href="copyright.html">{{ _("Copyright for Contributors") }} </a></li> <li><a href="bibliography.html">{{ _("Bibliography") }}</a></li> </ul> </li> </ul> - <ul class="nav navbar-right navbar-form"> + <ul class="nav navbar-right"> <li> <button class="btn btn-dark dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> - <img src="{{ url('images/'+lang+'.png') }}" alt="{{lang}}" /> + <img src="{{ url('images/languageicon.svg') }}" height="35" alt="[{{lang}}]" /> {{ lang_full }} [{{ lang }}] <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> + <a href="{{ self_localized('en') }}">English [en]</a> </li> <li> - <a href="{{ self_localized('de') }}"><img src="{{ url('images/de.png') }}" height="15" width="25" alt="Deutsch">Deutsch</a> + <a href="{{ self_localized('de') }}">Deutsch [de]</a> </li> <li> - <a href="{{ self_localized('fr') }}"><img src="{{ url('images/fr.png') }}" height="15" width="22" alt="Français">Français</a> + <a href="{{ self_localized('fr') }}">Français [fr]</a> </li> <li> - <a href="{{ self_localized('it') }}"><img src="{{ url('images/it.png') }}" height="15" width="22" alt="Italiano">Italiano</a> + <a href="{{ self_localized('it') }}">Italiano [it]</a> </li> <li> - <a href="{{ self_localized('es') }}"><img src="{{ url('images/es.png') }}" height="15" width="23" alt="Español">Español</a> + <a href="{{ self_localized('es') }}">Español [es]</a> </li> </ul> </li> |