From d280b1b4fdc57bfd4c0c9cb56fd836d2ae80dbb5 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Fri, 26 Feb 2021 10:29:57 -0800 Subject: web: generic view improvements (entities, lists) --- python/fatcat_web/templates/editgroup_view.html | 90 ++++++++++++++++--------- 1 file changed, 57 insertions(+), 33 deletions(-) (limited to 'python/fatcat_web/templates/editgroup_view.html') diff --git a/python/fatcat_web/templates/editgroup_view.html b/python/fatcat_web/templates/editgroup_view.html index a36dc3e5..dc18f9d3 100644 --- a/python/fatcat_web/templates/editgroup_view.html +++ b/python/fatcat_web/templates/editgroup_view.html @@ -12,9 +12,20 @@
{% for edit in edits %}
-
+
+
+ [view] + {% if auth_to.edit and not editgroup.changelog_index and not editgroup.submitted %} +
[re-edit] +
+
+ + +
+ {% endif %} +
- {{ entity_type }}/{{ edit.ident }} + {{ entity_type }}_{{ edit.ident }} {% if edit.redirect_ident %} => redirect to {{ entity_type }}/{{ edit.redirect_ident }} {% elif not edit.revision %} @@ -24,14 +35,6 @@ {% else %} updated {% endif %} - [view edit] - {% if auth_to.edit and not editgroup.changelog_index and not editgroup.submitted %} - [re-edit] -
- - -
- {% endif %}
{% if edit.revision %} Revision: {{ edit.revision }} @@ -77,36 +80,54 @@ {% endif %}

Editgroup -editgroup {{ editgroup.editgroup_id }}

+editgroup_{{ editgroup.editgroup_id }} {% endblock %} -

What is an editgroup? -An editgroup is a set of entity edits, bundled together into a coherent, -reviewable bundle. -
+

+
+ What is an editgroup? +
+

An editgroup is a set of entity edits, bundled together into a coherent, reviewable bundle. +

-
Status: -{% if editgroup.changelog_index %} - Merged (Changelog #{{ editgroup.changelog_index }}) -{% elif editgroup.submitted %} - Submitted ({{ editgroup.submitted.strftime("%Y-%m-%d %H:%M:%S") }}) -{% else %} - Not Submitted -{% endif %} + + + + + + + + + + + + + + +
Status + {% if editgroup.changelog_index %} + Merged (Changelog #{{ editgroup.changelog_index }}) + {% elif editgroup.submitted %} + Submitted ({{ editgroup.submitted.strftime("%Y-%m-%d %H:%M:%S") }}) + {% else %} + Not Submitted + {% endif %} +
Editor + {{ editgroup.editor.username }} +
Description + {% if editgroup.description %} + {{ editgroup.description }} + {% else %} + none + {% endif %} +
-
Editor: {{ editgroup.editor.username }} -
Description: -{% if editgroup.description %} - {{ editgroup.description }} -{% else %} - none -{% endif %} {% if editgroup.extra %}

Extra Metadata (raw JSON)

{{ entity_macros.extra_metadata(editgroup.extra) }} {% endif %} -

+

All Entity Changes

{{ edit_list(auth_to, editgroup, editgroup.edits.releases, "release", "Release") }} {{ edit_list(auth_to, editgroup, editgroup.edits.works, "work", "Work") }} @@ -116,14 +137,17 @@ reviewable bundle. {{ edit_list(auth_to, editgroup, editgroup.edits.filesets, "fileset", "File Set") }} {{ edit_list(auth_to, editgroup, editgroup.edits.webcaptures, "webcapture", "Web Capture") }}
+
-

Comments and Annotations

+

Comments and Annotations

{% for annotation in editgroup.annotations|reverse %}
{% if annotation.editor.is_bot %} - + {% else %} {% endif %} -- cgit v1.2.3