Browse Source

small adjustments

sh4nks 11 years ago
parent
commit
279516ef6e
3 changed files with 10 additions and 4 deletions
  1. 6 2
      flaskbb/templates/forum/forum.html
  2. 3 1
      flaskbb/templates/forum/topic.html
  3. 1 1
      flaskbb/user/forms.py

+ 6 - 2
flaskbb/templates/forum/forum.html

@@ -27,7 +27,7 @@
     <thead>
         <tr>
             <th colspan="5">
-                Subforums
+                Forums
             </th>
         </tr>
         <tr>
@@ -41,12 +41,14 @@
     <tbody>
         {% for subforum in forum.children %}
         <tr>
-            <td align="center" valign="center" width="1">
+            <td align="center" valign="center" width="4%">
+            {#
             {% if subforum.is_unread(current_user) %}
                 New posts
             {% else %}
                 No new posts
             {% endif %}
+            #}
             </td>
 
             <td valign="top">
@@ -116,11 +118,13 @@
         {% for topic in topics.items %}
         <tr>
             <td width="4%">
+            {#
             {% if topic.is_unread(current_user) %}
                 New
             {% else %}
                 Read
             {% endif %}
+            #}
             </td>
             <td>
                 <div>

+ 3 - 1
flaskbb/templates/forum/topic.html

@@ -26,6 +26,7 @@
     {% if current_user|delete_topic(topic.first_post.user_id, topic.forum) %}
     <a href="{{ url_for('forum.delete_topic', topic_id=topic.id) }}" class="btn btn-primary">Delete Topic</a>
     {% endif %}
+    {# Move this to the topictracker template
     {% if current_user.is_authenticated() %}
         {% if current_user.is_tracking_topic(topic) %}
         <a href="{{ url_for('forum.untrack_topic', topic_id=topic.id) }}" class="btn btn-primary">Untrack Topic</a>
@@ -33,6 +34,7 @@
         <a href="{{ url_for('forum.track_topic', topic_id=topic.id) }}" class="btn btn-primary">Track Topic</a>
         {% endif %}
     {% endif %}
+    #}
 </div>
 
 <table class="table table-bordered">
@@ -108,7 +110,7 @@
         <tr>
             <td>
                 <span class="pull-left">
-                    <a href="{{ url_for('pms.new_message') }}?to_user={{ post.user.username }}">PM</a>
+                    <a href="{{ url_for('user.new_message') }}?to_user={{ post.user.username }}">PM</a>
                     {% if post.user.website %}| <a href="{{post.user.website}}">Website</a>{% endif %}
                 </span>
 

+ 1 - 1
flaskbb/user/forms.py

@@ -17,7 +17,7 @@ from wtforms.validators import (Length, Required, Email, EqualTo, regexp,
 
 from flaskbb.user.models import User, PrivateMessage
 from flaskbb.extensions import db
-from flaskbb.helpers import SelectDateWidget
+from flaskbb.utils.wtforms import SelectDateWidget
 
 
 IMG_RE = r'^[^/\\]\.(?:jpg|gif|png)'