Skip to content

Commit a67034e

Browse files
wes-otfwes-otf
committed
Fixed timestamp bug & made latest revision uncomparable
1 parent df1a049 commit a67034e

1 file changed

Lines changed: 41 additions & 88 deletions

File tree

‎hypha/apply/funds/templates/funds/revisions_compare.html‎

Lines changed: 41 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -14,77 +14,13 @@
1414

1515
{% block content %}
1616
<div class="my-4 layout layout-flowrow-until-md layout-sidebar-flowrow-start">
17-
18-
{% comment %} <article class="layout-main">
19-
<div class="mb-4">
20-
<h2 class="section-header">{% trans "Changes" %}</h2>
21-
<div class="flex flex-wrap gap-2">
22-
<span class="badge badge-soft">{{ from_revision.timestamp|date:"SHORT_DATETIME_FORMAT" }}</span>
23-
24-
{% if to_revision.id != from_revision.id %}
25-
{% trans "↔" %}
26-
<span class="badge badge-soft">{{ to_revision.timestamp|date:"SHORT_DATETIME_FORMAT" }}</span>
27-
{% endif %}
28-
</div>
29-
</div>
30-
31-
<div class="card card-border">
32-
<div class="gap-8 max-w-full card-body html-diff">
33-
{% for diff in required_fields %}
34-
{% if forloop.first %}
35-
<section>
36-
<h4 class="pb-1 mb-2 font-medium border-b text-h3 border-base-300 question">{% trans "Title" %}</h4>
37-
<div>{{ diff }}</div>
38-
</section>
39-
{% elif forloop.counter == 2 %}
40-
<section>
41-
<h4 class="pb-1 mb-2 font-medium border-b text-h3 border-base-300 question">{% trans "Legal Name" %}</h4>
42-
<div>{{ diff }}</div>
43-
</section>
44-
{% elif forloop.counter == 3 %}
45-
<section>
46-
<h4 class="pb-1 mb-2 font-medium border-b text-h3 border-base-300 question">{% trans "E-mail" %}</h4>
47-
<div>{{ diff }}</div>
48-
</section>
49-
{% elif forloop.counter == 4 %}
50-
<section>
51-
<h4 class="pb-1 mb-2 font-medium border-b text-h3 border-base-300 question">{% trans "Address" %}</h4>
52-
<div>{{ diff }}</div>
53-
</section>
54-
{% elif forloop.counter == 5 %}
55-
<section>
56-
<h4 class="pb-1 mb-2 font-medium border-b text-h3 border-base-300 question">{% trans "Project Duration" %}</h4>
57-
<div>{{ diff }}</div>
58-
</section>
59-
{% elif forloop.counter == 6 %}
60-
<section>
61-
<h4 class="pb-1 mb-2 font-medium border-b text-h3 border-base-300 question">{% trans "Requested Funding" %}</h4>
62-
<div>{{ diff }}</div>
63-
</section>
64-
{% elif forloop.counter == 7 %}
65-
<section>
66-
<h4 class="pb-1 mb-2 font-medium border-b text-h3 border-base-300 question">{% trans "Organization" %}</h4>
67-
<div>{{ diff }}</div>
68-
</section>
69-
{% else %}
70-
<section>
71-
<div>{{ diff }}</div>
72-
</section>
73-
{% endif %}
74-
{% endfor %}
75-
{% for diff in stream_fields %}
76-
{{ diff }}
77-
{% endfor %}
78-
</div>
79-
</div>
80-
</article> {% endcomment %}
8117
<div class="layout-main">
8218
<div class="mb-4">
8319
<h2 class="section-header">{% trans "Changes" %}</h2>
8420
<div class="flex flex-wrap gap-2">
8521
<span class="badge badge-soft">
86-
<relative-time format='datetime' datetime="{{ to_revision.timestamp|date:'c' }}">
87-
{{ to_revision.timestamp|date:'SHORT_DATETIME_FORMAT' }}
22+
<relative-time format='datetime' datetime="{{ from_revision.timestamp|date:'c' }}">
23+
{{ from_revision.timestamp|date:'SHORT_DATETIME_FORMAT' }}
8824
</relative-time>
8925
</span>
9026

@@ -152,42 +88,59 @@ <h2 class="section-header">{% trans "Changes" %}</h2>
15288
<h2 class="mb-4 card-title">{% trans "Revisions" %}</h2>
15389
<div class="list">
15490
{% for revision in all_revisions %}
155-
<a
156-
class="list-row {% if revision.id == from_revision.id %} bg-base-300 {% else %}hover:bg-base-200{% endif %}"
157-
href="{{ revision.get_compare_url_to_latest }}"
158-
>
159-
<div class="list-col-grow">
160-
<span class="font-semibold">{{ revision.author }}</span> {% trans "edited" %}
91+
{% if forloop.first %}
92+
<div class="list-row">
93+
<div class="list-col-grow">
94+
<span class="font-semibold">{{ revision.author }}</span> {% trans "edited" %}
16195

162-
<relative-time datetime={{ revision.timestamp|date:"c" }} class="text-fg-muted">
163-
{{ revision.timestamp|date:"SHORT_DATETIME_FORMAT" }}
164-
</relative-time>
96+
<relative-time datetime={{ revision.timestamp|date:"c" }} class="text-fg-muted">
97+
{{ revision.timestamp|date:"SHORT_DATETIME_FORMAT" }}
98+
</relative-time>
16599

166-
{% if revision.is_draft %}
167-
<span class="uppercase badge badge-warning badge-outline">
168-
({% trans "draft" %})
169-
</span>
170-
{% endif %}
171-
</div>
100+
{% if revision.is_draft %}
101+
<span class="uppercase badge badge-warning badge-outline">
102+
({% trans "draft" %})
103+
</span>
104+
{% endif %}
105+
</div>
172106

173-
<div>
174-
{% if forloop.first %}
107+
<div>
175108
<span class="uppercase badge badge-info badge-outline">
176109
{% trans "latest" %}
177110
</span>
178-
{% else %}
179-
{% if revision.id != from_revision.id %}
111+
</div>
112+
</div>
113+
{% else %}
114+
<a
115+
class="list-row {% if revision.id == from_revision.id %} bg-base-300 {% else %}hover:bg-base-200{% endif %}"
116+
href="{{ revision.get_compare_url_to_latest }}"
117+
>
118+
<div class="list-col-grow">
119+
<span class="font-semibold">{{ revision.author }}</span> {% trans "edited" %}
120+
121+
<relative-time datetime={{ revision.timestamp|date:"c" }} class="text-fg-muted">
122+
{{ revision.timestamp|date:"SHORT_DATETIME_FORMAT" }}
123+
</relative-time>
124+
125+
{% if revision.is_draft %}
126+
<span class="uppercase badge badge-warning badge-outline">
127+
({% trans "draft" %})
128+
</span>
129+
{% endif %}
130+
</div>
131+
{% if revision.id != from_revision.id %}
132+
<div>
180133
<span
181134
class="btn btn-sm"
182135
href="{{ revision.get_compare_url_to_latest }}"
183136
>
184137
{% trans "view" %}
185138
{% heroicon_mini "arrow-right" class="size-4" %}
186139
</span>
187-
{% endif %}
140+
</div>
188141
{% endif %}
189-
</div>
190-
</a>
142+
</a>
143+
{% endif %}
191144
{% endfor %}
192145
</div>
193146
</div>

0 commit comments

Comments
 (0)