From 2bbdc49bb8cc63116ab56724e9df7da17d4964fa Mon Sep 17 00:00:00 2001
From: Chris Lawton <31627284+chris-lawton@users.noreply.github.com>
Date: Wed, 6 Nov 2019 17:28:05 +0000
Subject: [PATCH] style report detail page (#1666)
---
.../application_projects/report_detail.html | 60 +++++++++----------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/opentech/apply/projects/templates/application_projects/report_detail.html b/opentech/apply/projects/templates/application_projects/report_detail.html
index dc075e40c..ccd9ae0c9 100644
--- a/opentech/apply/projects/templates/application_projects/report_detail.html
+++ b/opentech/apply/projects/templates/application_projects/report_detail.html
@@ -2,43 +2,43 @@
{% load static bleach_tags %}
{% block title %}Report | {{ object.project.title }}{% endblock %}
+{% block body_class %}{% endblock %}
{% block content %}
-<div class="admin-bar">
- <div class="admin-bar__inner">
- <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>
+ <div class="admin-bar">
+ <div class="admin-bar__inner">
+ <a class="admin-bar__back-link" href="{{ object.project.get_absolute_url }}">
+ Project
+ </a>
+ <h2 class="heading heading--no-margin">{{ object.project.title }}</h2>
+ <h5 class="heading heading--no-margin">View report</h5>
+ </div>
</div>
-</div>
-<div class="wrapper wrapper--light-grey-bg wrapper--form wrapper--sidebar">
- <div class="wrapper--sidebar--inner">
+ <div class="wrapper wrapper--form">
{% if report.skipped %}
<h2>Report Skipped</h2>
- {% else%}
- <h3>
- Public
- </h3>
- {{ object.current.public_content|bleach|safe }}
- <h3>
- Private
- </h3>
- {{ object.current.private_content|bleach|safe }}
- {% for file in object.current.files.all %}
- {% if forloop.first %}
- <h4>Files</h4>
- <ul>
- {% endif %}
+ {% else %}
+ <h3>Public</h3>
+ <div class="rich-text">
+ {{ object.current.public_content|bleach|safe }}
+ </div>
- <li><a href="{{ file.get_absolute_url }}">{{ file.filename }}</a></li>
+ <h3>Private</h3>
+ <div class="rich-text">
+ {{ object.current.private_content|bleach|safe }}
+ </div>
+ {% for file in object.current.files.all %}
+ {% if forloop.first %}
+ <h4>Files</h4>
+ <ul>
+ {% endif %}
- {% if forloop.last %}
- </ul>
- {% endif %}
- {% endfor %}
+ <li><a href="{{ file.get_absolute_url }}">{{ file.filename }}</a></li>
+
+ {% if forloop.last %}
+ </ul>
+ {% endif %}
+ {% endfor %}
{% endif %}
</div>
-</div>
{% endblock %}
--
GitLab