Commit e1c9e52f by ichuang

move textinput display:inline into capa display.scss file as class

parent e3ecd22f
...@@ -149,6 +149,7 @@ def optioninput(element, value, status, render_template, msg=''): ...@@ -149,6 +149,7 @@ def optioninput(element, value, status, render_template, msg=''):
'state': status, 'state': status,
'msg': msg, 'msg': msg,
'options': osetdict, 'options': osetdict,
'inline': element.get('inline',''),
} }
html = render_template("optioninput.html", context) html = render_template("optioninput.html", context)
......
<section id="textinput_${id}" class="textinput" <% doinline = "inline" if inline else "" %>
% if inline:
style="display:inline" <section id="textinput_${id}" class="textinput ${doinline}" >
% endif
>
% if state == 'unsubmitted': % if state == 'unsubmitted':
<div class="unanswered" id="status_${id}" <div class="unanswered ${doinline}" id="status_${id}">
% if inline:
style="display:inline"
% endif
>
% elif state == 'correct': % elif state == 'correct':
<div class="correct" id="status_${id}" <div class="correct ${doinline}" id="status_${id}">
% if inline:
style="display:inline"
% endif
>
% elif state == 'incorrect': % elif state == 'incorrect':
<div class="incorrect" id="status_${id}" <div class="incorrect ${doinline}" id="status_${id}">
% if inline:
style="display:inline"
% endif
>
% elif state == 'incomplete': % elif state == 'incomplete':
<div class="incorrect" id="status_${id}" <div class="incorrect ${doinline}" id="status_${id}">
% if inline:
style="display:inline"
% endif
>
% endif % endif
% if hidden: % if hidden:
<div style="display:none;" name="${hidden}" inputid="input_${id}" /> <div style="display:none;" name="${hidden}" inputid="input_${id}" />
......
...@@ -49,6 +49,10 @@ section.problem { ...@@ -49,6 +49,10 @@ section.problem {
} }
} }
.inline {
display: inline;
}
div { div {
p { p {
&.answer { &.answer {
......
...@@ -18,16 +18,18 @@ MITX_FEATURES['ENABLE_DISCUSSION'] = False ...@@ -18,16 +18,18 @@ MITX_FEATURES['ENABLE_DISCUSSION'] = False
MITX_FEATURES['ACCESS_REQUIRE_STAFF_FOR_COURSE'] = True # require that user be in the staff_* group to be able to enroll MITX_FEATURES['ACCESS_REQUIRE_STAFF_FOR_COURSE'] = True # require that user be in the staff_* group to be able to enroll
MITX_FEATURES['DISABLE_START_DATES'] = True MITX_FEATURES['DISABLE_START_DATES'] = True
MITX_FEATURES['USE_DJANGO_PIPELINE']=False # don't recompile scss # MITX_FEATURES['USE_DJANGO_PIPELINE']=False # don't recompile scss
myhost = socket.gethostname() myhost = socket.gethostname()
if ('edxvm' in myhost) or ('ocw' in myhost): if ('edxvm' in myhost) or ('ocw' in myhost):
MITX_FEATURES['DISABLE_LOGIN_BUTTON'] = True # auto-login with MIT certificate MITX_FEATURES['DISABLE_LOGIN_BUTTON'] = True # auto-login with MIT certificate
MITX_FEATURES['USE_XQA_SERVER'] = 'https://qisx.mit.edu/xqa' # needs to be ssl or browser blocks it MITX_FEATURES['USE_XQA_SERVER'] = 'https://qisx.mit.edu/xqa' # needs to be ssl or browser blocks it
MITX_FEATURES['USE_DJANGO_PIPELINE']=False # don't recompile scss
if ('domU' in myhost): if ('domU' in myhost):
EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend' EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] = 'ichuang@mitx.mit.edu' # nonempty string = address for all activation emails MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] = 'ichuang@mitx.mit.edu' # nonempty string = address for all activation emails
MITX_FEATURES['USE_DJANGO_PIPELINE']=False # don't recompile scss
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https') # django 1.4 for nginx ssl proxy SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTOCOL', 'https') # django 1.4 for nginx ssl proxy
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment