sh4nks 9 лет назад
Родитель
Сommit
3106a2a5a0

+ 7 - 2
flaskbb/templates/macros.html

@@ -67,9 +67,11 @@
 
 
 
 
 {%- macro render_boolean_field(field, inline=False) -%}
 {%- macro render_boolean_field(field, inline=False) -%}
-<div class="checkbox {%- if inline -%}inline{%- endif -%}">
+<div class="checkbox{% if inline %}inline{% endif %}{% if field.errors %}has-error{% endif %}">
+    <label>
     {{ field(**kwargs) }}
     {{ field(**kwargs) }}
-    {{ field_label(field) }}
+    {{ field.label.text }}
+    </label>
     {{ field_description(field) }}
     {{ field_description(field) }}
     {{ field_errors(field) }}
     {{ field_errors(field) }}
 </div>
 </div>
@@ -96,6 +98,7 @@
 </div>
 </div>
 {%- endmacro -%}
 {%- endmacro -%}
 
 
+
 {%- macro render_submit_field(field, div_class='', input_class='') -%}
 {%- macro render_submit_field(field, div_class='', input_class='') -%}
 {% if div_class %}
 {% if div_class %}
 <div class="{{ div_class }}">
 <div class="{{ div_class }}">
@@ -108,6 +111,7 @@
 {% endif %}
 {% endif %}
 {%- endmacro -%}
 {%- endmacro -%}
 
 
+
 {%- macro render_field(field, with_label=True, div_class='', rows='') -%}
 {%- macro render_field(field, with_label=True, div_class='', rows='') -%}
 <div class="form-group{%- if field.errors %} has-error{%- endif %}">
 <div class="form-group{%- if field.errors %} has-error{%- endif %}">
     {% if div_class %}
     {% if div_class %}
@@ -188,6 +192,7 @@
     </div>
     </div>
 {%- endmacro -%}
 {%- endmacro -%}
 
 
+
 {%- macro horizontal_select_field(field, div_class='', label_class='', select_class="form-control", surrounded_div="col-sm-4") -%}
 {%- macro horizontal_select_field(field, div_class='', label_class='', select_class="form-control", surrounded_div="col-sm-4") -%}
 <div class="form-group row {%- if field.errors %} has-error{%- endif %}">
 <div class="form-group row {%- if field.errors %} has-error{%- endif %}">
     {% if label_class %}
     {% if label_class %}

+ 19 - 9
flaskbb/templates/management/category_form.html

@@ -3,7 +3,7 @@
 
 
 {% extends theme("management/management_layout.html") %}
 {% extends theme("management/management_layout.html") %}
 {% block management_content %}
 {% block management_content %}
-{% from theme("macros.html") import horizontal_field, render_boolean_field, navlink with context %}
+{% from theme("macros.html") import render_field, render_submit_field, navlink with context %}
 
 
 <div class="col-md-3">
 <div class="col-md-3">
     <ul class="nav nav-pills nav-stacked">
     <ul class="nav nav-pills nav-stacked">
@@ -14,15 +14,25 @@
 </div>
 </div>
 
 
 <div class="col-md-9">
 <div class="col-md-9">
-    <form class="form-horizontal" role="form" method="post">
-        {{ form.hidden_tag() }}
-        <legend class="">{{ title }}</legend>
-            {{ horizontal_field(form.title) }}
-            {{ horizontal_field(form.description, rows=5, div_class="col-lg-9") }}
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <span class="fa fa-comments-o"></span> {{ title }}
+                </div>
+                <div class="panel-body">
+                    <form class="form-horizontal" role="form" method="post">
+                        {{ form.hidden_tag() }}
+                        {{ render_field(form.title) }}
+                        {{ render_field(form.description, rows=5, div_class="col-md-12") }}
 
 
-            {{ horizontal_field(form.position) }}
-            {{ horizontal_field(form.submit, div_class="col-lg-offset-0 col-lg-9") }}
-    </form>
+                        {{ render_field(form.position) }}
+                        {{ render_submit_field(form.submit) }}
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 </div>
 
 
 {% endblock %}
 {% endblock %}

+ 27 - 19
flaskbb/templates/management/forum_form.html

@@ -3,7 +3,7 @@
 
 
 {% extends theme("management/management_layout.html") %}
 {% extends theme("management/management_layout.html") %}
 {% block management_content %}
 {% block management_content %}
