sh4nks 9 лет назад
Родитель
Сommit
6e9aa2a823

+ 12 - 66
flaskbb/static/css/flaskbb.css

@@ -1,34 +1,29 @@
 /* Sticky footer styles
 -------------------------------------------------- */
 html {
-  position: relative;
-  min-height: 100%;
+    position: relative;
+    min-height: 100%;
 }
 
 body {
-  /* Margin bottom by footer height */
-  margin-bottom: 60px;
-}
-
-.forum-moderation, .forum-selectall, .forum-select {
-
+    /* Margin bottom by footer height */
+    margin-bottom: 60px;
 }
 
-.footer {
-  position: absolute;
-  bottom: 0;
-  width: 100%;
-  /* Set the fixed height of the footer here */
-  height: 60px;
-  background-color: #f5f5f5;
+#footer {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    /* Set the fixed height of the footer here */
+    height: 60px;
 }
 
 .container .text-muted {
-  margin: 20px 0;
+    margin: 20px 0;
 }
 
 .pagination {
-  margin: 0;
+    margin: 0;
 }
 
 .pagination-text {
@@ -196,51 +191,6 @@ margin-bottom: 0px;
 }
 /* End sidebar */
 
-.form-grouped {
-    border-radius: 5px 0px 0px 5px !important;
-}
-
-.form-signin {
-    max-width: 330px;
-    padding: 15px;
-    margin: 0 auto;
-}
-
-.form-signin .form-signin-heading,
-.form-signin .checkbox {
-    margin-bottom: 10px;
-}
-
-.form-signin .checkbox {
-    font-weight: normal;
-}
-
-.form-signin .form-control {
-    position: relative;
-    font-size: 16px;
-    height: auto;
-    padding: 10px;
-    -webkit-box-sizing: border-box;
-       -moz-box-sizing: border-box;
-            box-sizing: border-box;
-}
-
-.form-signin .form-control:focus {
-    z-index: 2;
-}
-
-.form-signin input[type="text"] {
-    margin-bottom: -1px;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-}
-
-.form-signin input[type="password"] {
-    margin-bottom: 10px;
-    border-top-left-radius: 0;
-    border-top-right-radius: 0;
-}
-
 /* Reply/Topic previews */
 .preview-body {
     height: auto;
@@ -391,7 +341,3 @@ margin-bottom: 0px;
 .conversation-list .conversation-date {
     color: #999999;
 }
-
-.spacer-megalist{
-    padding-top: 20px;
-}

+ 0 - 0
flaskbb/static/css/code.css → flaskbb/static/css/pygments.css


+ 4 - 4
flaskbb/static/js/flaskbb.js

@@ -58,7 +58,7 @@ var BulkActions = function() {
             }
         }
 
-        send_data(url, data)
+        send_data(url, data);
 
         return false;
     };
@@ -87,9 +87,9 @@ var send_data = function(endpoint_url, data) {
             if(v.reverse) {
                 form.attr('action', v.reverse_url);
                 if(v.type == 'ban') {
-                    reverse_html = '<span class="fa fa-flag text-success" data-toggle="tooltip" data-placement="top" title="'+ v.reverse_name +'"></span>'
+                    reverse_html = '<span class="fa fa-flag text-success" data-toggle="tooltip" data-placement="top" title="'+ v.reverse_name +'"></span>';
                 } else if (v.type == 'unban') {
-                    reverse_html = '<span class="fa fa-flag text-warning" data-toggle="tooltip" data-placement="top" title="'+ v.reverse_name +'"></span>'
+                    reverse_html = '<span class="fa fa-flag text-warning" data-toggle="tooltip" data-placement="top" title="'+ v.reverse_name +'"></span>';
                 }
                 form.find('button').html(reverse_html);
             } else {
@@ -123,7 +123,7 @@ $(document).ready(function () {
         });
     });
     // Reply to post
