From 738eb5e239dd3c2757f627132ee6b86f3a256853 Mon Sep 17 00:00:00 2001
From: Chris Lawton <chris.lawton@torchbox.com>
Date: Thu, 9 May 2019 15:51:34 +0100
Subject: [PATCH] only show the last edited date if there is one and improve
style
---
.../templates/activity/include/listing_base.html | 7 ++++---
.../src/sass/apply/components/_feed.scss | 14 ++++++++++++++
2 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/opentech/apply/activity/templates/activity/include/listing_base.html b/opentech/apply/activity/templates/activity/include/listing_base.html
index f830163c1..2d2e7bdaf 100644
--- a/opentech/apply/activity/templates/activity/include/listing_base.html
+++ b/opentech/apply/activity/templates/activity/include/listing_base.html
@@ -7,14 +7,15 @@
<div class="feed__meta js-feed-meta">
<p class="feed__label feed__label--{{ activity.type }} feed__label--mobile">{{ activity.type|capfirst }}</p>
<p class="feed__meta-item"><span>{{ activity|display_author:request.user }}</span> – {{ activity.timestamp|date:"Y-m-d H:i" }}</p>
- <p class="feed__meta-item">
+ <p class="feed__meta-item feed__meta-item--edit-button">
<a class="link link--edit-submission is-active js-edit-comment" href="#">
Edit
<svg class="icon icon--pen"><use xlink:href="#pen"></use></svg>
</a>
</p>
- <!-- TODO: only show if has been previously edited -->
- <p class="feed__meta-item">Last edited: <span class="js-last-edited">{{ activity.edited }}</span></p>
+ {% if activity.edited %}
+ <p class="feed__meta-item feed__meta-item--last-edited">(Last edited: <span class="js-last-edited">{{ activity.edited }}</span>)</p>
+ {% endif %}
{% if activity.private %}
<p class="feed__meta-item feed__meta-item--right">
<svg class="icon icon--eye"><use xlink:href="#eye"></use></svg>
diff --git a/opentech/static_src/src/sass/apply/components/_feed.scss b/opentech/static_src/src/sass/apply/components/_feed.scss
index 2ab489a4b..d3afc66ee 100644
--- a/opentech/static_src/src/sass/apply/components/_feed.scss
+++ b/opentech/static_src/src/sass/apply/components/_feed.scss
@@ -101,6 +101,20 @@
margin: 0 15px 0 0;
}
+ &--edit-button {
+ border-left: 2px solid $color--mid-grey;
+ padding-left: 15px;
+ }
+
+ &--last-edited {
+ margin-right: 5px;
+ color: $color--mid-dark-grey;
+
+ span {
+ font-weight: $weight--normal;
+ }
+ }
+
&--right {
margin-left: auto;
}
--
GitLab