Edit question page

4 files changed, 59 insertions, 20 deletions

diff --git a/askbot/skins/default/media/style/jquery.autocomplete.css b/askbot/skins/default/media/style/jquery.autocomplete.css
index b3d7b759..09b08192 100644
--- a/askbot/skins/default/media/style/jquery.autocomplete.css
+++ b/askbot/skins/default/media/style/jquery.autocomplete.css
@@ -4,8 +4,11 @@
 .acResults {
 	padding: 0px;
 	border: 1px solid WindowFrame;
-	background-color: Window;
+	background-color: #fff;
 	overflow: hidden;
+    -webkit-box-shadow:  0px  1px 1px #A7A7A7;
+    -moz-box-shadow:  0px  1px 1px #BFBFBF;
+    box-shadow: 0px  1px 1px #BFBFBF;
 }
 
 .acResults ul {
@@ -23,7 +26,7 @@
 	display: block;
 	width: 100%;
 	font: menu;
-	font-size: 12px;
+	font-size: 14px;
 	overflow: hidden;
 }
 
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index a5f9649e..fbf8d56c 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -1169,7 +1169,18 @@ span.delete-icon:hover {
     padding-right: 15px;
 }
 
-/* ----- Ask Question Form template----- */
+/* ----- Ask and Edit Question Form template----- */
+
+.section-title{
+    color:@section-title;
+    font-family:@yanone;
+    font-weight:bold;
+    font-size:24px;
+}
+
+.ask-body {
+    padding-right: 10px;
+}
 
 #fmask{
     margin-bottom:30px;
@@ -1198,7 +1209,7 @@ span.delete-icon:hover {
     }
 }
 
-.ask-page{
+.ask-page, .edit-question-page{
 
     div#question-list {
          float: none;
@@ -1241,6 +1252,7 @@ span.delete-icon:hover {
         height:25px;
         padding-left:5px;
         width:395px;
+        font-size:14px;
     }
 }
 
@@ -1263,6 +1275,7 @@ span.delete-icon:hover {
     margin-top:3px;
     .rounded-corners(4px);
     .box-shadow(1px, 1px, 2px, #636363);
+    margin-right:7px;
 }
 
 #fmanswer input.submit:hover,
@@ -1341,9 +1354,9 @@ span.delete-icon:hover {
 
 .question-options {
     margin-top: 1px;
-    float: left;
     color: #666;
     line-height: 13px;
+    margin-bottom:5px;
 }
 .question-options label {
     vertical-align: text-bottom;
@@ -1355,6 +1368,33 @@ span.delete-icon:hover {
     margin: 5px 0 5px 0;
 }
 
+.edit-question-page{
+    #id_revision{
+        font-size:14px;
+        margin-top:10px;
+    }
+    #id_title{
+        font-size: 24px;
+        line-height: 24px;
+        height: 36px;
+        margin: 0px;
+        padding: 0px 0 0 5px;
+        border:#cce6ec 3px solid;
+        width:725px;
+        margin-bottom:10px;
+    }
+    #id_summary{
+        border:#cce6ec 3px solid;
+        height:25px;
+        padding-left:5px;
+        width:395px;
+        font-size:14px;
+    }
+    .title-desc{
+        margin-bottom:10px;
+    }
+}
+
 /* ----- Question template ----- */
 
 .question-page{
@@ -1429,7 +1469,7 @@ span.delete-icon:hover {
         }
         
         li {
-            margin-bottom:0.7em;
+            margin-bottom:7px;
         }
     }
 
@@ -2456,11 +2496,6 @@ button::-moz-focus-inner {
     *display: inline;
 }
 
-.ask-body {
-    padding-right: 10px;
-}
-
-
 .noscript {
     position: fixed;
     top: 0px;
@@ -2692,7 +2727,7 @@ p.signup_p {
     color:@link;
 }
 .wmd-preview li {
-    margin-bottom:0.7em;
+    margin-bottom:7px;
 }
 
 .karma-summary {
diff --git a/askbot/skins/default/templates/question_edit.html b/askbot/skins/default/templates/question_edit.html
index 3cdcd8bb..47873e0e 100644
--- a/askbot/skins/default/templates/question_edit.html
+++ b/askbot/skins/default/templates/question_edit.html
@@ -6,7 +6,7 @@
     <link rel="stylesheet" type="text/css" href="{{"/js/wmd/wmd.css"|media}}" />
 {% endblock %}
 {% block content %}
-<h1>{% trans %}Edit question{% endtrans %} [<a href="{{ question.get_absolute_url() }}">{% trans %}back{% endtrans %}</a>]</h1>
+<div class="section-title">{% trans %}Edit question{% endtrans %} [<a href="{{ question.get_absolute_url() }}">{% trans %}back{% endtrans %}</a>]</div>
 <form id="fmedit" action="{% url edit_question question.id %}" method="post" >{% csrf_token %}
 
     {% if revision_form.revision.errors %}{{ revision_form.revision.errors.as_ul() }}{% endif %}
@@ -24,8 +24,6 @@
                 )
     }}
     <div class="after-editor">
-        <input type="submit" value="{% trans %}Save edit{% endtrans %}" class="submit" />&nbsp;
-        <input type="button" value="{% trans %}Cancel{% endtrans %}" class="submit" onclick="history.back(-1);" />
         <div class="question-options">
             {% if settings.WIKI_ON and question.wiki == False %}
                 {{ macros.checkbox_in_div(form.wiki) }}
@@ -34,6 +32,9 @@
                 {{ macros.checkbox_in_div(form.reveal_identity) }}
             {% endif %}
         </div>
+        <input type="submit" value="{% trans %}Save edit{% endtrans %}" class="submit" />&nbsp;
+        <input type="button" value="{% trans %}Cancel{% endtrans %}" class="submit" onclick="history.back(-1);" />
+
     </div>
 </form>
 {% endblock %}
diff --git a/askbot/skins/default/templates/widgets/ask_form.html b/askbot/skins/default/templates/widgets/ask_form.html
index 4e3346b8..18196d93 100644
--- a/askbot/skins/default/templates/widgets/ask_form.html
+++ b/askbot/skins/default/templates/widgets/ask_form.html
@@ -30,11 +30,6 @@
             mandatory_tags = mandatory_tags
         )
     }}
-    {% if not request.user.is_authenticated() %}
-    <input type="submit" name="post_anon" value="{% trans %}Login/signup to post your question{% endtrans %}" class="submit" />
-    {% else %}
-    <input type="submit" name="post" value="{% trans %}Ask your question{% endtrans %}" class="submit" />
-    {% endif %}
     <div class="question-options">
         {% if settings.WIKI_ON %}
             {{ macros.checkbox_in_div(form.wiki) }}
@@ -43,5 +38,10 @@
             {{ macros.checkbox_in_div(form.ask_anonymously) }}
         {% endif %}
     </div>
+    {% if not request.user.is_authenticated() %}
+    <input type="submit" name="post_anon" value="{% trans %}Login/signup to post your question{% endtrans %}" class="submit" />
+    {% else %}
+    <input type="submit" name="post" value="{% trans %}Ask your question{% endtrans %}" class="submit" />
+    {% endif %}
     <div class="clean"></div>
 </form>