-    $('.quote_btn').click(function (event) {
+    $('.quote-btn').click(function (event) {
         event.preventDefault();
         var post_id = $(this).attr('data-post-id');
 

+ 13 - 80
flaskbb/templates/layout.html

@@ -2,6 +2,11 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="description" content="FlaskBB is a forum software written in Flask">
+        <meta name="author" content="FlaskBB Team">
+        <meta name="csrf-token" content="{{ csrf_token() }}">
+
         <title>
         {% block title %}
             {%- if not page_title -%}
@@ -12,17 +17,12 @@
         {% endblock %}
         </title>
 
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <meta name="description" content="FlaskBB is a forum software written in Flask">
-        <meta name="author" content="FlaskBB Team">
-        <meta name="csrf-token" content="{{ csrf_token() }}">
-
         <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
 
         {% block stylesheets %}
         <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
         <link rel="stylesheet" href="{{ url_for('static', filename='css/font-awesome.min.css') }}" >
-        <link rel="stylesheet" href="{{ url_for('static', filename='css/code.css') }}">
+        <link rel="stylesheet" href="{{ url_for('static', filename='css/pygments.css') }}">
         <link rel="stylesheet" href="{{ url_for('static', filename='css/flaskbb.css') }}">
         {% endblock %}
 
@@ -37,91 +37,22 @@
 
     <body>
         {% block navigation %}
-        {%- from theme("macros.html") import topnav with context -%}
-        <!-- Navigation -->
-        <nav class="navbar navbar-default navbar-static-top">
-            <div class="container">
-                <div class="navbar-header">
-                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
-                        <span class="sr-only">Toggle navigation</span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </button>
-                    <a class="navbar-brand" href="/">FlaskBB</a>
-                </div>
-                <div class="collapse navbar-collapse navbar-ex1-collapse">
-                    <ul class="nav navbar-nav">
-                        {{ emit_event("before-first-navigation-element") }}
-
-                        {# active_forum_nav is set in {forum, category, topic}.html and new_{topic, post}.html #}
-                        {{ 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>
-
-                {% if current_user and current_user.is_authenticated() %}
-                    <div class="btn-group navbar-btn navbar-right" style="padding-left: 15px; margin-right: -10px">
-                        <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>
-
-                    <div class="btn-group navbar-btn navbar-right">
-                        <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown">
-                            <span class="fa fa-envelope"></span> <span class="badge">{{ current_user.pm_unread }}</span>
-                        </button>
-                        <ul class="dropdown-menu" role="menu">
-                            <li><a href="{{ url_for('message.inbox') }}"><span class="fa fa-envelope"></span> {% trans %}Private Messages{% endtrans %}</a></li>
-                            <li><a href="{{ url_for('message.new_conversation') }}"><span class="fa fa-pencil"></span> {% trans %}New Message{% endtrans %}</a></li>
-                        </ul>
-                    </div>
-                {% else %}
-                    <div class="btn-group navbar-btn navbar-right">
-                        <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>
-                {% endif %}
-                </div><!-- nav-collapse -->
-            </div><!-- container -->
-        </nav> <!-- navbar navbar-inverse -->
+            {% include theme('navigation.html') %}
         {% endblock %}
 
 
         <div class="container">
             {% block messages %}
-                {% include theme('flashed_messages.html') %}
+                <div id="flashed-messages">
+                    {% include theme('flashed_messages.html') %}
+                </div>
             {% endblock %}
 
             {% block content %}
             {% endblock %}
         </div> <!-- /container -->
 
+
         {% block footer %}
         <div id="footer">
             <div class="container">
@@ -131,6 +62,7 @@
         </div>
         {% endblock %}
 
+
         {# standard javascript libs #}
         {% block javascript %}
         <script src="{{ url_for('static', filename='js/jquery.min.js') }}"></script>
@@ -138,6 +70,7 @@
         <script src="{{ url_for('static', filename='js/flaskbb.js') }}"></script>
         {% endblock %}
 
+
         {# space for extra scripts - to use in other templates #}
         {% block scripts %}
         {% endblock %}

+ 73 - 0
flaskbb/templates/navigation.html

@@ -0,0 +1,73 @@
+{%- from theme("macros.html") import topnav with context -%}
+<!-- Navigation -->
+<nav class="navbar navbar-default navbar-static-top">
+    <div class="container">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="/">FlaskBB</a>
+        </div>
+        <div class="collapse navbar-collapse navbar-ex1-collapse">
+            <ul class="nav navbar-nav">
+                {{ emit_event("before-first-navigation-element") }}
+
+                {# active_forum_nav is set in {forum, category, topic}.html and new_{topic, post}.html #}
+                {{ 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>
+
+        {% if current_user and current_user.is_authenticated() %}
+            <div class="btn-group navbar-btn navbar-right" style="padding-left: 15px; margin-right: -10px">
+                <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>
+
+            <div class="btn-group navbar-btn navbar-right">
+                <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown">
+                    <span class="fa fa-envelope"></span> <span class="badge">{{ current_user.pm_unread }}</span>
+                </button>
+                <ul class="dropdown-menu" role="menu">
+                    <li><a href="{{ url_for('message.inbox') }}"><span class="fa fa-envelope"></span> {% trans %}Private Messages{% endtrans %}</a></li>
+                    <li><a href="{{ url_for('message.new_conversation') }}"><span class="fa fa-pencil"></span> {% trans %}New Message{% endtrans %}</a></li>
+                </ul>
+            </div>
+        {% else %}
+            <div class="btn-group navbar-btn navbar-right">
+                <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>
+        {% endif %}
+        </div><!-- nav-collapse -->
+    </div><!-- container -->
+</nav> <!-- navbar navbar-inverse -->

+ 25 - 89
flaskbb/themes/bootstrap2/templates/layout.html

@@ -2,6 +2,11 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="description" content="FlaskBB is a forum software written in Flask">
+        <meta name="author" content="FlaskBB Team">
+        <meta name="csrf-token" content="{{ csrf_token() }}">
+
         <title>
         {% block title %}
             {%- if not page_title -%}
@@ -11,17 +16,14 @@
             {%- endif -%}
         {% endblock %}
         </title>
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <meta name="description" content="FlaskBB is a forum software written in Flask">
-        <meta name="author" content="FlaskBB Team">
 
         <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
 
         {% block stylesheets %}
-        <link rel="stylesheet" href="{{ url_for('static', filename='css/code.css') }}">
         <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
         <link rel="stylesheet" href="{{ theme_static('css/bootstrap-theme.min.css') }}">
         <link rel="stylesheet" href="{{ url_for('static', filename='css/font-awesome.min.css') }}">
+        <link rel="stylesheet" href="{{ url_for('static', filename='css/pygments.css') }}">
         <link rel="stylesheet" href="{{ url_for('static', filename='css/flaskbb.css') }}">
         {% endblock %}
 
@@ -36,105 +38,39 @@
 
     <body>
         {% block navigation %}
-        {%- from theme("macros.html") import topnav with context -%}
-        <!-- Navigation -->
-            <nav class="navbar navbar-inverse navbar-static-top">
-                <div class="container">
-                    <div class="navbar-header">
-                        <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
-                            <span class="sr-only">Toggle navigation</span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                            <span class="icon-bar"></span>
-                        </button>
-                        <a class="navbar-brand" href="/">FlaskBB</a>
-                    </div>
-                    <div class="collapse navbar-collapse navbar-ex1-collapse">
-                        <ul class="nav navbar-nav">
-                            {{ emit_event("before-first-navigation-element") }}
-
-                            {# active_forum_nav is set in {forum, category, topic}.html and new_{topic, post}.html #}
-                            {{ 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>
-
-                    {% if current_user and current_user.is_authenticated() %}
-                        <div class="btn-group navbar-btn navbar-right" style="padding-left: 15px; margin-right: -10px">
-                            <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>
+            {% include theme('navigation.html') %}
+        {% endblock %}
 
-                                <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>
+        <div class="container">
+            {% block messages %}
+                <div id="flashed-messages">
+                    {% include theme('flashed_messages.html') %}
+                </div>
+            {% endblock %}
 
-                        <div class="btn-group navbar-btn navbar-right">
-                            <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown">
-                                <span class="fa fa-envelope"></span> <span class="badge">{{ current_user.pm_unread }}</span>
-                            </button>
-                            <ul class="dropdown-menu" role="menu">
-                                <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>
-                        </div>
-                    {% else %}
-                        <div class="btn-group navbar-btn navbar-right">
-                            <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>
-                    {% endif %}
-                    </div><!-- nav-collapse -->
-                </div><!-- container -->
-            </nav> <!-- navbar navbar-inverse -->
+            {% block content %}
             {% endblock %}
+        </div> <!-- /container -->
 
 
+        {% block footer %}
+        <div id="footer">
             <div class="container">
-                {% block messages %}
-                    {% include theme('flashed_messages.html') %}
-                {% endblock %}
-
-                {% block content %}
-                {% endblock %}
-            </div> <!-- /container -->
-
-            {% block footer %}
-            <div id="footer">
-                <div class="container">
-                    <p class="text-muted credit pull-left">powered by <a href="http://flask.pocoo.org">Flask</a></p>
-                    <p class="text-muted credit pull-right">&copy; 2013 - 2015 - <a href="http://flaskbb.org">FlaskBB.org</a></p>
-                </div>
+                <p class="text-muted credit pull-left">powered by <a href="http://flask.pocoo.org">Flask</a></p>
+                <p class="text-muted credit pull-right">&copy; 2013 - 2015 - <a href="http://flaskbb.org">FlaskBB.org</a></p>
             </div>
-            {% endblock %}
+        </div>
+        {% endblock %}
+
 
         {% block javascript %}
         <script src="{{ url_for('static', filename='js/jquery.min.js') }}"></script>
         <script src="{{ url_for('static', filename='js/bootstrap.min.js') }}"></script>
+        <script src="{{ url_for('static', filename='js/flaskbb.js') }}"></script>
         {% endblock %}
 
+
         {% block scripts %}
         {% endblock %}
     </body>

+ 73 - 0
flaskbb/themes/bootstrap2/templates/navigation.html

@@ -0,0 +1,73 @@
+{%- from theme("macros.html") import topnav with context -%}
+<!-- Navigation -->
+<nav class="navbar navbar-inverse navbar-static-top">
+    <div class="container">
+        <div class="navbar-header">
+            <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
+                <span class="sr-only">Toggle navigation</span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+                <span class="icon-bar"></span>
+            </button>
+            <a class="navbar-brand" href="/">FlaskBB</a>
+        </div>
+        <div class="collapse navbar-collapse navbar-ex1-collapse">
+            <ul class="nav navbar-nav">
+                {{ emit_event("before-first-navigation-element") }}
+
+                {# active_forum_nav is set in {forum, category, topic}.html and new_{topic, post}.html #}
+                {{ 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>
+
+        {% if current_user and current_user.is_authenticated() %}
+            <div class="btn-group navbar-btn navbar-right" style="padding-left: 15px; margin-right: -10px">
+                <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>
+
+            <div class="btn-group navbar-btn navbar-right">
+                <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown">
+                    <span class="fa fa-envelope"></span> <span class="badge">{{ current_user.pm_unread }}</span>
+                </button>
+                <ul class="dropdown-menu" role="menu">
+                    <li><a href="{{ url_for('message.inbox') }}"><span class="fa fa-envelope"></span> {% trans %}Private Messages{% endtrans %}</a></li>
+                    <li><a href="{{ url_for('message.new_conversation') }}"><span class="fa fa-pencil"></span> {% trans %}New Message{% endtrans %}</a></li>
+                </ul>
+            </div>
+        {% else %}
+            <div class="btn-group navbar-btn navbar-right">
+                <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>
+        {% endif %}
+        </div><!-- nav-collapse -->
+    </div><!-- container -->
+</nav> <!-- navbar navbar-inverse -->

+ 9 - 80
flaskbb/themes/bootstrap3/templates/layout.html

@@ -2,6 +2,11 @@
 <html lang="en">
     <head>
         <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <meta name="description" content="FlaskBB is a forum software written in Flask">
+        <meta name="author" content="FlaskBB Team">
+        <meta name="csrf-token" content="{{ csrf_token() }}">
+
         <title>
         {% block title %}
             {%- if not page_title -%}
@@ -12,19 +17,12 @@
         {% endblock %}
         </title>
 
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <meta name="description" content="FlaskBB is a forum software written in Flask">
-        <meta name="author" content="FlaskBB Team">
-        <meta name="csrf-token" content="{{ csrf_token() }}">
-
         <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
 
         {% block stylesheets %}
         <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
         <link rel="stylesheet" href="{{ url_for('static', filename='css/font-awesome.min.css') }}" >
         <link rel="stylesheet" href="{{ url_for('static', filename='css/code.css') }}">
-        <link rel="stylesheet" href="{{ url_for('static', filename='css/bootstrap.min.css') }}">
-        <link rel="stylesheet" href="{{ url_for('static', filename='css/font-awesome.min.css') }}">
         <link rel="stylesheet" href="{{ url_for('static', filename='css/flaskbb.css') }}">
         {% endblock %}
 
@@ -39,79 +37,7 @@
 
     <body>
         {% block navigation %}
-        {%- from theme("macros.html") import topnav with context -%}
-        <!-- Navigation -->
-        <nav class="navbar navbar-default navbar-static-top">
-            <div class="container">
-                <div class="navbar-header">
-                    <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
-                        <span class="sr-only">Toggle navigation</span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                        <span class="icon-bar"></span>
-                    </button>
-                    <a class="navbar-brand" href="/">FlaskBB</a>
-                </div>
-                <div class="collapse navbar-collapse navbar-ex1-collapse">
-                    <ul class="nav navbar-nav">
-                        {{ emit_event("before-first-navigation-element") }}
-
-                        {# active_forum_nav is set in {forum, category, topic}.html and new_{topic, post}.html #}
-                        {{ 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>
-
-                {% if current_user and current_user.is_authenticated() %}
-                    <div class="btn-group navbar-btn navbar-right" style="padding-left: 15px; margin-right: -10px">
-                        <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>
-
-                    <div class="btn-group navbar-btn navbar-right">
-                        <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown">
-                            <span class="fa fa-envelope"></span> <span class="badge">{{ current_user.pm_unread }}</span>
-                        </button>
-                        <ul class="dropdown-menu" role="menu">
-                            <li><a href="{{ url_for('message.inbox') }}"><span class="fa fa-envelope"></span> {% trans %}Private Messages{% endtrans %}</a></li>
-                            <li><a href="{{ url_for('message.new_conversation') }}"><span class="fa fa-pencil"></span> {% trans %}New Message{% endtrans %}</a></li>
-                        </ul>
-                    </div>
-                {% else %}
-                    <div class="btn-group navbar-btn navbar-right">
-                        <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>
-                {% endif %}
-                </div><!-- nav-collapse -->
-            </div><!-- container -->
-        </nav> <!-- navbar navbar-inverse -->
+            {% include theme('navigation.html') %}
         {% endblock %}
 
 
@@ -126,6 +52,7 @@
             {% endblock %}
         </div> <!-- /container -->
 
+
         {% block footer %}
         <div id="footer">
             <div class="container">
@@ -135,6 +62,7 @@
         </div>
         {% endblock %}
 
+
         {# standard javascript libs #}
         {% block javascript %}
         <script src="{{ url_for('static', filename='js/jquery.min.js') }}"></script>
@@ -142,6 +70,7 @@
         <script src="{{ url_for('static', filename='js/flaskbb.js') }}"></script>
         {% endblock %}
 
+
         {# space for extra scripts - to use in other templates #}
         {% block scripts %}
         {% endblock %}