From 64507bd5fd38ac72760c29fbdd6525cab564c978 Mon Sep 17 00:00:00 2001 From: Don Mitchell Date: Fri, 11 Jan 2013 10:36:42 -0500 Subject: [PATCH 01/12] Drop down for markup done but w/o new icons --- cms/templates/widgets/problem-edit.html | 4 ++++ common/lib/xmodule/xmodule/js/src/problem/edit.coffee | 11 +++++++++++ 2 files changed, 15 insertions(+) diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html index 3458bcde65..cdfa50a7e0 100644 --- a/cms/templates/widgets/problem-edit.html +++ b/cms/templates/widgets/problem-edit.html @@ -14,6 +14,10 @@ class="problem-editor-icon number">
    • +
    • +
    • diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss index ba5a87feb4..bce0cca390 100644 --- a/common/lib/xmodule/xmodule/css/problem/edit.scss +++ b/common/lib/xmodule/xmodule/css/problem/edit.scss @@ -45,11 +45,32 @@ } } + .advanced-toggle { + @include white-button; + height: auto; + margin-top: -1px; + padding: 3px 9px; + font-size: 12px; + + &.current { + border: 1px solid $lightGrey !important; + border-radius: 3px !important; + background: $lightGrey !important; + color: $darkGrey !important; + pointer-events: none; + cursor: none; + + &:hover { + box-shadow: 0 0 0 0 !important; + } + } + } + .cheatsheet-toggle { width: 21px; height: 21px; padding: 0; - margin: 3px 5px 0 16px; + margin: 0 5px 0 15px; border-radius: 22px; border: 1px solid #a5aaaf; background: #e5ecf3; diff --git a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee index d913ca0fa2..5db981ccac 100644 --- a/common/lib/xmodule/xmodule/js/src/problem/edit.coffee +++ b/common/lib/xmodule/xmodule/js/src/problem/edit.coffee @@ -59,7 +59,7 @@ class @MarkdownEditingDescriptor extends XModule.Descriptor ### confirmConversionToXml: -> # TODO: use something besides a JavaScript confirm dialog? - return confirm("If you convert to the XML source representation, which is used by the Advanced Editor, you cannot go back to using the Simple Editor.\n\nProceed with conversion to XML?") + return confirm("If you use the Advanced Editor, this problem will be converted to XML and you will not be able to return to the Simple Editor Interface.\n\nProceed to the Advanced Editor and convert this problem to XML?") ### Event listener for toolbar buttons (only possible when markdown editor is visible). From ab7be1a6e000235350b74e711bb11f33402d3b48 Mon Sep 17 00:00:00 2001 From: Don Mitchell Date: Fri, 11 Jan 2013 15:22:30 -0500 Subject: [PATCH 03/12] Unit tests --- .../xmodule/js/spec/problem/edit_spec.coffee | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee b/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee index 6f833044f7..5217385d80 100644 --- a/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee +++ b/common/lib/xmodule/xmodule/js/spec/problem/edit_spec.coffee @@ -70,6 +70,22 @@ describe 'MarkdownEditingDescriptor', -> revisedSelection = MarkdownEditingDescriptor.insertSelect('my text') expect(revisedSelection).toEqual('[[my text]]') + describe 'insertHeader', -> + it 'inserts the template if selection is empty', -> + revisedSelection = MarkdownEditingDescriptor.insertHeader('') + expect(revisedSelection).toEqual(MarkdownEditingDescriptor.headerTemplate) + it 'wraps existing text', -> + revisedSelection = MarkdownEditingDescriptor.insertHeader('my text') + expect(revisedSelection).toEqual('my text\n====\n') + + describe 'insertExplanation', -> + it 'inserts the template if selection is empty', -> + revisedSelection = MarkdownEditingDescriptor.insertExplanation('') + expect(revisedSelection).toEqual(MarkdownEditingDescriptor.explanationTemplate) + it 'wraps existing text', -> + revisedSelection = MarkdownEditingDescriptor.insertExplanation('my text') + expect(revisedSelection).toEqual('[explanation]\nmy text\n[explanation]') + describe 'markdownToXml', -> it 'converts raw text to paragraph', -> data = MarkdownEditingDescriptor.markdownToXml('foo') From a4b6851e6c6086caa048192e70276ebe735996b2 Mon Sep 17 00:00:00 2001 From: cahrens Date: Fri, 11 Jan 2013 16:11:09 -0500 Subject: [PATCH 04/12] Remove some dead css. --- cms/templates/widgets/problem-edit.html | 2 +- .../lib/xmodule/xmodule/css/problem/edit.scss | 17 ----------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html index fcd946c5d0..4268385fcf 100644 --- a/cms/templates/widgets/problem-edit.html +++ b/cms/templates/widgets/problem-edit.html @@ -20,7 +20,7 @@ class="problem-editor-icon dropdown"> diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss index bce0cca390..7963bcc8b6 100644 --- a/common/lib/xmodule/xmodule/css/problem/edit.scss +++ b/common/lib/xmodule/xmodule/css/problem/edit.scss @@ -28,23 +28,6 @@ float: left; } - .tab { - height: 24px; - padding: 7px 20px 3px; - border: 1px solid #a5aaaf; - border-radius: 3px 3px 0 0; - @include linear-gradient(top, rgba(0, 0, 0, 0) 87%, rgba(0, 0, 0, .06)); - background-color: #e5ecf3; - font-size: 13px; - color: #3c3c3c; - box-shadow: 1px -1px 1px rgba(0, 0, 0, .05); - - &.current { - background: #fff; - border-bottom-color: #fff; - } - } - .advanced-toggle { @include white-button; height: auto; From 06aa4a553e30b0e749a545124571a9dfeb0817c9 Mon Sep 17 00:00:00 2001 From: Don Mitchell Date: Fri, 11 Jan 2013 16:53:23 -0500 Subject: [PATCH 05/12] Correct file name case (which I thought mac os would catch :-( --- ...lanation-example.png => explanation-example.png} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename cms/static/img/{Explanation-example.png => explanation-example.png} (100%) diff --git a/cms/static/img/Explanation-example.png b/cms/static/img/explanation-example.png similarity index 100% rename from cms/static/img/Explanation-example.png rename to cms/static/img/explanation-example.png From 033264b58d03e14010bad1a01d22a817ca44df44 Mon Sep 17 00:00:00 2001 From: Don Mitchell Date: Fri, 11 Jan 2013 16:57:00 -0500 Subject: [PATCH 06/12] Change case of Explanation to match markdown (although it's functionally equivalent) --- .../lib/xmodule/xmodule/templates/problem/multiplechoice.yaml | 4 ++-- .../xmodule/xmodule/templates/problem/numericalresponse.yaml | 4 ++-- .../lib/xmodule/xmodule/templates/problem/optionresponse.yaml | 4 ++-- .../xmodule/xmodule/templates/problem/string_response.yaml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml b/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml index a7f47ee9de..322757beee 100644 --- a/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml @@ -29,10 +29,10 @@ metadata: ( ) The Beatles - [Explanation] + [explanation] The release of the iPod allowed consumers to carry their entire music library with them in a format that did not rely on fragile and energy-intensive spinning disks. - [Explanation] + [explanation] " data: | diff --git a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml index 24ffe5590c..bdca1ef789 100644 --- a/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/numericalresponse.yaml @@ -28,7 +28,7 @@ metadata: = 5 - [Explanation] + [explanation] Pi, or the the ratio between a circle's circumference to its diameter, is an irrational number known to extreme precision. It is value is approximately equal to 3.14. @@ -37,7 +37,7 @@ metadata: can use any estimation technique that you like. If you look at your hand, you can count that you have five fingers. - [Explanation] + [explanation] " data: | diff --git a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml index a4d8a4dd65..d2603ca607 100644 --- a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml @@ -17,12 +17,12 @@ metadata: [[(Multiple Choice), String Response, Numerical Response, External Response, Image Response]] - [Explanation] + [explanation] Multiple Choice also allows students to select from a variety of pre-written responses, although the format makes it easier for students to read very long response options. Optionresponse also differs slightly because students are more likely to think of an answer and then search for it rather than relying purely on recognition to answer the question. - [Explanation] + [explanation] " data: | diff --git a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml index 2071cf0fd1..987ee9a7bf 100644 --- a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml +++ b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml @@ -19,10 +19,10 @@ metadata: = Michigan - [Explanation] + [explanation] Lansing is the capital of Michigan, although it is not Michgan's largest city, or even the seat of the county in which it resides. - [Explanation] + [explanation] " data: | From 1bf2cdd5280340417f698e7123f1501d9ef6cfd9 Mon Sep 17 00:00:00 2001 From: Don Mitchell Date: Fri, 11 Jan 2013 17:01:50 -0500 Subject: [PATCH 07/12] Changed order of buttons to match order of cheat sheet --- cms/templates/widgets/problem-edit.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html index 4268385fcf..c383d9aa1f 100644 --- a/cms/templates/widgets/problem-edit.html +++ b/cms/templates/widgets/problem-edit.html @@ -4,6 +4,8 @@ %if markdown != '' or data == '\n\n':
      +
      • -
    From 04e944736715ae41a5f64a3cbfdb6120f737bfdb Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Sun, 13 Jan 2013 12:15:29 -0500 Subject: [PATCH 08/12] added in icons for header and explanation markdown elements --- cms/static/img/problem-editor-icons.png | Bin 3309 -> 2307 bytes cms/templates/widgets/problem-edit.html | 4 ++-- .../lib/xmodule/xmodule/css/problem/edit.scss | 10 ++++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/cms/static/img/problem-editor-icons.png b/cms/static/img/problem-editor-icons.png index 62f078560fc47b5765e1d3c05e3b4077d7960ab4..27eb57b668a182b6a77c2556d2183a96084844a3 100644 GIT binary patch literal 2307 zcmX|B3pmqlA6_a&yhTVwgsEQ1;Y$bl3axCVIj=d)X2WI);4o_l zWD^Wv`R$v*ERjr1!#9BBLo4~KA}pGjQ&3b}|0pFrduDdli9jA1dzPJ72*{p3{?DI3@gBY?XEz+l zXL9OYAAjH?3M&|U7L%A}h4bJvG&VG~);($l_KPUzrpFyYQA}GrIW_k#F!G-Ya_8Rtr{olZ8bF;O zV_;|`la-m8m2c@x42Wa^J|!cU;1|^0`^4PImC4F*zji&6kq{np8>9dhpaG=@M8w*Y ze63wP?1?^%`LFNa z+Q4Z84aU_IF!nCQ*o2glzu3UCvGIf3$pfLTUOwOfK;uYN59$I!B0%FE-Mv5$NH73! z^YZib3v&0q25KgdeSx5nXD#h>gO2$qfnGLSjDdjb5vEZ)}uPR}U-Gseve90=ek0raHw9KZl?a~l_={w2n` zgS!LFZ{zPB00tvC{3e(I^V<%<|DynqsevF0p0|;?9l{d9?h+mj05Bhw{ zyT)&B>xY!}&iuDZJ>5o0v18wZ7YbdP{6;3P9$dJ-q zQZ!zW*}7}U1v2%M+X{hf;UZurwm~mGjs;roHZf7qzSi>GLfs6GD0-ouii& z&SdIIJkvbIy@@{$i8@%QVS?_y7{2QwT$QS$hl``NHK+M1>aj2yXX1zxgHrUB*mRR| zdl5C(GSU1_6eC!HI;pF*LD62TnwB|4?O?rgTX>{#|5F5hnZ@>wkM9p_)qP@wZj~_USy5^*U92w8o-*D2$OW=i z5iZdiB7h`*2pz|$Bl?cad{p4b^AmP$-+4q$!D66CUfK+*P_AaGQ~UCx+JyFZHq@8Z zNwBDWvrMTCyVMO;0M){S`m&0QLg;z1=yU8K77Zv z??Xq*Yq^i(;}|kA!IhagRx0}n6M9t74xGO{{T_~-$R36Y+)p$#)HXCZl%{z*5u}3* zcW?QEmBcHEAuV8Zec$8CJ8%10)o^uOfIcZ{(v znTK1+TiNo}iKkO#hBUr#^X|s=ln4c*6J%=LmE220k(9B1-aDC%@eDDYQWB9l6?a@# z*XAUHA&l9q1UoMD+qaOaUvxj{lb^A&6=k7P$nZ(Y^yhhp$nEC|&y^Ak_Y~>MsrFM2iSasLN$eflRXCG=3uaMS$$ zTH>Ive&IfekXZ6SbBk_{URy0qz6u4C!;{{KZ%?FY;T6w(UykCf^)Zf0E6Y)O{;t-) zRnmK4?GwB4$IR#`^FQ6MtDtFzp9xNHUFEx%zxP5~bV@G{9^&nV;t~V2@Mhm%mu5e1 zKPSD;g!8$MkL^IDT7*_d(`8-=<9;AlT@8DLjLs=JKKZ;Ph&Kyh;MHWAdCP)5|!pgRa!oaoOfX?-a%;bgt{< z?yc7iw_&evgbt;`7H3Unn!}!N8uC}IsH`aTVCkaC90e6b_&T$95(WO`5X1!}tkM)0 F`47Beleho? literal 3309 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 diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html index c383d9aa1f..d17bc21d3c 100644 --- a/cms/templates/widgets/problem-edit.html +++ b/cms/templates/widgets/problem-edit.html @@ -5,7 +5,7 @@
      • + class="problem-editor-icon header">
      • + class="problem-editor-icon explanation">
    • Advanced Editor
      • diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss index 7963bcc8b6..659f5becf9 100644 --- a/common/lib/xmodule/xmodule/css/problem/edit.scss +++ b/common/lib/xmodule/xmodule/css/problem/edit.scss @@ -131,6 +131,11 @@ background: url(../img/problem-editor-icons.png) no-repeat; } +.problem-editor-icon.header { + width: 18px; + background-position: -265px 0; +} + .problem-editor-icon.multiple-choice { background-position: 0 0; } @@ -154,4 +159,9 @@ background-position: -220px 0; } +.problem-editor-icon.explanation { + width: 17px; + background-position: -307px 0; +} + From 1cf5e10a34fd9a91ba1b643f8c45fcb9cbfeb568 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Sun, 13 Jan 2013 12:47:30 -0500 Subject: [PATCH 09/12] revised cheatsheet markdown, fixed height + added vertical scroll, and replaced explanation example in sheet --- cms/static/img/explanation-example.png | Bin 16532 -> 4772 bytes cms/templates/widgets/problem-edit.html | 19 ++++++++---------- .../lib/xmodule/xmodule/css/problem/edit.scss | 4 +++- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/cms/static/img/explanation-example.png b/cms/static/img/explanation-example.png index 2dbc2b3b960c69ce329c88a4c5b9223be3e47478..94db245515e470336748c13b83b69ccd8d25af08 100644 GIT binary patch literal 4772 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 IWDxkj0PhE3oB#j- diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html index d17bc21d3c..1026981fba 100644 --- a/cms/templates/widgets/problem-edit.html +++ b/cms/templates/widgets/problem-edit.html @@ -35,7 +35,7 @@
      Header
      -
      +
      @@ -46,7 +46,7 @@
      Multiple Choice
      -
      +
      @@ -57,7 +57,7 @@
      Check Multiple
      -
      +
      @@ -68,7 +68,7 @@
      String Response
      -
      +
      @@ -77,7 +77,7 @@
      Numerical Response
      -
      +
      @@ -86,7 +86,7 @@
      Option Response
      -
      +
      @@ -95,14 +95,11 @@
      Explanation
      -
      +
      -
      [explanation]
