Skip to content
This repository has been archived by the owner on Nov 7, 2019. It is now read-only.

Commit

Permalink
Merge ef761b6 into 4893017
Browse files Browse the repository at this point in the history
  • Loading branch information
@philli-m
philli-m committed Oct 23, 2019
2 parents 4893017 + ef761b6 commit f114b75
Show file tree
Hide file tree
Showing 40 changed files with 825 additions and 710 deletions.
14 changes: 7 additions & 7 deletions apps/activities/templates/a4_candy_activities/includes/activity_detail_content.html
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{% load wagtailcore_tags ckeditor_tags %}

<div class="l-wrapper">
<div class="l-center-6">
<div class="module-content--light">
<h1>{{ object.name }}</h1>
<p>{{ object.highlight }}</p>
<p>{{ object.description | transform_collapsibles | richtext }}</p>
<div class="row">
<div class="l-center-6">
<div class="module-content--light">
<h1>{{ object.name }}</h1>
<p>{{ object.highlight }}</p>
<p>{{ object.description | transform_collapsibles | richtext }}</p>
</div>
</div>
</div>
</div>


16 changes: 9 additions & 7 deletions apps/budgeting/templates/a4_candy_budgeting/proposal_confirm_delete.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@

{% block content %}
<div class="l-wrapper">
<div class="l-center-6">
<h1>{% trans 'Are you sure you want to delete the proposal?' %} </h1>
<div class="row">
<div class="l-center-6">
<h1>{% trans 'Are you sure you want to delete the proposal?' %} </h1>

<form enctype="multipart/form-data" action="{{ request.path }}" method="post">
{% csrf_token %}
<input type="submit" class="btn btn--primary" value="{% trans 'Yes'%}" />
<a href="{{ object.get_absolute_url }}" class="btn btn--light">{% trans 'Cancel'%}</a>
</form>
<form enctype="multipart/form-data" action="{{ request.path }}" method="post">
{% csrf_token %}
<input type="submit" class="btn btn--primary" value="{% trans 'Yes'%}" />
<a href="{{ object.get_absolute_url }}" class="btn btn--light">{% trans 'Cancel'%}</a>
</form>
</div>
</div>
</div>
{% endblock %}
26 changes: 14 additions & 12 deletions apps/budgeting/templates/a4_candy_budgeting/proposal_create_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,22 @@
{% block title %}{% trans 'Create a new proposal' %} &mdash; {{ block.super }}{% endblock %}
{% block content %}
<div class="l-wrapper">
<div class="l-center-8 pt-5">
<nav class="breadcrumbs" aria-label="{% trans 'breadcrumbs' %}">
<ul>
<li>
<a href="{{ module.get_detail_url }}">
<i class="fa fa-arrow-left" aria-hidden="true"></i>
{% trans 'go back' %}</a>
</li>
</ul>
</nav>
<div class="row">
<div class="l-center-8 pt-5">
<nav class="breadcrumbs" aria-label="{% trans 'breadcrumbs' %}">
<ul>
<li>
<a href="{{ module.get_detail_url }}">
<i class="fa fa-arrow-left" aria-hidden="true"></i>
{% trans 'go back' %}</a>
</li>
</ul>
</nav>

<h1>{% trans 'Submit a new proposal for this project'%}</h1>
<h1>{% trans 'Submit a new proposal for this project'%}</h1>

{% include "a4_candy_budgeting/includes/proposal_form.html" with proposal=proposal cancel=module.get_detail_url %}
{% include "a4_candy_budgeting/includes/proposal_form.html" with proposal=proposal cancel=module.get_detail_url %}
</div>
</div>
</div>
{% endblock %}
30 changes: 17 additions & 13 deletions apps/budgeting/templates/a4_candy_budgeting/proposal_list.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,10 @@
{% block phase_content %}
<div class="l-top-overlap">
<div class="l-wrapper">
<div class="l-center-8">
{% include "a4_candy_contrib/includes/map_filter_and_sort.html" with filter=view.filter mode=view.mode %}
<div class="row">
<div class="l-center-8">
{% include "a4_candy_contrib/includes/map_filter_and_sort.html" with filter=view.filter mode=view.mode %}
</div>
</div>
</div>
</div>
Expand All @@ -42,18 +44,20 @@
{% else %}
<div class="module-content">
<div class="l-wrapper">
<div class="l-center-8">
{% if object_list.count > 0 %}
<ul class="u-list-reset">
{% for object in object_list %}
{% include "a4_candy_budgeting/includes/proposal_list_item.html" with object=object %}
{% endfor %}
</ul>
{% else %}
{% trans "Nothing to show" %}
{% endif %}
<div class="row">
<div class="l-center-8">
{% if object_list.count > 0 %}
<ul class="u-list-reset">
{% for object in object_list %}
{% include "a4_candy_budgeting/includes/proposal_list_item.html" with object=object %}
{% endfor %}
</ul>
{% else %}
{% trans "Nothing to show" %}
{% endif %}

