temporal commit

4 files changed, 72 insertions, 35 deletions

diff --git a/askbot/skins/default/media/js/post.js b/askbot/skins/default/media/js/post.js
index 84c73799..9a0841f1 100644
--- a/askbot/skins/default/media/js/post.js
+++ b/askbot/skins/default/media/js/post.js
@@ -523,7 +523,7 @@ var Vote = function(){
             fav.text(data.count);
         }
         else if(data.success == "1"){
-            var followed_html = $.i18n._('<b>Following</b><b class="unfollow">Unfollow</b>');
+            var followed_html = $.i18n._('<div>Following</div><div class="unfollow">Unfollow</div>');
             object.html(followed_html);
             object.attr("class", 'button followed');
             var fav = getFavoriteNumber();
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index 498895b0..07848f0d 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -921,16 +921,16 @@ a:hover.medal {
 }
 
 .vote-buttons .button{
-    font-size: 15px;
-    text-decoration:none;
-    -moz-border-radius: 15px;
-    border-radius: 15px;
+    -moz-border-radius: 10px;
+    border-radius: 10px;
     height: 20px;
     width: 80px;
     border-style: solid;
     border-width: 1px;
-    padding: 8px 8px 8px 8px;
+    padding: 8px;
     float:left;
+    margin-right:100%;
+    margin-bottom: 10px;
 }
 
 .vote-buttons .followed{
@@ -939,11 +939,11 @@ a:hover.medal {
     background: #4cd46f;
 }
 
-.vote-buttons .followed b{
+.vote-buttons .followed div{
     font-weight: normal;
 }
 
-.vote-buttons .followed b.unfollow{
+.vote-buttons .followed div.unfollow{
     display:none;
 }
 
@@ -952,11 +952,11 @@ a:hover.medal {
     background: #d94849;
 }
 
-.vote-buttons .followed:hover b{
+.vote-buttons .followed:hover div{
     display:none;
 }
 
-.vote-buttons .followed:hover b.unfollow{
+.vote-buttons .followed:hover div.unfollow{
     display:inline;
     font-weight: bold;
 }
@@ -992,11 +992,16 @@ a:hover.medal {
 }
 
 .favorite-number {
-    padding: 0px;
+    padding: 10px;
     font-size: 100%;
     font-family: Arial;
     font-weight: bold;
     color: #777;
+    float: left;
+}
+
+.notify-me {
+    float: left;
 }
 
 .offensive-flag a {
@@ -2363,17 +2368,45 @@ pre.prettyprint { padding: 3px; border: 0px solid #888; }
 }
 
 .follow-toggle {
-    border-radius: 3px;
-    -moz-border-radius: 3px;
-    background: #fff0e0;
-    color: #777;
-    font-weight: bolder;
-    border: 1px solid #aaa;
-    cursor: pointer;
+    border-style: solid;
+    border-width: 2px;
+    -moz-border-radius: 10px;
+    border-radius: 10px;
+    height: 20px;
+    width: 200px;
+    float:left;
+}
+
+.follow-toggle .follow{
+    font-color: #000;
+    font-style:normal;
+    background: #4cd46f;
+}
+
+.follow-toggle .follow:hover{
+    font-weight: bold;
+}
+
+.follow-toggle .unfollow{
+    font-color: #000;
+}
+
+
+.follow-toggle .unfollow div.unfollow-red{
+    display:none;
+}
+
+.follow-toggle .unfollow div.unfollow-green{
+    background: #4cd46f;
+}
+
+.follow-toggle .unfollow div.unfollow-green:hover{
+    display:none;
 }
 
-.follow-toggle.unfollow:hover {
-    background: #a40000;
+.follow-toggle .unfollow div.unfollow-red:hover{
     color: #fff;
-    border: 1px solid #d40000;
+    background: #d94849;
+    display:inline;
+    font-weight: bold;
 }
diff --git a/askbot/skins/default/templates/macros.html b/askbot/skins/default/templates/macros.html
index 500e05d8..8d3dcf9b 100644
--- a/askbot/skins/default/templates/macros.html
+++ b/askbot/skins/default/templates/macros.html
@@ -29,13 +29,16 @@
 {%- 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-{{name}} {% if follow %}follow{% else %}unfollow{% endif %}" 
+        class="follow-toggle" 
         id="follow-{{ name }}-{{ id }}"
     >
-        {% if follow %}
-            {% trans %}follow {{alias}}{% endtrans %}
+        {% if not follow %}
+        <div class="follow">{% trans %}follow {{alias}}{% endtrans %}</div>
         {% else %}
-            {% trans %}unfollow {{alias}}{% endtrans %}
+        <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 -%}
diff --git a/askbot/skins/default/templates/question.html b/askbot/skins/default/templates/question.html
index c43c51f3..a4c20291 100644
--- a/askbot/skins/default/templates/question.html
+++ b/askbot/skins/default/templates/question.html
@@ -383,28 +383,29 @@
 {% block sidebar %}
 
 {{ settings.SIDEBAR_QUESTION_HEADER }}
-{% if favorited %}
 <div class="boxC vote-buttons">
+{% if favorited %}
   <a class="button followed" 
     alt="{% trans %}mark this question as favorite (click again to cancel){% endtrans %}">
-    <b>{%trans%}Following{% endtrans %}</b>
-    <b class='unfollow'>{%trans%}Unfollow{%endtrans%}</b>
+    <div>{%trans%}Following{% endtrans %}</div>
+    <div class='unfollow'>{%trans%}Unfollow{%endtrans%}</div>
   </a>
   <div id="favorite-number" class="favorite-number my-favorite-number">
-      {{ question.favourite_count }}
+    {{ question.favourite_count }} {%trans%}Followers{%endtrans%}
   </div>
-</div>
 {% else %}
-<div class="boxC vote-buttons">
   <a class="button follow"
     alt="{% trans %}mark this question as favorite (click again to cancel){% endtrans %}">
     {%trans %}Follow{%endtrans%}
   </a>
   <div id="favorite-number" class="favorite-number">
-     {% if question.favourite_count != 0 %}{{ question.favourite_count }}{% endif %}
+     {% if question.favourite_count != 0 %}{{ question.favourite_count }}{%trans%}Followers{%endtrans%}{% endif %}
   </div>
-</div>
 {% endif %}
+  <form id="fmanswer" action="{% url answer question.id %}" method="post">{% csrf_token %}
+    <div class="notify-me">{{ answer.email_notify }}<label for="id_email_notify"> {%trans%}Notify me for new answers{%endtrans%}</label></div> 
+  </form>
+</div>
 {% cache 0 "questions_tags" questions_tags question.id language_code %}
 {% if settings.SIDEBAR_QUESTION_SHOW_TAGS %}
     <div class="boxC">
@@ -444,7 +445,7 @@
 {% endcache %}
 
 {% if similar_questions.data and settings.SIDEBAR_QUESTION_SHOW_RELATED %}
-    {% cache 1800 "related_questions" related_questions question.id language_code %}
+    {#% cache 1800 "related_questions" related_questions question.id language_code %#}
     <div class="boxC">
         <h2>{% trans %}Related questions{% endtrans %}</h2>
         <div class="questions-related">
@@ -455,7 +456,7 @@
             {% endfor %}
         </div>
     </div>
-    {% endcache %}
+    {#% endcache %#}
 {% endif %}
 
 {{ settings.SIDEBAR_QUESTION_FOOTER }}