From e34954f45825f533124842a231b01137feb3ef6b Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 8 Feb 2012 14:30:55 -0500 Subject: [PATCH 1/9] Redesigned the new question view --- sass/_askbot-original.scss | 75 +++++++++++++++++++------------------ sass/_discussion-forms.scss | 32 +++++++++++++++- 2 files changed, 68 insertions(+), 39 deletions(-) diff --git a/sass/_askbot-original.scss b/sass/_askbot-original.scss index c1babea4ec..a1ff71cb0e 100644 --- a/sass/_askbot-original.scss +++ b/sass/_askbot-original.scss @@ -1014,27 +1014,27 @@ ul { font-weight: bold; font-size: 24px; } -#fmask { - margin-bottom: 30px; - width: 100%; } +// #fmask { +// margin-bottom: 30px; +// width: 100%; } -#askFormBar { - display: inline-block; - padding: 4px 7px 5px 0px; - margin-top: 0px; - p { - margin: 0 0 5px 0; - font-size: 14px; - color: #525252; - line-height: 1.4; } - .questionTitleInput { - font-size: 24px; - line-height: 24px; - height: 36px; - margin: 0px; - padding: 0px 0 0 5px; - border: #cce6ec 3px solid; - width: 725px; } } +// #askFormBar { +// display: inline-block; +// padding: 4px 7px 5px 0px; +// margin-top: 0px; +// p { +// margin: 0 0 5px 0; +// font-size: 14px; +// color: #525252; +// line-height: 1.4; } +// .questionTitleInput { +// font-size: 24px; +// line-height: 24px; +// height: 36px; +// margin: 0px; +// padding: 0px 0 0 5px; +// border: #cce6ec 3px solid; +// width: 725px; } } .ask-page div#question-list, .edit-question-page div#question-list { float: none; @@ -1075,12 +1075,12 @@ ul { color: #525252; font-size: 13px; } -.ask-page #id_tags, .edit-question-page #id_tags { - border: #cce6ec 3px solid; - height: 25px; - padding-left: 5px; - width: 395px; - font-size: 14px; } +// .ask-page #id_tags, .edit-question-page #id_tags { +// border: #cce6ec 3px solid; +// height: 25px; +// padding-left: 5px; +// width: 395px; +// font-size: 14px; } .title-desc { color: #707070; @@ -1126,8 +1126,8 @@ ul { // margin-bottom: 10px; // width: 710px; } -#id_title { - width: 100%; } +// #id_title { +// width: 100%; } // .wmd-preview { // margin: 3px 0 5px 0; @@ -2192,10 +2192,11 @@ ins { span { &.text-counter { margin-right: 20px; } - &.form-error { - color: #990000; - font-weight: normal; - margin-left: 5px; } } + // &.form-error { + // color: #990000; + // font-weight: normal; + // margin-left: 5px; } + } p.form-item { margin: 0px; } @@ -2247,11 +2248,11 @@ label.retag-error { margin-top: 10px; padding: 10px; } -span.form-error { - color: #990000; - font-size: 90%; - font-weight: normal; - margin-left: 5px; } +// span.form-error { +// color: #990000; +// font-size: 90%; +// font-weight: normal; +// margin-left: 5px; } .favorites-empty { width: 32px; diff --git a/sass/_discussion-forms.scss b/sass/_discussion-forms.scss index af758bde45..4b6098adf9 100644 --- a/sass/_discussion-forms.scss +++ b/sass/_discussion-forms.scss @@ -12,8 +12,19 @@ form.answer-form { width: 99%; } - span.form-error { - display: block; + div.form-item { + margin: 25px 0; + + label { + display: block; + margin-bottom: -5px; + } + } + + span.form-error, label.form-error { + color: #990000; + display: inline; + font-size: 90%; font-weight: bold; padding: 10px 0; } @@ -50,7 +61,24 @@ form.answer-form { } } } + input.after-editor { margin-bottom: 20px; margin-right: 10px; } + +form.question-form { + @extend .answer-form; + border: none; + padding: 0; + margin-top: -15px; + + input[type="text"] { + width: flex-grid(6); + } + + input[type="checkbox"] { + margin-top: 10px; + } +} + From e612572bad599a588a1dba239e4d0f1576113838 Mon Sep 17 00:00:00 2001 From: Piotr Mitros Date: Wed, 8 Feb 2012 14:39:22 -0500 Subject: [PATCH 2/9] MITX -> MITx --- main.html | 2 +- marketing.html | 2 +- simplewiki_create.html | 2 +- simplewiki_edit.html | 2 +- simplewiki_error.html | 2 +- simplewiki_history.html | 2 +- simplewiki_searchresults.html | 2 +- simplewiki_view.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/main.html b/main.html index ad1d7bd2de..d0e18f0e96 100644 --- a/main.html +++ b/main.html @@ -1,7 +1,7 @@ - <%block name="title">MITX 6.002 + <%block name="title">MITx 6.002 diff --git a/marketing.html b/marketing.html index d32a24e798..606fb3cb12 100644 --- a/marketing.html +++ b/marketing.html @@ -1,7 +1,7 @@ - <%block name="title">MITX 6.002 + <%block name="title">MITx 6.002 diff --git a/simplewiki_create.html b/simplewiki_create.html index 65ecbff4aa..a2161a22a7 100644 --- a/simplewiki_create.html +++ b/simplewiki_create.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">Create Article - MITX 6.002 Wiki +<%block name="title">Create Article - MITx 6.002 Wiki <%block name="wiki_page_title"> Create article diff --git a/simplewiki_edit.html b/simplewiki_edit.html index 30e2c6ecc0..7d7a9c6bb8 100644 --- a/simplewiki_edit.html +++ b/simplewiki_edit.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki +<%block name="title">${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki <%block name="wiki_page_title"> ${ wiki_article.title } diff --git a/simplewiki_error.html b/simplewiki_error.html index f4269f1043..8b7324a998 100644 --- a/simplewiki_error.html +++ b/simplewiki_error.html @@ -6,7 +6,7 @@ from django.core.urlresolvers import reverse %> -<%block name="title">Oops... - MITX 6.002 Wiki +<%block name="title">Oops... - MITx 6.002 Wiki <%block name="wiki_page_title"> diff --git a/simplewiki_history.html b/simplewiki_history.html index bea5a02284..87daba9f21 100644 --- a/simplewiki_history.html +++ b/simplewiki_history.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki +<%block name="title">${"Revision history of " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki <%! from django.core.urlresolvers import reverse diff --git a/simplewiki_searchresults.html b/simplewiki_searchresults.html index 267a1f921b..c7d43dbeb5 100644 --- a/simplewiki_searchresults.html +++ b/simplewiki_searchresults.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">Search Results - MITX 6.002 Wiki +<%block name="title">Search Results - MITx 6.002 Wiki <%! from django.core.urlresolvers import reverse diff --git a/simplewiki_view.html b/simplewiki_view.html index 05243b0bc1..ef7b02d6b2 100644 --- a/simplewiki_view.html +++ b/simplewiki_view.html @@ -2,7 +2,7 @@ <%inherit file="simplewiki_base.html"/> -<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITX 6.002 Wiki +<%block name="title">${wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002 Wiki <%block name="wiki_page_title"> ${ wiki_article.title } ${'- Deleted Revision!' if wiki_current_revision_deleted else ''} From a2f1928404e86713722da0064bac286ca10bcfb4 Mon Sep 17 00:00:00 2001 From: Ernie Park Date: Wed, 8 Feb 2012 15:49:10 -0500 Subject: [PATCH 3/9] update leanmodal scss and add feedback for reset password in profile --HG-- branch : templates_ernie_leanmodal_closebox --- profile.html | 11 +++++++---- sass/_leanmodal.scss | 16 ++++++++++++++++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/profile.html b/profile.html index c653e61a6d..422d21f2b8 100644 --- a/profile.html +++ b/profile.html @@ -72,7 +72,7 @@ $(function() { $('#pwd_reset_button').click(function() { $.post('/password_reset/',{ "csrfmiddlewaretoken" : "${ csrf }", "email" : $('#id_email').val()}, function(data){ - $('#pwd_reset').html(data); + $("#password_reset_complete_link").click(); log_event("profile", {"type":"password_send"}); }); }); @@ -155,9 +155,7 @@ $(function() {

