Browse Source

styling of review page

pull/160/head
Foley Lynn 8 years ago
parent
commit
2b19b361d4
5 changed files with 192 additions and 73 deletions
  1. +1
    -1
      edivorce/apps/core/static/css/main.css
  2. +20
    -2
      edivorce/apps/core/static/css/main.scss
  3. +2
    -0
      edivorce/apps/core/templates/base.html
  4. +14
    -10
      edivorce/apps/core/templates/partials/review_user_responses.html
  5. +155
    -60
      edivorce/apps/core/templates/question/11_review.html

+ 1
- 1
edivorce/apps/core/static/css/main.css
File diff suppressed because it is too large
View File


+ 20
- 2
edivorce/apps/core/static/css/main.scss View File

@ -544,6 +544,26 @@ textarea {
&.hasFocus {border: 1px solid $brand-blue;} &.hasFocus {border: 1px solid $brand-blue;}
} }
.step-review {
.collapse-trigger {
font-size: 24px;
&.collapsed {
margin-bottom: 0;
transition: 0.5s ease-out all;
}
}
table {
margin-bottom: 0;
thead tr {
background-color: $brand-blue;
color: #fff;
}
}
.collapse>div, .collapsing>div {
margin-bottom: 0;
}
}
/* Column Grid in flexbox */ /* Column Grid in flexbox */
.row-flex { .row-flex {
@ -652,8 +672,6 @@ textarea {
} }
} }
/* Side Progress Navigation */ /* Side Progress Navigation */
.progress-column, .progress-column,


+ 2
- 0
edivorce/apps/core/templates/base.html View File

@ -7,6 +7,8 @@
<title>{% block title %}Ministry of Justice e-Divorce{% endblock %}</title> <title>{% block title %}Ministry of Justice e-Divorce{% endblock %}</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}"> <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap.min.css" %}">
<link rel="stylesheet" type="text/css" href="{% static "css/bootstrap-datepicker3.min.css" %}"> <link rel="stylesheet" type="text/css" href="{% static "css/bootstrap-datepicker3.min.css" %}">
<link rel="stylesheet" type="text/css" href="{% static "css/font-awesome.min.css" %}"> <link rel="stylesheet" type="text/css" href="{% static "css/font-awesome.min.css" %}">


+ 14
- 10
edivorce/apps/core/templates/partials/review_user_responses.html View File

@ -1,15 +1,19 @@
{% if questions %} {% if questions %}
<table border="1">
<tr>
<th>Questions</th>
<th>User response</th>
</tr>
{% for question in questions %}
{{question.question}}
<table class="table table-bordered table-striped">
<thead>
<tr> <tr>
<td width="75%" style="padding-right: 5%">{{question.question__name}}</td>
<td width="25%">{{question.value}}</td>
<th>Questions</th>
<th>User response</th>
</tr> </tr>
{% endfor %}
</thead>
<tbody>
{% for question in questions %}
{{question.question}}
<tr>
<td width="75%" style="padding-right: 5%">{{question.question__name}}</td>
<td width="25%">{{question.value}}</td>
</tr>
{% endfor %}
</tbody>
</table> </table>
{% endif %} {% endif %}

+ 155
- 60
edivorce/apps/core/templates/question/11_review.html View File

