From 5b460ff6b7320fe610d0254c466f611659e108a1 Mon Sep 17 00:00:00 2001
From: ichuang <ichuang@mit.edu>
Date: Mon, 16 Sep 2013 20:43:37 -0400
Subject: [PATCH] add inline style flag to formulaequationinput

---
 common/lib/capa/capa/inputtypes.py                       | 5 ++++-
 common/lib/capa/capa/templates/formulaequationinput.html | 3 ++-
 common/lib/capa/capa/tests/test_inputtypes.py            | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/lib/capa/capa/inputtypes.py b/common/lib/capa/capa/inputtypes.py
index c8efa1dfe3..110d9788e6 100644
--- a/common/lib/capa/capa/inputtypes.py
+++ b/common/lib/capa/capa/inputtypes.py
@@ -1081,7 +1081,10 @@ class FormulaEquationInput(InputTypeBase):
         """
         Can set size of text field.
         """
-        return [Attribute('size', '20'), ]
+        return [
+            Attribute('size', '20'),
+            Attribute('inline', False),
+        ]
 
     def _extra_context(self):
         """
diff --git a/common/lib/capa/capa/templates/formulaequationinput.html b/common/lib/capa/capa/templates/formulaequationinput.html
index 3f0260a816..bff987e1ff 100644
--- a/common/lib/capa/capa/templates/formulaequationinput.html
+++ b/common/lib/capa/capa/templates/formulaequationinput.html
@@ -1,4 +1,5 @@
-<section id="formulaequationinput_${id}" class="inputtype formulaequationinput">
+<% doinline = 'style="display:inline-block;vertical-align:top"' if inline else "" %>
+<section id="formulaequationinput_${id}" class="inputtype formulaequationinput" ${doinline}>
   <div class="${reported_status}" id="status_${id}">
     <input type="text" name="input_${id}" id="input_${id}"
 	   data-input-id="${id}" value="${value|h}"
diff --git a/common/lib/capa/capa/tests/test_inputtypes.py b/common/lib/capa/capa/tests/test_inputtypes.py
index 95cc13e142..44c2f91199 100644
--- a/common/lib/capa/capa/tests/test_inputtypes.py
+++ b/common/lib/capa/capa/tests/test_inputtypes.py
@@ -808,6 +808,7 @@ class FormulaEquationTest(unittest.TestCase):
             'msg': '',
             'size': self.size,
             'previewer': '/static/js/capa/src/formula_equation_preview.js',
+            'inline': False,
         }
         self.assertEqual(context, expected)