diff --git a/opentech/apply/projects/forms.py b/opentech/apply/projects/forms.py index 218b2df53ea854cc466c0b0656650319cf228cc8..eeeb245ba3c46e3b1e0d94de8e9902df6601fc66 100644 --- a/opentech/apply/projects/forms.py +++ b/opentech/apply/projects/forms.py @@ -381,10 +381,10 @@ class UpdateProjectLeadForm(forms.ModelForm): class ReportEditForm(forms.ModelForm): public_content = RichTextField( - help_text="This section will be shared with the wider community." + help_text="This section of the report will be shared with the broader community." ) private_content = RichTextField( - help_text="This section will be shared with staff members only." + help_text="This section of the report will be shared with staff only." ) file_list = forms.ModelMultipleChoiceField( widget=forms.CheckboxSelectMultiple(attrs={'class': 'delete'}), diff --git a/opentech/apply/projects/templates/application_projects/report_form.html b/opentech/apply/projects/templates/application_projects/report_form.html index 3296a547ab57f663cd8b0f1a13c84f10f3fd1f95..5ba50eeae96b0db4b4fd54c1bf0ebd2f3a1f38bc 100644 --- a/opentech/apply/projects/templates/application_projects/report_form.html +++ b/opentech/apply/projects/templates/application_projects/report_form.html @@ -8,15 +8,21 @@ <a class="admin-bar__back-link" href="{{ object.project.get_absolute_url }}"> Project </a> - <h2 class="heading heading--no-margin">Report for the period {{ report.start_date }} to {{ report.end_date }}</h2> - <h5 class="heading heading--no-margin">{{ object.project.title }}</h5> + <h2 class="heading heading--no-margin">{{ object.project.title }}</h2> + <h5 class="heading heading--no-margin">Submit a report</h5> </div> </div> {% include "forms/includes/form_errors.html" with form=form %} -<div class="wrapper wrapper--light-grey-bg wrapper--form wrapper--sidebar"> +<div class="wrapper wrapper--light-grey-bg wrapper--form"> <div class="wrapper--sidebar--inner"> + + <div class="alert"> + <svg class="alert__icon"><use xlink:href="#exclamation-point"></use></svg> + <p class="alert__text">You are reporting for the period running from {{ report.start_date }} to {{ report.end_date }}</p> + </div> + <form class="form" action="" method="post" enctype="multipart/form-data" novalidate> {% csrf_token %} {{ form.media }} diff --git a/opentech/static_src/src/sass/apply/components/_alert.scss b/opentech/static_src/src/sass/apply/components/_alert.scss new file mode 100644 index 0000000000000000000000000000000000000000..9c1997b5e6fe28000fd9986286f5cc3f51c73371 --- /dev/null +++ b/opentech/static_src/src/sass/apply/components/_alert.scss @@ -0,0 +1,24 @@ +.alert { + border: 2px solid $color--lighter-blue; + padding: 1rem; + margin: 0 0 2rem; + background-color: $color--light-blue-90; + display: flex; + align-items: center; + + @include media-query(tablet-portrait) { + padding: 1.5rem; + } + + &__icon { + width: 25px; + height: 25px; + fill: $color--light-blue; + margin-right: .8rem; + } + + &__text { + margin: 0; + flex: 1; + } +} diff --git a/opentech/static_src/src/sass/apply/components/_data-block.scss b/opentech/static_src/src/sass/apply/components/_data-block.scss index f1f5544e06bec863729773aacd1714172622eba3..fe1e42f8526a6dc29d0e9a408d43e3178c645063 100644 --- a/opentech/static_src/src/sass/apply/components/_data-block.scss +++ b/opentech/static_src/src/sass/apply/components/_data-block.scss @@ -169,6 +169,7 @@ margin-right: 1rem; text-decoration: underline; color: $color--primary; + word-break: normal; &:last-child { margin: 0; diff --git a/opentech/static_src/src/sass/apply/main.scss b/opentech/static_src/src/sass/apply/main.scss index e05387624c1cc448bfa021cd614b119eea708833..332e4d98c7ee3105ffd0e9eb061198d415eb5b7d 100644 --- a/opentech/static_src/src/sass/apply/main.scss +++ b/opentech/static_src/src/sass/apply/main.scss @@ -8,6 +8,7 @@ @import 'base/typography'; // Components +@import 'components/alert'; @import 'components/all-submissions-table'; @import 'components/all-rounds-table'; @import 'components/admin-bar';