From b23bfc75bc33fbe0c3d589f8e8d259c5799a5ab2 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Sun, 19 Aug 2012 23:18:06 -0400
Subject: [PATCH] additional minor change: allow "inline" attrib on textline

---
 common/lib/capa/capa/inputtypes.py            |  4 +++-
 common/lib/capa/capa/templates/textinput.html | 12 ++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index 8c513e7aec..9de0a52e15 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -293,7 +293,9 @@ def textline(element, value, status, render_template, msg=""):
     hidden = element.get('hidden', '')	 # if specified, then textline is hidden and id is stored in div of name given by hidden
     escapedict = {'"': '&quot;'}
     value = saxutils.escape(value, escapedict)	 # otherwise, answers with quotes in them crashes the system!
-    context = {'id': eid, 'value': value, 'state': status, 'count': count, 'size': size, 'msg': msg, 'hidden': hidden}
+    context = {'id': eid, 'value': value, 'state': status, 'count': count, 'size': size, 'msg': msg, 'hidden': hidden,
+               'inline': element.get('inline',''),
+               }
     html = render_template("textinput.html", context)
     try:
         xhtml = etree.XML(html)
diff --git a/common/lib/capa/capa/templates/textinput.html b/common/lib/capa/capa/templates/textinput.html
index 08aa8379a7..814517d11c 100644
--- a/common/lib/capa/capa/templates/textinput.html
+++ b/common/lib/capa/capa/templates/textinput.html
@@ -1,6 +1,14 @@
-<section id="textinput_${id}" class="textinput">
+<section id="textinput_${id}" class="textinput"
+      % if inline:
+         style="display:inline"
+      % endif
+    >
     % if state == 'unsubmitted':
-    <div class="unanswered" id="status_${id}">
+    <div class="unanswered" id="status_${id}"
+      % if inline:
+         style="display:inline"
+      % endif
+      >
     % elif state == 'correct':
     <div class="correct" id="status_${id}">
     % elif state == 'incorrect':