Merge branch 'master' of git://github.com/byroncorrales/askbot-devel into new-template

9 files changed, 232 insertions, 137 deletions

diff --git a/askbot/skins/common/media/js/wmd/images/editor-toolbar-background.png b/askbot/skins/common/media/js/wmd/images/editor-toolbar-background.png
new file mode 100644
index 00000000..41875962
--- /dev/null
+++ b/askbot/skins/common/media/js/wmd/images/editor-toolbar-background.png
diff --git a/askbot/skins/common/media/js/wmd/wmd.css b/askbot/skins/common/media/js/wmd/wmd.css
index f1091a35..1ba80626 100644
--- a/askbot/skins/common/media/js/wmd/wmd.css
+++ b/askbot/skins/common/media/js/wmd/wmd.css
@@ -9,7 +9,13 @@
 
 #wmd-button-bar 
 {
-	background-color: White; 
+	background: url(images/editor-toolbar-background.png) repeat-x bottom;
+    height:36px;
+    border-left:#cce6ec 3px solid;
+    border-top:#cce6ec 3px solid;
+    border-right:#cce6ec 3px solid;
+    float:left;
+    width:670px;
 }
 
 #wmd-input 
@@ -35,7 +41,7 @@
 	position: relative; 
 	margin-left: 5px;
 	margin-right: 5px;
-	margin-bottom: 5px;
+	margin-bottom: 0px;
 	margin-top: 10px;
 	padding: 0px;  
 	height: 20px;
diff --git a/askbot/skins/default/media/images/close-small-dark.png b/askbot/skins/default/media/images/close-small-dark.png
index 280c1fc7..72ada35b 100755..100644
--- a/askbot/skins/default/media/images/close-small-dark.png
+++ b/askbot/skins/default/media/images/close-small-dark.png
diff --git a/askbot/skins/default/media/images/medium-button.png b/askbot/skins/default/media/images/medium-button.png
new file mode 100644
index 00000000..f384be91
--- /dev/null
+++ b/askbot/skins/default/media/images/medium-button.png
diff --git a/askbot/skins/default/media/images/tips.png b/askbot/skins/default/media/images/tips.png
new file mode 100644
index 00000000..7e8aafdf
--- /dev/null
+++ b/askbot/skins/default/media/images/tips.png
diff --git a/askbot/skins/default/media/style/lib_style.less b/askbot/skins/default/media/style/lib_style.less
index 471f8333..34710137 100644
--- a/askbot/skins/default/media/style/lib_style.less
+++ b/askbot/skins/default/media/style/lib_style.less
@@ -8,6 +8,7 @@
 @button-label:#4a757f;
 @section-title:#7ea9b3;
 @info-text:#8d8d8d;
+@info-text-dark:#6b6b6b;
 
 /* Variables for fonts*/
 
diff --git a/askbot/skins/default/media/style/style.css b/askbot/skins/default/media/style/style.css
index f7f945dc..ca1a5ee6 100644
--- a/askbot/skins/default/media/style/style.css
+++ b/askbot/skins/default/media/style/style.css
@@ -489,7 +489,7 @@ h1 {
     }
 
     ul {
-        margin-left: 15px;
+        margin-left: 22px;
     }
 
     li {
@@ -542,6 +542,29 @@ img.gravatar {
     margin:1px;
 }
 
+/* tips and markdown help are widgets for ask template */
+
+#tips{
+    li{
+        color:@info-text;
+       font-size:16px;
+       list-style-image: url(../images/tips.png);
+    }
+    a{
+        font-size:16px;
+    }
+}
+
+#markdownHelp{
+    li{
+        color:@info-text;
+       font-size:16px;
+    }
+    a{
+        font-size:16px;
+    }
+}
+
 /* ----- Sorting top Tab, check main_page/tab_bar.html ------*/
 
 .tabBar {
@@ -669,6 +692,14 @@ ul#searchTags {
 
 /* ----- Question list , check main_page/content.html and macros/macros.html----- */
 
+#question-list {
+    float: left;
+    position: relative;
+    background-color: #FFF;
+    padding: 0;
+    width: 100%;
+}
+
 .short-summary {
     position: relative;
     filter: inherit;
@@ -738,7 +769,7 @@ ul#searchTags {
     .tags {
         margin-top: 0;
         position:absolute;
-        bottom:20px;
+        bottom:15px;
     }
     
     .votes, .answers, .favorites, .views {
@@ -1009,7 +1040,7 @@ ul#related-tags li {
     float: left;
 }
 .deletable-tag.tag-left {
-    padding-right: 3px;
+    padding-right: 0px;
 }
 
 .tags a.tag-right,
@@ -1022,7 +1053,6 @@ ul#related-tags li {
     color: #1A1A1A;
 }
 
-
 .users-page h1, .tags-page h1 {
     float: left;
 }
@@ -1031,75 +1061,210 @@ ul#related-tags li {
     margin-right: 5px;
 }
 