@ -8,75 +8,170 @@
{% block progress %}{% include "progress.html" %}{% endblock %} {% block progress %}{% include "progress.html" %}{% endblock %}
{% block content %} {% block content %}
<h1><small>Step {% step_order step="review" %}:</small>Review</h1> <h1><small>Step {% step_order step="review" %}:</small>Review</h1>
<ul>
<li>
<h4>Pre-qualification questions</h4>
{% include "partials/review_user_responses.html" with questions=prequalification %}
</li>
<li>
<h4>Step 1: What are you asking for</h4>
{% include "partials/review_user_responses.html" with questions=which_orders %}
</li>
<li>
<h4>Step 2: Your information</h4>
{% include "partials/review_user_responses.html" with questions=your_information %}
</li>
<li>
<h4>Step 3: Your spouse</h4>
{% include "partials/review_user_responses.html" with questions=your_spouse %}
</li>
<li>
<h4>Step 4: Your marriage</h4>
{% include "partials/review_user_responses.html" with questions=your_marriage %}
</li>
<li>
<h4>Step 5: Your separation</h4>
{% include "partials/review_user_responses.html" with questions=your_separation %}
</li>
{% if 'Spousal support' in which_orders.0.value|load_json %}
<li>
<h4>Step 6: Spousal support</h4>
{% include "partials/review_user_responses.html" with questions=spousal_support %}
</li>
{% endif %}
{% if 'Division of property and debts' in which_orders.0.value|load_json %}
<li>
<h4>Step {% step_order step="property" %}: Property and debt</h4>
{% include "partials/review_user_responses.html" with questions=property_and_debt %}
</li>
{% endif %}
{% if 'Other orders' in which_orders.0.value|load_json %}
<li>
<h4>Step {% step_order step="other_orders" %}: Other orders</h4>
{% include "partials/review_user_responses.html" with questions=other_orders %}
</li>
{% endif %}
<li>
<h4>Step {% step_order step="other_questions" %}: Other questions</h4>
{% include "partials/review_user_responses.html" with questions=other_questions %}
</li>
<li>
<h4>Step {% step_order step="location" %}: Filing location</h4>
{% include "partials/review_user_responses.html" with questions=filing_locations %}
</li>
</ul>
{% endblock %}
<div class="question-well step-review">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_prequal" aria-controls="collapse_changed_name">
<div>
Pre-qualification questions
</div>
</div>
<div class="collapse in" id="review_step_prequal">
<div>
{% include "partials/review_user_responses.html" with questions=prequalification %}
</div>
</div>
</div>
<div class="question-well step-review">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_1" aria-controls="collapse_changed_name">
<div>
Step 1: What are you asking for
</div>
</div>
<div class="collapse in" id="review_step_1">
<div>
{% include "partials/review_user_responses.html" with questions=which_orders %}
</div>
</div>
</div>
<div class="question-well step-review">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_2" aria-controls="collapse_changed_name">
<div>
Step 2: Your information
</div>
</div>
<div class="collapse in" id="review_step_2">
<div>
{% include "partials/review_user_responses.html" with questions=your_information %}
</div>
</div>
</div>
<div class="question-well step-review">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_3" aria-controls="collapse_changed_name">
<div>
Step 3: Your spouse
</div>
</div>
<div class="collapse in" id="review_step_3">
<div>
{% include "partials/review_user_responses.html" with questions=your_spouse %}
</div>
</div>
</div>
<div class="question-well step-review">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_4" aria-controls="collapse_changed_name">
<div>
Step 4: Your marriage
</div>
</div>
<div class="collapse in" id="review_step_4">
<div>
{% include "partials/review_user_responses.html" with questions=your_marriage %}
</div>
</div>
</div>
<div class="question-well step-review">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_5" aria-controls="collapse_changed_name">
<div>
Step 5: Your separation
</div>
</div>
<div class="collapse in" id="review_step_5">
<div>
{% include "partials/review_user_responses.html" with questions=your_separation %}
</div>
</div>
</div>
{% if 'Spousal support' in which_orders.0.value|load_json %}
<div class="question-well step-review">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_6" aria-controls="collapse_changed_name">
<div>
Step 6: Spousal support
</div>
</div>
<div class="collapse in" id="review_step_6">
<div>
{% include "partials/review_user_responses.html" with questions=spousal_support %}
</div>
</div>
</div>
{% endif %}
{% if 'Division of property and debts' in which_orders.0.value|load_json %}
<div class="question-well step-review">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_7" aria-controls="collapse_changed_name">
<div>
Step {% step_order step="property" %}: Property and debt
</div>
</div>
<div class="collapse in" id="review_step_7">
<div>
{% include "partials/review_user_responses.html" with questions=property_and_debt %}
</div>
</div>
</div>
{% endif %}
{% if 'Other orders' in which_orders.0.value|load_json %}
<div class="question-well step-review">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_8" aria-controls="collapse_changed_name">
<div>
Step {% step_order step="other_orders" %}: Other orders
</div>
</div>
<div class="collapse in" id="review_step_8">
<div>
{% include "partials/review_user_responses.html" with questions=other_orders %}
</div>
</div>
</div>
{% endif %}
<div class="question-well step-review">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_9" aria-controls="collapse_changed_name">
<div>
Step {% step_order step="other_questions" %}: Other questions
</div>
</div>
<div class="collapse in" id="review_step_9">
<div>
{% include "partials/review_user_responses.html" with questions=other_questions %}
</div>
</div>
</div>
<div class="question-well step-review">
<div class="collapse-trigger" data-toggle="collapse" aria-expanded="true" data-target="#review_step_10" aria-controls="collapse_changed_name">
<div>
Step {% step_order step="location" %}: Filing location
</div>
</div>
<div class="collapse in" id="review_step_10">
<div>
{% include "partials/review_user_responses.html" with questions=filing_locations %}
</div>
</div>
</div>
{% endblock %}
{% block formbuttons %} {% block formbuttons %}
<div class="form-buttons clearfix"> <div class="form-buttons clearfix">
<a class="btn btn-success pull-right" href="{% url 'savepdf' %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
<a class="btn btn-success pull-right" href="{% url 'savepdf' %}">Next&nbsp;&nbsp;&nbsp;<i class="fa fa-arrow-circle-o-right"></i></a>
</div> </div>
{% endblock %} {% endblock %}
{% block sidebarNav %} {% block sidebarNav %}
<!-- no sidebar --> <!-- no sidebar -->
{% endblock %} {% endblock %}
{% block sidebar %} {% block sidebar %}
<!-- no sidebar --> <!-- no sidebar -->
{% endblock %}
{% endblock %}

Loading…
Cancel
Save