Move main section out of base template

This commit is contained in:
igorkorenfeld 2022-11-10 14:48:45 -05:00
parent f7c7c78d2f
commit 33cf8feb29
No known key found for this signature in database
GPG key ID: 826947A4B867F659
3 changed files with 23 additions and 21 deletions

View file

@ -3,26 +3,30 @@
{% block title %}Apply for a .gov domain {{form_titles|get_item:wizard.steps.current}}{% endblock %} {% block title %}Apply for a .gov domain {{form_titles|get_item:wizard.steps.current}}{% endblock %}
{% block content %} {% block content %}
<div class="grid-row grid-gap"> <div class="grid-container">
<div class="grid-col-3"> <div class="grid-row grid-gap">
{% include 'application_sidebar.html' %} <div class="grid-col-3">
</div> {% include 'application_sidebar.html' %}
<div class="grid-col-9"> </div>
{% if wizard.steps.prev %} <div class="grid-col-9">
<a href="{% url wizard.url_name step=wizard.steps.prev %}"> <main id="main-content" class="grid-container">
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img"> {% if wizard.steps.prev %}
<use xlink:href="{%static '/img/sprite.svg'%}#arrow_back"></use> <a href="{% url wizard.url_name step=wizard.steps.prev %}">
</svg><span class="margin-left-05">Previous step </span> <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
</a> <use xlink:href="{%static '/img/sprite.svg'%}#arrow_back"></use>
{% endif %} </svg><span class="margin-left-05">Previous step </span>
<h1> {{form_titles|get_item:wizard.steps.current}} </h1> </a>
{% block form_content %} {% endif %}
{% if wizard.steps.next %} <h1> {{form_titles|get_item:wizard.steps.current}} </h1>
{% block form_content %}
{% if wizard.steps.next %}
<button type="submit" class="usa-button">Next</button> <button type="submit" class="usa-button">Next</button>
{% else %} {% else %}
<button type="submit" class="usa-button">Submit your domain request</button> <button type="submit" class="usa-button">Submit your domain request</button>
{% endif %} {% endif %}
<button type="button" class="usa-button usa-button--outline">Save</button> <button type="button" class="usa-button usa-button--outline">Save</button>
</main>
</div>
{% endblock %} {% endblock %}
</div> </div>
</div> </div>

View file

@ -10,7 +10,7 @@
{{ form_titles|get_item:this_step }} {{ form_titles|get_item:this_step }}
</a> </a>
{% else %} {% else %}
<li class="usa-sidenav__item step__locked"> <li class="usa-sidenav__item step--locked">
{{ form_titles|get_item:this_step }} {{ form_titles|get_item:this_step }}
<svg class="usa-icon" aria-labelledby="locked-step" role="img"> <svg class="usa-icon" aria-labelledby="locked-step" role="img">
<title id="locked-step">locked until previous steps have been completed </title> <title id="locked-step">locked until previous steps have been completed </title>

View file

@ -171,10 +171,8 @@
{% block section_nav %}{% endblock %} {% block section_nav %}{% endblock %}
<main id="main-content" class="grid-container">
{% block hero %}{% endblock %} {% block hero %}{% endblock %}
{% block content %}{% endblock %} {% block content %}{% endblock %}
</main>
<div role="complementary">{% block complementary %}{% endblock %}</div> <div role="complementary">{% block complementary %}{% endblock %}</div>