Skip to content

Commit f84e7b9

Browse files
committed
tweaks to revision detail view
1 parent b5018f6 commit f84e7b9

1 file changed

Lines changed: 45 additions & 35 deletions

File tree

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

Lines changed: 45 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,11 @@
2020
<h2 class="section-header">{% trans "Changes" %}</h2>
2121
<div class="flex flex-wrap gap-2">
2222
<span class="badge badge-soft">{{ from_revision.timestamp|date:"SHORT_DATETIME_FORMAT" }}</span>
23-
{% trans "↔" %}
24-
<span class="badge badge-soft">{{ to_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 %}
2528
</div>
2629
</div>
2730

@@ -77,42 +80,49 @@ <h4 class="pb-1 mb-2 font-medium border-b text-h3 border-base-300 question">{% t
7780
</div>
7881

7982
<div class="layout-sidebar">
80-
<h2 class="mb-4 card-title">All Revisions</h2>
81-
<ul class="list">
82-
{% for revision in all_revisions %}
83-
<li class="list-row {% if revision.id == from_revision.id %} bg-base-300 {% endif %}">
84-
<div class="list-col-grow">
85-
<span class="font-semibold">{{ revision.author }}</span> {% trans "edited" %}
83+
<div class="sticky top-4">
84+
<h2 class="mb-4 card-title">{% trans "Revisions" %}</h2>
85+
<div class="list">
86+
{% for revision in all_revisions %}
87+
<a
88+
class="list-row {% if revision.id == from_revision.id %} bg-base-300 {% else %}hover:bg-base-200{% endif %}"
89+
href="{{ revision.get_compare_url_to_latest }}"
90+
>
91+
<div class="list-col-grow">
92+
<span class="font-semibold">{{ revision.author }}</span> {% trans "edited" %}
8693

87-
<relative-time datetime={{ revision.timestamp|date:"c" }} class="text-fg-muted">
88-
{{ revision.timestamp|date:"SHORT_DATETIME_FORMAT" }}
89-
</relative-time>
94+
<relative-time datetime={{ revision.timestamp|date:"c" }} class="text-fg-muted">
95+
{{ revision.timestamp|date:"SHORT_DATETIME_FORMAT" }}
96+
</relative-time>
9097

91-
{% if revision.is_draft %}
92-
<span class="uppercase badge badge-warning badge-outline">
93-
({% trans "draft" %})
94-
</span>
95-
{% endif %}
96-
</div>
98+
{% if revision.is_draft %}
99+
<span class="uppercase badge badge-warning badge-outline">
100+
({% trans "draft" %})
101+
</span>
102+
{% endif %}
103+
</div>
97104

98-
<div>
99-
{% if forloop.first %}
100-
<span class="uppercase badge badge-info badge-outline">
101-
{% trans "latest" %}
102-
</span>
103-
{% else %}
104-
<a
105-
class="btn btn-sm"
106-
href="{{ revision.get_compare_url_to_latest }}"
107-
>
108-
{% trans "compare" %}
109-
{% heroicon_mini "arrow-right" class="w-4 h-4" %}
110-
</a>
111-
{% endif %}
112-
</div>
113-
</li>
114-
{% endfor %}
115-
</ul>
105+
<div>
106+
{% if forloop.first %}
107+
<span class="uppercase badge badge-info badge-outline">
108+
{% trans "latest" %}
109+
</span>
110+
{% else %}
111+
{% if revision.id != from_revision.id %}
112+
<span
113+
class="btn btn-sm"
114+
href="{{ revision.get_compare_url_to_latest }}"
115+
>
116+
{% trans "view" %}
117+
{% heroicon_mini "arrow-right" class="w-4 h-4" %}
118+
</span>
119+
{% endif %}
120+
{% endif %}
121+
</div>
122+
</a>
123+
{% endfor %}
124+
</div>
125+
</div>
116126
</div>
117127
</div>
118128
{% endblock %}

0 commit comments

Comments
 (0)