8 files changed, 26 insertions, 7 deletions
diff --git a/askbot/conf/external_keys.py b/askbot/conf/external_keys.py
index c087322b..15ad2903 100644
--- a/askbot/conf/external_keys.py
+++ b/askbot/conf/external_keys.py
@@ -68,7 +68,7 @@ settings.register(
                         'Recaptcha is a tool that helps distinguish '
                         'real people from annoying spam robots. '
                         'Please get this and a public key at '
-                        'the <a href="http://recaptcha.net">recaptcha.net</a>'
+                        'the <a href="http://google.com/recaptcha">http://google.com/recaptcha</a>'
                     )
     )
 )
diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index ae5eb3e3..73380045 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -1,7 +1,11 @@
 Changes in Askbot
 =================
 
-0.7.21 (Current Version)
+Development version
+-------------------
+* Added noscript message (Arun SAG)
+
+0.7.22 (Current Version)
 ------------------------
 * Media resource revision is now incremented 
   automatically any time when media is updated (Adolfo Fitoria, Evgeny Fadeev)
@@ -10,6 +14,10 @@ Changes in Askbot
 * Avatar box in the sidebar is ordered with priority for real faces.(Adolfo Fitoria)
 * Django's createsuperuser now works with askbot (Adolfo Fitoria)
 
+0.7.21
+------
+This version was skipped
+
 0.7.20
 ------
 * Added support for login via self-hosted Wordpress site (Adolfo Fitoria)
diff --git a/askbot/doc/source/contributors.rst b/askbot/doc/source/contributors.rst
index c4c443d7..ea7ee34e 100644
--- a/askbot/doc/source/contributors.rst
+++ b/askbot/doc/source/contributors.rst
@@ -11,6 +11,7 @@ Programming and documentation
 * Mike Chen & Sailing Cai - original authors of CNPROG forum
 * Evgeny Fadeev - founder of askbot
 * `Adolfo Fitoria <http://fitoria.net>`_
+* `Arun SAG  <http://zer0c00l.in/>`_
 * Andy Knotts
 * Benoit Lavine (with Windriver Software, Inc.)
 * Jeff Madynski
diff --git a/askbot/skins/default/media/js/utils.js b/askbot/skins/default/media/js/utils.js
index c49da02b..ec55e535 100644
--- a/askbot/skins/default/media/js/utils.js
+++ b/askbot/skins/default/media/js/utils.js
@@ -3,6 +3,11 @@ var mediaUrl = function(resource){
     return scriptUrl + 'm/' + askbotSkin + '/' + resource;
 };
 
+var cleanUrl = function(url){
+    var re = new RegExp('//', 'g');
+    return url.replace(re, '/');
+};
+
 var copyAltToTitle = function(sel){
     sel.attr('title', sel.attr('alt'));
 };
diff --git a/askbot/skins/default/media/style/jquery.autocomplete.css b/askbot/skins/default/media/style/jquery.autocomplete.css
index 1ad98ddf..b3d7b759 100644
--- a/askbot/skins/default/media/style/jquery.autocomplete.css
+++ b/askbot/skins/default/media/style/jquery.autocomplete.css
@@ -28,7 +28,7 @@
 }
 
 .acLoading {
-	background : url('indicator.gif') right center no-repeat;
+	background : url('../images/indicator.gif') right center no-repeat;
 }
 
 .acSelect {
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html
index 31abe043..9f779945 100644
--- a/askbot/skins/default/templates/base.html
+++ b/askbot/skins/default/templates/base.html
@@ -60,6 +60,11 @@
         {% include "blocks/bottom_scripts.html" %}
         {% block endjs %}
         {% endblock %}
+        <script type="text/javascript">
+            for (url_name in askbot['urls']){
+                askbot['urls'][url_name] = cleanUrl(askbot['urls'][url_name]);
+            }
+        </script>
     </body>
 </html>
 <!-- end template base.html -->
diff --git a/askbot/skins/default/templates/blocks/bottom_scripts.html b/askbot/skins/default/templates/blocks/bottom_scripts.html
index ce1eeeeb..6fbd6adc 100644
--- a/askbot/skins/default/templates/blocks/bottom_scripts.html
+++ b/askbot/skins/default/templates/blocks/bottom_scripts.html
@@ -4,7 +4,7 @@
 #}
 <div id="no-javascript">
   <noscript class="noscript">
-    {{ settings.APP_SHORT_NAME }} works best with Javascript enabled
+    {% trans app_name = settings.APP_SHORT_NAME %}Please note: {{app_name}} requires javascript to work properly, please enable javascript in your browser{% endtrans %}
   </noscript>
 </div>
 <script type="text/javascript">
diff --git a/askbot/skins/default/templates/main_page/javascript.html b/askbot/skins/default/templates/main_page/javascript.html
index 13a620e4..14dfe3cd 100644
--- a/askbot/skins/default/templates/main_page/javascript.html
+++ b/askbot/skins/default/templates/main_page/javascript.html
@@ -14,9 +14,9 @@
             $.getJSON('{% url user_update_has_custom_avatar %}?t=' + today.getTime());
         {% endif %}
     });
-    askbot['urls']['mark_interesting_tag'] = scriptUrl + '{% trans %}mark-tag/{% endtrans %}{% trans %}interesting/{% endtrans %}';
-    askbot['urls']['mark_ignored_tag'] = scriptUrl + '{% trans %}mark-tag/{% endtrans %}{% trans %}ignored/{% endtrans %}';
-    askbot['urls']['unmark_tag'] = scriptUrl + '{% trans %}unmark-tag/{% endtrans %}';
+    askbot['urls']['mark_interesting_tag'] = scriptUrl + '{% url mark_interesting_tag %}';
+    askbot['urls']['mark_ignored_tag'] = scriptUrl + '{% url mark_ignored_tag %}';
+    askbot['urls']['unmark_tag'] = scriptUrl + '{% url unmark_tag %}';
     askbot['urls']['set_tag_filter_strategy'] = '{% url "set_tag_filter_strategy" %}';
     askbot['urls']['questions'] = '{% url "questions" %}';
     askbot['urls']['question_url_template'] = scriptUrl + '{% trans %}question/{% endtrans %}{{ "{{QuestionID}}/" }}';