increased fonts, slightly restyled the question summary view and restored use of the is_staff field for the forum admins because they must be staff in order to edit settings

9 files changed, 96 insertions, 43 deletions

diff --git a/askbot/importers/stackexchange/management/commands/load_stackexchange.py b/askbot/importers/stackexchange/management/commands/load_stackexchange.py
index 47d58ac8..6b656f58 100644
--- a/askbot/importers/stackexchange/management/commands/load_stackexchange.py
+++ b/askbot/importers/stackexchange/management/commands/load_stackexchange.py
@@ -765,7 +765,7 @@ class Command(BaseCommand):
             u = askbot.User()
             u_type = se_u.user_type.name
             if u_type == 'Administrator':
-                u.is_superuser = True
+                u.set_admin_status()
             elif u_type == 'Moderator':
                 u.set_status('m')
             elif u_type not in ('Unregistered', 'Registered'):
diff --git a/askbot/management/commands/add_admin.py b/askbot/management/commands/add_admin.py
index 3357cbad..6f7c7034 100644
--- a/askbot/management/commands/add_admin.py
+++ b/askbot/management/commands/add_admin.py
@@ -41,5 +41,5 @@ class Command(NoArgsCommand):
         self.confirm_action()
         self.remove_signals()
 
-        self.user.is_superuser = True
+        self.user.set_admin_status()
         self.user.save()
diff --git a/askbot/management/commands/remove_admin.py b/askbot/management/commands/remove_admin.py
index 2ec895e7..2aa95c20 100644
--- a/askbot/management/commands/remove_admin.py
+++ b/askbot/management/commands/remove_admin.py
@@ -41,5 +41,5 @@ class Command(NoArgsCommand):
         self.confirm_action()
         self.remove_signals()
 
-        self.user.is_superuser = False
+        self.user.remove_admin_status()
         self.user.save()
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py
index 7d8347f0..0fbf18a0 100644
--- a/askbot/models/__init__.py
+++ b/askbot/models/__init__.py
@@ -1126,8 +1126,20 @@ def user_is_username_taken(cls,username):
         return False
 
 def user_is_administrator(self):
-    return self.is_superuser
-
+    """checks whether user in the forum site administrator
+    the admin must be both superuser and staff member
+    the latter is because staff membership is required
+    to access the live settings"""
+    return (self.is_superuser and self.is_staff)
+
+def user_remove_admin_status(self):
+    self.is_staff = False
+    self.is_superuser = False
+
+def user_set_admin_status(self):
+    self.is_staff = True
+    self.is_superuser = True
+    
 def user_is_moderator(self):
     return (self.status == 'm' and self.is_administrator() == False)
 
@@ -1168,7 +1180,7 @@ def user_set_status(self, new_status):
     #clear admin status if user was an administrator
     #because this function is not dealing with the site admins
     if self.is_administrator():
-        self.is_superuser = False
+        self.remove_admin_status()
 
     self.status = new_status
     self.save()
@@ -1572,6 +1584,8 @@ User.add_to_class('decrement_response_count', user_decrement_response_count)
 User.add_to_class('increment_response_count', user_increment_response_count)
 User.add_to_class('clean_response_counts', user_clean_response_counts)
 User.add_to_class('is_administrator', user_is_administrator)
+User.add_to_class('set_admin_status', user_set_admin_status)
+User.add_to_class('remove_admin_status', user_remove_admin_status)
 User.add_to_class('is_moderator', user_is_moderator)
 User.add_to_class('is_approved', user_is_approved)
 User.add_to_class('is_watched', user_is_watched)
