Merge navigation.html with layout.html

Variables set in the jinja2 templates are not passed if the template is
just included

flaskbb/themes/aurora/templates/forum/topic.html

@@ -86,7 +86,7 @@
                         </div>
                     </div>
 
-                    <div class="post-content clearfix" id="pid{{ post.id }}">
+                        <div class="post-content clearfix" id="pid{{ post.id }}">
                         {{ post.content|markup|safe }}
                         <!-- Signature Begin -->
                         {% if flaskbb_config["SIGNATURE_ENABLED"] and post.user_id and user.signature %}

flaskbb/themes/aurora/templates/layout.html

@@ -55,7 +55,98 @@
 
                 <!-- forum menu - contains all the navigation items -->
                 {% block navigation %}
-                    {% include theme('navigation.html') %}
+                <div class="navbar navbar-default forum-navigation" role="navigation">
+                    <!-- Brand and toggle get grouped for better mobile display -->
+                    <div class="navbar-header">
+                      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse" aria-expanded="false">
+                        <span class="sr-only">Toggle navigation</span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                        <span class="icon-bar"></span>
+                      </button>
+                    </div>
+
+                    <div class="collapse navbar-collapse">
+                        <!-- navbar left -->
+                        <ul class="nav navbar-nav forum-nav">
+                            {%- from theme("macros.html") import is_active, topnav with context -%}
+                            {{ emit_event("before-first-navigation-element") }}
+
+                            {{ topnav(endpoint='forum.index', name=_('Forum'), icon='fa fa-comment', active=active_forum_nav) }}
+                            {{ topnav(endpoint='forum.memberlist', name=_('Memberlist'), icon='fa fa-user') }}
+                            {{ topnav(endpoint='forum.search', name=_('Search'), icon='fa fa-search') }}
+
+                            {{ emit_event("after-last-navigation-element") }}
+                        </ul>
+
+                        <!-- navbar right -->
+                        <ul class="nav navbar-nav navbar-right">
+
+                            {% if current_user and current_user.is_authenticated() %}
+                            <!-- Inbox -->
+                            <li class="dropdown {{ is_active('message.inbox') }}">
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+                                    <span class="fa fa-envelope"></span> Inbox <span class="label label-info">{{ current_user.unread_count }}</span>
+                                </a>
+                                <ul class="dropdown-menu dropdown-messages">
+                                    {% for message in current_user.unread_messages %}
+                                    <li>
+                                        <a href="{{ url_for('message.view_conversation', conversation_id=message.id) }}">
+                                            <div>
+                                                <span class="author-name">{{ message.from_user.username }}</span> <span class="pull-right text-muted">{{ message.last_message.date_created|time_since }}</span>
+                                                <div class="message-subject">{{ message.subject }}</div>
+                                            </div>
+                                        </a>
+                                    </li>
+                                    {% else %}
+                                    <li><a href="#">No unread messages.</a></li>
+                                    {% endfor %}
+                                    <li class="divider"></li>
+                                    <li><a href="{{ url_for('message.inbox') }}"><span class="fa fa-envelope"></span> {% trans %}Inbox{% endtrans %}</a></li>
+                                    <li><a href="{{ url_for('message.new_conversation') }}"><span class="fa fa-pencil"></span> {% trans %}New Message{% endtrans %}</a></li>
+                                </ul>
+                            </li>
+
+                            <!-- User Menu -->
+                            <li>
+                                <div class="btn-group navbar-btn user-btn">
+                                    <a class="btn btn-primary" href="{{ url_for('user.profile', username=current_user.username) }}">
+                                        <span class="fa fa-user"></span> {{ current_user.username }}
+                                    </a>
+                                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
+                                    <ul class="dropdown-menu" role="menu">
+                                        <li><a href="{{ url_for('forum.topictracker') }}"><span class="fa fa-book"></span> {% trans %}Topic Tracker{% endtrans %}</a></li>
+                                        <li class="divider"></li>
+
+                                        <li><a href="{{ url_for('user.settings') }}"><span class="fa fa-cogs"></span> {% trans %}Settings{% endtrans %}</a></li>
+                                        {% if current_user|is_admin_or_moderator %}
+                                        <li><a href="{{ url_for('management.overview') }}"><span class="fa fa-cog"></span> {% trans %}Management{% endtrans %}</a></li>
+                                        <li class="divider"></li>
+                                        {% endif %}
+
+                                        <li><a href="{{ url_for('auth.logout') }}"><span class="fa fa-power-off"></span> {% trans %}Logout{% endtrans %}</a></li>
+                                    </ul>
+                                </div>
+                            </li>
+                            {% else %}
+                            <!-- Not logged in - Login/Register -->
+                            <li>
+                                <div class="btn-group navbar-btn user-btn">
+                                    <a class="btn btn-primary" href="{{ url_for('auth.login') }}">
+                                        <span class="fa fa-user"></span> {% trans %}Login{% endtrans %}
+                                    </a>
+                                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
+                                    <ul class="dropdown-menu" role="menu">
+                                        <li><a href="{{ url_for('auth.register') }}">{% trans %}Register{% endtrans %}</a></li>
+                                        <li><a href="{{ url_for('auth.forgot_password') }}">{% trans %}Reset Password{% endtrans %}</a></li>
+                                    </ul>
+                                </div>
+                            </li>
+                            {% endif %}
+
+                        </ul> <!-- end navbar right -->
+                    </div> <!-- end navbar-collapse -->
+                </div> <!-- end navbar -->
                 {% endblock %}
 
                 <!-- Place for all the (flashed) messages -->

