Fix active menu entries

templates/base.html

@@ -51,8 +51,8 @@
             <ul class="navbar-nav navbar-right mr auto">
                 {% for title,url in MENUITEMS %}
                     {% if url is string %}
-                        <li class="nav-item{% if output_file == url %}active{% endif %}">
-                            <a class="nav-link" href="{{ genurl( url ) }}" >{{ title }}</a>
+                        <li class="nav-item {% if output_file ==  url %}active{% endif %}">
+                            <a class="nav-link" href="/{{ genurl( url ) }}" >{{ title }}</a>
                         </li>
                     {% elif url is iterable %}
                         <li class="nav-item dropdown
@@ -65,7 +65,7 @@
                             <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">{{- title }}</a>
                             <div class="dropdown-menu" aria-labelledby="navbarDropdown">
                                 {% for title,item_url in url %}
-                                    <a class="dropdown-item {% if item_url == output_url %}active{% endif %}" href="{{ genurl( item_url ) }}">{{ title }}</a>
+                                    <a class="dropdown-item {% if item_url == output_file %}active{% endif %}" href="/{{ genurl( item_url ) }}">{{ title }}</a>
                                 {% endfor %}
                             </div>
                         </li>

templates/page_default.html

 {% extends "base.html" %}
 
-{% block title %}{{ SITENAME }} - {{ page.title|striptags }}{%endblock%}
-
 {% block head %}
 {{ super() }}
         <link rel='stylesheet' type='text/css' href="/theme/css/page.css" />