Bootstrap tweaks

Just some minor cosmetic tweaks/fixes while I familiarise myself with the code.

- Make navbar static, fixed isn't necessary.
- Fixed footer exceeding window height when it is fixed to the bottom.
- Tweaked user settings' grid sizes (lots of lg usage where sm is appropriate)
- Made admin forms more consistent with user settings forms; removed 'add' forms and just used edit forms for adding stuff - they were identical files.

flaskbb/static/css/flaskbb.css

@@ -17,14 +17,11 @@ body {
   height: 60px;
   background-color: #f5f5f5;
 }
-#wrap > .container {
-  padding: 60px 15px 0;
-}
 .container .credit {
   margin: 20px 0;
 }
 #footer > .container {
-  margin-top: 15px;
+  margin: 0 auto 15px;
   padding-left: 15px;
   padding-right: 15px;
 }

flaskbb/templates/admin/add_category.html

@@ -1,22 +0,0 @@
-{% set page_title = "Add Category" %}
-{% set active_forum_nav=True %}
-
-{% extends "admin/admin_layout.html" %}
-{% block admin_content %}
-{% from "macros.html" import render_field %}
-
-<form class="form-horizontal" role="form" method="post">
-    {{ form.hidden_tag() }}
-    <legend class="">Add Forum</legend>
-        {{ render_field(form.title) }}
-        {{ render_field(form.position) }}
-        {{ render_field(form.description, rows=5, div_class="col-lg-9") }}
-
-        <div class="form-group">
-            <div class="col-lg-offset-0 col-lg-9">
-                <button type="submit" class="btn btn-success">Save</button>
-            </div>
-        </div>
-</form>
-
-{% endblock %}

flaskbb/templates/admin/add_forum.html

@@ -1,23 +0,0 @@
-{% set page_title = "Add Forum" %}
-{% set active_forum_nav=True %}
-
-{% extends "admin/admin_layout.html" %}
-{% block admin_content %}
-{% from "macros.html" import render_field, render_select_field %}
-
-<form class="form-horizontal" role="form" method="post">
-    {{ form.hidden_tag() }}
-    <legend class="">Add Forum</legend>
-        {{ render_field(form.title) }}
-        {{ render_field(form.position) }}
-        {{ render_select_field(form.category) }}
-        {{ render_field(form.description, rows=5, div_class="col-lg-9") }}
-
-        <div class="form-group">
-            <div class="col-lg-offset-0 col-lg-9">
-                <button type="submit" class="btn btn-success">Save</button>
-            </div>
-        </div>
-</form>
-
-{% endblock %}

flaskbb/templates/admin/add_group.html

@@ -1,35 +0,0 @@
-{% set page_title = "Add Group" %}
-{% set active_forum_nav=True %}
-
-{% extends "admin/admin_layout.html" %}
-{% block admin_content %}
-{% from "macros.html" import render_field, render_boolean_field %}
-
-<form class="form-horizontal" role="form" method="post">
-    {{ form.hidden_tag() }}
-    <legend class="">Add Group</legend>
-        {{ render_field(form.name) }}
-        {{ render_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.editpost) }}
-        {{ render_boolean_field(form.deletepost) }}
-        {{ render_boolean_field(form.deletetopic) }}
-        {{ render_boolean_field(form.posttopic) }}
-        {{ render_boolean_field(form.postreply) }}
-
-        <div class="form-group">
-            <div class="col-lg-offset-0 col-lg-9">
-                <button type="submit" class="btn btn-success">Save</button>
-            </div>
-        </div>
-</form>
-
-{% endblock %}

flaskbb/templates/admin/add_user.html

@@ -1,32 +0,0 @@
-{% set page_title = "Add User" %}
-{% set active_forum_nav=True %}
-
-{% extends "admin/admin_layout.html" %}
-{% block admin_content %}
-{% from "macros.html" import render_field, render_select_field %}
-
-<form class="form-horizontal" role="form" method="post">
-    {{ form.hidden_tag() }}
-    <legend class="">Add User</legend>
-        {{ render_field(form.username) }}
-        {{ render_field(form.email) }}
-        {{ render_field(form.password) }}
-        {{ render_field(form.birthday) }}
-        {{ render_select_field(form.gender) }}
-        {{ render_field(form.location) }}
-        {{ render_field(form.website) }}
-        {{ render_field(form.avatar) }}
-        {{ render_select_field(form.primary_group) }}
-        {{ render_select_field(form.secondary_groups) }}
-        {{ render_field(form.signature, rows=5, div_class="col-lg-9") }}
-        {{ render_field(form.notes, rows=12, div_class="col-lg-9") }}
-
-
-        <div class="form-group">
-            <div class="col-lg-offset-0 col-lg-9">
-                <button type="submit" class="btn btn-success">Save</button>
-            </div>
-        </div>
-</form>
-
-{% endblock %}

