osqa-89:

password field should be type password

osqa-107:
comment length should be configurable.

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@74 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/models/comment.py b/forum/models/comment.py
index 15049b2d211d733841b3160d19600d4042a84e6e..a2e74258e036fc8dfdbb1f321680c982e5eba923 100644 (file)
--- a/forum/models/comment.py
+++ b/forum/models/comment.py
@@ -32,7 +32,7 @@ class Comment(Node):
         try:\r
             ping_google()\r
         except Exception:\r
-            logging.debug('problem pinging google did you register you sitemap with google?')\r
+            logging.debug('problem pinging google did you register your sitemap with google?')\r
 \r
     def mark_deleted(self, user):\r
         if super(Comment, self).mark_deleted(user):\r

diff --git a/forum/settings/basic.py b/forum/settings/basic.py
index cbfdbbdd24b10eed8acd7096692438f71f3d3b95..b712365d726617e0e378be4238841939a628eed8 100644 (file)
--- a/forum/settings/basic.py
+++ b/forum/settings/basic.py
@@ -54,8 +54,15 @@ The introductory page that is visible in the sidebar for anonymous users.
 """),\r
 widget=Textarea))\r
 \r
-APP_COPYRIGHT = Setting('APP_COPYRIGHT', 'Copyright OSQA, 2009. Some rights reserved under creative commons license.', BASIC_SET, dict(\r
+APP_COPYRIGHT = Setting('APP_COPYRIGHT', 'Copyright OSQA, 2010. Some rights reserved under creative commons license.', BASIC_SET, dict(\r
 label = _("Copyright notice"),\r
 help_text = _("""\r
 The copyright notice visible at the footer of your page.\r
-""")))
\ No newline at end of file
+""")))\r
+\r
+COMMENT_MAX_LENGTH = Setting('COMMENT_MAX_LENGTH', 300, BASIC_SET, dict(\r
+label = _("Maximum length of comment"),\r
+help_text = _("""\r
+The maximum length a user can enter for a comment.\r
+""")))\r
+\r

diff --git a/forum/settings/email.py b/forum/settings/email.py
index 71c2e69ca18e37a591d5514d4aaa9c1084937f50..7a0725bb24bedcf2a69f81f083ad08c579d6ef9a 100644 (file)
--- a/forum/settings/email.py
+++ b/forum/settings/email.py
@@ -1,5 +1,6 @@
 from base import Setting, SettingSet\r
 from django.utils.translation import ugettext_lazy as _\r
+from django.forms.widgets import PasswordInput\r
 \r
 EMAIL_SET = SettingSet('email', _('Email Settings'), _("Email server and other email related settings."), 50)\r
 \r
@@ -29,7 +30,8 @@ label = _("Email Password"),
 help_text = _("""\r
 The password for your SMTP connection.\r
 """),\r
-required=False))\r
+required=False,\r
+widget=PasswordInput))\r
 \r
 EMAIL_USE_TLS = Setting('EMAIL_USE_TLS', False, EMAIL_SET, dict(\r
 label = _("Use TLS"),\r

diff --git a/forum/skins/default/templates/faq.html b/forum/skins/default/templates/faq.html
index 284e12295814fb13fe3b189fdee99397e8044439..0876db47be7902ac47cc4fc906ce3a1e57682a7b 100644 (file)
--- a/forum/skins/default/templates/faq.html
+++ b/forum/skins/default/templates/faq.html
@@ -14,7 +14,7 @@
 
         <div class="first">
             <h3 class="subtitle">{% trans "What kinds of questions can I ask here?" %}</h3>
-            <p>{% trans "Most importanly - questions should be <strong>relevant</strong> to this community." %}
+            <p>{% trans "Most importantly - questions should be <strong>relevant</strong> to this community." %}
             {% trans "Before asking the question - please make sure to use search to see whether your question has alredy been answered."%}
             </p>
             

diff --git a/forum/templatetags/node_tags.py b/forum/templatetags/node_tags.py
index 8a6b069920c281275b13ab2ed886c0ba86ce808b..5e772bc7524db5d2d1ad6cc7d5cdc67df3c167f2 100644 (file)
--- a/forum/templatetags/node_tags.py
+++ b/forum/templatetags/node_tags.py
@@ -4,6 +4,7 @@ from forum.models import Question, FavoriteQuestion
 from django.utils.translation import ugettext as _\r
 from django.core.urlresolvers import reverse\r
 from django import template\r
+from django.conf import settings\r
 \r
 register = template.Library()\r
 \r
@@ -120,7 +121,7 @@ def comments(post, user):
         'comments': comments,\r
         'post': post,\r
         'can_comment': user.can_comment(post),\r
-        'max_length': 300,\r
+        'max_length': settings.COMMENT_MAX_LENGTH,\r
         'showing': showing,\r
         'total': len(all_comments),\r
     }\r