diff options
Diffstat (limited to '')
| -rw-r--r-- | webmentions_ssg/templates/sent_source.html | 227 |
1 files changed, 60 insertions, 167 deletions
diff --git a/webmentions_ssg/templates/sent_source.html b/webmentions_ssg/templates/sent_source.html index 600934c..d3da4ea 100644 --- a/webmentions_ssg/templates/sent_source.html +++ b/webmentions_ssg/templates/sent_source.html @@ -6,20 +6,16 @@ SPDX-License-Identifier: BSD-3-Clause {% extends "base.html" %} {% from "bootstrap5/pagination.html" import render_pagination %} -{% from "includes/failure_guidance.html" import render_failure %} {% set sent_status_presentation = { "sent": { - "row_class": "table-success", "badge_class": "text-bg-success", "label": "Sent" }, "no_endpoint": { - "row_class": "table-warning", "badge_class": "text-bg-warning", "label": "Unsupported" }, "failed": { - "row_class": "table-danger", "badge_class": "text-bg-danger", "label": "Failed" } @@ -39,16 +35,8 @@ SPDX-License-Identifier: BSD-3-Clause </div> <section class="card mb-4" aria-labelledby="source-details-heading"> <div class="card-body"> - <h2 class="h4 card-title mb-3" id="source-details-heading">Details</h2> + <h2 class="h4 card-title mb-3" id="source-details-heading">Source details</h2> <dl class="row mb-0"> - <dt class="col-md-3">Source ID</dt> - <dd class="col-md-9"> - <code class="text-break">{{ source.uuid }}</code> - </dd> - <dt class="col-md-3">Content hash</dt> - <dd class="col-md-9"> - <code class="text-break">{{ source.content_hash }}</code> - </dd> <dt class="col-md-3">Path</dt> <dd class="col-md-9 text-break"> {{ source.path }} @@ -57,47 +45,54 @@ SPDX-License-Identifier: BSD-3-Clause <dd class="col-md-9 text-break"> <a href="{{ source.url }}">{{ source.url }}</a> </dd> + <dt class="col-md-3">Revision</dt> + <dd class="col-md-9"> + {{ source.revision }} + </dd> <dt class="col-md-3">Created</dt> <dd class="col-md-9"> <time datetime="{{ source.created_at | utc_isoformat }}" - title="{{ source.created_at | utc_timestamp }}"> - {{ source.created_at | relative_time }} - </time> + title="{{ source.created_at | utc_timestamp }}">{{ source.created_at | relative_time }}</time> </dd> <dt class="col-md-3">Last seen</dt> <dd class="col-md-9"> <time datetime="{{ source.last_seen_at | utc_isoformat }}" - title="{{ source.last_seen_at | utc_timestamp }}"> - {{ source.last_seen_at | relative_time }} - </time> + title="{{ source.last_seen_at | utc_timestamp }}">{{ source.last_seen_at | relative_time }}</time> </dd> - <dt class="col-md-3">Revised</dt> + <dt class="col-md-3">Last revised</dt> <dd class="col-md-9"> <time datetime="{{ source.revised_at | utc_isoformat }}" - title="{{ source.revised_at | utc_timestamp }}"> - {{ source.revised_at | relative_time }} - </time> + title="{{ source.revised_at | utc_timestamp }}">{{ source.revised_at | relative_time }}</time> </dd> - <dt class="col-md-3">Deleted</dt> - <dd class="col-md-9"> - {% if source.deleted_at is none %} - <span class="text-body-secondary">Never</span> - {% else %} + {% if source.deleted_at is not none %} + <dt class="col-md-3">Deleted</dt> + <dd class="col-md-9"> <time datetime="{{ source.deleted_at | utc_isoformat }}" - title="{{ source.deleted_at | utc_timestamp }}"> - {{ source.deleted_at | relative_time }} - </time> - {% endif %} + title="{{ source.deleted_at | utc_timestamp }}">{{ source.deleted_at | relative_time }}</time> + </dd> + {% endif %} + <dt class="col-md-3">Source ID</dt> + <dd class="col-md-9"> + <code class="text-break">{{ source.uuid }}</code> </dd> - <dt class="col-md-3">Revision</dt> + <dt class="col-md-3">Content hash</dt> <dd class="col-md-9"> - {{ source.revision }} + <code class="text-break">{{ source.content_hash }}</code> </dd> </dl> </div> </section> <div class="d-flex flex-wrap gap-2 mb-4" aria-label="Source actions"> <button type="button" + class="btn btn-sm btn-danger" + data-bs-toggle="modal" + data-bs-target="#confirmation-modal" + data-action="{{ url_for('webmentions.resend_failed_source_webmentions', source_uuid=source.uuid, source_page=source_page, page=webmentions.page, history_page=history.page, **filters) }}" + data-title="Resend all failed webmentions for this source?" + data-message="Only failed Webmentions belonging to this source will be queued again, including failed targets on other pages. Successful, unsupported, and pending Webmentions will not be resent." + data-confirm-label="Resend all failed" + data-confirm-class="btn-danger">Resend all failed</button> + <button type="button" class="btn btn-sm btn-primary" data-bs-toggle="modal" data-bs-target="#confirmation-modal" @@ -110,7 +105,7 @@ SPDX-License-Identifier: BSD-3-Clause <section aria-labelledby="sent-webmentions-heading" class="mb-4"> <div class="d-flex justify-content-between align-items-center gap-2 mb-3"> <h2 class="h4 mb-0" id="sent-webmentions-heading">Sent Webmentions</h2> - <span class="text-body-secondary">{{ webmentions.total }} webmentions</span> + <span class="text-body-secondary">{{ webmentions.total }} targets</span> </div> {% if webmentions.items %} <div class="table-responsive"> @@ -119,121 +114,36 @@ SPDX-License-Identifier: BSD-3-Clause <tr> <th scope="col">Status</th> <th scope="col">Target</th> - <th scope="col" class="d-none d-md-table-cell">Active</th> - <th scope="col" class="d-none d-md-table-cell">Revisions</th> - <th scope="col" class="d-none d-md-table-cell">Delivery</th> - <th scope="col" class="d-none d-md-table-cell">Last activity</th> - <th scope="col">Actions</th> + <th scope="col" class="d-none d-md-table-cell">Link</th> + <th scope="col" class="d-none d-md-table-cell">Last attempt</th> + <th scope="col">Details</th> </tr> </thead> <tbody> {% for webmention in webmentions %} - {% set style = sent_status_presentation.get(webmention.status, {"row_class": "table-info", "badge_class": "text-bg-info", "label": "Pending" }) %} - <tr class="{{ style.row_class }}"> - <td class="text-break"> - <span class="badge {{ style.badge_class }}">{{ style.label }}</span> - {% if webmention.failure_reason is not none %} - <div class="small mt-2">{{ render_failure(webmention.failure_reason, "sent") }}</div> - {% endif %} - {% if webmention.awaiting_processing and webmention.attempt_count > 0 and webmention.next_retry_at is not none %} - <div class="small mt-2"> - Retry scheduled after attempt {{ webmention.attempt_count }}: - <time datetime="{{ webmention.next_retry_at | utc_isoformat }}" - title="{{ webmention.next_retry_at | utc_timestamp }}"> - {{ webmention.next_retry_at | relative_time }} - </time> - </div> - {% endif %} - </td> - <td class="text-break"> - <a href="{{ webmention.target }}">{{ webmention.target }}</a> - </td> + {% set style = sent_status_presentation.get(webmention.status, {"badge_class": "text-bg-info", "label": "Pending"}) %} + <tr> + <td><span class="badge {{ style.badge_class }}">{{ style.label }}</span></td> + <td class="text-break"><a href="{{ webmention.target }}">{{ webmention.target }}</a></td> <td class="d-none d-md-table-cell"> {% if webmention.linked %} - <span class="badge text-bg-success">Active</span> + <span class="badge text-bg-success">Linked</span> {% else %} - <span class="badge text-bg-danger">Removed</span> + <span class="badge text-bg-secondary">Removed</span> {% endif %} </td> - <td class="small text-nowrap d-none d-md-table-cell"> - <div> - <strong>Desired:</strong> - {{ webmention.desired_revision }} - </div> - <div> - <strong>Processed:</strong> - {{ webmention.processed_revision - if webmention.processed_revision is not none - else "—" }} - </div> - <div> - <strong>Sent:</strong> - {{ webmention.sent_revision - if webmention.sent_revision is not none - else "—" }} - </div> - </td> - <td class="small d-none d-md-table-cell"> - {% if webmention.webmention_endpoint is not none %} - <div class="mb-1"> - <strong>Endpoint:</strong> - <a href="{{ webmention.webmention_endpoint }}" - class="text-break">{{ webmention.webmention_endpoint }}</a> - </div> - {% endif %} - {% if webmention.endpoint_response_status is not none %} - <div class="mb-1"> - <strong>HTTP:</strong> - {{ webmention.endpoint_response_status }} - </div> - {% endif %} - {% if webmention.status_url is not none %} - <div> - <strong>Status:</strong> - {% if webmention.status_url | is_http_url %} - <a href="{{ webmention.status_url }}" class="text-break">{{ webmention.status_url }}</a> - {% else %} - <span class="text-break">{{ webmention.status_url }}</span> - {% endif %} - </div> + <td class="text-nowrap d-none d-md-table-cell"> + {% if webmention.last_attempted_at is not none %} + <time datetime="{{ webmention.last_attempted_at | utc_isoformat }}" + title="{{ webmention.last_attempted_at | utc_timestamp }}">{{ webmention.last_attempted_at | relative_time }}</time> + {% else %} + — {% endif %} </td> - <td class="small text-nowrap d-none d-md-table-cell"> - <div class="mb-1"> - <strong>Attempted:</strong> - <br> - {% if webmention.last_attempted_at is not none %} - <time datetime="{{ webmention.last_attempted_at | utc_isoformat }}" - title="{{ webmention.last_attempted_at | utc_timestamp }}"> - {{ webmention.last_attempted_at | relative_time }} - </time> - {% else %} - — - {% endif %} - </div> - <div> - <strong>Sent:</strong> - <br> - {% if webmention.last_sent_at is not none %} - <time datetime="{{ webmention.last_sent_at | utc_isoformat }}" - title="{{ webmention.last_sent_at | utc_timestamp }}"> - {{ webmention.last_sent_at | relative_time }} - </time> - {% else %} - — - {% endif %} - </div> - </td> <td> - <button type="button" - class="btn btn-sm btn-primary" - data-bs-toggle="modal" - data-bs-target="#confirmation-modal" - data-action="{{ url_for('webmentions.resend_webmention', source_uuid=source.uuid, webmention_uuid=webmention.uuid, source_page=source_page, page=webmentions.page, history_page=history.page, **filters) }}" - data-title="Resend Webmention?" - data-message="This Webmention will be queued again for delivery to {{ webmention.target }}." - data-confirm-label="Resend" - data-confirm-class="btn-primary">Resend</button> + <a class="btn btn-sm btn-primary" + href="{{ url_for('webmentions.sent_webmention_detail', source_uuid=source.uuid, webmention_uuid=webmention.uuid, source_page=source_page, page=webmentions.page, **filters) }}" + aria-label="Details for Webmention to {{ webmention.target }}">Details</a> </td> </tr> {% endfor %} @@ -247,35 +157,18 @@ SPDX-License-Identifier: BSD-3-Clause <p class="text-body-secondary">No Webmentions have been discovered for this source.</p> {% endif %} </section> - <section aria-labelledby="status-history-heading"> - <h2 class="h4 mb-3" id="status-history-heading">Status history</h2> + <section aria-labelledby="source-history-heading"> + <h2 class="h4 mb-3" id="source-history-heading">Source history</h2> {% if history.items %} - <ol class="list-group list-group-numbered mb-3"> + <ol class="list-group mb-3"> {% for event in history.items %} - {% set style = sent_status_presentation.get(event.status, {"badge_class": "text-bg-info", "label": "Pending"}) %} - <li class="list-group-item d-flex gap-2"> - <div class="flex-grow-1" style="min-width: 0;"> - <div class="d-flex flex-wrap align-items-center gap-2 mb-1"> - <span class="badge {{ style.badge_class }}">{{ style.label }}</span> - <strong>{{ event.action }}</strong> - <time class="ms-auto text-body-secondary small" - datetime="{{ event.occurred_at | utc_isoformat }}" - title="{{ event.occurred_at | utc_timestamp }}"> - {{ event.occurred_at | relative_time }} - </time> - </div> - <div class="text-break small mb-1"> - <a href="{{ event.webmention.target }}">{{ event.webmention.target }}</a> - </div> - <div class="small text-body-secondary"> - Revision {{ event.revision }} · Attempt {{ event.attempt_count }} - {% if event.endpoint_response_status is not none %} - · HTTP {{ event.endpoint_response_status }} - {% endif %} - </div> - {% if event.failure_reason %} - <div class="small mt-2">{{ render_failure(event.failure_reason, "sent") }}</div> - {% endif %} + <li class="list-group-item"> + <div class="d-flex flex-wrap align-items-center gap-2"> + <strong>{{ event.action }}</strong> + <span class="text-body-secondary small">Revision {{ event.revision }}</span> + <time class="ms-auto text-body-secondary small" + datetime="{{ event.occurred_at | utc_isoformat }}" + title="{{ event.occurred_at | utc_timestamp }}">{{ event.occurred_at | relative_time }}</time> </div> </li> {% endfor %} @@ -291,12 +184,12 @@ SPDX-License-Identifier: BSD-3-Clause source_page=source_page if source_page > 1 else none, webmentions_page=webmentions.page if webmentions.page > 1 else none ), - fragment='status-history-heading' + fragment='source-history-heading' ) }} </div> {% endif %} {% else %} - <p class="text-body-secondary">No historical delivery events were recorded for this source. Current Webmention statuses appear above.</p> + <p class="text-body-secondary">No source lifecycle events have been recorded yet. Delivery history is available on each Webmention's detail page.</p> {% endif %} </section> {% include "includes/confirmation_modal.html" %} |
