Merge branch 'master' of github.com:ASKBOT/askbot-devel

12 files changed, 154 insertions, 168 deletions

diff --git a/askbot/doc/source/changelog.rst b/askbot/doc/source/changelog.rst
index 430d98de..00918e76 100644
--- a/askbot/doc/source/changelog.rst
+++ b/askbot/doc/source/changelog.rst
@@ -3,6 +3,7 @@ Changes in Askbot
 
 Development version
 -------------------
+* Added management command `build_livesettings_cache` (Adolfo)
 * Welcome email for the case when replying by email is enabled (Evgeny)
 * Detection of email signature based on the response to the welcome email (Evgeny)
 * Hide "website" and "about" section of the blocked user profiles
diff --git a/askbot/doc/source/management-commands.rst b/askbot/doc/source/management-commands.rst
index b96251dc..2755bcf5 100644
--- a/askbot/doc/source/management-commands.rst
+++ b/askbot/doc/source/management-commands.rst
@@ -80,6 +80,8 @@ The bulk of the management commands fall into this group and will probably be th
 +---------------------------------+-------------------------------------------------------------+
 | `build_thread_summary_cache`    | Rebuilds cache for the question summary snippet.            |
 +---------------------------------+-------------------------------------------------------------+
+| `build_livesettings_cache`      | Rebuilds cache for the live settings.                       |
++---------------------------------+-------------------------------------------------------------+
 | `delete_contextless_...`        | `delete_contextless_badge_award_activities`                 |
 |                                 | Deletes Activity objects of type badge award where the      |
 |                                 | related context object is lost.                             |
diff --git a/askbot/management/commands/preload_livesettings_cache.py b/askbot/management/commands/build_livesettings_cache.py
index 1898fc6a..1898fc6a 100644
--- a/askbot/management/commands/preload_livesettings_cache.py
+++ b/askbot/management/commands/build_livesettings_cache.py
diff --git a/askbot/skins/default/media/style/lib_style.less b/askbot/skins/default/media/style/lib_style.less
index 63389526..05ab38f5 100644
--- a/askbot/skins/default/media/style/lib_style.less
+++ b/askbot/skins/default/media/style/lib_style.less
@@ -14,13 +14,12 @@
 
 @body-font:Arial; /* "Trebuchet MS", sans-serif;*/
 @sort-font:Georgia, serif;
-@main-font:'Yanone Kaffeesatz', Arial, sans-serif;
+@main-font:'Open Sans Condensed', Arial, sans-serif;
 @secondary-font:Arial;
 
 /* Buttons */
 
