Merge pull request #599 from Gluejar/survey-accessability

Survey accessability
pull/1/head
Raymond Yee 2016-06-16 15:46:25 -07:00 committed by GitHub
commit 20f570695a
9 changed files with 37 additions and 381 deletions

View File

@ -3,13 +3,13 @@
{% block title %}{{ block.super }}Questionnaire{% endblock title %}
{% block search_box %}
{% render_with_landing '' %}
<a href="{{landing_object.publishers.0.url}}"><img style="float:left;margin:10px" src="{{landing_object.publishers.0.logo_url}}" /></a>
<a href="{{landing_object.publishers.0.url}}"><img style="float:left;margin:10px" src="{{landing_object.publishers.0.logo_url}}" alt="{{landing_object.publishers.0.name}}" /></a>
{% endblock %}
{% block signin %}
{% endblock %}
{% block extra_css %}
<link rel="stylesheet" href="/static/bootstrap/bootstrap.min.css" type="text/css"/>
<link rel="stylesheet" href="/static/questionnaire.css"></script>
<link rel="stylesheet" href="/static/bootstrap/bootstrap.min.css" type="text/css" />
<link rel="stylesheet" href="/static/questionnaire.css" />
<style type="text/css">
{% block styleextra %}
{% endblock %}

File diff suppressed because one or more lines are too long

View File

@ -22,14 +22,14 @@
}
.questionset-text p{
font-size: 1.3em;
line-height: 1.3em;
font-size: 1.2em;
line-height: 1.2em;
}
.question-text {
font-size: 1.3em;
line-height: 1.3em;
font-size: 1.2em;
line-height: 1.2em;
}
div.input {

View File

@ -6,8 +6,8 @@
<title>{% block title %}Questionnaire{% endblock title %}</title>
<link rel="stylesheet" href="/static/bootstrap/bootstrap.min.css" type="text/css"/>
<link rel="stylesheet" href="/static/questionnaire.css"></script>
<link rel="stylesheet" href="/static/bootstrap/bootstrap.min.css" type="text/css" />
<link rel="stylesheet" href="/static/questionnaire.css" />
<style type="text/css">
{% block styleextra %}

View File

@ -1,7 +1,7 @@
{% load i18n %}
<div class="clearfix">
<div class="input">
<ul class="inputs-list">
<ul class="inputs-list list-unstyled">
{% for sel, choice in qdict.choices %}
<li>
<label>
@ -17,7 +17,7 @@
{% if question.extra %}
<span class="extra-block">{{ question.extra }}</span>
{% endif %}
<input id="{{ question.number }}_comment" checks="dep_check('{{ question.number }},_entry_')" type="input" name="question_{{ question.number }}_comment" value="{{ qdict.comment }}">
<input id="{{ question.number }}_comment" checks="dep_check('{{ question.number }},_entry_')" type="text" name="question_{{ question.number }}_comment" value="{{ qdict.comment }}">
</div>
</div>

View File

@ -2,7 +2,7 @@
<div class="clearfix">
<div class="input">
<ul class="inputs-list">
<ul class="inputs-list list-unstyled">
{% for choice, key, checked, prev_value in qdict.choices %}
<li>
<!-- <label> -->

View File

@ -1,7 +1,7 @@
{% load i18n %}
<div class="clearfix">
<div class="input">
<ul class="inputs-list">
<ul class="inputs-list list-unstyled">
<!-- yes -->
<li>

View File

@ -1,7 +1,7 @@
{% load i18n %}
<div class="clearfix">
<div class="input">
<ul class="inputs-list">
<ul class="inputs-list list-unstyled">
{% for sel, choice in qdict.choices %}
<li>
<label>

View File

@ -3,16 +3,31 @@
{% load static %}
{% load dynamicStyleTags %}
{% load landings %}
{% block title %}
Survey: {{ questionset.heading }}
{% endblock %}
{% block headextra %}
<script type="text/javascript" src="{% static 'jquery-1.7.1.min.js' %}"></script>
<script type="text/javascript" src="{% static 'questionset.js' %}"></script>
<link rel="stylesheet" href="{% static 'progressbar.css' %}"/>
<link rel="stylesheet" href="{% static 'progressbar.css' %}" />
{% if questionsetstylesheet|getAssociatedStylesheets %}
<style type="text/css">
{{ questionsetstylesheet|getAssociatedStylesheets|safe }}
</style>
{% endif %}
{% if progress %}
{% if questionset.questionnaire.name|add:"Progress"|getAssociatedStylesheets %}
<style type="text/css">
{{ questionset.questionnaire.name|add:"Progress"|getAssociatedStylesheets|safe }}
</style>
{% else %}
<style type="text/css">
{{ "CommonProgressStyles"|getAssociatedStylesheets|safe }}
</style>
{% endif %}
{% endif %}
{% for x in jsinclude %}
<script type="text/javascript" src="{{ x }}"></script>
{% endfor %}
@ -38,15 +53,6 @@
{% block questionnaire %}
{% if progress %}
{% if questionset.questionnaire.name|add:"Progress"|getAssociatedStylesheets %}
<style type="text/css">
{{ questionset.questionnaire.name|add:"Progress"|getAssociatedStylesheets|safe }}
</style>
{% else %}
<style type="text/css">
{{ "CommonProgressStyles"|getAssociatedStylesheets|safe }}
</style>
{% endif %}
<div id="progress_bar" class="ui-progress-bar ui-container">
<div class="ui-progress" style="width: {{progress}}%;">
<span class="ui-label"><b class="value">{{progress}}%</b></span>