initial implementation of editgroup 'diff' for review

2 files changed, 84 insertions, 4 deletions

diff --git a/python/fatcat_web/templates/editgroup_diff.html b/python/fatcat_web/templates/editgroup_diff.html
new file mode 100644
index 00000000..de6a800d
--- /dev/null
+++ b/python/fatcat_web/templates/editgroup_diff.html
@@ -0,0 +1,77 @@
+{% extends "editgroup_view.html" %}
+
+{% macro edit_diff_list(auth_to, editgroup, edits, diffs, entity_type, entity_name) -%}
+{% if edits %}
+  <h3>{{ entity_name }} Edits ({{ edits|count }})</h3>
+  <hr>
+  <div class="ui divided list">
+    {% for edit in edits %}
+    <div class="item">
+      <div class="content" style="padding-bottom: 0.5em;">
+        <div style="float: right; font-weight: bold;">
+          <a href="/editgroup/{{ editgroup.editgroup_id }}/{{ entity_type }}/{{ edit.ident }}">[view]</a>
+          {% if auth_to.edit and not editgroup.changelog_index and not editgroup.submitted %}
+            <br><a href="/editgroup/{{ editgroup.editgroup_id }}/{{ entity_type }}/{{ edit.ident }}/edit" style="color: green;">[re-edit]</a>
+            <br>
+            <form id="submit_edit_delete" method="POST" action="/editgroup/{{ editgroup.editgroup_id }}/{{ entity_type }}/edit/{{ edit.edit_id }}/delete" style="display:inline;">
+                <input type="hidden" name="csrf_token" value="{{ csrf_token() }}"/>
+                <input type="submit" value="[delete]" style="background:none; color: red; border: none; font-weight:bold; cursor:pointer; padding: 0;"></input>
+            </form>
+          {% endif %}
+        </div>
+        <div class="header">
+          <a href="/{{ entity_type }}/{{ edit.ident }}">{{ entity_type }}_{{ edit.ident }}</a>
+          {% if edit.redirect_ident %}
+            =&gt; redirect to <a href="/{{ entity_type }}/{{ edit.redirect_ident }}">{{ entity_type }}/{{ edit.redirect_ident }}</a>
+          {% elif not edit.revision %}
+            deleted
+          {% elif not edit.prev_revision %}
+            created
+          {% else %}
+            updated
+          {% endif %}
+        </div>
+        {% if edit.revision %}
+          Revision: <small><code><a href="/{{ entity_type }}/rev/{{ edit.revision }}">{{ edit.revision }}</a></code></small>
+        {% endif %}
+        {% if edit.extra %}
+          {{ entity_macros.extra_metadata(edit.extra) }}
+        {% endif %}
+        {% if edit.revision and not edit.redirect_ident and edit.ident in diffs %}
+          <div style="border: 2px solid black; overflow-x:scroll; margin: 0.5em;">
+          {% for line in diffs[edit.ident]['diff_lines'] %}
+            {% set line_space = false %}
+            {% if line.startswith('@@') or line.startswith('---') or line.startswith('+++') %}
+              {% set line_color = "lightblue" %}
+            {% elif line.startswith('+') %}
+              {% set line_color = "lightgreen" %}
+            {% elif line.startswith('-') %}
+              {% set line_color = "#ffa3a3" %}
+            {% else %}
+              {% set line_color = "#ddd" %}
+              {% set line_space = true %}
+            {% endif %}
+            <pre style="background-color: {{ line_color }}; margin: 0px;">{% if line_space %} {% endif %}{{ line.strip() }}</pre>
+          {% endfor %}
+          </div>
+        {% endif %}
+      </div>
+    </div>
+    {% endfor %}
+  </div>
+{% endif %}
+{%- endmacro %}
+
+{% block title %}Editgroup diff{% endblock %}
+
+{% block editgroupedits %}
+<h3 class="ui header">All Entity Change Diffs</h3>
+{{ edit_diff_list(auth_to, editgroup, editgroup.edits.releases, editgroup_diffs.release, "release", "Release") }}
+{{ edit_diff_list(auth_to, editgroup, editgroup.edits.works, editgroup_diffs.work, "work", "Work") }}
+{{ edit_diff_list(auth_to, editgroup, editgroup.edits.containers, editgroup_diffs.container, "container", "Container") }}
+{{ edit_diff_list(auth_to, editgroup, editgroup.edits.creators, editgroup_diffs.creator, "creator", "Creator") }}
+{{ edit_diff_list(auth_to, editgroup, editgroup.edits.files, editgroup_diffs.file, "file", "File") }}
+{{ edit_diff_list(auth_to, editgroup, editgroup.edits.filesets, editgroup_diffs.fileset, "fileset", "File Set") }}
+{{ edit_diff_list(auth_to, editgroup, editgroup.edits.webcaptures, editgroup_diffs.webcapture, "webcapture", "Web Capture") }}
+{% endblock %}
+
diff --git a/python/fatcat_web/templates/editgroup_view.html b/python/fatcat_web/templates/editgroup_view.html
index e1af719d..de904c2a 100644
--- a/python/fatcat_web/templates/editgroup_view.html
+++ b/python/fatcat_web/templates/editgroup_view.html
@@ -1,10 +1,6 @@
 {% extends "base.html" %}
 {% import "entity_macros.html" as entity_macros %}
 
-{% block title %}Editgroup{% endblock %}
-
-{% block body %}
-
 {% macro edit_list(auth_to, editgroup, edits, entity_type, entity_name) -%}
 <div class="{% if edits %}active{% endif %} title">
   <h3><i class="dropdown icon"></i>{{ entity_name }} Edits ({{ edits|count }})</h3>
@@ -49,6 +45,9 @@
 </div>
 {%- endmacro %}
 
+{% block title %}Editgroup{% endblock %}
+
+{% block body %}
 {# extended by changelog_entry #}
 {% block editgroupheader %}
 
@@ -170,6 +169,7 @@
   {{ entity_macros.extra_metadata(editgroup.extra) }}
 {% endif %}
 
+{% block editgroupedits %}
 <h3 class="ui header">All Entity Changes</h3>
 <div class="ui styled fluid accordion">
   {{ edit_list(auth_to, editgroup, editgroup.edits.releases, "release", "Release") }}
@@ -183,8 +183,10 @@
 <div style="float: right; font-size: smaller;">
   <a href="{{ config.FATCAT_PUBLIC_API_HOST }}/editgroup/{{ editgroup.editgroup_id }}">As JSON via API</a>
 </div>
+{% endblock %}
 
 <br>
+{% block editgroupannotations %}
 <h3 class="ui header">Comments and Annotations</h3>
 {% for annotation in editgroup.annotations|reverse %}
   <div class="ui segments">
@@ -241,6 +243,7 @@
     </form><br>
   </div>
 {% endif %}
+{% endblock %}
 
 {% endblock %}