flaskbb/themes/aurora/templates/navigation.html

@@ -1,92 +0,0 @@
-<div class="navbar navbar-default forum-navigation" role="navigation">
-    <!-- Brand and toggle get grouped for better mobile display -->
-    <div class="navbar-header">
-      <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse" aria-expanded="false">
-        <span class="sr-only">Toggle navigation</span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </button>
-    </div>
-
-    <div class="collapse navbar-collapse">
-        <!-- navbar left -->
-        <ul class="nav navbar-nav forum-nav">
-            {%- from theme("macros.html") import is_active, topnav with context -%}
-            {{ emit_event("before-first-navigation-element") }}
-
-            {{ topnav(endpoint='forum.index', name=_('Forum'), icon='fa fa-comment', active=active_forum_nav) }}
-            {{ topnav(endpoint='forum.memberlist', name=_('Memberlist'), icon='fa fa-user') }}
-            {{ topnav(endpoint='forum.search', name=_('Search'), icon='fa fa-search') }}
-
-            {{ emit_event("after-last-navigation-element") }}
-        </ul>
-
-        <!-- navbar right -->
-        <ul class="nav navbar-nav navbar-right">
-
-            {% if current_user and current_user.is_authenticated() %}
-            <!-- Inbox -->
-            <li class="dropdown {{ is_active('message.inbox') }}">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-                    <span class="fa fa-envelope"></span> Inbox <span class="label label-info">{{ current_user.unread_count }}</span>
-                </a>
-                <ul class="dropdown-menu dropdown-messages">
-                    {% for message in current_user.unread_messages %}
-                    <li>
-                        <a href="{{ url_for('message.view_conversation', conversation_id=message.id) }}">
-                            <div>
-                                <span class="author-name">{{ message.from_user.username }}</span> <span class="pull-right text-muted">{{ message.last_message.date_created|time_since }}</span>
-                                <div class="message-subject">{{ message.subject }}</div>
-                            </div>
-                        </a>
-                    </li>
-                    {% else %}
-                    <li><a href="#">No unread messages.</a></li>
-                    {% endfor %}
-                    <li class="divider"></li>
-                    <li><a href="{{ url_for('message.inbox') }}"><span class="fa fa-envelope"></span> {% trans %}Inbox{% endtrans %}</a></li>
-                    <li><a href="{{ url_for('message.new_conversation') }}"><span class="fa fa-pencil"></span> {% trans %}New Message{% endtrans %}</a></li>
-                </ul>
-            </li>
-
-            <!-- User Menu -->
-            <li>
-                <div class="btn-group navbar-btn user-btn">
-                    <a class="btn btn-primary" href="{{ url_for('user.profile', username=current_user.username) }}">
-                        <span class="fa fa-user"></span> {{ current_user.username }}
-                    </a>
-                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-                    <ul class="dropdown-menu" role="menu">
-                        <li><a href="{{ url_for('forum.topictracker') }}"><span class="fa fa-book"></span> {% trans %}Topic Tracker{% endtrans %}</a></li>
-                        <li class="divider"></li>
-
-                        <li><a href="{{ url_for('user.settings') }}"><span class="fa fa-cogs"></span> {% trans %}Settings{% endtrans %}</a></li>
-                        {% if current_user|is_admin_or_moderator %}
-                        <li><a href="{{ url_for('management.overview') }}"><span class="fa fa-cog"></span> {% trans %}Management{% endtrans %}</a></li>
-                        <li class="divider"></li>
-                        {% endif %}
-
-                        <li><a href="{{ url_for('auth.logout') }}"><span class="fa fa-power-off"></span> {% trans %}Logout{% endtrans %}</a></li>
-                    </ul>
-                </div>
-            </li>
-            {% else %}
-            <!-- Not logged in - Login/Register -->
-            <li>
-                <div class="btn-group navbar-btn user-btn">
-                    <a class="btn btn-primary" href="{{ url_for('auth.login') }}">
-                        <span class="fa fa-user"></span> {% trans %}Login{% endtrans %}
-                    </a>
-                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
-                    <ul class="dropdown-menu" role="menu">
-                        <li><a href="{{ url_for('auth.register') }}">{% trans %}Register{% endtrans %}</a></li>
-                        <li><a href="{{ url_for('auth.forgot_password') }}">{% trans %}Reset Password{% endtrans %}</a></li>
-                    </ul>
-                </div>
-            </li>
-            {% endif %}
-
-        </ul> <!-- end navbar right -->
-    </div> <!-- end navbar-collapse -->
-</div> <!-- end navbar -->