-{% from theme("macros.html") import horizontal_field, render_boolean_field, navlink with context %}
+{% from theme("macros.html") import render_field, render_submit_field, render_boolean_field, navlink with context %}
 
 
 <div class="col-md-3">
 <div class="col-md-3">
     <ul class="nav nav-pills nav-stacked">
     <ul class="nav nav-pills nav-stacked">
@@ -14,23 +14,31 @@
 </div>
 </div>
 
 
 <div class="col-md-9">
 <div class="col-md-9">
-    <form class="form-horizontal" role="form" method="post">
-        {{ form.hidden_tag() }}
-        <legend class="">{{ title }}</legend>
-            {{ horizontal_field(form.title) }}
-            {{ horizontal_field(form.description, rows=5, div_class="col-lg-9") }}
-
-            {{ horizontal_field(form.category) }}
-            {{ horizontal_field(form.position) }}
-
-            {{ horizontal_field(form.external) }}
-
-            {{ horizontal_field(form.moderators) }}
-            {{ render_boolean_field(form.show_moderators) }}
-
-            {{ render_boolean_field(form.locked) }}
-
-            {{ horizontal_field(form.submit, div_class="col-lg-offset-0 col-lg-9") }}
-    </form>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <span class="fa fa-comment-o"></span> {{ title }}
+                </div>
+                <div class="panel-body">
+                    <form class="form-horizontal" method="post">
+                        {{ form.hidden_tag() }}
+                        {{ render_field(form.title) }}
+                        {{ render_field(form.description, rows=5, div_class="col-md-12") }}
+                        {{ render_field(form.category) }}
+                        {{ render_field(form.position) }}
+                        {{ render_field(form.external) }}
+                        {{ render_field(form.moderators) }}
+                        {{ render_boolean_field(form.show_moderators) }}
+                        {{ render_boolean_field(form.locked) }}
+
+                        <div class="row">
+                            {{ render_submit_field(form.submit, div_class="col-lg-offset-0 col-lg-9") }}
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 </div>
 {% endblock %}
 {% endblock %}

+ 57 - 48
flaskbb/templates/management/forums.html

@@ -14,59 +14,68 @@
 
 
 
 
 <div class="col-md-9">
 <div class="col-md-9">