flaskbb/templates/admin/admin_layout.html

@@ -3,7 +3,7 @@
 {%- from 'macros.html' import navlink with context-%}
 
 <div class="row">
-    <div class="col-md-3">
+    <div class="col-sm-3">
         <div class="sidebar">
             <ul class="nav sidenav">
                 <li class="nav-header">Options</li>
@@ -14,9 +14,9 @@
                 {{ navlink('admin.forums', 'Forums') }}
             </ul>
         </div><!--/.sidebar -->
-    </div><!--/.col-md-3 -->
-    <div class="col-md-9">
+    </div><!--/.col-sm-3 -->
+    <div class="col-sm-9">
         {% block admin_content %}{% endblock %}
-    </div><!--/.col-md-9 -->
+    </div><!--/.col-sm-9 -->
 </div><!--/.row -->
 {% endblock %}

flaskbb/templates/admin/edit_category.html

@@ -1,16 +1,16 @@
-{% set page_title = "Add Category" %}
+{% set page_title = "Edit Category" %}
 {% set active_forum_nav=True %}
 
 {% extends "admin/admin_layout.html" %}
 {% block admin_content %}
-{% from "macros.html" import render_field %}
+{% from "macros.html" import horizontal_field %}
 
 <form class="form-horizontal" role="form" method="post">
     {{ form.hidden_tag() }}
-    <legend class="">Add Forum</legend>
-        {{ render_field(form.title) }}
-        {{ render_field(form.position) }}
-        {{ render_field(form.description, rows=5, div_class="col-lg-9") }}
+    <legend class="">Edit Forum</legend>
+        {{ horizontal_field(form.title) }}
+        {{ horizontal_field(form.position) }}
+        {{ horizontal_field(form.description, rows=5, div_class="col-lg-9") }}
 
         <div class="form-group">
             <div class="col-lg-offset-0 col-lg-9">

flaskbb/templates/admin/edit_forum.html

@@ -1,17 +1,17 @@
-{% set page_title = "Add Forum" %}
+{% set page_title = "Edit Forum" %}
 {% set active_forum_nav=True %}
 
 {% extends "admin/admin_layout.html" %}
 {% block admin_content %}
-{% from "macros.html" import render_field, render_select_field %}
+{% from "macros.html" import horizontal_field %}
 
 <form class="form-horizontal" role="form" method="post">
     {{ form.hidden_tag() }}
-    <legend class="">Add Forum</legend>
-        {{ render_field(form.title) }}
-        {{ render_field(form.position) }}
-        {{ render_select_field(form.category) }}
-        {{ render_field(form.description, rows=5, div_class="col-lg-9") }}
+    <legend class="">Edit Forum</legend>
+        {{ horizontal_field(form.title) }}
+        {{ horizontal_field(form.position) }}
+        {{ horizontal_field(form.category) }}
+        {{ horizontal_field(form.description, rows=5, div_class="col-lg-9") }}
 
         <div class="form-group">
             <div class="col-lg-offset-0 col-lg-9">

flaskbb/templates/admin/edit_group.html

@@ -1,15 +1,15 @@
-{% set page_title = "Add Group" %}
+{% set page_title = "Edit Group" %}
 {% set active_forum_nav=True %}
 
 {% extends "admin/admin_layout.html" %}
 {% block admin_content %}
-{% from "macros.html" import render_field, render_boolean_field %}
+{% from "macros.html" import horizontal_field, render_boolean_field %}
 
 <form class="form-horizontal" role="form" method="post">
     {{ form.hidden_tag() }}
-    <legend class="">Add Group</legend>
-        {{ render_field(form.name) }}
-        {{ render_field(form.description) }}
+    <legend class="">Edit Group</legend>
+        {{ horizontal_field(form.name) }}
+        {{ horizontal_field(form.description) }}
 
         {{ render_boolean_field(form.admin) }}
         {{ render_boolean_field(form.super_mod) }}

flaskbb/templates/admin/edit_user.html

@@ -1,29 +1,29 @@
-{% set page_title = "Add User" %}
+{% set page_title = "Edit User" %}
 {% set active_forum_nav=True %}
 
 {% extends "admin/admin_layout.html" %}
 {% block admin_content %}
-{% from "macros.html" import render_field, render_select_field %}
+{% from "macros.html" import horizontal_field %}
 
 <form class="form-horizontal" role="form" method="post">
     {{ form.hidden_tag() }}