diff --git a/askbot/skins/default/media/js/live_search.js b/askbot/skins/default/media/js/live_search.js
index 9c090a99..4b6da7c5 100644
--- a/askbot/skins/default/media/js/live_search.js
+++ b/askbot/skins/default/media/js/live_search.js
@@ -213,9 +213,9 @@ $(document).ready(function(){
                     question['views_word'],
                     question['views_class']
                 ) +
+                render_user_info(question) +
             '</div>' + 
             render_title(question) +
-            render_user_info(question) +
             render_tags(question['tags'], true, false) +
         '</div>';
         return entry_html;
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index 8a3dedf1..f456c3f0 100755
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -2,7 +2,7 @@
 
 body {
     background: #FFF;
-    font-size: 12px;
+    font-size: 14px;
     line-height: 150%;
     margin: 0;
     padding: 0;
@@ -37,7 +37,7 @@ input, select {
 
 p {
     margin-bottom: 13px;
-    font-size: 13px;
+    font-size: 14px;
     line-height: 140%;
     padding-left: 5px;
 }
@@ -179,7 +179,6 @@ blockquote {
     text-align: right; /*letter-spacing:1px; */
     margin-left: 20px;
     text-decoration: underline;
-    font-size: 12px;
     color: #555555;
 }
 
@@ -340,7 +339,7 @@ blockquote {
 
 .short-summary {
     position: relative;
-    padding: 3px 2px 5px 2px;
+    padding: 5px 2px 5px 2px;
     border-top: 1px dashed #ccccce;
     overflow: hidden;
     width: 702px;
@@ -352,14 +351,22 @@ blockquote {
     font-family: "Trebuchet MS", "segoe ui", arial, sans-serif;
 }
 
+.short-summary .userinfo .relativetime,
+.short-summary .userinfo a {
+    font-size: 11px;
+    font-weight: normal;
+    color: #777;
+}
+
+
 .short-summary .userinfo {
-    float: right;
-    margin-top: 8px;
+    text-align:center;
+    line-height:16px;
 }
 
 .short-summary .counts {
     float: right;
-    margin: 4px 0 0 5px;
+    margin: 2px 0 0 5px;
 }
 
 .short-summary .counts .item-count {
@@ -371,8 +378,16 @@ blockquote {
     font-weight: 800;
 }
 
-.short-summary .counts .votes div {
-    padding-top:1px;
+.short-summary .counts .votes div,
+.short-summary .counts .views div
+{
+    font-size: 12px;
+    line-height:14px;
+    color: #666;
+}
+
+.short-summary .tags {
+    margin-top: 0;
 }
 
 .no-votes {
@@ -406,12 +421,10 @@ blockquote {
 
 .short-summary .votes,
 .short-summary .views {
-    font-size: 12px;
     text-align: center;
-    margin: 0 0 0 7px;
+    margin: 0 3px;
     padding: 4px 2px 0px 2px;
     width: 46px;
-    height: 48px;
     float: left;
     -moz-border-radius: 5px;
     -khtml-border-radius: 5px;
@@ -457,6 +470,10 @@ blockquote {
     margin: 0;
 }
 
+.boxC h2 {
+    padding-left: 0;
+}
+
 .pager {
     clear:both;
     border-top: 1px solid #777;
@@ -531,7 +548,7 @@ blockquote {
 
 .tags {
     font-family: sans-serif;
-    line-height: 200%;
+    line-height: 170%;
     display: block;
     margin-top: 5px;
 }
@@ -542,7 +559,9 @@ blockquote {
 
 p.rss {
     float: right;
-    margin-right: 2px;
+    font-size: 12px;
+    color: #666;
+    margin: 0 2px 0 0;
 }
 
 p.rss a {
@@ -726,13 +745,12 @@ a:hover.medal {
     font-size: 125%;
 }
 
-.question-body {
+.question-body, .answer-body {
     min-height: 39px;
-    font-size: 13px;
     line-height: 20px;
 }
 
-.question-body IMG {
+.question-body IMG, .answer-body IMG {
     max-width: 600px;
 }
 
@@ -817,7 +835,7 @@ a:hover.medal {
 }
 
 .comments {
-    font-size: 11px;
+    font-size: 12px;
     line-height: 15px;
     clear: both;
 }
@@ -836,7 +854,7 @@ a:hover.medal {
     width: 664px;
     margin: 0 0 4px 0;
     font-family: sans-serif;
-    font-size: 11px;
+    font-size: 12px;
     line-height: 15px;
     padding: 2px 0 0 2px;
 }
@@ -907,17 +925,6 @@ div.comments {
     text-decoration: underline;
 }
 
-/*回答*/
-.answer-body {
-    min-height: 39px;
-    font-size: 13px;
-    line-height: 20px;
-}
-
-.answer-body IMG {
-    max-width: 600px;
-}
-
 .accepted-answer {
     background-color: #EBFFE6;
     border-bottom-color: #9BD59B;
@@ -1807,6 +1814,11 @@ ul.form-horizontal-rows li input {
     margin: 5px 0 0 0;
 }
 
+#hideIgnoredTagsControl label {
+    font-size: 12px;
+    color: #666;
+}
+
 #hideIgnoredTagsCb {
     margin: 0 2px 0 1px;
 }
@@ -1900,12 +1912,14 @@ p.signup_p {
 .search-tips {
     font-size:12px;
     line-height:12px;
+    color: #666;
     margin:0 0 5px 0;
     padding:0px;
     clear:both;
 }
 .search-tips a {
     text-decoration: underline;
+    color: #666;
 }
 
 .faq-rep-item { 
diff --git a/askbot/skins/default/templates/blocks/tag_selector.html b/askbot/skins/default/templates/blocks/tag_selector.html
index 1a8e946b..52c21e6a 100644
--- a/askbot/skins/default/templates/blocks/tag_selector.html
+++ b/askbot/skins/default/templates/blocks/tag_selector.html
@@ -35,7 +35,7 @@
     <input id="ignoredTagInput" autocomplete="off" type="text"/>&nbsp;
     <input id="ignoredTagAdd" type="submit" value="{% trans %}Add{% endtrans%}"/>
     <p id="hideIgnoredTagsControl">
-    <input id="hideIgnoredTagsCb" type="checkbox" {% if request.user.hide_ignored_questions %}checked="checked"{% endif %} />&nbsp;
+    <input id="hideIgnoredTagsCb" type="checkbox" {% if request.user.hide_ignored_questions %}checked="checked"{% endif %} />
     <label id="hideIgnoredTagsLabel" for="hideIgnoredTagsCb">{% trans %}keep ignored questions hidden{% endtrans %}</label>
     <p>
 </div>
diff --git a/askbot/skins/default/templates/import_data.html b/askbot/skins/default/templates/import_data.html
index a78bb57a..2cab1bfb 100644
--- a/askbot/skins/default/templates/import_data.html
+++ b/askbot/skins/default/templates/import_data.html
@@ -11,6 +11,31 @@
     $('#load-dump-form input[type=submit]').click(function(){
         return;
     });
+    $("#upload").ajaxStart(function(){
+          $(this).hide();
+      }).ajaxComplete(function(){
+          $(this).show();
+      });
+
+    $.ajaxFileUpload({
+        url: "{% url import_data %}",
+        secureuri:false,
+        fileElementId:'id_dump_file',
+        dataType: 'xml',
+        success: function (data, status){
+            var fileURL = $(data).find('file_url').text(); 
+            var error = $(data).find('error').text();
+            if(error != ''){
+                alert(error);
+            } else {
+                imageUrl.attr('value', fileURL);
+            }
+        },
+        error: function (data, status, e){
+            alert(e);
+        }
+    });
+}
     
 </script>
 {% endblock %}
diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html
index 2449580c..dc820468 100644
--- a/askbot/skins/default/templates/macros.html
+++ b/askbot/skins/default/templates/macros.html
@@ -239,13 +239,13 @@ poor design of the data or methods on data objects #}
                 {% trans cnt=question.view_count %}view{% pluralize %}views{% endtrans %}
                 </div>
             </div>
+            <div class="userinfo">
+                <span class="relativetime" title="{{question.last_activity_at}}">{{ question.last_activity_at|diff_date }}</span>
+                <a href="{% url user_profile question.last_activity_by.id, question.last_activity_by.username|slugify %}">{{question.last_activity_by.username}}</a>
+                {#{user_score_and_badge_summary(question.last_activity_by)}#}
+            </div>
         </div>
         <h2><a title="{{question.summary|escape}}" href="{{ question.get_absolute_url() }}">{{question.get_question_title()|escape}}</a></h2>
-        <div class="userinfo">
-            <span class="relativetime" title="{{question.last_activity_at}}">{{ question.last_activity_at|diff_date }}</span>
-            <a href="{% url user_profile question.last_activity_by.id, question.last_activity_by.username|slugify %}">{{question.last_activity_by.username}}</a>
-            {#{user_score_and_badge_summary(question.last_activity_by)}#}
-        </div>
         {% spaceless %}
         <div class="tags">
             {% for tag in question.get_tag_names() %}