-    <legend>{% trans %}Manage Forums{% endtrans %}</legend>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <span class="fa fa-comments"></span> {% trans %}Manage Forums{% endtrans %}
+                </div>
+                <div class="panel-body">
+                    {% for category in categories %}
+                    <table class="table table-bordered">
+                        <thead class="categoryhead">
+                            <tr>
+                                <td colspan="2">
+                                    <div><strong><a href="{{ url_for('forum.view_category', category_id=category.id) }}">{{ category.title }}</a></strong></div>
+                                </td>
+                                <td valign="top" align="center" style="white-space: nowrap">
+                                    <a href="{{ url_for('management.add_forum', category_id=category.id) }}">{% trans %}Add Forum{% endtrans %}</a> |
+                                    <a href="{{ url_for('management.edit_category', category_id = category.id) }}">{% trans %}Edit{% endtrans %}</a> |
+                                    <form class="inline-form" method="post" action="{{ url_for('management.delete_category', category_id=category.id) }}">
+                                        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
+                                        <button class="btn btn-link">{% trans %}Delete{% endtrans %}</button>
+                                    </form>
+                                </td>
+                            </tr>
+                        </thead>
+                        <tbody class="forumbody">
+                            <tr class="forum_stats">
+                                <td colspan="2"><strong>{% trans %}Forum{% endtrans %}</strong></td>
+                                <td width="85" align="center" style="white-space: nowrap"><strong>{% trans %}Management{% endtrans %}</strong></td>
+                            </tr>
 
 
-    {% for category in categories %}
-    <table class="table table-bordered">
-        <thead class="categoryhead">
-            <tr>
-                <td colspan="2">
-                    <div><strong><a href="{{ url_for('forum.view_category', category_id=category.id) }}">{{ category.title }}</a></strong></div>
-                </td>
-                <td valign="top" align="center" style="white-space: nowrap">
-                    <a href="{{ url_for('management.add_forum', category_id=category.id) }}">{% trans %}Add Forum{% endtrans %}</a> |
-                    <a href="{{ url_for('management.edit_category', category_id = category.id) }}">{% trans %}Edit{% endtrans %}</a> |
-                    <form class="inline-form" method="post" action="{{ url_for('management.delete_category', category_id=category.id) }}">
-                        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-                        <button class="btn btn-link">{% trans %}Delete{% endtrans %}</button>
-                    </form>
-                </td>
-            </tr>
-        </thead>
-        <tbody class="forumbody">
-            <tr class="forum_stats">
-                <td colspan="2"><strong>{% trans %}Forum{% endtrans %}</strong></td>
-                <td width="85" align="center" style="white-space: nowrap"><strong>{% trans %}Management{% endtrans %}</strong></td>
-            </tr>
+                            {% for forum in category.forums %}
+                            <tr>
+                                <td align="center" valign="center" width="4%">
 
 
-            {% for forum in category.forums %}
-            <tr>
-                <td align="center" valign="center" width="4%">
+                                </td>
 
 
-                </td>
+                                <td valign="top">
+                                    <strong><a href="{{ url_for('forum.view_forum', forum_id=forum.id) }}">{{ forum.title }}</a></strong>
 
 
-                <td valign="top">
-                    <strong><a href="{{ url_for('forum.view_forum', forum_id=forum.id) }}">{{ forum.title }}</a></strong>
+                                    <div class="forum-description">
+                                        {% autoescape false %}
+                                        {{ forum.description|markup }}
+                                        {% endautoescape %}
+                                    </div>
+                                </td>
 
 
-                    <div class="forum-description">
-                        {% autoescape false %}
-                        {{ forum.description|markup }}
-                        {% endautoescape %}
-                    </div>
-                </td>
+                                <td valign="top" align="center" style="white-space: nowrap">
+                                    <a href="{{ url_for('management.edit_forum', forum_id = forum.id) }}">{% trans %}Edit{% endtrans %}</a> |
+                                    <form class="inline-form" method="post" action="{{ url_for('management.delete_forum', forum_id=forum.id) }}">
+                                        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
+                                        <button class="btn btn-link">{% trans %}Delete{% endtrans %}</button>
+                                    </form>
+                                </td>
+                            </tr>
+                            {% endfor %}
 
 
-                <td valign="top" align="center" style="white-space: nowrap">
-                    <a href="{{ url_for('management.edit_forum', forum_id = forum.id) }}">{% trans %}Edit{% endtrans %}</a> |
-                    <form class="inline-form" method="post" action="{{ url_for('management.delete_forum', forum_id=forum.id) }}">
-                        <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-                        <button class="btn btn-link">{% trans %}Delete{% endtrans %}</button>
-                    </form>
-                </td>
-            </tr>
-            {% endfor %}
-
-        </tbody>
-    </table>
-    {% endfor %}
+                        </tbody>
+                    </table>
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 </div>
 {% endblock %}
 {% endblock %}

+ 36 - 26
flaskbb/templates/management/group_form.html

@@ -3,7 +3,7 @@
 
 
 {% extends theme("management/management_layout.html") %}
 {% extends theme("management/management_layout.html") %}
 {% block management_content %}
 {% block management_content %}
-{% from theme("macros.html") import horizontal_field, render_boolean_field, navlink with context %}
+{% from theme("macros.html") import render_field, render_boolean_field, render_submit_field, navlink with context %}
 
 
 <div class="col-md-3">
 <div class="col-md-3">
     <ul class="nav nav-pills nav-stacked">
     <ul class="nav nav-pills nav-stacked">
@@ -13,30 +13,40 @@
 </div>
 </div>
 
 
 <div class="col-md-9">
 <div class="col-md-9">
-    <form class="form-horizontal" role="form" method="post">
-        {{ form.hidden_tag() }}
-        <legend class="">{{ title }}</legend>
-            {{ horizontal_field(form.name) }}
-            {{ horizontal_field(form.description) }}
-
-            {{ render_boolean_field(form.admin) }}
-            {{ render_boolean_field(form.super_mod) }}
-
-
-            {{ render_boolean_field(form.mod) }}
-            {{ render_boolean_field(form.banned) }}
-            {{ render_boolean_field(form.guest) }}
-
-            {{ render_boolean_field(form.mod_edituser) }}
-            {{ render_boolean_field(form.mod_banuser) }}
-
-            {{ render_boolean_field(form.editpost) }}
-            {{ render_boolean_field(form.deletepost) }}
-            {{ render_boolean_field(form.deletetopic) }}
-            {{ render_boolean_field(form.posttopic) }}
-            {{ render_boolean_field(form.postreply) }}
-
-            {{ horizontal_field(form.submit, div_class="col-lg-offset-0 col-lg-9") }}
-    </form>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <span class="fa fa-user-plus"></span> {{ title }}
+                </div>
+                <div class="panel-body">
+                    <form class="form-horizontal" role="form" method="post">
+                        {{ form.hidden_tag() }}
+                        {{ render_field(form.name) }}
+                        {{ render_field(form.description, rows="4", div_class="col-md-12") }}
+
+                        {{ render_boolean_field(form.admin) }}
+                        {{ render_boolean_field(form.super_mod) }}
+
+                        {{ render_boolean_field(form.mod) }}
+                        {{ render_boolean_field(form.banned) }}
+                        {{ render_boolean_field(form.guest) }}
+
+                        {{ render_boolean_field(form.mod_edituser) }}
+                        {{ render_boolean_field(form.mod_banuser) }}
+
+                        {{ render_boolean_field(form.editpost) }}
+                        {{ render_boolean_field(form.deletepost) }}
+                        {{ render_boolean_field(form.deletetopic) }}
+                        {{ render_boolean_field(form.posttopic) }}
+                        {{ render_boolean_field(form.postreply) }}
+                        <div class="row">
+                            {{ render_submit_field(form.submit, div_class="col-lg-offset-0 col-lg-9") }}
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 </div>
 {% endblock %}
 {% endblock %}

