Bootstap migration talk.ipfire.org

[people/shoehn/ipfire.org.git] / templates / modules / menu.html

diff --git a/templates/modules/menu.html b/templates/modules/menu.html
index 615996d8862992019d38b896e076d99a3834fbf0..32673be1240ba76232a6bad945eef2d237ad2905 100644 (file)
--- a/templates/modules/menu.html
+++ b/templates/modules/menu.html
@@ -71,20 +71,15 @@
                <li class="nav-item">
                        <a class="nav-link diagnosis" href="/diagnosis">{{ _("Diagnosis") }}</a>
                </li>
+       {% elif hostname == "planet.ipfire.org" %}
+               <form class="form-inline" role="search" method="GET" action="/search">
+                       <input type="text" class="form-control mx-2" name="q" placeholder="{{ _("Search") }}">
+                       <button type="submit" class="btn btn-default m-2"><span class="fa fa-search"></span></button>
+               </form>
+       
        {% end %}
 </ul>
 
-{% if hostname == "planet.ipfire.org" %}
-       <form class="navbar-form navbar-left" role="search" method="GET" action="/search">
-               <div class="form-group">
-                       <input type="text" class="form-control" name="q" placeholder="{{ _("Search") }}">
-               </div>
-               <button type="submit" class="btn btn-default">
-                       <span class="fa fa-search"></span>
-               </button>
-       </form>
-{% end %}
-
 {% if current_user %}
        <ul class="nav navbar-nav navbar-right">
                <li class="nav-item">
@@ -109,9 +104,8 @@
 {% elif not hostname in ("www.ipfire.org", "dev.ipfire.org")  %}
        <ul class="nav navbar-nav navbar-right">
                <li class="nav-item">
-               <a class="nav-link" href="http://www.ipfire.org">
-                       <i class="glyphicon glyphicon-home glyphicon-white"></i> &nbsp;
-                       www.ipfire.org
+               <a class="nav-link" href="//www.ipfire.org">
+                       <i class="fa fa-home" aria-hidden="true"></i> &nbsp; www.ipfire.org
                </a>
                </li>
        </ul>