removed url translation from js files and from migration 5 - the original badge install

15 files changed, 103 insertions, 116 deletions

diff --git a/askbot/migrations/0005_install_badges.py b/askbot/migrations/0005_install_badges.py
index e404254e..278f1ce1 100644
--- a/askbot/migrations/0005_install_badges.py
+++ b/askbot/migrations/0005_install_badges.py
@@ -5,45 +5,43 @@ from south.db import db
 from south.v2 import DataMigration
 from django.db import models
 
-_ = lambda v:v #fake translation function so that badges are translated, but database takes keys
-
 INITIAL_BADGE_DATA = (
-    (_('Disciplined'), 3, _('disciplined'), _('Deleted own post with score of 3 or higher'), True, 0),
-    (_('Peer Pressure'), 3, _('peer-pressure'), _('Deleted own post with score of -3 or lower'), True, 0),
-    (_('Nice answer'), 3, _('nice-answer'), _('Answer voted up 10 times'), True, 0),
-    (_('Nice Question'), 3, _('nice-question'), _('Question voted up 10 times'), True, 0),
-    (_('Pundit'), 3, _('pundit'), _('Left 10 comments with score of 10 or more'), False, 0),
-    (_('Popular Question'), 3, _('popular-question'), _('Asked a question with 1,000 views'), True, 0),
-    (_('Citizen patrol'), 3, _('citizen-patrol'), _('First flagged post'), False, 0),
-    (_('Cleanup'), 3, _('cleanup'), _('First rollback'), False, 0),
-    (_('Critic'), 3, _('critic'), _('First down vote'), False, 0),
-    (_('Editor'), 3, _('editor'), _('First edit'), False, 0),
-    (_('Organizer'), 3, _('organizer'), _('First retag'), False, 0),
-    (_('Scholar'), 3, _('scholar'), _('First accepted answer on your own question'), False, 0),
-    (_('Student'), 3, _('student'), _('Asked first question with at least one up vote'), False, 0),
-    (_('Supporter'), 3, _('supporter'), _('First up vote'), False, 0),
-    (_('Teacher'), 3, _('teacher'), _('Answered first question with at least one up vote'), False, 0),
-    (_('Autobiographer'), 3, _('autobiographer'), _('Completed all user profile fields'), False, 0),
-    (_('Self-Learner'), 3, _('self-learner'), _('Answered your own question with at least 3 up votes'), True, 0),
-    (_('Great Answer'), 1, _('great-answer'), _('Answer voted up 100 times'), True, 0),
-    (_('Great Question'), 1, _('great-question'), _('Question voted up 100 times'), True, 0),
-    (_('Stellar Question'), 1, _('stellar-question'), _('Question favorited by 100 users'), True, 0),
-    (_('Famous question'), 1, _('famous-question'), _('Asked a question with 10,000 views'), True, 0),
-    (_('Alpha'), 2, _('alpha'), _('Actively participated in the private alpha'), False, 0),
-    (_('Good Answer'), 2, _('good-answer'), _('Answer voted up 25 times'), True, 0),
-    (_('Good Question'), 2, _('good-question'), _('Question voted up 25 times'), True, 0),
-    (_('Favorite Question'), 2, _('favorite-question'), _('Question favorited by 25 users'), True, 0),
-    (_('Civic duty'), 2, _('civic-duty'), _('Voted 300 times'), False, 0),
-    (_('Strunk & White'), 2, _('strunk-and-white'), _('Edited 100 entries'), False, 0),
-    (_('Generalist'), 2, _('generalist'), _('Active in many different tags'), False, 0),
-    (_('Expert'), 2, _('expert'), _('Very active in one tag'), False, 0),
-    (_('Yearling'), 2, _('yearling'), _('Active member for a year'), False, 0),
-    (_('Notable Question'), 2, _('notable-question'), _('Asked a question with 2,500 views'), True, 0),
-    (_('Enlightened'), 2, _('enlightened'), _('First answer was accepted with at least 10 up votes'), False, 0),
-    (_('Beta'), 2, _('beta'), _('Actively participated in the private beta'), False, 0),
-    (_('Guru'), 2, _('guru'), _('Accepted answer and voted up 40 times'), True, 0),
-    (_('Necromancer'), 2, _('necromancer'), _('Answered a question more than 60 days later with at least 5 votes'), True, 0),
-    (_('Taxonomist'), 2, _('taxonomist'), _('Created a tag used by 50 questions'), True, 0)
+    ('Disciplined', 3, 'disciplined', 'Deleted own post with score of 3 or higher', True, 0),
+    ('Peer Pressure', 3, 'peer-pressure', 'Deleted own post with score of -3 or lower', True, 0),
+    ('Nice answer', 3, 'nice-answer', 'Answer voted up 10 times', True, 0),
+    ('Nice Question', 3, 'nice-question', 'Question voted up 10 times', True, 0),
+    ('Pundit', 3, 'pundit', 'Left 10 comments with score of 10 or more', False, 0),
+    ('Popular Question', 3, 'popular-question', 'Asked a question with 1,000 views', True, 0),
+    ('Citizen patrol', 3, 'citizen-patrol', 'First flagged post', False, 0),
+    ('Cleanup', 3, 'cleanup', 'First rollback', False, 0),
+    ('Critic', 3, 'critic', 'First down vote', False, 0),
+    ('Editor', 3, 'editor', 'First edit', False, 0),
+    ('Organizer', 3, 'organizer', 'First retag', False, 0),
+    ('Scholar', 3, 'scholar', 'First accepted answer on your own question', False, 0),
+    ('Student', 3, 'student', 'Asked first question with at least one up vote', False, 0),
+    ('Supporter', 3, 'supporter', 'First up vote', False, 0),
+    ('Teacher', 3, 'teacher', 'Answered first question with at least one up vote', False, 0),
+    ('Autobiographer', 3, 'autobiographer', 'Completed all user profile fields', False, 0),
+    ('Self-Learner', 3, 'self-learner', 'Answered your own question with at least 3 up votes', True, 0),
+    ('Great Answer', 1, 'great-answer', 'Answer voted up 100 times', True, 0),
+    ('Great Question', 1, 'great-question', 'Question voted up 100 times', True, 0),
+    ('Stellar Question', 1, 'stellar-question', 'Question favorited by 100 users', True, 0),
+    ('Famous question', 1, 'famous-question', 'Asked a question with 10,000 views', True, 0),
+    ('Alpha', 2, 'alpha', 'Actively participated in the private alpha', False, 0),
+    ('Good Answer', 2, 'good-answer', 'Answer voted up 25 times', True, 0),
+    ('Good Question', 2, 'good-question', 'Question voted up 25 times', True, 0),
+    ('Favorite Question', 2, 'favorite-question', 'Question favorited by 25 users', True, 0),
+    ('Civic duty', 2, 'civic-duty', 'Voted 300 times', False, 0),
+    ('Strunk & White', 2, 'strunk-and-white', 'Edited 100 entries', False, 0),
+    ('Generalist', 2, 'generalist', 'Active in many different tags', False, 0),
+    ('Expert', 2, 'expert', 'Very active in one tag', False, 0),
+    ('Yearling', 2, 'yearling', 'Active member for a year', False, 0),
+    ('Notable Question', 2, 'notable-question', 'Asked a question with 2,500 views', True, 0),
+    ('Enlightened', 2, 'enlightened', 'First answer was accepted with at least 10 up votes', False, 0),
+    ('Beta', 2, 'beta', 'Actively participated in the private beta', False, 0),
+    ('Guru', 2, 'guru', 'Accepted answer and voted up 40 times', True, 0),
+    ('Necromancer', 2, 'necromancer', 'Answered a question more than 60 days later with at least 5 votes', True, 0),
+    ('Taxonomist', 2, 'taxonomist', 'Created a tag used by 50 questions', True, 0)
 )
 
 class Migration(DataMigration):