+ 34 - 27
flaskbb/templates/management/overview.html

@@ -4,32 +4,39 @@
 {% block management_content %}
 {% block management_content %}
 
 
 <div class="col-md-12">
 <div class="col-md-12">
-    <table class="table table-bordered">
-        <thead>
-            <tr>
-                <th colspan="4">{% trans %}Global Statistics{% endtrans %}</th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr>
-                <td><b>{% trans %}FlaskBB Version{% endtrans %}</b></td>
-                <td>{{ flaskbb_version }}</td>
-                <td><b>{% trans %}Posts{% endtrans %}</b></td>
-                <td>{{ post_count }}</td>
-            </tr>
-            <tr>
-                <td><b>{% trans %}Python Version{% endtrans %}</b></td>
-                <td>{{ python_version }}</td>
-                <td><b>{% trans %}Topics{% endtrans %}</b></td>
-                <td>{{ topic_count }}</td>
-            </tr>
-            <tr>
-                <td><b>{% trans %}Flask Version{% endtrans %}</b></td>
-                <td>{{ flask_version }}</td>
-                <td><b>{% trans %}Users{% endtrans %}</b></td>
-                <td>{{ user_count }}</td>
-            </tr>
-        </tbody>
-    </table>
+    <div class="panel panel-primary">
+        <div class="panel-heading">
+            <span class="fa fa-tasks"></span> {% trans %}Overview{% endtrans %}
+        </div>
+        <div class="panel-body">
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th colspan="4">{% trans %}Global Statistics{% endtrans %}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr>
+                        <td><b>{% trans %}FlaskBB Version{% endtrans %}</b></td>
+                        <td>{{ flaskbb_version }}</td>
+                        <td><b>{% trans %}Posts{% endtrans %}</b></td>
+                        <td>{{ post_count }}</td>
+                    </tr>
+                    <tr>
+                        <td><b>{% trans %}Python Version{% endtrans %}</b></td>
+                        <td>{{ python_version }}</td>
+                        <td><b>{% trans %}Topics{% endtrans %}</b></td>
+                        <td>{{ topic_count }}</td>
+                    </tr>
+                    <tr>
+                        <td><b>{% trans %}Flask Version{% endtrans %}</b></td>
+                        <td>{{ flask_version }}</td>
+                        <td><b>{% trans %}Users{% endtrans %}</b></td>
+                        <td>{{ user_count }}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
 </div>
 </div>
 {% endblock %}
 {% endblock %}

+ 63 - 56
flaskbb/templates/management/plugins.html

@@ -4,61 +4,68 @@
 {% block management_content %}
 {% block management_content %}
 {% from theme('macros.html') import render_pagination %}
 {% from theme('macros.html') import render_pagination %}
 
 
