diff options
Diffstat (limited to 'python/fatcat_web/templates')
-rw-r--r-- | python/fatcat_web/templates/changelog.html | 14 | ||||
-rw-r--r-- | python/fatcat_web/templates/editgroup_reviewable.html | 2 | ||||
-rw-r--r-- | python/fatcat_web/templates/editgroup_view.html | 90 | ||||
-rw-r--r-- | python/fatcat_web/templates/editor_annotations.html | 12 | ||||
-rw-r--r-- | python/fatcat_web/templates/editor_editgroups.html | 12 | ||||
-rw-r--r-- | python/fatcat_web/templates/editor_view.html | 15 | ||||
-rw-r--r-- | python/fatcat_web/templates/entity_history.html | 10 | ||||
-rw-r--r-- | python/fatcat_web/templates/entity_macros.html | 24 | ||||
-rw-r--r-- | python/fatcat_web/templates/entity_view_metadata.html | 3 |
9 files changed, 113 insertions, 69 deletions
diff --git a/python/fatcat_web/templates/changelog.html b/python/fatcat_web/templates/changelog.html index 8b899d38..322f3e3b 100644 --- a/python/fatcat_web/templates/changelog.html +++ b/python/fatcat_web/templates/changelog.html @@ -7,9 +7,11 @@ <h1 class="ui header">Recent Changes <div class="sub header"><code>changelog</code></div></h1> -Limited to the most recent entries. +<p>This is a feed of all the changes to the catalog, in the order that they are +accepted. Only the most recent entries are shown, but the API can be used to +inspect every change all the way back to the start. -<table class="ui table"> +<table class="ui small table"> <thead><tr><th>Changelog<br>Index <th>Editgroup <th>Description @@ -19,7 +21,7 @@ Limited to the most recent entries. <br>{{ entry.timestamp.strftime("%Y-%m-%d %H:%M:%S") }} <td> {% if entry.editgroup.editor.is_bot %} - <i class="icon bug"></i> + <i class="icon server"></i> {% else %} <i class="icon user"></i> {% endif %} @@ -28,10 +30,14 @@ Limited to the most recent entries. </a></code> <br> <small><code><a href="/editgroup/{{ entry.editgroup.editgroup_id }}"> - {{ entry.editgroup.editgroup_id }} + editgroup_{{ entry.editgroup.editgroup_id }} </a></code></small> <td>{% if entry.editgroup.description != None %}{{ entry.editgroup.description }}{% endif %} {% endfor %} </table> +<div style="float: right; font-size: smaller;"> + <a href="{{ config.FATCAT_API_HOST }}/changelog">As JSON via API</a> +</div> + {% endblock %} diff --git a/python/fatcat_web/templates/editgroup_reviewable.html b/python/fatcat_web/templates/editgroup_reviewable.html index 4cfea697..ec1fc1f5 100644 --- a/python/fatcat_web/templates/editgroup_reviewable.html +++ b/python/fatcat_web/templates/editgroup_reviewable.html @@ -16,7 +16,7 @@ Limited to the most recent entries. {% for editgroup in entries %} <tr><td> {% if editgroup.editor.is_bot %} - <i class="icon bug"></i> + <i class="icon server"></i> {% else %} <i class="icon user"></i> {% endif %} 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 @@ <div class="ui divided list"> {% for edit in edits %} <div class="item"> - <div class="content"> + <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; padding:9;font-weight:bold;cursor:pointer;"></input> + </form> + {% endif %} + </div> <div class="header"> - <a href="/{{ entity_type }}/{{ edit.ident }}">{{ entity_type }}/{{ edit.ident }}</a> + <a href="/{{ entity_type }}/{{ edit.ident }}">{{ entity_type }}_{{ edit.ident }}</a> {% if edit.redirect_ident %} => redirect to <a href="/{{ entity_type }}/{{ edit.redirect_ident }}">{{ entity_type }}/{{ edit.redirect_ident }}</a> {% elif not edit.revision %} @@ -24,14 +35,6 @@ {% else %} updated {% endif %} - <a href="/editgroup/{{ editgroup.editgroup_id }}/{{ entity_type }}/{{ edit.ident }}">[view edit]</a> - {% if auth_to.edit and not editgroup.changelog_index and not editgroup.submitted %} - <a href="/editgroup/{{ editgroup.editgroup_id }}/{{ entity_type }}/{{ edit.ident }}/edit" style="color: green;">[re-edit]</a> - <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-edit]" style="background:none; color: red; border: none; padding:9;font-weight:bold;cursor:pointer;"></input> - </form> - {% endif %} </div> {% if edit.revision %} Revision: <small><code><a href="/{{ entity_type }}/rev/{{ edit.revision }}">{{ edit.revision }}</a></code></small> @@ -77,36 +80,54 @@ {% endif %} <h1 class="ui header">Editgroup -<span class="sub header"><code>editgroup {{ editgroup.editgroup_id }}</code></span></h1> +<span class="sub header"><code>editgroup_{{ editgroup.editgroup_id }}</code></span></h1> {% endblock %} -<p><b>What is an editgroup?</b> -An editgroup is a set of entity edits, bundled together into a coherent, -reviewable bundle. -<br> +<div class="ui info small message"> + <div class="header"> + What is an editgroup? + </div> + <p>An editgroup is a set of entity edits, bundled together into a coherent, reviewable bundle. +</div> -<br><b>Status:</b> -{% if editgroup.changelog_index %} - Merged (<a href="/changelog/{{ editgroup.changelog_index }}">Changelog #{{ editgroup.changelog_index }}</a>) -{% elif editgroup.submitted %} - Submitted ({{ editgroup.submitted.strftime("%Y-%m-%d %H:%M:%S") }}) -{% else %} - Not Submitted -{% endif %} +<table class="ui fixed compact small definition table"> + <tbody> + <tr> + <td class="three wide right aligned">Status</td> + <td class="seven wide"> + {% if editgroup.changelog_index %} + Merged (<a href="/changelog/{{ editgroup.changelog_index }}">Changelog #{{ editgroup.changelog_index }}</a>) + {% elif editgroup.submitted %} + Submitted ({{ editgroup.submitted.strftime("%Y-%m-%d %H:%M:%S") }}) + {% else %} + Not Submitted + {% endif %} + </td> + </tr> + <tr> + <td class="right aligned">Editor</td> + <td> + <a href="/editor/{{editgroup.editor_id}}">{{ editgroup.editor.username }}</a> + </td> + </tr> + <tr> + <td class="right aligned">Description</td> + <td> + {% if editgroup.description %} + {{ editgroup.description }} + {% else %} + <i>none</i> + {% endif %} + </td> + </tr> +</tbody></table> -<br><b>Editor:</b> <a href="/editor/{{editgroup.editor_id}}">{{ editgroup.editor.username }}</a> -<br><b>Description:</b> -{% if editgroup.description %} - {{ editgroup.description }} -{% else %} - <i>none</i> -{% endif %} {% if editgroup.extra %} <h4>Extra Metadata (raw JSON)</h4> {{ entity_macros.extra_metadata(editgroup.extra) }} {% endif %} -<br><br style="clear: both;"> +<h3 class="ui header">All Entity Changes</h3> <div class="ui styled fluid accordion"> {{ 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") }} </div> +<div style="float: right; font-size: smaller;"> + <a href="{{ config.FATCAT_API_HOST }}/editgroup/{{ editgroup.editgroup_id }}">As JSON via API</a> +</div> <br> -<h2 class="ui header">Comments and Annotations</h2> +<h3 class="ui header">Comments and Annotations</h3> {% for annotation in editgroup.annotations|reverse %} <div class="ui segments"> <div class="ui top attached secondary segment"> {% if annotation.editor.is_bot %} - <i class="icon bug"></i> + <i class="icon server"></i> {% else %} <i class="icon user"></i> {% endif %} diff --git a/python/fatcat_web/templates/editor_annotations.html b/python/fatcat_web/templates/editor_annotations.html index c46039f5..7a8b53cf 100644 --- a/python/fatcat_web/templates/editor_annotations.html +++ b/python/fatcat_web/templates/editor_annotations.html @@ -1,16 +1,16 @@ {% extends "base.html" %} {% block body %} -<h1 class="ui header">Comments and Annotations +<h1 class="ui header">{{ editor.username }}: Comments and Annotations <div class="sub header"> - <code>editor - <a href="/editor/{{editor.editor_id}}">{{ editor.username }}</a> - </code> - </a> + <code>editor_{{ editor.editor_id }}</code> </div> </h1> +<a href="/editor/{{ editor.editor_id }}/editgroups">Edit History</a> - +<a href="/editor/{{ editor.editor_id }}/annotations">Comments and Annotation History</a> <br> +<br> {% for annotation in annotations %} <div class="ui segments"> <div class="ui top attached secondary segment"> @@ -29,7 +29,7 @@ </div> </div> {% else %} - <i>None!</i> + <i>No comments or annotations for this editor!</i> {% endfor %} {% endblock %} diff --git a/python/fatcat_web/templates/editor_editgroups.html b/python/fatcat_web/templates/editor_editgroups.html index 3c3dd20d..756b3a02 100644 --- a/python/fatcat_web/templates/editor_editgroups.html +++ b/python/fatcat_web/templates/editor_editgroups.html @@ -1,15 +1,15 @@ {% extends "base.html" %} {% block body %} -<h1 class="ui header">Edit History +<h1 class="ui header">{{ editor.username }}: Edit History <div class="sub header"> - <code>editor - <a href="/editor/{{editor.editor_id}}">{{ editor.username }}</a> - </code> - </a> + <code>editor_{{editor.editor_id}}</code> </div> </h1> +<a href="/editor/{{ editor.editor_id }}/editgroups">Edit History</a> - +<a href="/editor/{{ editor.editor_id }}/annotations">Comments and Annotation History</a> +<br> <table class="ui table"> <thead><tr>{# <th>Created (UTC) #} <th>Status @@ -28,7 +28,7 @@ Work in Progress {% endif %} <td><small><code><a href="/editgroup/{{ editgroup.editgroup_id }}"> - {{ editgroup.editgroup_id }} + editgroup_{{ editgroup.editgroup_id }} </a></code></small> <td>{% if editgroup.description != None %}{{ editgroup.description }}{% endif %} {% endfor %} diff --git a/python/fatcat_web/templates/editor_view.html b/python/fatcat_web/templates/editor_view.html index 6ac58e3d..5906af75 100644 --- a/python/fatcat_web/templates/editor_view.html +++ b/python/fatcat_web/templates/editor_view.html @@ -6,11 +6,20 @@ <h1 class="ui header">{{ editor.username }} <div class="sub header"> - <code>editor {{ editor.editor_id }}</code> + <code>editor_{{ editor.editor_id }}</code> </div> </h1> -<p><b><a href="/editor/{{ editor.editor_id }}/editgroups">Edit History</a></b> -<p><b><a href="/editor/{{ editor.editor_id }}/annotations">Comments and Annotation History</a></b> +<a href="/editor/{{ editor.editor_id }}/editgroups">Edit History</a> - +<a href="/editor/{{ editor.editor_id }}/annotations">Comments and Annotation History</a> + +<br> +<br> +<div class="ui small info message"> + <div class="header"> + This page is intentionally bare + </div> + <p>We don't have much to share about individual editors. +</div> {% endblock %} diff --git a/python/fatcat_web/templates/entity_history.html b/python/fatcat_web/templates/entity_history.html index c9f45d84..0115b845 100644 --- a/python/fatcat_web/templates/entity_history.html +++ b/python/fatcat_web/templates/entity_history.html @@ -3,9 +3,9 @@ {% block entity_main %} -<h3 class="ui header">Edit History</h3> +<h3 class="ui header">Entity Edit History</h3> -This table only shows <i>merged</i> edits, not work-in-progress. +This table only shows <i>accepted</i> edits included in the catalog, not any work-in-progress. <table class="ui table"> <thead><tr><th>Changelog @@ -17,7 +17,7 @@ This table only shows <i>merged</i> edits, not work-in-progress. <br>{{ entry.changelog_entry.timestamp.strftime("%Y-%m-%d %H:%M") }} <td> {% if entry.editgroup.editor.is_bot %} - <i class="icon bug"></i> + <i class="icon server"></i> {% else %} <i class="icon user"></i> {% endif %} @@ -34,5 +34,9 @@ This table only shows <i>merged</i> edits, not work-in-progress. <td>{% if entry.editgroup.description != None %}{{ entry.editgroup.description }}{% endif %} {% endfor %} </table> +<div style="float: right; font-size: smaller;"> + <a href="{{ config.FATCAT_API_HOST }}/{{ entity_type }}/{{ entity.ident }}/history">As JSON via API</a> +</div> + {% endblock %} diff --git a/python/fatcat_web/templates/entity_macros.html b/python/fatcat_web/templates/entity_macros.html index e8a763d2..e68254de 100644 --- a/python/fatcat_web/templates/entity_macros.html +++ b/python/fatcat_web/templates/entity_macros.html @@ -5,15 +5,15 @@ <div class="ui segment pink inverted attached"> {% if editgroup.changelog_index %} <b>Accepted Edit Version</b> - <p>This is the version of the entity as of a specific merged editgroup: + <p>This is the version of the entity as of a specific point in time: {% elif editgroup.submitted %} <b>Submitted Edit Version</b> - <p>This is a version of the entity that has been submitted for approval as part of an editgroup: + <p>This is a version of the entity that has been submitted for approval as part of: {% else %} <b>Edit In Progress</b> - <p>This is a version of the entity that has not yet been submitted for approval, part of an editgroup: + <p>This is a version of the entity that has not yet been submitted for approval. Part of: {% endif %} - <b><a href="/editgroup/{{ editgroup.editgroup_id }}" style="color: white; font-weight: bold;">{{ editgroup.editgroup_id }}</a></b> + <a href="/editgroup/{{ editgroup.editgroup_id }}" style="color: white; font-weight: bold; font-size: smaller;"><code>editgroup_{{ editgroup.editgroup_id }}</code></a> </div> {% elif entity.state == None and entity.ident == None %} <div class="ui segment pink inverted attached"> @@ -27,17 +27,15 @@ </div> {% endif %} -<div class="ui segment attached"> - <b>Fatcat Bits</b> - <p> - {% if entity.state %} - State is "{{ entity.state }}". +<div class="ui segment attached" style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;"> + <b>Catalog Record</b> + {% if entity.state and entity.state != "active" %} + <br>State: <code>{{ entity.state }}</code> {% endif %} {% if entity.revision %} - Revision: - <br><small><code><a href="/{{ entity_type }}/rev/{{ entity.revision }}">{{ entity.revision }}</a></code></small> + <br>Revision: <small><code><a href="/{{ entity_type }}/rev/{{ entity.revision }}">{{ entity.revision }}</a></code></small> {% endif %} - <br><a href=" + <br>API URL: <a href=" {%- if config.FATCAT_DOMAIN == 'dev.fatcat.wiki' -%} http://localhost:9411 {%- else -%} @@ -52,7 +50,7 @@ /{{ entity_type }}/rev/{{ entity.revision }} {% endif %} {% if expand %}?expand={{ expand}}{% endif %}"> - As JSON object via API + JSON </a> </div> diff --git a/python/fatcat_web/templates/entity_view_metadata.html b/python/fatcat_web/templates/entity_view_metadata.html index 7ccdc5bb..90ce25d9 100644 --- a/python/fatcat_web/templates/entity_view_metadata.html +++ b/python/fatcat_web/templates/entity_view_metadata.html @@ -6,6 +6,9 @@ <h3>Entity Metadata (schema)</h3> {{ entity_macros.extra_metadata(entity._metadata) }} +<div style="float: right;"> + <a href="{{ config.FATCAT_API_HOST }}/{{ entity_type }}/{{ entity.ident }}">As JSON via API</a> +</div> {% if entity.extra %} <h3>Extra Metadata (raw JSON)</h3> |