+span.delete-icon {
+    padding-left: 13px;
+    vertical-align: bottom;
+    background: url(../images/close-small-dark.png) bottom no-repeat;
+    cursor: default;
+}
+span.delete-icon:hover {
+    background: url(../images/close-small-dark.png) top no-repeat;
+}
+
+.tags span.delete-icon {
+    float: left;
+    height: 20px;
+    width:8px;
+    margin: 0px 0 0 10px;
+    border-left:#fff 1px solid;
+    display: block;
+}
+
+.tag-number {
+    font-weight: normal;
+    float: left;
+    font-size:16px;
+    color:#5d5d5d;
+}
+
+.badges .tag-number {
+    float: none;
+    display: inline;
+    padding-right: 15px;
+}
+
+/* ----- Ask Question Form template----- */
+
 #askFormBar {
     display:inline-block;
-    background-color: #e3e3e3;/*888a85; /*#e9b96e;*/
-    border: 1px solid #aaaaaa;
-    padding: 4px 7px 5px 5px;
+    padding: 4px 7px 5px 0px;
+    margin-top:10px;
+    
+    p{
+        width: 670px;
+       margin:0 0 5px 0;
+       font-size:16px;
+       color:@info-text-dark;
+       line-height:1.2;
+    }
+    .questionTitleInput {
+        font-size: 24px;
+        line-height: 24px;
+        height: 36px;
+        width: 670px;
+        margin: 0px;
+        padding: 0px 0 0 5px;
+        border:#cce6ec 3px solid;
+    }
 }
-#askFormBar p {
-    width: 685px;
-    margin:0 0 5px 0;
+
+.ask-page{
+
+    div#question-list {
+        float: none;
+        width: 677px;
+        border-bottom:#f0f0ec 1px solid;
+        float:left;
+        margin-bottom:10px;
+
+    }
+
+    div#question-list h2 {
+        font-size: 16px;
+        padding-bottom: 0;
+        color:@link;
+        border-top:#f0f0ec 1px solid;
+        border-left:#f0f0ec 1px solid;
+        height:30px;
+        line-height:30px;
+        font-weight:normal;
+    }
+
+    div#question-list span {
+        width:28px;
+        height:26px;
+        line-height:26px;
+        text-align:center;
+        margin-right: 10px;
+        float:left;
+        display:block;
+        color:#fff;
+        background: #b8d0d5;
+        .rounded-corners(3px);
+    }
+    label{
+        color:@info-text-dark;
+        font-size:15px;
+    }
+
+    #id_tags{
+        border:#cce6ec 3px solid;
+        width:665px;
+        height:25px;
+        padding-left:5px;
+    }
 }
-#askFormBar .questionTitleInput {
-    font-size: 24px;
-    line-height: 24px;
-    height: 36px;
-    width: 680px;
-    margin: 0px;
-    padding: 5px 0 0 5px;
+
+.title-desc {
+    color: @info-text;
+    font-size: 15px;
 }
 
-#question-list {
+.ask-page input.submit,
+.edit-question-page input.submit {
     float: left;
-    position: relative;
-    background-color: #FFF;
-    padding: 0;
+    background: url(../images/medium-button.png) top repeat-x;
+    height:34px;
+    border:0;
+    font-family:@yanone;
+    color:@button-label;
+    font-weight:normal;
+    font-size:21px;
+    margin-top:3px;
+    .rounded-corners(4px);
+    .box-shadow(1px, 1px, 2px, #636363);
+}
+.ask-page input.submit:hover,
+.edit-question-page input.submit:hover{
+    text-decoration:none;
+    background: url(../images/medium-button.png) bottom repeat-x;
+    .text-shadow(0px, 1px, 0px, #c6d9dd)
+}
+#editor { /*adjustment for editor preview*/
+    font-size: 100%;
+    min-height: 200px;
+    line-height: 18px;
+    width: 650px;
+    margin:0;
+    border-left:#cce6ec 3px solid;
+    border-bottom:#cce6ec 3px solid;
+    border-right:#cce6ec 3px solid;
+    border-top:0;
+    padding:10px;
+    margin-bottom:10px;
+}
+
+#id_title {
     width: 100%;
 }
 
-.ask-page div#question-list {
-    float: none;
-    width: 706px;
+.wmd-preview {
+    margin: 3px 0 5px 0;
+    padding: 6px;
+    width: 665px;
+    background-color: #F5F5F5;
+    min-height: 20px;
+    overflow: auto;
 }
-.ask-page div#question-list h2 {
-    font-size: 14px;
-    padding-bottom: 0;
+
+.wmd-preview pre {
+    background-color: #E7F1F8;
+
 }
-.ask-page div#question-list span {
-    padding: 3px 7px;
-    margin-right: 5px;
-    background: #ccc;
+
+.wmd-preview blockquote {
+    background-color: #eee;
 }
 