{% include "a4_candy_contrib/includes/pagination.html" %}
{% include "a4_candy_contrib/includes/pagination.html" %}
</div>
</div>
</div>
</div>
Expand Down
60 changes: 31 additions & 29 deletions apps/budgeting/templates/a4_candy_budgeting/proposal_moderate_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,40 +4,42 @@
{% block title %}{% trans 'Moderate' %} {{ object.name }} &mdash; {{ block.super }}{% endblock %}
{% block content %}
<div class="l-wrapper">
<div class="l-center-8 pt-5">
<nav class="breadcrumbs" aria-label="{% trans 'breadcrumbs' %}">
<ul>
<li>
<a href="{{ module.get_detail_url }}">
<i class="fa fa-arrow-left" aria-hidden="true"></i>
{% trans 'go back' %}</a>
</li>
<li>
<a href="{{ object.get_absolute_url }}">
<i class="fa fa-arrow-left" aria-hidden="true"></i>
{% trans 'back to proposal' %}</a>
</li>
</ul>
</nav>
<div class="row">
<div class="l-center-8 pt-5">
<nav class="breadcrumbs" aria-label="{% trans 'breadcrumbs' %}">
<ul>
<li>
<a href="{{ module.get_detail_url }}">
<i class="fa fa-arrow-left" aria-hidden="true"></i>
{% trans 'go back' %}</a>
</li>
<li>
<a href="{{ object.get_absolute_url }}">
<i class="fa fa-arrow-left" aria-hidden="true"></i>
{% trans 'back to proposal' %}</a>
</li>
</ul>
</nav>

<h1>{% trans 'Moderate proposal' %}</h1>
<h1>{% trans 'Moderate proposal' %}</h1>

<form enctype="multipart/form-data" action="{{ request.path }}" method="post">
{% csrf_token %}
{% for form in forms.values %}
{{ form.media }}
{% endfor %}
<form enctype="multipart/form-data" action="{{ request.path }}" method="post">
{% csrf_token %}
{% for form in forms.values %}
{{ form.media }}
{% endfor %}

{% include 'a4_candy_contrib/includes/form_field.html' with field=forms.moderateable.moderator_feedback %}
{% include 'a4_candy_contrib/includes/form_field.html' with field=forms.statement.statement %}
{% include 'a4_candy_contrib/includes/form_checkbox_field.html' with field=forms.moderateable.is_archived %}
{% include 'a4_candy_contrib/includes/form_field.html' with field=forms.moderateable.moderator_feedback %}
{% include 'a4_candy_contrib/includes/form_field.html' with field=forms.statement.statement %}
{% include 'a4_candy_contrib/includes/form_checkbox_field.html' with field=forms.moderateable.is_archived %}

<div class="u-spacer-bottom">
<input type="submit" class="btn btn--primary" value="{% trans 'Save' %}" />
<a href="{{ object.get_absolute_url }}" class="btn btn--light">{% trans 'Cancel' %}</a>
</div>
</form>
<div class="u-spacer-bottom">
<input type="submit" class="btn btn--primary" value="{% trans 'Save' %}" />
<a href="{{ object.get_absolute_url }}" class="btn btn--light">{% trans 'Cancel' %}</a>
</div>
</form>

</div>
</div>
</div>
{% endblock %}
36 changes: 19 additions & 17 deletions apps/budgeting/templates/a4_candy_budgeting/proposal_update_form.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,27 @@

{% block content %}
<div class="l-wrapper">
<div class="l-center-8 pt-5">
<nav class="breadcrumbs" aria-label="{% trans 'breadcrumbs' %}">
<ul>
<li>
<a href="{{ module.get_detail_url }}">
<i class="fa fa-arrow-left" aria-hidden="true"></i>
{% trans 'go back' %}</a>
</li>
<li>
<a href="{{ object.get_absolute_url }}">
<i class="fa fa-arrow-left" aria-hidden="true"></i>
{% trans 'back to proposal' %}</a>
</li>
</ul>
</nav>
<div class="row">
<div class="l-center-8 pt-5">
<nav class="breadcrumbs" aria-label="{% trans 'breadcrumbs' %}">
<ul>
<li>
<a href="{{ module.get_detail_url }}">
<i class="fa fa-arrow-left" aria-hidden="true"></i>
{% trans 'go back' %}</a>
</li>
<li>
<a href="{{ object.get_absolute_url }}">
<i class="fa fa-arrow-left" aria-hidden="true"></i>
{% trans 'back to proposal' %}</a>
</li>
</ul>
</nav>

<h1>{% trans 'Edit proposal' %}</h1>
<h1>{% trans 'Edit proposal' %}</h1>