diff --git a/askbot/skins/default/media/js/admin.js b/askbot/skins/default/media/js/admin.js
deleted file mode 100644
index 39dff48c..00000000
--- a/askbot/skins/default/media/js/admin.js
+++ /dev/null
@@ -1,13 +0,0 @@
-$(document).ready( function(){
-    var options = {
-                   success: function(a,b){$('.admin #action_status').html($.i18n._('changes saved'));},
-                   dataType:'json',
-                   timeout:5000,
-                   url: scriptUrl + $.i18n._('moderate-user/') + viewUserID +  '/'
-                    };
-    var form = $('.admin #moderate_user_form').ajaxForm(options);
-    var box = $('.admin input#id_is_approved').click(function(){ 
-        $('.admin #action_status').html($.i18n._('sending data...'));
-        form.ajaxSubmit(options);
-    });
-});
diff --git a/askbot/skins/default/media/js/editor.js b/askbot/skins/default/media/js/editor.js
index 18cc5166..f69639cf 100644
--- a/askbot/skins/default/media/js/editor.js
+++ b/askbot/skins/default/media/js/editor.js
@@ -42,7 +42,7 @@ function ajaxFileUpload(imageUrl)
       $.ajaxFileUpload
       (
         {
-            url:'/upload/',
+            url: askbot['urls']['upload'],
               secureuri:false,
               fileElementId:'file-upload',
               dataType: 'xml',
diff --git a/askbot/skins/default/media/js/i18n.js b/askbot/skins/default/media/js/i18n.js
index c3b645f2..ebf6ec64 100644
--- a/askbot/skins/default/media/js/i18n.js
+++ b/askbot/skins/default/media/js/i18n.js
@@ -385,7 +385,6 @@ var i18nRu = {
     'anonymous users cannot delete/undelete': 'неавторизированные пользователи не могут восстанавливать и удалять сообщения', 
     'anonymous users cannot flag offensive posts': 'неавторизированные пользователи не могут пожаловаться на сообщение', 
     'anonymous users cannot select favorite questions': 'неавторизированные пользователи не могут добавлять вопросы в закладки', 
-    'answers/': 'ответы/', 
     'bold': 'жирный', 
     'bulleted list': 'список', 
     'can write': 'пишите', 
@@ -394,7 +393,6 @@ var i18nRu = {
     'characters': 'символы', 
     'click to close': 'нажмите, что бы закрыть', 
     'comments': 'комментарии', 
-    'comments/': 'комментарии/', 
     'community karma points': 'репутация сообщества', 
     'confirm delete': 'подтвердите удаление', 
     'confirm delete comment': 'удалить комментарий', 
@@ -403,7 +401,6 @@ var i18nRu = {
     'daily vote cap exhausted': 'исчерпан доступный на сегодня лимит голосований', 
     'delete': 'удалить', 
     'delete this comment': 'удалить комментарий', 
-    'delete/': 'удалить/', 
     'enter image url': 'введите url изображения, например:<br /> http://www.domain.ru/kartinka.gif', 
     'enter url': 'введите url, например:<br />http://www.domain.ru/ </p>', 
     'flag offensive cap exhausted': 'исчерпан доступный на сегодня лимит сообщений о спаме', 
@@ -424,7 +421,6 @@ var i18nRu = {
     'post deleted': 'сообщение удалено', 
     'post recovered': 'восстановить сообщение', 
     'preformatted text': 'форматирование текста', 
-    'questions/': 'вопросы/', 
     'quote': 'цитата', 
     'redo': 'повторить', 
     'tablimits info': 'допускается применение не более 5 тегов', 
@@ -434,12 +430,16 @@ var i18nRu = {
     'undelete': 'восстановить', 
     'undo': 'отменить', 
     'upload image': 'загрузить изображение', 
-    'vote/': 'голосовать/',
-    'unmark-tag/':'отменить-отметку-темы/',
-    'ignored/':'неинтересная/',
-    'mark-tag/':'отметить-тему/',
-    'interesting/':'интересная/',
-    'command/':'комманда/',
+    'delete/': 'udalyaem/', 
+    'answers/': 'otvety/', 
+    'comments/': 'kommentarii/', 
+    'questions/': 'voprosy/', 
+    'vote/': 'golosuem/',
+    'unmark-tag/':'otmenyaem-pometku-temy/',
+    'ignored/':'neinteresnaya/',
+    'mark-tag/':'pomechayem-temy/',
+    'interesting/':'interesnaya/',
+    'command/':'komanda/',
     'moderate-user/': 'модерировать-пользователя/'
 };
 
diff --git a/askbot/skins/default/media/js/live_search.js b/askbot/skins/default/media/js/live_search.js
index f01cfebf..b9e8ead2 100644
--- a/askbot/skins/default/media/js/live_search.js
+++ b/askbot/skins/default/media/js/live_search.js
@@ -83,10 +83,10 @@ $(document).ready(function(){
     var render_title = function(result){
         return '<h2>' +
                     '<a title="' + result['summary'] + '" ' +
-                        'href="' + scriptUrl + 
-                                $.i18n._('question/') + result['id'] + 
-                            '/"' +
-                    '>' +
+                        'href="' + 
+                            askbot['urls']['question_url_template']
+                            .replace('{{QuestionID}}', result['id']) +
+                    '">' +
                         result['title'] +
                     '</a>' +
                 '</h2>';
@@ -96,9 +96,11 @@ $(document).ready(function(){
         if (result['u_id'] !== false){
             var u_slug = result['u_name'].toLowerCase().replace(/ +/g, '-');
             return '<a ' +
-                        'href="' + scriptUrl + $.i18n._('users/') + result['u_id'] + 
-                            '/' + u_slug + '/"' +
-                    '>' +
+                        'href="' + 
+                            askbot['urls']['user_url_template']
+                            .replace('{{user_id}}', result['u_id'])
+                            .replace('{{slug}}', u_slug) +
+                    '">' +
                         result['u_name'] +
                     '</a> ';
         }
@@ -150,8 +152,7 @@ $(document).ready(function(){
     };
 
     var render_tag = function(tag_name){
-        var url = scriptUrl + 
-                    $.i18n._('questions/') + 
+        var url = askbot['urls']['questions'] +
                     '?tags=' + encodeURI(tag_name);
         var tag_title = $.i18n._(
                             "see questions tagged '{tag}'"
@@ -335,7 +336,7 @@ $(document).ready(function(){
     var send_query = function(query_text, sort_method){
         var post_data = {query: query_text};
         $.ajax({
-            url: scriptUrl + $.i18n._('questions/'), 
+            url: askbot['urls']['questions'],
             data: {query: query_text, sort: sort_method},
             dataType: 'json',
             success: render_result,
@@ -347,7 +348,7 @@ $(document).ready(function(){
     var reset_query = function(sort_method){
         refresh_x_button();
         $.ajax({
-            url: scriptUrl + $.i18n._('questions/'), 
+            url: askbot['urls']['questions'],
             data: {reset_query: true, sort: sort_method},
             dataType: 'json',
             success: render_result,
diff --git a/askbot/skins/default/media/js/post.js b/askbot/skins/default/media/js/post.js
index 5b7185dd..0709d66e 100644
--- a/askbot/skins/default/media/js/post.js
+++ b/askbot/skins/default/media/js/post.js
@@ -177,16 +177,14 @@ var Vote = function(){
     var acceptAnonymousMessage = $.i18n._('insufficient privilege');
     var acceptOwnAnswerMessage = $.i18n._('cannot pick own answer as best');
 
-    var pleaseLogin = " <a href='" + scriptUrl + $.i18n._("account/") + $.i18n._("signin/")
-                    + "?next=" + scriptUrl + $.i18n._("question/") + "{{QuestionID}}/{{questionSlug}}'>"
+    var pleaseLogin = " <a href='" + askbot['urls']['user_signin']
+                    + "?next=" + askbot['urls']['question_url_template']
+                    + "'>"
                     + $.i18n._('please login') + "</a>";
 
-    var pleaseSeeFAQ = $.i18n._('please see') + "<a href='" + scriptUrl + $.i18n._("faq/") + "'>faq</a>";
-
     var favoriteAnonymousMessage = $.i18n._('anonymous users cannot select favorite questions') + pleaseLogin;
     var voteAnonymousMessage = $.i18n._('anonymous users cannot vote') + pleaseLogin;
     //there were a couple of more messages...
-    var voteDenyCancelMessage = $.i18n._('cannot revoke old vote') + pleaseSeeFAQ;
     var offensiveConfirmation = $.i18n._('please confirm offensive');
     var offensiveAnonymousMessage = $.i18n._('anonymous users cannot flag offensive posts') + pleaseLogin;
     var removeConfirmation = $.i18n._('confirm delete');
@@ -356,7 +354,7 @@ var Vote = function(){
             type: "POST",
             cache: false,
             dataType: "json",
-            url: scriptUrl + $.i18n._("questions/") + questionId + "/" + $.i18n._("vote/"),
+            url: askbot['urls']['vote_url_template'].replace('{{QuestionID}}', questionId),
             data: { "type": voteType, "postId": postId },
             error: handleFail,
             success: function(data){callback(object, voteType, data);}
@@ -465,9 +463,6 @@ var Vote = function(){
         //todo: transfer proper translations of these from i18n.js
         //to django.po files
         //_('anonymous users cannot flag offensive posts') + pleaseLogin;
-        //_('flag offensive cap exhausted') + pleaseSeeFAQ;
-        //_('need >15 points to report spam') + pleaseSeeFAQ;
-        //_('cannot flag message as offensive twice') + pleaseSeeFAQ;
         if (data.success == "1"){
             $(object).children('span[class=darkred]').text("("+ data.count +")");
         }
@@ -635,8 +630,7 @@ var questionRetagger = function(){
 
     var render_tag = function(tag_name){
         //copy-paste from live search!!!
-        var url = scriptUrl + 
-                    $.i18n._('questions/') + 
+        var url = askbot['urls']['questions'] + 
                     '?tags=' + encodeURI(tag_name);
         var tag_title = $.i18n._(
                             "see questions tagged '{tag}'"
diff --git a/askbot/skins/default/media/js/tag_selector.js b/askbot/skins/default/media/js/tag_selector.js
index 6b33852e..8df017d1 100644
--- a/askbot/skins/default/media/js/tag_selector.js
+++ b/askbot/skins/default/media/js/tag_selector.js
@@ -1,19 +1,18 @@
-//var scriptUrl, interestingTags, ignoredTags, tags, $;
+//var interestingTags, ignoredTags, tags, $;
 function pickedTags(){
 
     var sendAjax = function(tagname, reason, action, callback){
-        var url = scriptUrl;
+        var url = '';
         if (action == 'add'){
-            url += $.i18n._('mark-tag/');
             if (reason == 'good'){
-                url += $.i18n._('interesting/');
+                url = askbot['urls']['mark_interesting_tag'];
             }
             else {
-                url += $.i18n._('ignored/');
+                url = askbot['urls']['mark_ignored_tag'];
             }
         }
         else {
-            url += $.i18n._('unmark-tag/');
+            url = askbot['urls']['unmark_tag'];
         }
         url = url + tagname + '/';
 
@@ -82,8 +81,7 @@ function pickedTags(){
                 new_tag.addClass('deletable-tag');
                 var tag_link = $('<a></a>');
                 tag_link.attr('rel','tag');
-                var tag_url = scriptUrl + $.i18n._('questions/') +
-                              '?tags=' + tagname;
+                var tag_url = askbot['urls']['questions'] + '?tags=' + tagname;
                 tag_link.attr('href', tag_url);
                 tag_link.html(tagname);
                 var del_link = $('<img></img>');
@@ -137,7 +135,7 @@ function pickedTags(){
                         type: 'POST',
                         dataType: 'json',
                         cache: false,
-                        url: scriptUrl + $.i18n._('command/'),
+                        url: askbot['urls']['command'],
                         data: {command:'toggle-ignored-questions'}
                     });
         });
diff --git a/askbot/skins/default/media/js/utils.js b/askbot/skins/default/media/js/utils.js
index a4dd1aa6..2eed998a 100644
--- a/askbot/skins/default/media/js/utils.js
+++ b/askbot/skins/default/media/js/utils.js
@@ -73,8 +73,10 @@ var notify = function() {
         },       
         close: function(doPostback) {
             if (doPostback) {
-               $.post(scriptUrl + $.i18n._("messages/") + 
-                $.i18n._("markread/"), { formdata: "required" });
+               $.post(
+                   askbot['urls']['mark_read_message'],
+                   { formdata: "required" }
+               );
             }
             $(".notify").fadeOut("fast");
             $("body").css("margin-top", "0");
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html
index bc1ab94b..c23f0f0a 100644
--- a/askbot/skins/default/templates/base.html
+++ b/askbot/skins/default/templates/base.html
@@ -29,7 +29,7 @@
             askbot['messages'] = {};
         </script>
         {% block forejs %}
-    {% endblock %}
+        {% endblock %}
         {# avoid adding javascript here so that pages load faster #}
     </head>
     {% endspaceless %}
diff --git a/askbot/skins/default/templates/blocks/bottom_scripts.html b/askbot/skins/default/templates/blocks/bottom_scripts.html
index 51dff2c9..d069b330 100644
--- a/askbot/skins/default/templates/blocks/bottom_scripts.html
+++ b/askbot/skins/default/templates/blocks/bottom_scripts.html
@@ -17,6 +17,7 @@
     {% else %}
         askbot['data']['userIsAuthenticated'] = false;
     {% endif %}
+    askbot['urls']['mark_read_message'] = '{% url "read_message" %}';
 </script>
 <script 
     type="text/javascript"
diff --git a/askbot/skins/default/templates/editor_data.html b/askbot/skins/default/templates/editor_data.html
index 1e76924d..79ed96fb 100644
--- a/askbot/skins/default/templates/editor_data.html
+++ b/askbot/skins/default/templates/editor_data.html
@@ -1,12 +1,10 @@
 <script type="text/javascript">
     {# data necessary for the post editor, goes into endjs block #}
-    var askbot = askbot || {};
-    askbot['settings'] = askbot['settings'] || {};
-    askbot['messages'] = askbot['messages'] || {};
     askbot['settings']['maxTagLength'] = {{settings.MAX_TAG_LENGTH}};
                             'each tag must be shorter than %(max_chars)d characters',
     askbot['messages']['maxTagLength'] = '{% trans max_chars = settings.MAX_TAG_LENGTH %}each tag must be shorter that {{max_chars}} character{% pluralize %}each tag must be shorter than {{max_chars}} characters{% endtrans %}';
     askbot['settings']['maxTagsPerPost'] = {{settings.MAX_TAGS_PER_POST}};
     askbot['messages']['maxTagsPerPost'] = '{% trans tag_count = settings.MAX_TAGS_PER_POST %}please use {{tag_count}} tag{% pluralize %}please use {{tag_count}} tags or less{% endtrans %}';
     askbot['messages']['tagLimits'] = '{% trans tag_count=settings.MAX_TAGS_PER_POST, max_chars=settings.MAX_TAG_LENGTH %}please use up to {{tag_count}} tags, less than {{max_chars}} characters each{% endtrans %}'; 
+    askbot['urls']['upload'] = '{% url "upload" %}';
 </script>
diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index 4ba93263..e4f5bdd8 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -426,6 +426,9 @@
             askbot['urls']['editComment'] = '{% url edit_comment %}';
             askbot['urls']['deleteComment'] = '{% url delete_comment %}';
             askbot['urls']['getComment'] = '{% url get_comment %}';
+            askbot['urls']['question_url_template'] = '{{settings.ASKBOT_URL}}/{% trans %}question/{% endtrans %}{{ "{{QuestionID}}/{{questionSlug}}" }}';{# yes it needs to be that whacky #}
+            askbot['urls']['user_signin'] = '{% url user_signin %}';
+            askbot['urls']['vote_url_template'] = '{{settings.ASKBOT_URL}}/{% trans %}questions/{% endtrans %}{{ "{{QuestionID}}/" }}{% trans %}vote/{% endtrans %}';
             askbot['messages']['addComment'] = '{% trans %}add comment{% endtrans %}';
         </script>
         <script type='text/javascript' src='{{"/js/wmd/showdown.js"|media}}'></script>
@@ -472,4 +475,3 @@
     </script>
     {% include "editor_data.html" %}
 {% endblock %}
-<!-- end question.html -->
diff --git a/askbot/skins/default/templates/questions.html b/askbot/skins/default/templates/questions.html
index 25c5d36f..ec14795d 100644
--- a/askbot/skins/default/templates/questions.html
+++ b/askbot/skins/default/templates/questions.html
@@ -244,6 +244,13 @@
             Hilite.elementid = "listA";
             Hilite.debug_referrer = location.href;
         });
+        askbot['urls']['mark_interesting_tag'] = '{{settings.ASKBOT_URL}}/{% trans %}mark-tag/{% endtrans %}{% trans %}interesting/{% endtrans %}';
+        askbot['urls']['mark_ignored_tag'] = '{{settings.ASKBOT_URL}}/{% trans %}mark-tag/{% endtrans %}{% trans %}ignored/{% endtrans %}';
+        askbot['urls']['unmark_tag'] = '{{settings.ASKBOT_URL}}/{% trans %}unmark-tag/{% endtrans %}';
+        askbot['urls']['command'] = '{% url "call_ajax" %}';
+        askbot['urls']['questions'] = '{% url "questions" %}';
+        askbot['urls']['question_url_template'] = '{{settings.ASKBOT_URL}}/{% trans %}question/{% endtrans %}{{ "{{QuestionID}}/" }}';
+        askbot['urls']['user_url_template'] = '{{settings.ASKBOT_URL}}/{% trans %}users/{% endtrans %}{{ "{{user_id}}" }}/{{ "{{slug}}" }}/';
     </script>
     <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
     {% if request.user.is_authenticated() %}
diff --git a/askbot/skins/default/templates/user.html b/askbot/skins/default/templates/user.html
index 4a42d23d..1d0881a2 100644
--- a/askbot/skins/default/templates/user.html
+++ b/askbot/skins/default/templates/user.html
@@ -22,8 +22,6 @@
 {% endblock %}<!-- end user.html -->
 {% block endjs %}
     {% if request.user|can_moderate_user(view_user) %}
-        <!-- todo: add condition that scripts are loaded for admins only -->
-        <script type='text/javascript' src='{{"/js/admin.js"|media}}'></script>
         <script type='text/javascript' src='{{"/js/jquery.form.js"|media}}'></script>
     {% endif %}
     <script type="text/javascript">
diff --git a/askbot/urls.py b/askbot/urls.py
index 96e25f28..d3f938aa 100644
--- a/askbot/urls.py
+++ b/askbot/urls.py
@@ -54,7 +54,7 @@ urlpatterns = patterns('',
         kwargs = {'object_name': 'Answer'},
         name='answer_revisions'
     ),
-    url(
+    url(#this url works both normally and through ajax
         r'^%s$' % _('questions/'), 
         views.readers.questions, 
         name='questions'
@@ -69,7 +69,7 @@ urlpatterns = patterns('',
         views.writers.edit_question, 
         name='edit_question'
     ),
-    url(
+    url(#this url is both regular and ajax
         r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('retag/')), 
         views.writers.retag_question, 
         name='retag_question'
@@ -89,7 +89,7 @@ urlpatterns = patterns('',
         views.writers.answer, 
         name='answer'
     ),
-    url(
+    url(#ajax only
         r'^%s(?P<id>\d+)/%s$' % (_('questions/'), _('vote/')), 
         views.commands.vote, 
         name='vote'
@@ -100,27 +100,27 @@ urlpatterns = patterns('',
         kwargs = {'object_name': 'Question'},
         name='question_revisions'
     ),
-    url(
+    url(#ajax only
         r'^post_comments/$',
         views.writers.post_comments, 
         name='post_comments'
     ),
-    url(
+    url(#ajax only
         r'^edit_comment/$',
         views.writers.edit_comment,
         name='edit_comment'
     ),
-    url(
+    url(#ajax only
         r'^%s$' % _('command/'), 
         views.commands.ajax_command, 
         name='call_ajax'
     ),
-    url(
+    url(#ajax only
         r'^comment/delete/$',
         views.writers.delete_comment, 
         name='delete_comment'
     ),
-    url(
+    url(#ajax only
         r'^comment/get_text/$',
         views.readers.get_comment, 
         name='get_comment'
@@ -136,23 +136,23 @@ urlpatterns = patterns('',
         views.readers.tags, 
         name='tags'
     ),
-    url(
+    url(#ajax only
         r'^%s%s(?P<tag>[^/]+)/$' % (_('mark-tag/'),_('interesting/')),
         views.commands.mark_tag,
         kwargs={'reason':'good','action':'add'},
         name='mark_interesting_tag'
     ),
-    url(
+    url(#ajax only
         r'^%s%s(?P<tag>[^/]+)/$' % (_('mark-tag/'),_('ignored/')),
         views.commands.mark_tag,
         kwargs={'reason':'bad','action':'add'},
         name='mark_ignored_tag'
     ),
-    url(
+    url(#ajax only
         r'^%s(?P<tag>[^/]+)/$' % _('unmark-tag/'),
         views.commands.mark_tag,
         kwargs={'action':'remove'},
-        name='mark_ignored_tag'
+        name='unmark_tag'
     ),
     url(
         r'^%s$' % _('users/'),
@@ -180,12 +180,12 @@ urlpatterns = patterns('',
         views.meta.badge,
         name='badge'
     ),
-    url(
+    url(#ajax only
         r'^%s%s$' % (_('messages/'), _('markread/')),
         views.commands.read_message,
         name='read_message'
     ),
-    url(
+    url(#ajax only
         r'^manage_inbox/$',
         views.commands.manage_inbox,
         name='manage_inbox'
@@ -196,6 +196,7 @@ urlpatterns = patterns('',
         {'feed_dict': feeds},
         name='feeds'
     ),
+    #upload url is ajax only
     url( r'^%s$' % _('upload/'), views.writers.upload, name='upload'),
     url(r'^%s$' % _('search/'), views.readers.search, name='search'),
     url(r'^%s$' % _('feedback/'), views.meta.feedback, name='feedback'),