-span.delete-icon {
-    padding-left: 13px;
-    vertical-align: bottom;
-    background: url(../images/close-small-dark.png) no-repeat;
-    cursor: default;
+.wmd-preview IMG {
+    max-width: 600px;
 }
-span.delete-icon:hover {
-    background: url(../images/close-small-hover.png) no-repeat;
+
+.preview-toggle {
+    width: 100%;
+    color: #b6a475; /*letter-spacing:1px;*/
+    text-align: left;
 }
 
-.tags span.delete-icon {
-    float: left;
-    height: 15px;
-    margin: 2px 0 0 1px;
-    display: block;
+.preview-toggle span:hover {
+    cursor: pointer;
 }
 
-.tag-number {
-    font-weight: 700;
-    display: block;
+.after-editor {
+    margin-top: 10px;
+}
+
+.checkbox {
+    margin-left:5px;
+    font-weight:normal;
+    cursor:help
+}
+
+.question-options {
+    margin-top: 1px;
     float: left;
-    font-family: sans-serif;
+    color: #666;
+    line-height: 13px;
+}
+.question-options label {
+    vertical-align: text-bottom;
 }
 
-.badges .tag-number {
-    float: none;
-    display: inline;
-    padding-right: 15px;
+
+.edit-content-html {
+    border-top: 1px dotted #D8D2A9;
+    border-bottom: 1px dotted #D8D2A9;
+    margin: 5px 0 5px 0;
 }
 
 
@@ -1714,87 +1879,6 @@ span.form-error {
     margin-left: 5px;
 }
 
-.title-desc {
-    color: #666666;
-    font-size: 90%;
-}
-
-/*adjustment for editor preview*/
-#editor {
-    font-size: 100%;
-    min-height: 200px;
-    line-height: 18px;
-    width: 702px;
-    margin:0;
-}
-
-#id_title {
-    width: 100%;
-}
-
-.wmd-preview {
-    margin: 3px 0 5px 0;
-    padding: 6px;
-    width: 691px;
-    background-color: #F5F5F5;
-    min-height: 20px;
-    overflow: auto;
-}
-
-.wmd-preview pre {
-    background-color: #E7F1F8;
-
-}
-
-.wmd-preview blockquote {
-    background-color: #eee;
-}
-
-.wmd-preview IMG {
-    max-width: 600px;
-}
-
-.preview-toggle {
-    width: 100%;
-    color: #666; /*letter-spacing:1px;*/
-    text-align: left;
-}
-
-.preview-toggle span:hover {
-    cursor: pointer;
-}
-
-.after-editor {
-    margin-top: 10px;
-}
-
-.checkbox {
-    margin-left:5px;
-    font-weight:normal;
-    cursor:help
-}
-
-.question-options {
-    margin-top: 1px;
-    float: left;
-    color: #666;
-    line-height: 13px;
-}
-.question-options label {
-    vertical-align: text-bottom;
-}
-
-.ask-page input.submit,
-.edit-question-page input.submit {
-    float: left;
-}
-
-.edit-content-html {
-    border-top: 1px dotted #D8D2A9;
-    border-bottom: 1px dotted #D8D2A9;
-    margin: 5px 0 5px 0;
-}
-
 .revision {
     margin: 10px 0 10px 0;
     width: 100%;
diff --git a/askbot/skins/default/templates/ask.html b/askbot/skins/default/templates/ask.html
index 07bd8424..f398af04 100644
--- a/askbot/skins/default/templates/ask.html
+++ b/askbot/skins/default/templates/ask.html
@@ -9,6 +9,9 @@
 {% block sidebar %}
 {% include "widgets/question_edit_tips.html" %}
 {% endblock %}
+{% block content %}
+    Here needs to be placed the form!
+{% endblock %}
 {% block endjs %}
     <script type='text/javascript' src='{{"/js/editor.js"|media}}'></script>
     <script type='text/javascript' src='{{"/js/jquery.validate.js"|media}}'></script>
@@ -60,4 +63,5 @@
         });
     </script>
 {% endblock %}
+
 <!-- end template ask.html -->
diff --git a/askbot/skins/default/templates/widgets/question_edit_tips.html b/askbot/skins/default/templates/widgets/question_edit_tips.html
index 83c36840..b62c6338 100644
--- a/askbot/skins/default/templates/widgets/question_edit_tips.html
+++ b/askbot/skins/default/templates/widgets/question_edit_tips.html
@@ -1,5 +1,5 @@
 <!-- question_edit_tips.html -->
-<div class="boxC">
+<div id ="tips" class="box">
     <h2>{% trans %}question tips{% endtrans %}</h2>
     <ul>
         <li> <b>{% trans %}please ask a relevant question{% endtrans %}</b>
@@ -12,11 +12,11 @@
         </li>
     </ul>
     <p class='info-box-follow-up-links'>
-        <a href="{% url faq %}" target="_blank" title="{% trans %}see frequently asked questions{% endtrans %}">{% trans %}faq{% endtrans %} »</a>
+        <a href="{% url faq %}" target="_blank" title="{% trans %}see frequently asked questions{% endtrans %}">{% trans %}FAQ{% endtrans %} »</a>
     </p>
 </div>
 
-<div class="boxC">
+<div id="markdownHelp"class="box">
     <h2>{% trans %}Markdown tips{% endtrans %}</h2>
     <ul>
         {% if settings.MARKDUP_CODE_FRIENDLY or settings.ENABLE_MATHJAX %}