fixed the previous commit

29 files changed, 309 insertions, 360 deletions

diff --git a/askbot/skins/default/templates/404.jinja.html b/askbot/skins/default/templates/404.jinja.html
index 61c2b767..db5a3cba 100644
--- a/askbot/skins/default/templates/404.jinja.html
+++ b/askbot/skins/default/templates/404.jinja.html
@@ -1,4 +1,4 @@
-{% extends "base_content.html" %}
+{% extends "one_column_body.html" %}
 <!-- template 404.jinja.html -->
 {% block title %}{% spaceless %}{% trans %}Page not found{% endtrans %}{% endspaceless %}{% endblock %}
 {% block forestyle%}
@@ -6,14 +6,6 @@
     form input { margin-right: 5px; }
 </style>
 {% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        $().ready(function(){
-            $("#linkPrevious").bind("click", back=function(){history.go(-1);})            
-        });
-         
-        </script>
-{% endblock %}
 {% block content %}
 <div id="main-bar" class="headNormal">
     {% trans %}Page not found{% endtrans %}
@@ -44,4 +36,11 @@
     </div>
 </div>
 {% endblock %}
+{% block endjs %}
+   <script type="text/javascript">
+        $().ready(function(){
+            $("#linkPrevious").bind("click", back=function(){history.go(-1);})            
+        });
+    </script>
+{% endblock %}
 <!-- end template 404.jinja.html -->
diff --git a/askbot/skins/default/templates/500.jinja.html b/askbot/skins/default/templates/500.jinja.html
index e353ac2e..516dda34 100644
--- a/askbot/skins/default/templates/500.jinja.html
+++ b/askbot/skins/default/templates/500.jinja.html
@@ -1,14 +1,6 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 <!-- template 500.html -->
 {% block title %}{% spaceless %}{% trans %}Internal server error{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-        <script type="text/javascript">
-        $().ready(function(){
-            $("#linkPrevious").bind("click", back=function(){history.go(-1);})            
-        });
-         
-        </script>
-{% endblock %}
 {% block content %}
 <div id="main-bar" class="">
     <h3>{% trans %}Internal server error{% endtrans %}</h3>
@@ -25,4 +17,11 @@
     </div>
 </div>
 {% endblock %}
+{% block endjs %}
+    <script type="text/javascript">
+    $().ready(function(){
+        $("#linkPrevious").bind("click", back=function(){history.go(-1);})            
+        });
+    </script>
+{% endblock %}
 <!-- end template 500.html -->
diff --git a/askbot/skins/default/templates/about.html b/askbot/skins/default/templates/about.html
index b69eac0a..40f6ce12 100644
--- a/askbot/skins/default/templates/about.html
+++ b/askbot/skins/default/templates/about.html
@@ -1,8 +1,6 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 <!-- template about.html -->
 {% block title %}{% spaceless %}{% trans %}About{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-{% endblock %}
 {% block content %}
 <div class="headNormal">
 {% trans %}About{% endtrans %}
diff --git a/askbot/skins/default/templates/answer_edit.html b/askbot/skins/default/templates/answer_edit.html
index 8e1affa3..79bc8b4d 100644
--- a/askbot/skins/default/templates/answer_edit.html
+++ b/askbot/skins/default/templates/answer_edit.html
@@ -1,11 +1,10 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 {% import "macros.html" as macros %}
 <!-- template answer_edit.html -->
 {% block title %}{% spaceless %}{% trans %}Edit answer{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
+{% block forestyle %}
     <link rel="stylesheet" type="text/css" href="{{"/js/wmd/wmd.css"|media}}" />
 {% endblock %}
-        
 {% block content %}
 <div id="main-bar" class="headNormal">
     {% trans %}Edit answer{% endtrans %} [<a href="{{ answer.question.get_absolute_url() }}#{{ answer.id }}">{% trans %}back{% endtrans %}</a>]
diff --git a/askbot/skins/default/templates/ask.html b/askbot/skins/default/templates/ask.html
index 58bc52a0..0634704d 100644
--- a/askbot/skins/default/templates/ask.html
+++ b/askbot/skins/default/templates/ask.html
@@ -1,14 +1,13 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 <!-- template ask.html -->
 {% block title %}{% spaceless %}{% trans %}Ask a question{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
+{% block forestyle %}
     <link rel="stylesheet" type="text/css" href="{{"/js/wmd/wmd.css"|media}}" />
 {% endblock %}
 {# main contents of ask form is in the template input_bar #}
 {% block sidebar %}
 {% include "question_edit_tips.html" %}
 {% endblock %}
-
 {% block endjs %}
     <script type='text/javascript' src='{{"/js/com.cnprog.editor.js"|media}}'></script>
     <script type='text/javascript' src='{{"/js/jquery.validate.js"|media}}'></script>
diff --git a/askbot/skins/default/templates/authopenid/changeemail.html b/askbot/skins/default/templates/authopenid/changeemail.html
index a96ea274..d2a34a10 100644
--- a/askbot/skins/default/templates/authopenid/changeemail.html
+++ b/askbot/skins/default/templates/authopenid/changeemail.html
@@ -1,4 +1,4 @@
-{% extends "base_content.html" %}
+{% extends "one_column_body.html" %}
 {% block title %}{% spaceless %}{% trans %}Change email{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
 <!-- changeemail.html action_type={{action_type}}-->
diff --git a/askbot/skins/default/templates/authopenid/complete.html b/askbot/skins/default/templates/authopenid/complete.html
index 77142e74..7ba5e322 100644
--- a/askbot/skins/default/templates/authopenid/complete.html
+++ b/askbot/skins/default/templates/authopenid/complete.html
@@ -1,4 +1,4 @@
-{% extends "base_content.html" %}
+{% extends "one_column_body.html" %}
 <!-- complete.html -->
 {#
 views calling this template: 
diff --git a/askbot/skins/default/templates/authopenid/signin.html b/askbot/skins/default/templates/authopenid/signin.html
index 881c76b8..dbb5ace9 100644
--- a/askbot/skins/default/templates/authopenid/signin.html
+++ b/askbot/skins/default/templates/authopenid/signin.html
@@ -1,42 +1,8 @@
-{% extends "base.html" %}

+{% extends "two_column_body.html" %}

 <!-- signin.html -->

 {% block title %}{% spaceless %}{% trans %}User login{% endtrans %}{% endspaceless %}{% endblock %}

-{% block forejs %}

+{% block forestyle %}

     <link rel="stylesheet" type="text/css" media="screen" href="{{"/jquery-openid/openid.css"|media}}"/>

-    <script type='text/javascript' src='{{"/js/jquery.validate.min.js"|media}}'></script>

-    <script type="text/javascript" src="{{"/jquery-openid/jquery.openid.js"|media}}"></script>

-    <script type="text/javascript">

-        $(document).ready( function() { $("body").authenticator(); })

-            var extra_token_name = {};

-            var create_pw_text = {};

-            var change_pw_text = {};

-            var authUrl = '/{% trans %}account/{% endtrans %}';

-            var siteName = '{{settings.APP_SHORT_NAME}}';

-            var provider_count = {{existing_login_methods|length}};

-            {% for login_provider in major_login_providers %}

-                {% if login_provider.extra_token_name %}

-                    extra_token_name['{{login_provider.name}}'] = '{{login_provider.extra_token_name}}';

-                {% endif %}

-                {% if login_provider.type == 'password' %}

-                    create_pw_text['{{login_provider.name}}'] = '{{login_provider.create_password_prompt}}';

-                    change_pw_text['{{login_provider.name}}'] = '{{login_provider.change_password_prompt}}';

-                {% endif %}

-            {% endfor %}

-            {% for login_provider in minor_login_providers %}

-                {% if login_provider.extra_token_name %}

-                    extra_token_name['{{login_provider.name}}'] = '{{login_provider.extra_token_name}}';

-                {% endif %}

-                {% if login_provider.type == 'password' %}

-                    create_pw_text['{{login_provider.name}}'] = '{{login_provider.create_password_prompt}}';

-                    change_pw_text['{{login_provider.name}}'] = '{{login_provider.change_password_prompt}}';

-                {% endif %}

-            {% endfor %}

-            {% if user.is_authenticated() %}

-                var userIsAuthenticated = true;

-            {% else %}

-                var userIsAuthenticated = false;

-            {% endif %}

-    </script>

 {% endblock %}

 {% block content %}

 <h1>{{page_title}}</h1>

@@ -272,22 +238,58 @@
         <a href="http://openid.net/get/" target="_blank">{% trans %}Get OpenID{% endtrans %} »</a>

     </p>

 </div>

-{% if settings.FACEBOOK_KEY and settings.FACEBOOK_SECRET %}

-<div id="fb-root"></div>

-<script src="http://connect.facebook.net/en_US/all.js"></script>

-<script>

-    $(document).ready(function(){

-        FB.init({appId: '{{settings.FACEBOOK_KEY}}', status: true, cookie: true, xfbml: true});

-        FB.Event.subscribe('auth.sessionChange', function(response){

-                if (response.session) {

-                // A user has logged in, and a new cookie has been saved

-                    $('#signin-form').submit();

-                } else {

-                // The user has logged out, and the cookie has been cleared

-                }

-        });

-    });

-</script>

-{% endif %}

 {% endblock%}

+{% block endjs %}

+    {% if settings.FACEBOOK_KEY and settings.FACEBOOK_SECRET %}

+    <div id="fb-root"></div>

+    <script src="http://connect.facebook.net/en_US/all.js"></script>

+    <script>

+        $(document).ready(function(){

+            FB.init({appId: '{{settings.FACEBOOK_KEY}}', status: true, cookie: true, xfbml: true});

+            FB.Event.subscribe('auth.sessionChange', function(response){

+                    if (response.session) {

+                    // A user has logged in, and a new cookie has been saved

+                        $('#signin-form').submit();

+                    } else {

+                    // The user has logged out, and the cookie has been cleared

+                    }

+            });

+        });

+    </script>

+    {% endif %}

+    <script type='text/javascript' src='{{"/js/jquery.validate.min.js"|media}}'></script>

+    <script type="text/javascript" src="{{"/jquery-openid/jquery.openid.js"|media}}"></script>

+    <script type="text/javascript">

+        $(document).ready( function() { $("body").authenticator(); })

+            var extra_token_name = {};

+            var create_pw_text = {};

+            var change_pw_text = {};

+            var authUrl = '/{% trans %}account/{% endtrans %}';

+            var siteName = '{{settings.APP_SHORT_NAME}}';

+            var provider_count = {{existing_login_methods|length}};

+            {% for login_provider in major_login_providers %}

+                {% if login_provider.extra_token_name %}

+                    extra_token_name['{{login_provider.name}}'] = '{{login_provider.extra_token_name}}';

+                {% endif %}

+                {% if login_provider.type == 'password' %}

+                    create_pw_text['{{login_provider.name}}'] = '{{login_provider.create_password_prompt}}';

+                    change_pw_text['{{login_provider.name}}'] = '{{login_provider.change_password_prompt}}';

+                {% endif %}

+            {% endfor %}

+            {% for login_provider in minor_login_providers %}

+                {% if login_provider.extra_token_name %}

+                    extra_token_name['{{login_provider.name}}'] = '{{login_provider.extra_token_name}}';

+                {% endif %}

+                {% if login_provider.type == 'password' %}

+                    create_pw_text['{{login_provider.name}}'] = '{{login_provider.create_password_prompt}}';

+                    change_pw_text['{{login_provider.name}}'] = '{{login_provider.change_password_prompt}}';

+                {% endif %}

+            {% endfor %}

+            {% if user.is_authenticated() %}

+                var userIsAuthenticated = true;

+            {% else %}

+                var userIsAuthenticated = false;

+            {% endif %}

+    </script>

+{% endblock %}

 <!-- end signin.html -->

diff --git a/askbot/skins/default/templates/authopenid/signup_with_password.html b/askbot/skins/default/templates/authopenid/signup_with_password.html
index b14a1270..84b9a792 100644
--- a/askbot/skins/default/templates/authopenid/signup_with_password.html
+++ b/askbot/skins/default/templates/authopenid/signup_with_password.html
@@ -1,4 +1,4 @@
-{% extends "base_content.html" %}
+{% extends "one_column_body.html" %}
 <!--signup.html-->
 {% block title %}{% spaceless %}{% trans %}Signup{% endtrans %}{% endspaceless %}{% endblock %}
 {% block content %}
diff --git a/askbot/skins/default/templates/badge.html b/askbot/skins/default/templates/badge.html
index 88ee6db6..016a3302 100644
--- a/askbot/skins/default/templates/badge.html
+++ b/askbot/skins/default/templates/badge.html
@@ -1,14 +1,7 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 {% import "macros.html" as macros %}
 <!-- template badge.html -->
 {% block title %}{% spaceless %}{% trans name=badge.name %}{{name}}{% endtrans %} - {% trans %}Badge{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-    <script type="text/javascript">
-        $().ready(function(){
-            $("#nav_badges").attr('className',"on");
-        });
-    </script>
-{% endblock %}
 {% block content %}
 <div id="main-bar" class="headNormal">
 {% trans %}Badge{% endtrans %}
@@ -42,4 +35,11 @@
 
 </div>
 {% endblock %}
+{% block endjs %}
+    <script type="text/javascript">
+        $().ready(function(){
+            $("#nav_badges").attr('className',"on");
+        });
+    </script>
+{% endblock %}
 <!-- end template badge.html -->
diff --git a/askbot/skins/default/templates/badges.html b/askbot/skins/default/templates/badges.html
index d9c7fc4f..d1111ce5 100644
--- a/askbot/skins/default/templates/badges.html
+++ b/askbot/skins/default/templates/badges.html
@@ -1,14 +1,6 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 <!-- template badges.html -->
 {% block title %}{% spaceless %}{% trans %}Badges summary{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        $().ready(function(){
-            $("#nav_badges").attr('className',"on");
-        });
-         
-        </script>
-{% endblock %}
 {% block content %}
 <div class="headlineA">
         <span class="headMedals">{% trans %}Badges{% endtrans %}</span>
@@ -72,4 +64,12 @@
     </div>
 </div>
 {% endblock %}
+{% block endjs %}
+       <script type="text/javascript">
+        $().ready(function(){
+            $("#nav_badges").attr('className',"on");
+        });
+         
+        </script>
+{% endblock %}
 <!-- end template badges.html -->
diff --git a/askbot/skins/default/templates/base.html b/askbot/skins/default/templates/base.html
index 228d76cc..e3b3e642 100644
--- a/askbot/skins/default/templates/base.html
+++ b/askbot/skins/default/templates/base.html
@@ -1,34 +1,47 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <!-- template base.html -->
-{% load extra_filters %}
-{% load extra_tags %}
-{% load smart_if %}
-{% load i18n %}
 <html xmlns="http://www.w3.org/1999/xhtml">
+    {% spaceless %}
     <head>
         <title>{% block title %}{% endblock %} - {{ settings.APP_TITLE|escape }}</title>
-        {% spaceless %}
-        {% block meta %}{% endblock %}
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         {% block meta_description %}
         <meta name="description" content="{{settings.APP_DESCRIPTION|escape}}" />
         {% endblock %}
-        {% endspaceless %}
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
         <meta name="keywords" content="{%block keywords%}{%endblock%},{{settings.APP_KEYWORDS|escape}}" />
         {% if settings.GOOGLE_SITEMAP_CODE %}
         <meta name="google-site-verification" content="{{settings.GOOGLE_SITEMAP_CODE}}" />
         {% endif %}
         <link rel="shortcut icon" href="{{ "/images/favicon.gif"|media }}" />
         <link href="{{"/style/style.css"|media }}" rel="stylesheet" type="text/css" />
+        {% block forestyle %}{% endblock %}
+        {% if user_messages %}
+        <style type="text/css">
+            body { margin-top:2.4em; }
+        </style>
+        {% endif %}
+        {% block forejs %}
+        {% endblock %}
+    </head>
+    {% endspaceless %}
+    <body{% if page_class %} class="{{page_class}}"{% endif %}>
+        <div class="notify" style="display:none">
+            {% if user_messages %}
+                {% for message in user_messages %}
+                      <p class="darkred">{{ message }}</p>
+                {% endfor %}
+            {% endif %}
+            <a id="close-notify" onclick="notify.close(true)">&times;</a>
+        </div>
+        {% include "header.html" %}
+        {% block body %}
+        {% endblock %}
+        {% include "footer.html" %}
         <script type="text/javascript">
             var i18nLang = '{{settings.LANGUAGE_CODE}}';
             var scriptUrl = '/{{settings.ASKBOT_URL}}'
             var askbotSkin = '{{settings.ASKBOT_DEFAULT_SKIN}}';
-            {% if settings.ENABLE_MATHJAX %}
-            var enableMathJax = true;
-            {% else %}
-            var enableMathJax = false;
-            {% endif %}
+            var enableMathJax = {% if settings.ENABLE_MATHJAX %}true{% else %}false{% endif %};
         </script>
         <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.3/jquery.min.js" type="text/javascript"></script>
         <script type='text/javascript' src='{{"/js/com.cnprog.i18n.js"|media }}'></script>
@@ -43,75 +56,45 @@
                 });
             </script>
         {% endif %}
-        {% if user_messages %}
-        <style type="text/css">
-            body { margin-top:2.4em; }
-        </style>
-        {% endif %}
-        {% block forejs %}
+        {% block endjs %}
         {% endblock %}
-    </head>
-    {% if page_class %}
-    <body class="{{page_class}}">
-    {% else %}
-    <body>
-    {% endif %}
-        <div class="notify" style="display:none">
+        <script type="text/javascript">
+        {% if active_tab != "tags" and active_tab != "users" %}
+        {# start asking question with title from search query #}
+            $(document).ready(function(){
+                $('#nav_ask').click(
+                    function(){
+                        var starting_title = $('#keywords').attr('value');
+                        var new_url = $(this).attr('href') + '?title=' + encodeURIComponent(starting_title);
+                        window.location.href = new_url;
+                        return false;
+                    }
+                );
+                //{# focus input on the search bar endcomment #}
+                {% if active_tab != "ask" %}
+                    $('#keywords').focus();
+                {% else %}
+                    $('#id_title').focus();
+                {% endif %}
                 {% if user_messages %}
-                    {% for message in user_messages %}
-                          <p class="darkred">{{ message }}</p>
-                    {% endfor %}
+                    $('#validate_email_alert').click(function(){notify.close(true)})
+                    notify.show();
                 {% endif %}
-            <a id="close-notify" onclick="notify.close(true)">&times;</a>
-        </div>
-        {% include "header.html" %}
-        <div id="wrapper">
-            <div id="room">
-                <div id="CALeft">
-                    {% include "input_bar.html" %}
-                    {% block content%}
-                    {% endblock%}
-
-                </div>
-                <div id="CARight">
-                    {% block sidebar%}
-                    {% endblock%}
-                </div>
-                <div id="tail" style="clear:both;">
-                    {% block tail %}
-                    {% endblock %}
-                </div>
-            </div>
-            <div class="spacer3"></div>
-        </div>
-        {% include "footer.html" %}
-        {% block endjs %}
-        {% endblock %}
-            <script type="text/javascript">
-            {% if active_tab != "tags" and active_tab != "users" %}
-            {# start asking question with title from search query #}
-                $(document).ready(function(){
-                    $('#nav_ask').click(
-                        function(){
-                            var starting_title = $('#keywords').attr('value');
-                            var new_url = $(this).attr('href') + '?title=' + encodeURIComponent(starting_title);
-                            window.location.href = new_url;
-                            return false;
-                        }
-                    );
-                    //{# focus input on the search bar endcomment #}
-                    {% if active_tab != "ask" %}
-                        $('#keywords').focus();
-                    {% else %}
-                        $('#id_title').focus();
-                    {% endif %}
-                });
-            {% endif %}
-            {% if user_messages %}
-                $('#validate_email_alert').click(function(){notify.close(true)})
-                notify.show();
-            {% endif %}
+            });
+        {% endif %}
+        </script>
+        {% if settings.GOOGLE_ANALYTICS_KEY %}
+        <script type="text/javascript">
+            var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+            document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
             </script>
+            <script type="text/javascript">
+            try {
+            var pageTracker = _gat._getTracker('{{ settings.GOOGLE_ANALYTICS_KEY }}');
+            pageTracker._trackPageview();
+            } catch(err) {}
+        </script>
+        {% endif %}
     </body>
 </html>
 <!-- end template base.html -->
diff --git a/askbot/skins/default/templates/close.html b/askbot/skins/default/templates/close.html
index eddf84f0..0cfd5b06 100644
--- a/askbot/skins/default/templates/close.html
+++ b/askbot/skins/default/templates/close.html
@@ -1,13 +1,6 @@
-{% extends "base_content.html" %}
+{% extends "one_column_body.html" %}
 <!-- template close.html -->
 {% block title %}{% spaceless %}{% trans %}Close question{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        $().ready(function(){
-            $('#btBack').bind('click', function(){ history.back(); });
-        });
-        </script>
-{% endblock %}
 {% block content %}
 <div id="main-bar" class="headNormal">
     {% trans %}Close question{% endtrans %}
@@ -28,4 +21,11 @@
     </form>
 </div>
 {% endblock %}
+{% block endjs %}
+    <script type="text/javascript">
+        $().ready(function(){
+            $('#btBack').bind('click', function(){ history.back(); });
+        });
+    </script>
+{% endblock %}
 <!-- end template close.html -->
diff --git a/askbot/skins/default/templates/faq.html b/askbot/skins/default/templates/faq.html
index 2c1dcfcc..b23df74c 100644
--- a/askbot/skins/default/templates/faq.html
+++ b/askbot/skins/default/templates/faq.html
@@ -1,8 +1,6 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 <!-- template faq.html -->
 {% block title %}{% spaceless %}{% trans %}FAQ{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-{% endblock %}
 {% block content %}
 <div class="headNormal">
     {% trans %}Frequently Asked Questions {% endtrans %}({% trans %}FAQ{% endtrans %})
diff --git a/askbot/skins/default/templates/feedback.html b/askbot/skins/default/templates/feedback.html
index ee381679..7d76ef8d 100644
--- a/askbot/skins/default/templates/feedback.html
+++ b/askbot/skins/default/templates/feedback.html
@@ -1,8 +1,6 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 <!-- template feedback.html -->
 {% block title %}{% spaceless %}{% trans %}Feedback{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-{% endblock %}
 {% block content %}
 <div class="headNormal">
 {% trans %}Give us your feedback!{% endtrans %}
diff --git a/askbot/skins/default/templates/footer.html b/askbot/skins/default/templates/footer.html
index b57e0fbb..03f27460 100644
--- a/askbot/skins/default/templates/footer.html
+++ b/askbot/skins/default/templates/footer.html
@@ -29,16 +29,4 @@
         </a>
     </div>
 </div>
-{% if settings.GOOGLE_ANALYTICS_KEY %}
-<script type="text/javascript">
-    var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-    document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-    </script>
-    <script type="text/javascript">
-    try {
-    var pageTracker = _gat._getTracker('{{ settings.GOOGLE_ANALYTICS_KEY }}');
-    pageTracker._trackPageview();
-    } catch(err) {}
-</script>
-{% endif %}
 <!-- end template footer.html -->
diff --git a/askbot/skins/default/templates/logout.html b/askbot/skins/default/templates/logout.html
index 067fec2e..2b16c407 100644
--- a/askbot/skins/default/templates/logout.html
+++ b/askbot/skins/default/templates/logout.html
@@ -1,12 +1,28 @@
-{% extends "base_content.html" %}
+{% extends "one_column_body.html" %}
 <!-- template logout.html -->
 {% block title %}{% spaceless %}{% trans %}Logout{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
+{% block content %}
+<div  class="headNormal">
+    {% trans %}Logout{% endtrans %} 
+</div>
+<div id="main-body" style="width:100%">
+    <p>{% trans %}As a registered user you can login with your OpenID, log out of the site or permanently remove your account.{% endtrans %}</p>
+    <input id="btLogout" type="button" class="submit" value="{% trans %}Logout now{% endtrans %}"><!-- style="width:150px">-->
+</div>
+{% if settings.FACEBOOK_KEY and settings.FACEBOOK_SECRET %}
+    <div id="fb-root"></div>
+    <script src="http://connect.facebook.net/en_US/all.js"></script>
+    <script>
+        FB.init({appId: '{{settings.FACEBOOK_KEY}}', status: true, cookie: true, xfbml: true});
+    </script>
+{% endif %}
+{% endblock %}
+{% block endjs %}
     <script type="text/javascript">
     var sign_out = function(){
         window.location.href='{% url user_signout %}?next={{ next }}';
     }
-    $().ready(function(){
+    $(document).ready(function(){
         $('#btLogout').bind('click', function(){
             if (typeof FB != 'undefined'){
                 FB.getLoginStatus(function(response){
@@ -27,20 +43,4 @@
     });
     </script>
 {% endblock %}
-{% block content %}
-<div  class="headNormal">
-    {% trans %}Logout{% endtrans %} 
-</div>
-<div id="main-body" style="width:100%">
-    <p>{% trans %}As a registered user you can login with your OpenID, log out of the site or permanently remove your account.{% endtrans %}</p>
-    <input id="btLogout" type="button" class="submit" value="{% trans %}Logout now{% endtrans %}"><!-- style="width:150px">-->
-</div>
-{% if settings.FACEBOOK_KEY and settings.FACEBOOK_SECRET %}
-<div id="fb-root"></div>
-<script src="http://connect.facebook.net/en_US/all.js"></script>
-<script>
-    FB.init({appId: '{{settings.FACEBOOK_KEY}}', status: true, cookie: true, xfbml: true});
-</script>
-{% endif %}
-{% endblock %}
 <!-- end logout.html -->
diff --git a/askbot/skins/default/templates/privacy.html b/askbot/skins/default/templates/privacy.html
index de6ff879..deb49053 100644
--- a/askbot/skins/default/templates/privacy.html
+++ b/askbot/skins/default/templates/privacy.html
@@ -1,8 +1,6 @@
-{% extends "base_content.html" %}
+{% extends "one_column_body.html" %}
 <!-- privacy.html -->
 {% block title %}{% spaceless %}{% trans %}Privacy policy{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-{% endblock %}
 {% block content %}
 <div class="headNormal">
     {% trans %}Privacy policy{% endtrans %}
diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index 6c96cc03..1aa464f2 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 {% import "macros.html" as macros %}
 <!-- question.html -->
 {% block title %}{% spaceless %}{{ question.get_question_title() }}{% endspaceless %}{% endblock %}
@@ -6,11 +6,10 @@
         <meta name="description" content="{{question.summary}}" />
 {% endblock %}
 {% block keywords %}{{question.tagname_meta_generator()}}{% endblock %}
-{% block forejs %}
+{% block forestyle %}
     <link rel="canonical" href="{{settings.APP_URL}}{{question.get_absolute_url()}}" />
     <link rel="stylesheet" type="text/css" href="{{"/js/wmd/wmd.css"|media}}" />
 {% endblock %}
-        
 {% block content %}
 <div class="headNormal">
     <a href="{{ question.get_absolute_url() }}">{{ question.get_question_title() }}</a>
diff --git a/askbot/skins/default/templates/question_edit.html b/askbot/skins/default/templates/question_edit.html
index 1be2186a..9b341a81 100644
--- a/askbot/skins/default/templates/question_edit.html
+++ b/askbot/skins/default/templates/question_edit.html
@@ -1,8 +1,8 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 {% import "macros.html" as macros %}
 <!-- question_edit.html -->
 {% block title %}{% spaceless %}{% trans %}Edit question{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
+{% block forestyle %}
     <link rel="stylesheet" type="text/css" href="{{"/js/wmd/wmd.css"|media}}" />
 {% endblock %}
 {% block content %}
diff --git a/askbot/skins/default/templates/question_retag.html b/askbot/skins/default/templates/question_retag.html
index 55bf2c8f..f4e52514 100644
--- a/askbot/skins/default/templates/question_retag.html
+++ b/askbot/skins/default/templates/question_retag.html
@@ -1,50 +1,6 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 <!-- question_retag.html -->
 {% block title %}{% spaceless %}{% trans %}Change tags{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-    <script type='text/javascript' src='{{"/js/com.cnprog.editor.js"|media}}'></script>
-    <script type='text/javascript' src='{{"/js/com.cnprog.post.js"|media}}'></script>
-    <script type='text/javascript' src='{{"/js/jquery.validate.min.js"|media}}'></script>
-    <script type="text/javascript">
-
-    $().ready(function(){
-        $("#nav_questions").attr('className',"on");
-        //Tags autocomplete action
-        var tags = {{ tags }};
-    $("#id_tags").autocomplete(tags, {
-        minChars: 1,
-        matchContains: true,
-        max: 20,
-        multiple: true,
-        multipleSeparator: " ",
-        formatItem: function(row, i, max) {
-            return row.n + " ("+ row.c +")";
-        },
-        formatResult: function(row, i, max){
-            return row.n;
-        }
-        
-    });
-     $("#fmretag").validate({
-        rules: {
-            tags: {
-                required: true,
-                maxength: 105
-            }
-        },
-        messages: {
-            tags: {
-                    required: "{% trans %}tags are required{% endtrans %}",
-                    maxlength: "{% trans %}up to 5 tags, less than 20 characters each{% endtrans %}"
-                }
-            }
-            
-        });
-        lanai.highlightSyntax();
-    });
-    </script>
-{% endblock %}
-        
 {% block content %}
 <div id="main-bar" class="headNormal">
     {% trans %}Change tags{% endtrans %} [<a href="{{ question.get_absolute_url() }}">{% trans %}back{% endtrans %}</a>]
@@ -88,5 +44,45 @@
 </div>
 {% endblock %}
 {% block endjs %}
+    <script type='text/javascript' src='{{"/js/com.cnprog.editor.js"|media}}'></script>
+    <script type='text/javascript' src='{{"/js/com.cnprog.post.js"|media}}'></script>
+    <script type='text/javascript' src='{{"/js/jquery.validate.min.js"|media}}'></script>
+    <script type="text/javascript">
+        $().ready(function(){
+            $("#nav_questions").attr('className',"on");
+            //Tags autocomplete action
+            var tags = {{ tags }};
+        $("#id_tags").autocomplete(tags, {
+            minChars: 1,
+            matchContains: true,
+            max: 20,
+            multiple: true,
+            multipleSeparator: " ",
+            formatItem: function(row, i, max) {
+                return row.n + " ("+ row.c +")";
+            },
+            formatResult: function(row, i, max){
+                return row.n;
+            }
+            
+        });
+         $("#fmretag").validate({
+            rules: {
+                tags: {
+                    required: true,
+                    maxength: 105
+                }
+            },
+            messages: {
+                tags: {
+                        required: "{% trans %}tags are required{% endtrans %}",
+                        maxlength: "{% trans %}up to 5 tags, less than 20 characters each{% endtrans %}"
+                    }
+                }
+                
+            });
+            lanai.highlightSyntax();
+        });
+    </script>
 {% endblock %}
 <!-- end question_retag.html -->
diff --git a/askbot/skins/default/templates/questions.html b/askbot/skins/default/templates/questions.html
index aa68d86f..6c5544f7 100644
--- a/askbot/skins/default/templates/questions.html
+++ b/askbot/skins/default/templates/questions.html
@@ -1,9 +1,7 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 <!-- questions.html -->
 {% import "macros.html" as macros %}
 {% block title %}{% spaceless %}{% trans %}Questions{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-{% endblock %}
 {% block content %}
 {% cache 600 "scope_sort_tabs" search_tags request.user scope sort query context.page context.page_size language_code %}
 <div class="tabBar">
diff --git a/askbot/skins/default/templates/reopen.html b/askbot/skins/default/templates/reopen.html
index 0f859eee..d1012d1b 100644
--- a/askbot/skins/default/templates/reopen.html
+++ b/askbot/skins/default/templates/reopen.html
@@ -1,13 +1,6 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 <!-- reopen.html -->
 {% block title %}{% spaceless %}{% trans %}Reopen question{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        $().ready(function(){
-            $('#btBack').bind('click', function(){ history.back(); });
-        });
-        </script>
-{% endblock %}
 {% block content %}
 <div id="main-bar" class="headNormal">
     {% trans %}Reopen question{% endtrans %}
@@ -39,4 +32,11 @@
     </form>
 </div>
 {% endblock %}
+{% block endjs %}
+    <script type="text/javascript">
+        $().ready(function(){
+            $('#btBack').bind('click', function(){ history.back(); });
+        });
+    </script>
+{% endblock %}
 <!-- end reopen.html -->
diff --git a/askbot/skins/default/templates/revisions.html b/askbot/skins/default/templates/revisions.html
index 0bd55d75..02de2871 100644
--- a/askbot/skins/default/templates/revisions.html
+++ b/askbot/skins/default/templates/revisions.html
@@ -1,38 +1,7 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 {% import "macros.html" as macros %}
 <!-- revisions.html -->
 {% block title %}{% spaceless %}{% trans %}Revision history{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-        <script type='text/javascript' src='{{"/js/com.cnprog.editor.js"|media}}'></script>
-        <script type='text/javascript' src='{{"/js/com.cnprog.post.js"|media}}'></script>
-        <script type="text/javascript">
-        //todo - take this out into .js file 
-        $().ready(function(){
-            $("#nav_questions").attr('className',"on");
-            $('div.revision div[id^=rev-header-]').bind('click', function(){
-                var revId = this.id.substr(11);
-                toggleRev(revId); 
-            
-            });
-            lanai.highlightSyntax();
-        });
-        
-        function toggleRev(id) {
-            var arrow = $("#rev-arrow-" + id);
-            var visible = arrow.attr("src").indexOf("hide") > -1;
-            var path = mediaUrl(
-                                "media/images/expander-arrow-" + 
-                                (visible ? "show" : "hide") + 
-                                ".gif" + 
-                                "?v={{settings.MEDIA_RESOURCE_REVISION}}"
-                            );
-            arrow.attr("src", path);
-            $("#rev-body-" + id).slideToggle("fast");
-        }
-        
-        </script>
-{% endblock %}
-        
 {% block content %}
 <div id="main-bar" class="headNormal">
     {% trans %}Revision history{% endtrans %} [<a href="{{ post.get_absolute_url() }}">{% trans %}back{% endtrans %}</a>]
@@ -97,5 +66,32 @@
 {% endblock %}
 
 {% block endjs %}
+    <script type='text/javascript' src='{{"/js/com.cnprog.editor.js"|media}}'></script>
+    <script type='text/javascript' src='{{"/js/com.cnprog.post.js"|media}}'></script>
+    <script type="text/javascript">
+    //todo - take this out into .js file 
+    $().ready(function(){
+        $("#nav_questions").attr('className',"on");
+        $('div.revision div[id^=rev-header-]').bind('click', function(){
+            var revId = this.id.substr(11);
+            toggleRev(revId); 
+        
+        });
+        lanai.highlightSyntax();
+    });
+
+    function toggleRev(id) {
+        var arrow = $("#rev-arrow-" + id);
+        var visible = arrow.attr("src").indexOf("hide") > -1;
+        var path = mediaUrl(
+                            "media/images/expander-arrow-" + 
+                            (visible ? "show" : "hide") + 
+                            ".gif" + 
+                            "?v={{settings.MEDIA_RESOURCE_REVISION}}"
+                        );
+        arrow.attr("src", path);
+        $("#rev-body-" + id).slideToggle("fast");
+    }
+</script>
 {% endblock %}
 <!-- end revisions.html -->
diff --git a/askbot/skins/default/templates/tags.html b/askbot/skins/default/templates/tags.html
index 598c239d..a6aa7d5d 100644
--- a/askbot/skins/default/templates/tags.html
+++ b/askbot/skins/default/templates/tags.html
@@ -1,27 +1,7 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 {% import "macros.html" as macros %}
 <!-- tags.html -->
 {% block title %}{% spaceless %}{% trans %}Tag list{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-       /*<![CDATA[*/
-        $().ready(function(){
-            $("#nav_tags").attr('className',"on");
-            $("#ipSearchTag").focus();
-
-            var orderby = "{{ tab_id }}";
-            if(orderby != "used" && orderby != "name")
-                orderby = "used";
-            $("#sort_" + orderby).attr('className',"on");
-            $("#type-tag").attr('checked',true);
-
-            Hilite.exact = false;
-            Hilite.elementid = "searchtags";
-            Hilite.debug_referrer = location.href;
-        });
-        /*]]>*/
-        </script>
-{% endblock %}
 {% block content %}
 <!-- Tabs -->
 <div class="tabBar">
@@ -55,11 +35,30 @@
 </ul>
 {% endif %}
 </div>
-
 {% endblock %}
 {% block tail %}
 <div class="pager">
     {{macros.paginator(paginator_context)}}
 </div>              
 {% endblock %}
+{% block endjs %}
+    <script type="text/javascript">
+    /*<![CDATA[*/
+        $().ready(function(){
+            $("#nav_tags").attr('className',"on");
+            $("#ipSearchTag").focus();
+
+            var orderby = "{{ tab_id }}";
+            if(orderby != "used" && orderby != "name")
+                orderby = "used";
+            $("#sort_" + orderby).attr('className',"on");
+            $("#type-tag").attr('checked',true);
+
+            Hilite.exact = false;
+            Hilite.elementid = "searchtags";
+            Hilite.debug_referrer = location.href;
+        });
+    /*]]>*/
+    </script>
+{% endblock %}
 <!-- end tags.html -->
diff --git a/askbot/skins/default/templates/unused/notarobot.html b/askbot/skins/default/templates/unused/notarobot.html
index 17e907ce..e84756b7 100644
--- a/askbot/skins/default/templates/unused/notarobot.html
+++ b/askbot/skins/default/templates/unused/notarobot.html
@@ -1,4 +1,4 @@
-{% extends "base_content.html" %}
+{% extends "one_column_body.html" %}
 {% load i18n %}
 {% block title %}{% spaceless %}{% trans "Please prove that you are a Human Being" %}{% endspaceless %}{% endblock %}
 {% block content %}
diff --git a/askbot/skins/default/templates/user.html b/askbot/skins/default/templates/user.html
index ec84dadc..6ca19211 100644
--- a/askbot/skins/default/templates/user.html
+++ b/askbot/skins/default/templates/user.html
@@ -1,4 +1,4 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 <!-- user.html -->
 {% block title %}{% spaceless %}{{ page_title }}{% endspaceless %}{% endblock %}
 {% block forestyle%}
diff --git a/askbot/skins/default/templates/user_edit.html b/askbot/skins/default/templates/user_edit.html
index 3fe78375..3f8541e4 100644
--- a/askbot/skins/default/templates/user_edit.html
+++ b/askbot/skins/default/templates/user_edit.html
@@ -1,4 +1,4 @@
-{% extends "base_content.html" %}
+{% extends "one_column_body.html" %}
 {% import "macros.html" as macros %}
 <!-- user_edit.html -->
 {% block title %}{% spaceless %}{% trans %}Edit user profile{% endtrans %}{% endspaceless %}{% endblock %}
diff --git a/askbot/skins/default/templates/users.html b/askbot/skins/default/templates/users.html
index 2c5a5cf9..5b6ce475 100644
--- a/askbot/skins/default/templates/users.html
+++ b/askbot/skins/default/templates/users.html
@@ -1,22 +1,7 @@
-{% extends "base.html" %}
+{% extends "two_column_body.html" %}
 {% import "macros.html" as macros %}
 <!-- users.html -->
 {% block title %}{% spaceless %}{% trans %}Users{% endtrans %}{% endspaceless %}{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        //todo move javascript out
-        $().ready(function(){
-            $("#nav_users").attr('className',"on");
-            $("#type-user").attr('checked',true);
-            var orderby = "{{ tab_id }}";
-            $("#sort_" + orderby).attr('className',"on");
-            
-            Hilite.exact = false;
-            Hilite.elementid = "main-body";
-            Hilite.debug_referrer = location.href;
-        });
-        </script>
-{% endblock %}
 {% block content %}
 <div class="tabBar">
     <div class="headUsers">{% trans %}Users{% endtrans %}</div>
@@ -65,4 +50,19 @@
     {{ macros.paginator(paginator_context) }}
 </div>              
 {% endblock %}
+{% block endjs %}
+    <script type="text/javascript">
+        //todo move javascript out
+        $().ready(function(){
+            $("#nav_users").attr('className',"on");
+            $("#type-user").attr('checked',true);
+            var orderby = "{{ tab_id }}";
+            $("#sort_" + orderby).attr('className',"on");
+            
+            Hilite.exact = false;
+            Hilite.elementid = "main-body";
+            Hilite.debug_referrer = location.href;
+        });
+    </script>
+{% endblock %}
 <!-- end users.html -->