{% include "a4_candy_budgeting/includes/proposal_form.html" with proposal=proposal cancel=object.get_absolute_url %}
{% include "a4_candy_budgeting/includes/proposal_form.html" with proposal=proposal cancel=object.get_absolute_url %}
</div>
</div>
</div>
{% endblock %}
4 changes: 3 additions & 1 deletion apps/cms/pages/templates/a4_candy_cms_pages/home_page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,10 @@ <h1 class="homepage-header__teaser p-3 ml-md-4">{{ page.teaser|richtext }}</h1>
</div>
</div>
</div>

{% if page.body %}
<div class="p-3">{{ page.body|richtext }}</div>
{% endif %}

<div>{{ page.body_streamfield }}</div>

{% if page.form_page %}
Expand Down
8 changes: 5 additions & 3 deletions apps/cms/pages/templates/a4_candy_cms_pages/simple_page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@

{% block content %}
<div class="l-wrapper">
<div class="l-center-8">
<h1 class="cms-title">{{ page.title }}</h1>
{{ page.body|richtext }}
<div class="row">
<div class="l-center-8">
<h1 class="cms-title">{{ page.title }}</h1>
{{ page.body|richtext }}
</div>
</div>
</div>
{% endblock %}
78 changes: 40 additions & 38 deletions apps/contrib/templates/a4_candy_contrib/component_library.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1367,48 +1367,50 @@ <h2 id="cl-list_item">List Item</h2>
<div class="cl-example">
<div class="module-content">
<div class="l-wrapper">
<div class="l-center-8">
<ul class="u-list-reset">
<li class="list-item list-item--squashed">
<div class="list-item__stats">
<span class="rating">
<span class="rating-button rating-up is-read-only" title="Positive Ratings">0
<i class="fa fa-chevron-up" aria-label="Positive Ratings"></i>
</span>
<span class="rating-button rating-down is-read-only" title="Negative Ratings">0
<i class="fa fa-chevron-down" aria-label="Negative Ratings"></i>
<div class="row">
<div class="l-center-8">
<ul class="u-list-reset">
<li class="list-item list-item--squashed">
<div class="list-item__stats">
<span class="rating">
<span class="rating-button rating-up is-read-only" title="Positive Ratings">0
<i class="fa fa-chevron-up" aria-label="Positive Ratings"></i>
</span>
<span class="rating-button rating-down is-read-only" title="Negative Ratings">0
<i class="fa fa-chevron-down" aria-label="Negative Ratings"></i>
</span>
</span>
</span>
<span title="Comments">0
<i class="far fa-comment" aria-label="Comments"></i></span>
</div>

<h3 class="list-item__title"><a href="#cl-list_item">My Idea</a></h3>
<div class="list-item__labels">Label</div>
<span class="list-item__author">Author</span>
<time class="list-item__date">Date 2018</time>
</li>
<span title="Comments">0
<i class="far fa-comment" aria-label="Comments"></i></span>
</div>

<li class="list-item list-item--squashed">
<div class="list-item__stats">
<span class="rating">
<span class="rating-button rating-up is-read-only" title="Positive Ratings">0
<i class="fa fa-chevron-up" aria-label="Positive Ratings"></i></span>
<span class="rating-button rating-down is-read-only" title="Negative Ratings">0
<i class="fa fa-chevron-down" aria-label="Negative Ratings"></i>
<h3 class="list-item__title"><a href="#cl-list_item">My Idea</a></h3>
<div class="list-item__labels">Label</div>
<span class="list-item__author">Author</span>
<time class="list-item__date">Date 2018</time>
</li>

<li class="list-item list-item--squashed">
<div class="list-item__stats">
<span class="rating">
<span class="rating-button rating-up is-read-only" title="Positive Ratings">0
<i class="fa fa-chevron-up" aria-label="Positive Ratings"></i></span>
<span class="rating-button rating-down is-read-only" title="Negative Ratings">0
<i class="fa fa-chevron-down" aria-label="Negative Ratings"></i>
</span>
</span>
</span>
<span title="Comments">0
<i class="far fa-comment" aria-label="Comments"></i>
</span>
</div>
<span title="Comments">0
<i class="far fa-comment" aria-label="Comments"></i>
</span>
</div>

<h3 class="list-item__title"><a href="#cl-list_item">My Idea 2</a></h3>
<div class="list-item__labels">Label</div>
<span class="list-item__author">Author</span>
<time class="list-item__date">Date 2018</time>
</li>
</ul>
<h3 class="list-item__title"><a href="#cl-list_item">My Idea 2</a></h3>
<div class="list-item__labels">Label</div>
<span class="list-item__author">Author</span>
<time class="list-item__date">Date 2018</time>
</li>
</ul>
</div>
</div>
</div>
</div>
Expand Down
Loading

0 comments on commit f114b75

Please sign in to comment.