-A short explanation of the answer.
-[explanation]
-
      + 
      [explanation] A short explanation of the answer. [explanation]
      diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss index 659f5becf9..9f80cce5ad 100644 --- a/common/lib/xmodule/xmodule/css/problem/edit.scss +++ b/common/lib/xmodule/xmodule/css/problem/edit.scss @@ -71,13 +71,15 @@ left: 100%; width: 0; border-radius: 0 3px 3px 0; - @include linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 15px); + @include linear-gradient(left, rgba(0, 0, 0, .1), rgba(0, 0, 0, 0) 4px); background-color: #fff; overflow: hidden; @include transition(width .3s); &.shown { width: 300px; + height: 100%; + overflow-y: scroll; } .cheatsheet-wrapper { From 2429192765f4bba99f92c99d03f9d8b066545ce8 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Sun, 13 Jan 2013 13:07:11 -0500 Subject: [PATCH 10/12] resolved problem headers/general H1 elements floating by default in component views --- cms/static/sass/_unit.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index 23d708dbc1..39c406b2cd 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -282,6 +282,10 @@ .xmodule_display { padding: 40px 20px 20px; overflow-x: auto; + + h1 { + float: none; + } } .wrapper-component-editor { From 11656feba300ade343f0bcc553a86820c6d2a83c Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Sun, 13 Jan 2013 13:10:29 -0500 Subject: [PATCH 11/12] one last style tweak to problem header styling --- cms/static/sass/_unit.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss index 39c406b2cd..5edce2419c 100644 --- a/cms/static/sass/_unit.scss +++ b/cms/static/sass/_unit.scss @@ -285,6 +285,7 @@ h1 { float: none; + margin-left: 0; } } From e82987a32d03f295d5f489106e2b135447350469 Mon Sep 17 00:00:00 2001 From: Brian Talbot Date: Mon, 14 Jan 2013 09:37:38 -0500 Subject: [PATCH 12/12] problem editor - revised classes on editor cheatsheet text and explanation tooltip text --- cms/templates/widgets/problem-edit.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cms/templates/widgets/problem-edit.html b/cms/templates/widgets/problem-edit.html index 1026981fba..83e7b6b9b1 100644 --- a/cms/templates/widgets/problem-edit.html +++ b/cms/templates/widgets/problem-edit.html @@ -16,7 +16,7 @@ class="problem-editor-icon number">
      • -
      @@ -57,7 +57,7 @@
    Check Multiple
    -
    +
    @@ -68,7 +68,7 @@
    String Response
    -
    +
    @@ -77,7 +77,7 @@
    Numerical Response
    -
    +
    @@ -86,7 +86,7 @@
    Option Response
    -
    +