-<legend>{% trans %}Manage Plugins{% endtrans %}</legend>
+<div class="col-md-12">
+    <div class="panel panel-primary">
+        <div class="panel-heading">
+            <span class="fa fa-puzzle-piece"></span> {% trans %}Manage Plugins{% endtrans %}
+        </div>
+        <div class="panel-body">
+            <table class="table">
+                <thead>
+                    <tr>
+                        <th>{% trans %}Plugin{% endtrans %}</th>
+                        <th>{% trans %}Information{% endtrans %}</th>
+                        <th>{% trans %}Manage{% endtrans %}</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    {% for plugin in plugins %}
+                    <tr>
+                      <td>
+                        {% if plugin.website %}
+                          <a href="{{ plugin.website }}">{{ plugin.name }}</a>
+                        {% else %}
+                          {{ plugin.name }}
+                        {% endif %}
+                        </td>
+                        <td>
+                            {% trans %}Version{% endtrans %}: <i>{{ plugin.version }}</i> <br />
+                            {{ plugin.description }} <br />
+                            {% trans %}by{% endtrans %}  <i>{{ plugin.author }}</i>
+                        </td>
+                        <td>
+                            {% if not plugin.enabled %}
+                            <form class="inline-form" method="post" action="{{ url_for('management.enable_plugin', plugin=plugin.identifier) }}">
+                                <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
+                                <button class="btn btn-link">{% trans %}Enable{% endtrans %}</button>
+                            </form>
+                            {% else %}
+                            <form class="inline-form" method="post" action="{{ url_for('management.disable_plugin', plugin=plugin.identifier) }}">
+                                <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
+                                <button class="btn btn-link">{% trans %}Disable{% endtrans %}</button>
+                            </form>
+                            {% endif %}
 
 
-<table class="table table-bordered">
-    <thead>
-        <tr>
-            <th>{% trans %}Plugin{% endtrans %}</th>
-            <th>{% trans %}Information{% endtrans %}</th>
-            <th>{% trans %}Manage{% endtrans %}</th>
-        </tr>
-    </thead>
-    <tbody>
-        {% for plugin in plugins %}
-        <tr>
-          <td>
-            {% if plugin.website %}
-              <a href="{{ plugin.website }}">{{ plugin.name }}</a>
-            {% else %}
-              {{ plugin.name }}
-            {% endif %}
-            </td>
-            <td>
-                {% trans %}Version{% endtrans %}: <i>{{ plugin.version }}</i> <br />
-                {{ plugin.description }} <br />
-                {% trans %}by{% endtrans %}  <i>{{ plugin.author }}</i>
-            </td>
-            <td>
-                {% if not plugin.enabled %}
-                <form class="inline-form" method="post" action="{{ url_for('management.enable_plugin', plugin=plugin.identifier) }}">
-                    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-                    <button class="btn btn-link">{% trans %}Enable{% endtrans %}</button>
-                </form>
-                {% else %}
-                <form class="inline-form" method="post" action="{{ url_for('management.disable_plugin', plugin=plugin.identifier) }}">
-                    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-                    <button class="btn btn-link">{% trans %}Disable{% endtrans %}</button>
-                </form>
-                {% endif %}
-
-                {% set uninstallable = plugin.uninstallable %}
-                {% if plugin.installable and not uninstallable %}
-                <br />
-                <form class="inline-form" method="post" action="{{ url_for('management.install_plugin', plugin=plugin.identifier) }}">
-                    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-                    <button class="btn btn-link">{% trans %}Install{% endtrans %}</button>
-                </form>
-                {% endif %}
-                {% if uninstallable %}
-                <form class="inline-form" method="post" action="{{ url_for('management.uninstall_plugin', plugin=plugin.identifier) }}">
-                    <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
-                    <button class="btn btn-link">{% trans %}Uninstall{% endtrans %}</button>
-                </form>
-                {% endif %}
-            </td>
-        </tr>
-        {% endfor %}
-    </tbody>
-</table>
+                            {% set uninstallable = plugin.uninstallable %}
+                            {% if plugin.installable and not uninstallable %}
+                            <br />
+                            <form class="inline-form" method="post" action="{{ url_for('management.install_plugin', plugin=plugin.identifier) }}">
+                                <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
+                                <button class="btn btn-link">{% trans %}Install{% endtrans %}</button>
+                            </form>
+                            {% endif %}
+                            {% if uninstallable %}
+                            <form class="inline-form" method="post" action="{{ url_for('management.uninstall_plugin', plugin=plugin.identifier) }}">
+                                <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" />
+                                <button class="btn btn-link">{% trans %}Uninstall{% endtrans %}</button>
+                            </form>
+                            {% endif %}
+                        </td>
+                    </tr>
+                    {% endfor %}
+                </tbody>
+            </table>
+        </div>
+    </div>
+</div>
 {% endblock %}
 {% endblock %}

+ 29 - 22
flaskbb/templates/management/settings.html

@@ -17,27 +17,34 @@
 </div><!--/.col-md-3 -->
 </div><!--/.col-md-3 -->
 
 
 <div class="col-md-9">
 <div class="col-md-9">