-.button-style(@w:100px ,@h:20px, @f:14px){
-    width:@w;
+.button-style(@h:20px, @f:14px){
     height:@h;
     font-size:@f;
     text-align:center;
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index 348eb6b2..7a695825 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -195,7 +195,7 @@ body.user-messages {
   text-align: center;
   background-color: #f5dd69;
   border-top: #fff 1px solid;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 .notify p.notification {
   margin-top: 6px;
@@ -222,7 +222,7 @@ body.user-messages {
 #header {
   margin-top: 0px;
   background: #16160f;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 .content-wrapper {
   /* wrapper positioning class */
@@ -275,12 +275,13 @@ body.user-messages {
   float: right;
   /* for #header.with-logo it is modified */
 
+  margin-right: 7px;
 }
 #metaNav a {
   color: #e2e2ae;
   padding: 0px 0px 0px 35px;
   height: 25px;
-  line-height: 30px;
+  line-height: 25px;
   margin: 5px 0px 0px 10px;
   font-size: 18px;
   font-weight: 100;
@@ -337,7 +338,7 @@ body.user-messages {
   border-bottom: #d3d3c2 1px solid;
   border-top: #fcfcfc 1px solid;
   margin-bottom: 10px;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 #secondaryHeader #homeButton {
   border-right: #afaf9e 1px solid;
@@ -359,11 +360,11 @@ body.user-messages {
   float: left;
 }
 #secondaryHeader #scopeWrapper .scope-selector {
-  font-size: 21px;
-  color: #5a5a4b;
+  font-size: 20px;
+  color: #7a7a6b;
   height: 55px;
   line-height: 55px;
-  margin-left: 24px;
+  margin-left: 16px;
 }
 #secondaryHeader #scopeWrapper .on {
   background: url(../images/scopearrow.png) no-repeat center bottom;
@@ -376,7 +377,7 @@ body.user-messages {
 
   display: inline-block;
   background-color: #fff;
-  width: 412px;
+  width: 400px;
   border: 1px solid #c9c9b5;
   float: right;
   height: 42px;
@@ -384,21 +385,22 @@ body.user-messages {
 }
 #searchBar .searchInput,
 #searchBar .searchInputCancelable {
-  font-size: 30px;
-  height: 40px;
+  font-size: 26px;
+  height: 39px;
   font-weight: 300;
   background: #FFF;
   border: 0px;
   color: #484848;
   padding-left: 10px;
+  padding-top: 1px;
   font-family: Arial;
-  vertical-align: middle;
+  vertical-align: top;
 }
 #searchBar .searchInput {
-  width: 352px;
+  width: 340px;
 }
 #searchBar .searchInputCancelable {
-  width: 317px;
+  width: 305px;
 }
 #searchBar .logoutsearch {
   width: 337px;
@@ -450,14 +452,13 @@ body.anon #searchBar .searchInputCancelable {
   margin-top: 6px;
   float: right;
   text-transform: uppercase;
-  width: 200px;
   height: 42px;
-  font-size: 23px;
+  font-size: 20px;
   text-align: center;
   text-decoration: none;
   cursor: pointer;
   color: #4a757f;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   text-shadow: 0px 1px 0px #c6d9dd;
   -moz-text-shadow: 0px 1px 0px #c6d9dd;
   -webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -478,6 +479,9 @@ body.anon #searchBar .searchInputCancelable {
   -webkit-box-shadow: 1px 1px 2px #636363;
   -moz-box-shadow: 1px 1px 2px #636363;
   box-shadow: 1px 1px 2px #636363;
+  width: 200px;
+  /* to match width of sidebar */
+
 }
 #askButton:hover {
   background-color: #cde5e9;
@@ -522,7 +526,7 @@ body.anon #searchBar .searchInputCancelable {
 .box p {
   margin-bottom: 4px;
   color: #707070;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 .box p.info-box-follow-up-links {
   text-align: right;
@@ -539,7 +543,7 @@ body.anon #searchBar .searchInputCancelable {
   color: #656565;
   padding-right: 10px;
   margin-bottom: 10px;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   width: 190px;
 }
 .box h3 {
@@ -547,7 +551,7 @@ body.anon #searchBar .searchInputCancelable {
   font-size: 18px;
   text-align: left;
   font-weight: normal;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   padding-left: 0px;
 }
 .box .contributorback {
@@ -556,12 +560,10 @@ body.anon #searchBar .searchInputCancelable {
 .box label {
   color: #707070;
   font-size: 15px;
-  display: block;
-  float: right;
+  vertical-align: bottom;
+  display: inline;
   text-align: left;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
-  width: 80px;
-  margin-right: 18px;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 .box #displayTagFilterControl label,
 .box #emailTagFilterControl label {
@@ -594,7 +596,7 @@ body.anon #searchBar .searchInputCancelable {
 .box .inputs #ignoredTagInput,
 .box .inputs #subscribedTagInput,
 .box .inputs #ab-tag-search {
-  width: 156px;
+  width: 152px;
   padding-left: 5px;
   border: #c9c9b5 1px solid;
   height: 25px;
@@ -609,14 +611,13 @@ body.anon #searchBar .searchInputCancelable {
   border: 0;
   font-weight: bold;
   margin-top: -2px;
-  width: 30px;
   height: 27px;
   font-size: 14px;
   text-align: center;
   text-decoration: none;
   cursor: pointer;
   color: #4a757f;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   text-shadow: 0px 1px 0px #c6d9dd;
   -moz-text-shadow: 0px 1px 0px #c6d9dd;
   -webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -672,14 +673,13 @@ body.anon #searchBar .searchInputCancelable {
   font-weight: normal;
   margin-top: 3px;
   display: block;
-  width: 120px;
   height: 34px;
   font-size: 21px;
   text-align: center;
   text-decoration: none;
   cursor: pointer;
   color: #4a757f;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   text-shadow: 0px 1px 0px #c6d9dd;
   -moz-text-shadow: 0px 1px 0px #c6d9dd;
   -webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -702,6 +702,7 @@ body.anon #searchBar .searchInputCancelable {
   box-shadow: 1px 1px 2px #636363;
   margin: 0 auto;
   padding: 0;
+  width: 130px;
 }
 .box a.followed:hover,
 .box a.follow:hover {
@@ -740,7 +741,7 @@ body.anon #searchBar .searchInputCancelable {
   text-align: center;
 }
 .box .notify-sidebar #question-subscribe-sidebar {
-  margin: 7px 0 0 3px;
+  margin: 0 0 0 3px;
 }
 .users-page .box label {
   display: inline;
@@ -877,20 +878,20 @@ body.anon #searchBar .searchInputCancelable {
 /* ----- Headline, containing number of questions and tags selected, check main_page/headline.html ----- */
 #questionCount {
   font-weight: bold;
-  font-size: 23px;
+  font-size: 20px;
   color: #7ea9b3;
   width: 200px;
   float: left;
-  margin-bottom: 8px;
+  margin-bottom: 6px;
   padding-top: 6px;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 #listSearchTags {
   float: left;
   margin-top: 3px;
   color: #707070;
   font-size: 16px;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 ul#searchTags {
   margin-left: 10px;
@@ -904,7 +905,7 @@ ul#searchTags {
   margin: 5px 0 10px 0;
   padding: 0px;
   float: left;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 .search-tips a {
   text-decoration: underline;
@@ -918,28 +919,26 @@ ul#searchTags {
   padding: 0;
   width: 100%;
 }
-.main-page #question-list {
-  margin-top: 10px;
-}
 .short-summary {
   position: relative;
   filter: inherit;
-  padding: 10px;
+  padding: 10px 0 3px 0;
   border-bottom: 1px solid #DDDBCE;
   margin-bottom: 1px;
   overflow: hidden;
-  width: 710px;
+  width: 733px;
   float: left;
-  background: url(../images/summary-background.png) repeat-x;
+  /*background: url(../images/summary-background.png) repeat-x;*/
+
 }
 .short-summary h2 {
-  font-size: 24px;
+  font-size: 20px;
   font-weight: normal;
   line-height: 26px;
   padding-left: 0;
-  margin-bottom: 6px;
+  margin-bottom: 7px;
   display: block;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 .short-summary a {
   color: #464646;
@@ -964,12 +963,12 @@ ul#searchTags {
 .short-summary .counts {
   float: right;
   margin: 4px 0 0 5px;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 .short-summary .counts .item-count {
   padding: 0px 5px 0px 5px;
   font-size: 25px;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 .short-summary .counts .votes div,
 .short-summary .counts .views div,
@@ -981,7 +980,7 @@ ul#searchTags {
   color: #646464;
 }
 .short-summary .tags {
-  margin-top: 0;
+  margin: 0 0 0 1px;
 }
 .short-summary .votes,
 .short-summary .answers,
@@ -1179,6 +1178,10 @@ ul.tags.marked-tags li,
 ul#ab-user-tags li {
   width: 160px;
   margin: 5px;
+  margin-left: 0;
+}
+.tags-page ul.tags {
+  margin-left: 5px;
 }
 ul#related-tags li {
   margin: 0 5px 8px 0;
@@ -1284,7 +1287,7 @@ ul#related-tags li {
 /* ----- Ask and Edit Question Form template----- */
 .section-title {
   color: #7ea9b3;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   font-weight: bold;
   font-size: 24px;
 }
@@ -1373,14 +1376,13 @@ ul#related-tags li {
   float: left;
   font-weight: normal;
   margin-top: 3px;
-  width: 160px;
   height: 34px;
   font-size: 21px;
   text-align: center;
   text-decoration: none;
   cursor: pointer;
   color: #4a757f;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   text-shadow: 0px 1px 0px #c6d9dd;
   -moz-text-shadow: 0px 1px 0px #c6d9dd;
   -webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -1560,11 +1562,11 @@ ul#related-tags li {
 /* ----- Question template ----- */
 .question-page h1 {
   padding-top: 0px;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 .question-page h1 a {
   color: #464646;
-  font-size: 30px;
+  font-size: 26px;
   font-weight: normal;
   line-height: 1;
 }
@@ -1573,12 +1575,12 @@ ul#related-tags li {
   clear: both;
   padding: 3px 0 0 23px;
   font-size: 15px;
-  width: 110px;
+  width: 130px;
   background-position: center left;
   margin-left: 0px !important;
 }
 .question-page p.rss a {
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   vertical-align: top;
 }
 .question-page .question-content {
@@ -1592,7 +1594,7 @@ ul#related-tags li {
 }
 .question-page #question-table,
 .question-page .answer-table {
-  margin: 6px 0 6px 0;
+  margin: 8px 0 6px 0;
   border-spacing: 0px;
   width: 670px;
   padding-right: 10px;
@@ -1743,7 +1745,7 @@ ul#related-tags li {
 }
 .question-page #questionCount {
   float: left;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   line-height: 15px;
 }
 .question-page .question-img-upvote,
@@ -1792,7 +1794,7 @@ ul#related-tags li {
   color: #7ea9b3;
   width: 200px;
   float: left;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 .question-page .comments {
   font-size: 12px;
@@ -1855,14 +1857,13 @@ ul#related-tags li {
 .question-page .comments button {
   line-height: 25px;
   margin-bottom: 5px;
-  width: 100px;
   height: 27px;
   font-size: 12px;
   text-align: center;
   text-decoration: none;
   cursor: pointer;
   color: #4a757f;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   text-shadow: 0px 1px 0px #c6d9dd;
   -moz-text-shadow: 0px 1px 0px #c6d9dd;
   -webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -2035,8 +2036,8 @@ ul#related-tags li {
   float: left;
   text-align: center;
   padding-top: 2px;
-  margin: 10px 10px 0px 3px;
-  /* smalls IE fixes */
+  margin: 0px 10px 0px 3px;
+  /* small IE fixes */
 
   *margin: 0;
   *height: 210px;
@@ -2046,15 +2047,16 @@ ul#related-tags li {
   cursor: pointer;
 }
 .question-page .vote-number {
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
-  padding: 0px 0 5px 0;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
+  padding: 2px 0 5px 0;
   font-size: 25px;
   font-weight: bold;
   color: #777;
 }
 .question-page .vote-buttons .notify-sidebar {
   text-align: left;
-  width: 120px;
+  width: 130px;
+  margin-top: 7px;
 }
 .question-page .vote-buttons .notify-sidebar label {
   vertical-align: top;
@@ -2124,7 +2126,7 @@ ul#related-tags li {
   margin-top: 10px;
 }
 .question-page #fmanswer h2 {
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   color: #7ea9b3;
   font-size: 24px;
 }
@@ -2245,14 +2247,13 @@ ul#related-tags li {
 .user-profile-page input.submit {
   font-weight: normal;
   margin: 5px 0px;
-  width: 100px;
   height: 26px;
   font-size: 15px;
   text-align: center;
   text-decoration: none;
   cursor: pointer;
   color: #4a757f;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   text-shadow: 0px 1px 0px #c6d9dd;
   -moz-text-shadow: 0px 1px 0px #c6d9dd;
   -webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -2341,14 +2342,13 @@ ul#related-tags li {
 #local_login_buttons .submit-b,
 #password-fs .submit-b,
 #openid-fs .submit-b {
-  width: 100px;
   height: 24px;
   font-size: 15px;
   text-align: center;
   text-decoration: none;
   cursor: pointer;
   color: #4a757f;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   text-shadow: 0px 1px 0px #c6d9dd;
   -moz-text-shadow: 0px 1px 0px #c6d9dd;
   -webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -2492,7 +2492,7 @@ a:hover.medal {
 }
 .user-profile-page h2 {
   padding: 10px 0px 10px 0px;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 .user-details {
   font-size: 13px;
@@ -2517,14 +2517,13 @@ a:hover.medal {
   font-weight: bold;
   line-height: 26px;
   margin-top: -2px;
-  width: 100px;
   height: 26px;
   font-size: 14px;
   text-align: center;
   text-decoration: none;
   cursor: pointer;
   color: #4a757f;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   text-shadow: 0px 1px 0px #c6d9dd;
   -moz-text-shadow: 0px 1px 0px #c6d9dd;
   -webkit-text-shadow: 0px 1px 0px #c6d9dd;
@@ -2579,13 +2578,13 @@ a:hover.medal {
   display: none;
 }
 .count {
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   font-size: 200%;
   font-weight: 700;
   color: #777777;
 }
 .scoreNumber {
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   font-size: 35px;
   font-weight: 800;
   color: #777;
@@ -2696,7 +2695,7 @@ a:hover.medal {
   color: #525252;
 }
 .revision h3 {
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
   font-size: 21px;
   padding-left: 0px;
 }
@@ -2803,7 +2802,7 @@ ins {
   padding: 6px 0 0 0;
   background: #16160f;
   font-size: 16px;
-  font-family: 'Yanone Kaffeesatz', Arial, sans-serif;
+  font-family: 'Open Sans Condensed', Arial, sans-serif;
 }
 #ground p {
   margin-bottom: 0;
@@ -3375,6 +3374,9 @@ p.signup_p {
   padding: 0;
   margin-top: -3px;
 }
+.user-profile-page ul.tags {
+  margin-left: 5px;
+}
 .userList {
   font-size: 13px;
 }
@@ -3518,7 +3520,6 @@ body.anon.lang-es #searchBar .searchInputCancelable {
   margin: 0 5px 3px 0;
 }
 .group-wiki .follow-toggle.group-join-btn {
-  width: 150px;
   margin: 4px auto 10px auto;
   display: block;
 }
diff --git a/askbot/skins/default/media/style/style.less b/askbot/skins/default/media/style/style.less
index ea404391..fd2d5b5a 100644
--- a/askbot/skins/default/media/style/style.less
+++ b/askbot/skins/default/media/style/style.less
@@ -270,12 +270,13 @@ body.user-messages {
 
 #metaNav {/* Top Navigation bar containing links for tags, people and badges, check widgets/header.html */
     float: right;/* for #header.with-logo it is modified */
+    margin-right: 7px;
 
     a {
         color: #e2e2ae;
         padding: 0px 0px 0px 35px;
         height: 25px;
-        line-height: 30px;
+        line-height: 25px;
         margin:5px 0px 0px 10px;
         font-size: 18px;
         font-weight: 100;
@@ -368,11 +369,11 @@ body.user-messages {
          }
 
         .scope-selector{
-            font-size:21px;
-            color:#5a5a4b;
+            font-size:20px;
+            color:#7a7a6b;
             height:55px;
             line-height:55px;
-            margin-left:24px
+            margin-left:16px
         }
         .on{
             background:url(../images/scopearrow.png) no-repeat center bottom;
@@ -385,32 +386,33 @@ body.user-messages {
 }
 
 #searchBar { /* Main search form , check widgets/search_bar.html */
-    display:inline-block;
+    display: inline-block;
     background-color: #fff;
-    width:412px;
+    width: 400px;
     border: 1px solid #c9c9b5;
     float:right;
     height:42px;
     margin:6px 0px 0px 15px;
 
     .searchInput, .searchInputCancelable{
-        font-size: 30px;
-        height: 40px;
+        font-size: 26px;
+        height: 39px;
         font-weight:300;
         background:#FFF;
         border:0px;
         color:#484848;
         padding-left:10px;
+        padding-top: 1px;
         font-family:@body-font;
-        vertical-align: middle;
+        vertical-align: top;
     }
 
     .searchInput,{
-        width: 352px;
+        width: 340px;
     }
 
     .searchInputCancelable {
-        width: 317px;
+        width: 305px;
     }
 
     .logoutsearch {
@@ -472,7 +474,8 @@ body.anon {
     margin-top:6px;
     float:right;
     text-transform:uppercase;
-    .button-style(200px, 42px, 23px);
+    .button-style(42px, 20px);
+    width: 200px;/* to match width of sidebar */
 }
 
 #askButton:hover{
@@ -546,12 +549,10 @@ body.anon {
     label {
         color: @info-text;
         font-size:15px;
-        display: block;
-        float: right;
+        vertical-align: bottom;
+        display: inline;
         text-align:left;
         font-family:@main-font;
-        width:80px;
-        margin-right:18px;
     }
 
     #displayTagFilterControl label,
@@ -587,7 +588,7 @@ body.anon {
         #ignoredTagInput,
         #subscribedTagInput,
         #ab-tag-search {
-            width:156px;
+            width:152px;
             padding-left:5px;
             border:#c9c9b5 1px solid;
             height:25px;
@@ -602,7 +603,7 @@ body.anon {
             border:0;
             font-weight:bold;
             margin-top:-2px;
-            .button-style(30px, 27px, 14px);
+            .button-style(27px, 14px);
             .rounded-corners(4px);
         }
        #interestingTagAdd:hover,
@@ -627,8 +628,9 @@ body.anon {
         font-weight:normal;
         margin-top:3px;
         display:block;
-        .button-style(120px,34px,21px);
+        .button-style(34px,21px);
         .center;
+        width: 130px;
     }
 
     a.followed:hover, a.follow:hover{
@@ -659,7 +661,7 @@ body.anon {
 
     /* notify by email box */
     .notify-sidebar #question-subscribe-sidebar {
-        margin: 7px 0 0 3px;
+        margin: 0 0 0 3px;
     }
 }
 
@@ -813,12 +815,12 @@ body.anon {
 
 #questionCount{
     font-weight:bold;
-    font-size:23px;
+    font-size:20px;
     color:@section-title;
     width:200px;
     float:left;
-    margin-bottom:8px;
-    padding-top:6px;
+    margin-bottom:6px;
+    padding-top: 6px;
     font-family:@main-font;
 }
 
@@ -861,27 +863,23 @@ ul#searchTags {
     width: 100%;
 }
 
-.main-page #question-list {
-    margin-top: 10px;
-}
-
 .short-summary {
     position: relative;
     filter: inherit;
-    padding: 10px;
+    padding: 10px 0 3px 0;
     border-bottom: 1px solid #DDDBCE;
     margin-bottom:1px;
     overflow: hidden;
-    width: 710px;
+    width: 733px;
     float: left;
-    background: url(../images/summary-background.png) repeat-x;
-    
+    /*background: url(../images/summary-background.png) repeat-x;*/
+
     h2 {
-        font-size: 24px;
+        font-size: 20px;
         font-weight:normal;
         line-height: 26px;
         padding-left: 0;
-        margin-bottom:6px;
+        margin-bottom:7px;
         display:block;
         font-family:@main-font;
     }
@@ -935,7 +933,7 @@ ul#searchTags {
     }
     
     .tags {
-        margin-top: 0;
+        margin: 0 0 0 1px;
     }
     
     .votes, .answers, .favorites, .views {
@@ -1361,7 +1359,7 @@ ul#related-tags li {
     float: left;
     font-weight:normal;
     margin-top:3px;
-    .button-style(160px,34px,21px);
+    .button-style(34px,21px);
     margin-right:7px;
 }
 
@@ -1518,14 +1516,14 @@ ul#related-tags li {
 
     h1{
         padding-top:0px;
-       font-family:@main-font;
-    }
-    
-    h1 a{
-         color:@question-link;
-        font-size:30px;
-        font-weight:normal;
-        line-height:1;
+        font-family:@main-font;
+
+        a {
+            color:@question-link;
+            font-size:26px;
+            font-weight:normal;
+            line-height:1;
+        }
     }
 
     p.rss {
@@ -1533,7 +1531,7 @@ ul#related-tags li {
         clear:both;
         padding: 3px 0 0 23px;
         font-size: 15px;
-        width:110px;
+        width:130px;
         background-position:center left;
         margin-left:0px !important;
     }
@@ -1542,7 +1540,7 @@ ul#related-tags li {
         font-family:@main-font;
         vertical-align: top;
     }
-       
+
     .question-content{
         float:right;
         width:682px;
@@ -1556,7 +1554,7 @@ ul#related-tags li {
 
     #question-table,
     .answer-table {
-        margin: 6px 0 6px 0;
+        margin: 8px 0 6px 0;
         border-spacing: 0px;
         width: 670px;
         padding-right:10px;
@@ -1700,7 +1698,7 @@ ul#related-tags li {
     .tabBar{
        width:100%;
     }
-    
+
     #questionCount{
         float:left;
         font-family:@main-font;
@@ -1820,7 +1818,7 @@ ul#related-tags li {
         button{
             line-height:25px;
             margin-bottom:5px;
-            .button-style(100px, 27px, 12px);
+            .button-style(27px, 12px);
             font-family:@body-font;
             font-weight:bold;
         }
@@ -1982,7 +1980,7 @@ ul#related-tags li {
 
     .vote-number {
         font-family: @main-font;
-        padding: 0px 0 5px 0;
+        padding: 2px 0 5px 0;
         font-size: 25px;
         font-weight: bold;
         color: #777;
@@ -1990,10 +1988,11 @@ ul#related-tags li {
 
     .vote-buttons .notify-sidebar {
         text-align: left;
-        width:120px;
-    }
-    .vote-buttons .notify-sidebar label {
-        vertical-align: top;
+        width:130px;
+        margin-top: 7px;
+        label {
+            vertical-align: top;
+        }
     }
 
     .tabBar-answer{
@@ -2010,7 +2009,7 @@ ul#related-tags li {
     .accepted-answer {
         background-color: #f7fecc;
         border-bottom-color: #9BD59B;
-        
+
         .vote-buttons {
             width:27px;
            margin-right:10px;
@@ -2172,7 +2171,7 @@ ul#related-tags li {
     input.submit{
         font-weight:normal;
         margin:5px 0px;
-        .button-style(100px,26px,15px);
+        .button-style(26px,15px);
         font-family:@body-font;
     }
     input.submit:hover{
@@ -2203,7 +2202,7 @@ ul#related-tags li {
         width:200px;
     }
     .submit-b{
-        .button-style(100px,24px,15px);
+        .button-style(24px,15px);
         font-family:@body-font;
         font-weight:bold;
         padding-right:10px;
@@ -2362,7 +2361,7 @@ a:hover.medal {
     font-weight:bold;
     line-height:26px;
     margin-top:-2px;
-    .button-style(100px,26px,14px);
+    .button-style(26px,14px);
 }
 
 .follow-toggle:hover, .submit:hover {
@@ -3430,7 +3429,6 @@ body.anon.lang-es {
         margin: 0 5px 3px 0;
     }
     .follow-toggle.group-join-btn {
-        width: 150px;
         margin: 4px auto 10px auto;
         display: block;
     }
diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html
index 3e463c1c..261c860f 100644
--- a/askbot/skins/default/templates/macros.html
+++ b/askbot/skins/default/templates/macros.html
@@ -6,23 +6,6 @@
     >{% if icon == False %}{% if site_label %}{{ site_label }}{% else %}{{ site }}{% endif %}{% endif %}</a>
 {%- endmacro -%}
 
-{%- macro follow_toggle(follow, name, alias, id) -%}
-    {# follow - boolean; name - object type name; alias - e.g. users name; id - object id #}
-    <div 
-        class="follow-toggle follow-user-toggle" 
-        id="follow-{{ name|escape }}-{{ id }}"
-    >
-        {% if follow %}
-        <div class="follow">{% trans %}follow {{alias}}{% endtrans %}</div>
-        {% else %}
-        <div class="unfollow">
-          <div class="unfollow-red">{% trans %}unfollow {{alias}}{% endtrans %}</div>
-          <div class="unfollow-green">{% trans %}following {{alias}}{% endtrans %}</div>
-        </div>
-        {% endif %}
-    </div>
-{%- endmacro -%}
-
 {%- macro inbox_post_snippet(response, inbox_section) -%}
 <div id="re_{{response.id}}" class="re{% if response.is_new %} new highlight{% else %} seen{% endif %}">
     <input type="checkbox" />
@@ -530,8 +513,8 @@ answer {% if answer.accepted() %}accepted-answer{% endif %} {% if answer.author_
 {%- macro follow_toggle(follow, name, alias, id) -%}
     {# follow - boolean; name - object type name; alias - e.g. users name; id - object id #}
     <div 
-        class="follow-toggle" 
-        id="follow-{{ name }}-{{ id }}"
+        class="follow-toggle follow-user-toggle" 
+        id="follow-{{ name|escape }}-{{ id }}"
     >
         {% if follow %}
         <div class="follow">{% trans %}follow {{alias}}{% endtrans %}</div>
diff --git a/askbot/skins/default/templates/meta/html_head_stylesheets.html b/askbot/skins/default/templates/meta/html_head_stylesheets.html
index 0d2ba463..8977f152 100644
--- a/askbot/skins/default/templates/meta/html_head_stylesheets.html
+++ b/askbot/skins/default/templates/meta/html_head_stylesheets.html
@@ -1,4 +1,5 @@
 {% if settings.ASKBOT_CSS_DEVEL == False %}
+
 <link href="{{"/style/style.css"|media }}" rel="stylesheet" type="text/css" />
 {% else %}
 <link href="{{"/style/style.less"|media }}" rel="stylesheet/less" type="text/css" />
@@ -7,7 +8,7 @@
 {% if settings.USE_LOCAL_FONTS %}
     {% include "meta/fonts.html" %}
 {% else %}
-    <link href='http://fonts.googleapis.com/css?family=Yanone+Kaffeesatz:300,400,700' rel='stylesheet' type='text/css'>
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans+Condensed:400,700&subset=latin,cyrillic-ext,latin-ext' rel='stylesheet' type='text/css'>
 {% endif %}
 {{ skin.get_extra_css_link() }}
 {% if settings.USE_CUSTOM_CSS %}
diff --git a/askbot/skins/default/templates/question/content.html b/askbot/skins/default/templates/question/content.html
index 58b1bcca..906b1953 100644
--- a/askbot/skins/default/templates/question/content.html
+++ b/askbot/skins/default/templates/question/content.html
@@ -3,11 +3,6 @@
 {# ==== BEGIN: question/question_card.html ==== #}
 {% include "question/question_card.html" %}
 {# ==== END: question/question_card.html ==== #}
-{% if thread.closed %}
-    {# ==== START: question/closed_question_info.html ==== #}
-    {% include "question/closed_question_info.html" %}
-    {# ==== END: question/closed_question_info.html ==== #}
-{% endif %}
 
 {% if answers %}
     <div class="clean"></div>
diff --git a/askbot/skins/default/templates/question/question_card.html b/askbot/skins/default/templates/question/question_card.html
index dd52ea0f..c787bf34 100644
--- a/askbot/skins/default/templates/question/question_card.html
+++ b/askbot/skins/default/templates/question/question_card.html
@@ -25,6 +25,12 @@
                 }
             })();
         </script>
+        {% if thread.closed %}
+            <div class="clearfix"></div>
+            {# ==== START: question/closed_question_info.html ==== #}
+            {% include "question/closed_question_info.html" %}
+            {# ==== END: question/closed_question_info.html ==== #}
+        {% endif %}
         {% include "question/question_comments.html" %}
     </div>
 
diff --git a/askbot/skins/default/templates/reopen.html b/askbot/skins/default/templates/reopen.html
index 52d926ce..4ddd6f31 100644
--- a/askbot/skins/default/templates/reopen.html
+++ b/askbot/skins/default/templates/reopen.html
@@ -9,8 +9,8 @@
         <span class="big">{{ question.get_question_title()|escape }}</span>
     </a>
 </p>
-<p>{% trans %}This question has been closed by 
-    <a href="{{closed_by_profile_url}}">{{closed_by_username|escape}}</a>
+<p>{% trans username = closed_by_username|escape %}This question has been closed by 
+    <a href="{{closed_by_profile_url}}">{{username}}</a>
 {% endtrans %}
 </p>
 <p>
diff --git a/askbot/views/users.py b/askbot/views/users.py
index 0ebfb936..66ab7420 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -81,12 +81,12 @@ def show_users(request, by_group = False, group_id = None, group_slug = None):
                 except models.Tag.DoesNotExist:
                     raise Http404
                 if group_slug == slugify(group.name):
-                    group_users = models.User.objects.filter(
+                    users = users.filter(
                         group_memberships__group__id = group_id
                     )
                     if request.user.is_authenticated():
                         user_is_group_member = bool(
-                                                    group_users.filter(
+                                                    users.filter(
                                                         id = request.user.id
                                                     ).count()
                                                 )
@@ -125,7 +125,7 @@ def show_users(request, by_group = False, group_id = None, group_slug = None):
             order_by_parameter = '-reputation'
 
         objects_list = Paginator(
-                            models.User.objects.order_by(order_by_parameter),
+                            users.order_by(order_by_parameter),
                             const.USERS_PAGE_SIZE
                         )
         base_url = request.path + '?sort=%s&amp;' % sortby