Merge pull request #3 from RJacksonm1/master

Minor fixes

flaskbb/app.py

@@ -114,9 +114,11 @@ def configure_extensions(app):
                    PrivateMessage.user_id == id).subquery()
         u = db.session.query(User, unread_count).filter(User.id == id).first()
 
-        user, user.pm_unread = u
-
-        return user
+        if u:
+            user, user.pm_unread = u
+            return user
+        else:
+            return None
 
     login_manager.init_app(app)
 

flaskbb/templates/forum/new_post.html

@@ -3,6 +3,7 @@
 
 {% extends "layout.html" %}
 {% block content %}
+{% from "macros.html" import render_field %}
 
 <ul class="breadcrumb">
     <li><a href="{{ url_for('forum.index') }}">Forum</a></li>
@@ -15,9 +16,9 @@
 <form class="form" role="form" method="post">
     {{ form.hidden_tag() }}
     <h3>New Post</h3>
-    <div class="form-group">
-    {{ form.content(rows="12", class="form-control") }}
-    </div>
+
+    {{ render_field(form.content, div_class="col-sm-12", rows=12) }}
+
     <button type="submit" class="btn btn-success">Reply!</button>
 </form>
 

flaskbb/templates/forum/new_topic.html

@@ -3,7 +3,7 @@
 
 {% extends "layout.html" %}
 {% block content %}
-{% from "macros.html" import inline_field %}
+{% from "macros.html" import render_field %}
 
 <ul class="breadcrumb">
     <li><a href="{{ url_for('forum.index') }}">Forum</a></li>
@@ -15,15 +15,10 @@
 <form class="form" role="form" method="post">
     {{ form.hidden_tag() }}
     <h3>New Topic</h3>
-    <div class="form-group">
-        <label>Topic Title</label>
-        {{ form.title(class="form-control", placeholder="Topic Title") }}
-    </div>
 
-    <div class="form-group">
-        <label>Content</label>
-        {{ form.content(rows="12", class="form-control") }}
-    </div>
+    {{ render_field(form.title, div_class="col-sm-12") }}
+    {{ render_field(form.content, div_class="col-sm-12", rows=12) }}
+
     <button type="submit" class="btn btn-success">Reply!</button>
 </form>
 

flaskbb/templates/forum/topic.html

@@ -126,11 +126,12 @@
 </table>
 
 {% if current_user|post_reply(topic.forum) and not topic.locked %}
+    {% from "macros.html" import render_field %}
 <form class="form" action="#" method="post">
     {{ form.hidden_tag() }}
-    <div class="form-group">
-    {{ form.content(rows="6", class="form-control") }}
-    </div>
+
+    {{ render_field(form.content, div_class="col-sm-12", rows=5) }}
+
     <button type="submit" class="btn btn-success">Reply!</button>
 </form>
 {% endif %}