From c2f0ea49bdfd17899f217635d0528406a5376165 Mon Sep 17 00:00:00 2001
From: Don Mitchell <dmitchell@edx.org>
Date: Mon, 7 Jan 2013 12:32:54 -0500
Subject: [PATCH] Hopefully fixed yamls for markdown

---
 .../templates/problem/multiplechoice.yaml     |  3 +-
 .../templates/problem/optionresponse.yaml     | 36 +++++++++----------
 .../templates/problem/string_response.yaml    | 18 ++++++++++
 3 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml b/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
index f9eb8448b3..f3479f9b4a 100644
--- a/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/multiplechoice.yaml
@@ -3,7 +3,7 @@ metadata:
     display_name: Multiple Choice
     rerandomize: never
     showanswer: always
-    markdown: "
+    markdown: |
        A multiple choice problem presents radio buttons for student input. Students can only select a single 
        option presented. Multiple Choice questions have been the subject of many areas of research due to the early 
        invention and adoption of bubble sheets.
@@ -19,7 +19,6 @@ metadata:
             ( ) The vegetable peeler
             ( ) Android
             ( ) The Beatles
-        "
 data: |
    <problem>
    <p>
diff --git a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml
index ec88fdf68c..2ec60860d6 100644
--- a/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/optionresponse.yaml
@@ -3,26 +3,22 @@ metadata:
     display_name: Option Response
     rerandomize: never
     showanswer: always
-#    markdown: "
-#          <p>OptionResponse gives a limited set of options for students to respond with, and presents those options
-#          in a format that encourages them to search for a specific answer rather than being immediately presented with options from which to recognize the correct answer.</p>
-#
-#          <p>
-#          The answer options and the identification of the correct answer is defined in the <b>optioninput</b> tag.
-#          </p>
-#          <p>Translation between Option Response and __________ is extremely straightforward:
-#
-#          <optionresponse>
-#                <optioninput options="('Multiple Choice','String Response','Numerical Response','External Response','Image Response')" correct="Multiple Choice"></optioninput>
-#          </optionresponse>
-#          </p>
-#              <solution>
-#                  <div class="detailed-solution">
-#                      <p>Explanation</p>
-#                      <p>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.</p>
-#                  </div>
-#              </solution>
-#        "
+    markdown: |
+        OptionResponse gives a limited set of options for students to respond with, and presents those options
+        in a format that encourages them to search for a specific answer rather than being immediately presented with options from which to recognize the correct answer.</p>
+
+        The answer options and the identification of the correct answer is defined in the <b>optioninput</b> tag.
+
+        Translation between Option Response and __________ is extremely straightforward:
+        [[(Multiple Choice), String Response, Numerical Response, External Response, Image Response]]
+
+        <solution>
+            <div class="detailed-solution">
+            <p>Explanation</p>
+            <p>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.</p>
+            </div>
+        </solution>
+        
 data: |
   <problem>
   <p>OptionResponse gives a limited set of options for students to respond with, and presents those options
diff --git a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml
index 040f4c4ac1..3af6026f56 100644
--- a/common/lib/xmodule/xmodule/templates/problem/string_response.yaml
+++ b/common/lib/xmodule/xmodule/templates/problem/string_response.yaml
@@ -3,6 +3,24 @@ metadata:
     display_name: String Response
     rerandomize: never
     showanswer: always
+    markdown: !
+        A string response problem accepts a line of text input from the
+        student, and evaluates the input for correctness based on an expected
+        answer within each input box. 
+    
+        The answer is correct if it matches every character of the expected answer. This can be a problem with 
+        international spelling, dates, or anything where the format of the answer is not clear. 
+    
+        Which US state has Lansing as its capital?
+        = Michigan
+
+            <solution>
+                <div class="detailed-solution">
+                    <p>Explanation</p>
+                    <p>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.</p>
+                </div>
+            </solution>
+    
 data: |
     <problem showanswer="always">
     <p>