Password change

-

We'll e-mail you a password reset link at ${email}. Follow - the link in the confirmation email to change your - password.

+

We'll e-mail a password reset link to ${email}.

@@ -167,3 +165,8 @@ $(function() {
+
+ +

Password Reset Email Sent

+ An email has been sent to ${email}. Follow the link in the email to change your password. +
diff --git a/sass/_leanmodal.scss b/sass/_leanmodal.scss index db8b0950f5..40471d7403 100644 --- a/sass/_leanmodal.scss +++ b/sass/_leanmodal.scss @@ -18,12 +18,28 @@ div.leanModal_box { background: #fff; padding: lh(2); + a.modal_close { + position: absolute; + top: 12px; + right: 12px; + display: block; + width: 14px; + height: 14px; + z-index: 2; + color: #000; + + &:hover{ + text-decoration: none; + } + } + h1 { font-size: 24px; margin-top: 0; padding-bottom: lh(); border-bottom: 1px solid #eee; margin-bottom: lh(); + text-align: left; } &#enroll { From 8b48c8b410a8bbd6e904243792476fcb82b6c46d Mon Sep 17 00:00:00 2001 From: Reda Lemeden Date: Wed, 8 Feb 2012 16:09:59 -0500 Subject: [PATCH 4/9] Added answer controls --- sass/_discussion-answers.scss | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/sass/_discussion-answers.scss b/sass/_discussion-answers.scss index c313320c5a..1743b236a3 100644 --- a/sass/_discussion-answers.scss +++ b/sass/_discussion-answers.scss @@ -54,3 +54,19 @@ div.answer-own { padding-left: flex-grid(1.2); padding-top: 10px; } + +div.answer-actions { + text-align: right; + margin: 0; + padding: 0; + + span.sep { + color: #ddd; + } + a { + text-decoration: none; + } + a.question-edit, a.permant-link { + color: #999; + } +} From 42b9898572deb39d1f84a98d64ecfc880062294c Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 8 Feb 2012 16:46:41 -0500 Subject: [PATCH 5/9] Edited styles for the leanmodal x --HG-- branch : templates_ernie_leanmodal_closebox --- sass/_leanmodal.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sass/_leanmodal.scss b/sass/_leanmodal.scss index 40471d7403..93e7216182 100644 --- a/sass/_leanmodal.scss +++ b/sass/_leanmodal.scss @@ -26,10 +26,12 @@ div.leanModal_box { width: 14px; height: 14px; z-index: 2; - color: #000; + color: #aaa; + font-style: normal; &:hover{ text-decoration: none; + color: $mit-red; } } From 78b198e359efb06460a37e00013ce98e00c87f94 Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Wed, 8 Feb 2012 16:49:14 -0500 Subject: [PATCH 6/9] Close templates_ernie_leanmodal_closebox --HG-- extra : close : 1 From acab3d2ee95f21083f9a229e3a485488d85c4b19 Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 8 Feb 2012 18:41:48 -0500 Subject: [PATCH 7/9] Changed article creation to *not* create child articles --- simplewiki_base.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/simplewiki_base.html b/simplewiki_base.html index 2770013771..17f110bf1a 100644 --- a/simplewiki_base.html +++ b/simplewiki_base.html @@ -102,10 +102,7 @@
<% theaction = "this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '')" - if (wiki_article is not UNDEFINED): - baseURL = reverse("wiki_create", args=[wiki_article.get_url()]) - else: - baseURL = reverse("wiki_create", args=["/"]) + baseURL = reverse("wiki_create", args=["/"]) %>
From 0585fd43fed62c4d7daa154f4cec5ed903af1adb Mon Sep 17 00:00:00 2001 From: Bridger Maxwell Date: Wed, 8 Feb 2012 22:21:33 -0500 Subject: [PATCH 8/9] Changed editing instruction to not have wiki: shortcut, as that is incompatible right now. --- simplewiki_instructions.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/simplewiki_instructions.html b/simplewiki_instructions.html index 8b579feda2..a1a7273692 100644 --- a/simplewiki_instructions.html +++ b/simplewiki_instructions.html @@ -5,7 +5,7 @@

circuit:basic

$LaTeX Math Expression$

To create a new wiki article, create a link to it. Clicking the link gives you the creation page. -

[Article Name](wiki:ArticleName)

+

[Article Name](/wiki/view/ArticleName)

Other useful examples:

[Link](http://google.com)

Huge Header From 28d32757244da49e156f8d7cb9133e67eb611d8b Mon Sep 17 00:00:00 2001 From: Kyle Fiedler Date: Thu, 9 Feb 2012 11:09:59 -0500 Subject: [PATCH 9/9] Refactored html for calc and restyled --- main.html | 27 +++++++++++++----------- sass/_leanmodal.scss | 49 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 12 deletions(-) diff --git a/main.html b/main.html index d0e18f0e96..05d00112f5 100644 --- a/main.html +++ b/main.html @@ -71,21 +71,24 @@

- + - - - - - -
Suffixes :  %kMGTcmunp
Operations :  ^ * / + - ()
Functions :  sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs
Constants :  e
+
+
Suffixes:
+
%kMGTcmunp
+
Operations:
+
^ * / + - ()
+
Functions:
+
sin, cos, tan, sqrt, log10, log2, ln, arccos, arcsin, arctan, abs
+
Constants
+
e
+ + +