made pinging google conditional on setting sitemap code and made comment maximum length adjustible

5 files changed, 32 insertions, 7 deletions

diff --git a/askbot/conf/forum_data_rules.py b/askbot/conf/forum_data_rules.py
index 68025f48..dd740487 100644
--- a/askbot/conf/forum_data_rules.py
+++ b/askbot/conf/forum_data_rules.py
@@ -33,6 +33,17 @@ settings.register(
 settings.register(
     IntegerValue(
         FORUM_DATA_RULES,
+        'MAX_COMMENT_LENGTH',
+        default=300,
+        description=_(
+                'Maximum comment length, must be < %(max_len)s'
+            ) % {'max_len': const.COMMENT_HARD_MAX_LENGTH }
+    )
+)
+
+settings.register(
+    IntegerValue(
+        FORUM_DATA_RULES,
         'MIN_SEARCH_WORD_LENGTH',
         default=4,
         description=_('Minimum length of search term for Ajax search'),
diff --git a/askbot/models/base.py b/askbot/models/base.py
index f81d6172..7adad057 100644
--- a/askbot/models/base.py
+++ b/askbot/models/base.py
@@ -151,7 +151,9 @@ def parse_and_save_post(post, author = None, **kwargs):
                 )
 
     try:
-        ping_google()
+        from askbot.conf import settings as askbot_settings
+        if askbot_settings.GOOGLE_SITEMAP_CODE != '':
+            ping_google()
     except Exception:
         logging.debug('cannot ping google - did you register with them?')
 
diff --git a/askbot/models/question.py b/askbot/models/question.py
index c13985c0..76edce91 100644
--- a/askbot/models/question.py
+++ b/askbot/models/question.py
@@ -404,7 +404,9 @@ class Question(content.Content, DeletableContent):
     def delete(self):
         super(Question, self).delete()
         try:
-            ping_google()
+            from askbot.conf import settings as askbot_settings
+            if askbot_settings.GOOGLE_SITEMAP_CODE != '':
+                ping_google()
         except Exception:
             logging.debug('problem pinging google did you register you sitemap with google?')
 
diff --git a/askbot/skins/default/media/js/com.cnprog.post.js b/askbot/skins/default/media/js/com.cnprog.post.js
index e03053ab..4512132d 100755
--- a/askbot/skins/default/media/js/com.cnprog.post.js
+++ b/askbot/skins/default/media/js/com.cnprog.post.js
@@ -519,7 +519,8 @@ function createComments(type) {
         if (canPostComments(id)) {
             if (jDiv.find("#" + formId).length === 0) {
                 var form = '<form id="' + formId + '" class="post-comments"><div>';
-                form += '<textarea name="comment" cols="60" rows="5" maxlength="300" onblur="' +
+                form += '<textarea name="comment" cols="60" rows="5" ' +
+                        'maxlength="' + maxCommentLength + '" onblur="' +
                         objectType +'Comments.updateTextCounter(this)" ';
                 form += 'onfocus="' + objectType +
                         'Comments.updateTextCounter(this)" onkeyup="' + objectType +
@@ -721,10 +722,18 @@ function createComments(type) {
 
         updateTextCounter: function(textarea) {
             var length = textarea.value ? textarea.value.length : 0;
-            var color = length > 270 ? "#f00" : length > 200 ? "#f60" : "#999";
+            var length1 = maxCommentLength - 100;
+            if (length1 < 0){
+                length1 = Math.round(0.7*maxCommentLength);
+            }
+            var length2 = maxCommentLength - 30;
+            if (length2 < 0){
+                length2 = Math.round(0.9*maxCommentLength);
+            }
+            var color = length > length2 ? "#f00" : length > length1 ? "#f60" : "#999";
             var jSpan = $(textarea).siblings("span.text-counter");
             jSpan.html($.i18n._('can write') +
-                        (300 - length) + ' ' +
+                        (maxCommentLength - length) + ' ' +
                         $.i18n._('characters')).css("color", color);
         }
     };
diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index a4d8e128..afb6a393 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -12,10 +12,11 @@
         <script type='text/javascript' src='{{"/js/com.cnprog.editor.js"|media}}'></script>
         <script type='text/javascript'>
             {% if settings.ENABLE_MATHJAX or settings.MARKUP_CODE_FRIENDLY %}
-                var codeFriendlyMarkdown = true;
+            var codeFriendlyMarkdown = true;
             {% else %}
-                var codeFriendlyMarkdown = false;
+            var codeFriendlyMarkdown = false;
             {% endif %}
+            var maxCommentLength = {{settings.MAX_COMMENT_LENGTH}};
         </script>
         <script type='text/javascript' src='{{"/js/wmd/showdown.js"|media}}'></script>
         <script type='text/javascript' src='{{"/js/wmd/wmd.js"|media}}'></script>