-    <legend class="">Add User</legend>
-        {{ render_field(form.username) }}
-        {{ render_field(form.email) }}
-        {{ render_field(form.password) }}
-        {{ render_field(form.birthday) }}
-        {{ render_select_field(form.gender) }}
-        {{ render_field(form.location) }}
-        {{ render_field(form.website) }}
-        {{ render_field(form.avatar) }}
-        {{ render_select_field(form.primary_group) }}
-        {{ render_select_field(form.secondary_groups) }}
-        {{ render_field(form.signature, rows=5, div_class="col-lg-9") }}
-        {{ render_field(form.notes, rows=12, div_class="col-lg-9") }}
+    <legend class="">Edit User</legend>
+        {{ horizontal_field(form.username) }}
+        {{ horizontal_field(form.email) }}
+        {{ horizontal_field(form.password) }}
+        {{ horizontal_field(form.birthday) }}
+        {{ 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") }}
 
 
         <div class="form-group">
-            <div class="col-lg-offset-0 col-lg-9">
+            <div class="col-sm-offset-3 col-sm-9">
                 <button type="submit" class="btn btn-success">Save</button>
             </div>
         </div>

flaskbb/templates/auth/forgot_password.html

@@ -11,7 +11,7 @@
         {{ wtf.horizontal_field(form.email) }}
 
     <div class="form-group">
-        <div class="col-lg-offset-2 col-lg-10">
+        <div class="col-sm-offset-3 col-sm-9">
             <button type="submit" class="btn btn-primary">Reset Password</button>
         </div>
     </div>

flaskbb/templates/auth/login.html

@@ -12,7 +12,7 @@
     {{ horizontal_field(form.password)}}
 
     <div class="form-group">
-        <div class="col-lg-offset-2 col-lg-3">
+        <div class="col-sm-offset-3 col-sm-3">
             <div class="checkbox">
                 <label>
                     {{ form.remember_me }} Remember Me
@@ -22,7 +22,7 @@
     </div>
 
     <div class="form-group">
-        <div class="col-lg-offset-2 col-lg-10">
+        <div class="col-sm-offset-3 col-sm-9">
             <button type="submit" class="btn btn-success">Login</button>
         </div>
     </div>

flaskbb/templates/forum/memberlist.html

@@ -11,7 +11,7 @@
 
   <div class="pull-left" style="padding-bottom: 10px">
     {{ render_pagination(users, url_for('forum.memberlist')) }}
-  </div><!-- /.col-lg-6 -->
+  </div><!-- /.col-pull-left -->
   <div class="pull-right" style="padding-bottom: 10px">
     <div class="input-group">
       <input type="text" class="form-control" placeholder="Search">

flaskbb/templates/layout.html

@@ -21,7 +21,7 @@
         {% block navigation %}
         {%- from "macros.html" import topnav with context -%}
         <!-- Navigation -->
-            <nav class="navbar navbar-default navbar-fixed-top">
+            <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">

flaskbb/templates/macros.html

@@ -33,7 +33,7 @@
     {% if div_class %}
     <div class="{{ div_class }}">
     {% else %}
-    <div class="col-lg-5">
+    <div class="col-sm-5">
     {% endif %}
         <label>{{ field.label.text }}</label>
         {% if field.type == 'QuerySelectMultipleField' or field.type == 'SelectMultipleField' %}
@@ -53,7 +53,7 @@
     {% if div_class %}
     <div class="{{ div_class }}">
     {% else %}
-    <div class="col-lg-5">
+    <div class="col-sm-5">
     {% endif %}
         <label>{{ field.label.text }}</label>
         {%- if kwargs['required'] or field.flags.required -%}
@@ -81,7 +81,7 @@
 <div class="form-group {%- if field.errors %} has-error{%- endif %}">
     {{field.label(class="sr-only")}}
 
-    <div class="col-lg-4">
+    <div class="col-sm-4">
     {%- if kwargs['required'] or field.flags.required -%}
         {% if label_text %}
             {{field(class='form-control', placeholder=label_text, required="required", **kwargs)}}
@@ -103,14 +103,14 @@
 
 
 {%- macro horizontal_field(field, label_text='', label_class='') -%}
-<div class="form-group {%- if field.errors %} has-error{%- endif %}">
+<div class="form-group row {%- if field.errors %} has-error{%- endif %}">
 
     {% if class %}
         {{ field.label(class=class) }}
     {% else %}
-        {{ field.label(class="col-lg-2 control-label") }}
+        {{ field.label(class="col-sm-3 control-label") }}
     {% endif %}
-    <div class="col-lg-3">
+    <div class="col-sm-9">
 
     {%- if kwargs['required'] or field.flags.required -%}
         {% if label_text %}

flaskbb/templates/pms/new_message.html

@@ -8,8 +8,8 @@
     {{ wtf.horizontal_field(form.subject)}}
     {{ wtf.horizontal_field(form.message)}}
 
-    <div class="form-group">
-        <div class="col-lg-offset-1 col-lg-8">
+    <div class="form-group row">
+        <div class="col-sm-offset-3 col-lg-9">
             <button class="btn btn-success" type="submit" name="send_message">Send Message</button>
             <button class="btn btn-info" type="submit" name="save_message">Save as Draft</button>
         </div>

flaskbb/templates/pms/pm_layout.html

@@ -9,7 +9,7 @@
 </ul>
 
 <div class="row">
-    <div class="col-md-3">
+    <div class="col-sm-3">
         <div class="sidebar">
             <ul class="nav sidenav">
                 <li class="nav-header">Options | <small><a href="{{ url_for('pms.new_message') }}">New PM</a></small></li>
@@ -19,9 +19,9 @@
                 {{ navlink('pms.trash', 'Trash') }}
             </ul>
         </div><!--/.sidebar -->
-    </div><!--/.col-md-3 -->
-    <div class="col-md-9">
+    </div><!--/.col-sm-3 -->
+    <div class="col-sm-9">
         {% block pm_content %}{% endblock %}
-    </div><!--/.col-md-9 -->
+    </div><!--/.col-sm-9 -->
 </div><!--/.row -->
 {% endblock %}

flaskbb/templates/user/change_email.html

@@ -9,8 +9,8 @@
     {{ horizontal_field(form.new_email)}}
     {{ horizontal_field(form.confirm_new_email)}}
 
-    <div class="form-group">
-        <div class="col-lg-offset-3 col-lg-9">
+    <div class="form-group row">
+        <div class="col-sm-offset-3 col-sm-9">
             <button type="submit" class="btn btn-success">Save</button>
         </div>
     </div>

flaskbb/templates/user/change_password.html

@@ -9,8 +9,8 @@
     {{ horizontal_field(form.new_password)}}
     {{ horizontal_field(form.confirm_new_password)}}
 
-    <div class="form-group">
-        <div class="col-lg-offset-3 col-lg-9">
+    <div class="form-group row">
+        <div class="col-sm-offset-3 col-sm-9">
             <button type="submit" class="btn btn-success">Save</button>
         </div>
     </div>

flaskbb/templates/user/change_user_details.html

@@ -5,16 +5,16 @@
 <form class="form-horizontal" role="form" method="POST">
     <legend class="">Change User Details</legend>
     {{ form.hidden_tag() }}
-    {{ horizontal_field(form.birthday)}}
-    {{ horizontal_field(form.gender)}}
-    {{ horizontal_field(form.location)}}
-    {{ horizontal_field(form.website)}}
-    {{ horizontal_field(form.avatar)}}
-    {{ horizontal_field(form.signature, rows=5, div_class="col-lg-9")}}
-    {{ horizontal_field(form.notes, rows=12, div_class="col-lg-9")}}
+    {{ horizontal_field(form.birthday) }}
+    {{ horizontal_field(form.gender) }}
+    {{ horizontal_field(form.location) }}
+    {{ horizontal_field(form.website) }}
+    {{ horizontal_field(form.avatar) }}
+    {{ horizontal_field(form.signature, rows=5, div_class="col-sm-9") }}
+    {{ horizontal_field(form.notes, rows=12, div_class="col-sm-9") }}
 
-    <div class="form-group">
-        <div class="col-lg-offset-3 col-lg-9">
+    <div class="form-group row">
+        <div class="col-sm-offset-3 col-sm-9">
             <button type="submit" class="btn btn-success">Save</button>
         </div>
     </div>

flaskbb/templates/user/settings_layout.html

@@ -9,7 +9,7 @@
 </ul>
 
 <div class="row">
-    <div class="col-md-3">
+    <div class="col-sm-3">
         <div class="sidebar">
             <ul class="nav sidenav">
                 <li class="nav-header">Account Settings</li>
@@ -24,10 +24,10 @@
                 <li><a href="#">Link</a></li>
             </ul>
         </div> <!--/.sidebar -->
-    </div><!--/.col-md-3 -->
-    <div class="col-md-9">
+    </div><!--/.col-sm-3 -->
+    <div class="col-sm-9">
         {% block settings_content %}{% endblock %}
-    </div><!--/.col-md-9 -->
+    </div><!--/.col-sm-9 -->
 </div><!--/row-->
 
 {% endblock %}