From c04455c546dea68556b0db967aebdfd6d6574950 Mon Sep 17 00:00:00 2001
From: Vik Paruchuri <vik@edx.org>
Date: Fri, 4 Jan 2013 13:30:33 -0500
Subject: [PATCH] Fix html display

---
 common/lib/xmodule/xmodule/open_ended_module.py | 5 +++--
 lms/templates/open_ended.html                   | 9 ++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/common/lib/xmodule/xmodule/open_ended_module.py b/common/lib/xmodule/xmodule/open_ended_module.py
index bce571ebfc..b8f3bf8278 100644
--- a/common/lib/xmodule/xmodule/open_ended_module.py
+++ b/common/lib/xmodule/xmodule/open_ended_module.py
@@ -635,9 +635,9 @@ class OpenEndedModule():
         #set context variables and render template
         if self.state != self.INITIAL:
             latest = self.latest_answer()
-            previous_answer = latest if latest is not None else ''
+            previous_answer = latest if latest is not None else self.initial_display
         else:
-            previous_answer = ''
+            previous_answer = self.initial_display
 
         context = {
             'prompt': self.prompt,
@@ -648,6 +648,7 @@ class OpenEndedModule():
             'cols' : 80,
             'hidden' : '',
             'id' : 'open_ended',
+            'msg' : "",
             }
 
         html = system.render_template('open_ended.html', context)
diff --git a/lms/templates/open_ended.html b/lms/templates/open_ended.html
index a3e148d36b..3456b61068 100644
--- a/lms/templates/open_ended.html
+++ b/lms/templates/open_ended.html
@@ -1,9 +1,10 @@
 <section id="openended_${id}" class="open-ended-child" data-state="${state}">
+    ${prompt|n}
   <textarea rows="${rows}" cols="${cols}" name="input_${id}" class="short-form-response" id="input_${id}"
        % if hidden:
       	    style="display:none;"
        % endif
-  >${value|h}</textarea>
+  >${previous_answer|h}</textarea>
 
   <div class="grader-status">
     % if state == 'initial':
@@ -21,14 +22,16 @@
     % endif
   </div>
 
+  <input type="button" value="Submit" class="submit-button" name="show"/>
+    
   <span id="answer_${id}"></span>
 
-    % if status == 'queued':
+    % if state == 'assessing':
     <input name="reload" class="reload" type="button" value="Recheck for Feedback" onclick="document.location.reload(true);" />
     % endif
   <div class="external-grader-message">
       ${msg|n}
-    % if status in ['correct','incorrect']:
+    % if state == 'done':
     <div class="collapsible evaluation-response">
       <header>
       <a href="#">Respond to Feedback</a>