-<legend>{{ active_group.name }}</legend>
-
-<form class="form-horizontal" role="form" method="post">
-
-    {{ form.hidden_tag() }}
-    {% for field in form %}
-        {% if field.type not in ["TextField", "IntegerField"] %}
-            {% if field.type == "BooleanField" %}
-                {{ render_boolean_field(field) }}
-            {% endif %}
-
-            {% if field.type in ["SelectField", "SelectMultipleField"] %}
-                {{ render_select_field(field) }}
-            {% endif %}
-        {% else %}
-            {{ render_field(field) }}
-        {% endif %}
-    {%  endfor %}
-
-    <button type="submit" class="btn btn-success">{% trans %}Save{% endtrans %}</button>
-
-</form>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <span class="fa fa-cogs"></span> {{ active_group.name }}
+                </div>
+                <div class="panel-body">
+                    <form class="form-horizontal" role="form" method="post">
+                        {{ form.hidden_tag() }}
+                        {% for field in form %}
+                            {% if field.type not in ["TextField", "IntegerField"] %}
+                                {% if field.type == "BooleanField" %}
+                                    {{ render_boolean_field(field) }}
+                                {% endif %}
+
+                                {% if field.type in ["SelectField", "SelectMultipleField"] %}
+                                    {{ render_select_field(field) }}
+                                {% endif %}
+                            {% else %}
+                                {{ render_field(field) }}
+                            {% endif %}
+                        {%  endfor %}
+
+                        <button type="submit" class="btn btn-success">{% trans %}Save{% endtrans %}</button>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 </div>
 {% endblock %}
 {% endblock %}

+ 27 - 17
flaskbb/templates/management/user_form.html

@@ -17,22 +17,32 @@
 </div><!--/.col-md-3 -->
 </div><!--/.col-md-3 -->
 
 
 <div class="col-md-9">
 <div class="col-md-9">
-    <form class="form-horizontal" role="form" method="post">
-        {{ form.hidden_tag() }}
-        <legend class="">{{ title }}</legend>
-            {{ horizontal_field(form.username) }}
-            {{ horizontal_field(form.email) }}
-            {{ horizontal_field(form.password) }}
-            {{ horizontal_select_field(form.birthday, surrounded_div="col-sm-4") }}
-            {{ horizontal_field(form.gender) }}
-            {{ horizontal_field(form.location) }}
-            {{ horizontal_field(form.website) }}
-            {{ horizontal_field(form.avatar) }}
-            {{ horizontal_field(form.primary_group) }}
-            {{ horizontal_field(form.secondary_groups) }}
-            {{ horizontal_field(form.signature, rows=5, div_class="col-sm-9") }}
-            {{ horizontal_field(form.notes, rows=12, div_class="col-sm-9") }}
-            {{ horizontal_field(form.submit) }}
-    </form>
+    <div class="row">
+        <div class="col-md-12">
+            <div class="panel panel-primary">
+                <div class="panel-heading">
+                    <span class="fa fa-user-plus"></span> {{ title }}
+                </div>
+                <div class="panel-body">
+                    <form class="form-horizontal" role="form" method="post">
+                        {{ form.hidden_tag() }}
+                        {{ horizontal_field(form.username) }}
+                        {{ horizontal_field(form.email) }}
+                        {{ horizontal_field(form.password) }}
+                        {{ horizontal_select_field(form.birthday, surrounded_div="col-sm-4") }}
+                        {{ horizontal_field(form.gender) }}
+                        {{ horizontal_field(form.location) }}
+                        {{ horizontal_field(form.website) }}
+                        {{ horizontal_field(form.avatar) }}
+                        {{ horizontal_field(form.primary_group) }}
+                        {{ horizontal_field(form.secondary_groups) }}
+                        {{ horizontal_field(form.signature, rows=5, div_class="col-sm-9") }}
+                        {{ horizontal_field(form.notes, rows=12, div_class="col-sm-9") }}
+                        {{ horizontal_field(form.submit) }}
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
 </div>
 </div>
 {% endblock %}
 {% endblock %}

+ 0 - 2
flaskbb/templates/management/users.html

@@ -34,8 +34,6 @@
 
 
                 </div>
                 </div>
                 <div class="panel-body management-body">
                 <div class="panel-body management-body">
-
-
                     <form class="search-form" role="form" method="post">
                     <form class="search-form" role="form" method="post">
                         {{ search_form.hidden_tag() }}
                         {{ search_form.hidden_tag() }}
                         <div class="input-group">
                         <div class="input-group">