From a0db4ab1ee9e254c53911dc45d028ddd930c33a3 Mon Sep 17 00:00:00 2001 From: George Katsikas <giorgakis.katsikas@gmail.com> Date: Thu, 30 Nov 2023 12:31:50 +0100 Subject: [PATCH] refactor (metadata) management links for edadmin --- .../templates/journals/_manage_link_list.html | 37 +++++++++++++++++++ .../templates/journals/issue_list.html | 8 +--- .../journals/manage_comment_metadata.html | 12 +----- .../templates/journals/manage_metadata.html | 10 +---- .../journals/manage_report_metadata.html | 11 +----- .../journals/manage_update_metadata.html | 11 +----- .../templates/journals/volume_list.html | 8 +--- .../templates/proceedings/proceedings.html | 11 ++---- 8 files changed, 48 insertions(+), 60 deletions(-) create mode 100644 scipost_django/journals/templates/journals/_manage_link_list.html diff --git a/scipost_django/journals/templates/journals/_manage_link_list.html b/scipost_django/journals/templates/journals/_manage_link_list.html new file mode 100644 index 000000000..967f89977 --- /dev/null +++ b/scipost_django/journals/templates/journals/_manage_link_list.html @@ -0,0 +1,37 @@ +<ul> + <li> + <a + {% if active == "volumes" %}class="active"{% endif %} + href="{% url 'journals:admin_volumes_list' %}">Manage Volumes</a> + </li> + <li> + <a + {% if active == "issues" %}class="active"{% endif %} + href="{% url 'journals:admin_issue_list' %}">Manage Issues</a> + </li> + <li> + <a + {% if active == "proceedings" %}class="active"{% endif %} + href="{% url 'proceedings:proceedings' %}">Manage Proceedings Issues</a> + </li> + <li> + <a + {% if active == "publication" %}class="active"{% endif %} + href="{% url 'journals:manage_metadata' %}">Manage Publication metadata</a> + </li> + <li> + <a + {% if active == "report" %}class="active"{% endif %} + href="{% url 'journals:manage_report_metadata' %}">Manage Report metadata</a> + </li> + <li> + <a + {% if active == "comment" %}class="active"{% endif %} + href="{% url 'journals:manage_comment_metadata' %}">Manage Comment metadata</a> + </li> + <li> + <a + {% if active == "publicationupdate" %}class="active"{% endif %} + href="{% url 'journals:manage_update_metadata' %}">Manage PublicationUpdate metadata</a> + </li> +</ul> diff --git a/scipost_django/journals/templates/journals/issue_list.html b/scipost_django/journals/templates/journals/issue_list.html index 584691c73..a02af094b 100644 --- a/scipost_django/journals/templates/journals/issue_list.html +++ b/scipost_django/journals/templates/journals/issue_list.html @@ -14,13 +14,7 @@ <div class="row"> <div class="col-12"> <h1 class="highlight">Manage Issues</h1> - <ul> - <li><a href="{% url 'journals:admin_volumes_list' %}">Manage Volumes</a></li> - <li><a href="{% url 'journals:admin_issue_list' %}" class="active">Manage Issues</a></li> - <li><a href="{% url 'proceedings:proceedings' %}">Manage Proceedings Issues</a></li> - <li><a href="{% url 'journals:manage_metadata' %}">Manage Publications metadata</a></li> - <li><a href="{% url 'journals:manage_report_metadata' %}">Manage Report metadata</a></li> - </ul> + {% include "journals/_manage_link_list.html" with active="issues" %} <h3 class="my-3">Journals overview</h3> <table class="table"> diff --git a/scipost_django/journals/templates/journals/manage_comment_metadata.html b/scipost_django/journals/templates/journals/manage_comment_metadata.html index b413ffaa9..e73d404e6 100644 --- a/scipost_django/journals/templates/journals/manage_comment_metadata.html +++ b/scipost_django/journals/templates/journals/manage_comment_metadata.html @@ -13,16 +13,8 @@ {% endblock %} {% block content %} - - <ul> - <li><a href="{% url 'journals:admin_volumes_list' %}">Manage Volumes</a></li> - <li><a href="{% url 'journals:admin_issue_list' %}">Manage Issues</a></li> - <li><a href="{% url 'proceedings:proceedings' %}">Manage Proceedings Issues</a></li> - <li><a href="{% url 'journals:manage_metadata' %}">Manage Publications metadata</a></li> - <li><a href="{% url 'journals:manage_report_metadata' %}">Manage Report metadata</a></li> - <li><a href="{% url 'journals:manage_comment_metadata' %}" class="active">Manage Comment metadata</a></li> - <li><a href="{% url 'journals:manage_update_metadata' %}">Manage PublicationUpdate metadata</a></li> - </ul> + <h1 class="highlight">Manage Comment metadata</h1> + {% include "journals/_manage_link_list.html" with active="comment" %} <table class="table table-hover mb-5"> <thead class="table-light"> diff --git a/scipost_django/journals/templates/journals/manage_metadata.html b/scipost_django/journals/templates/journals/manage_metadata.html index f340b6342..85bdd1697 100644 --- a/scipost_django/journals/templates/journals/manage_metadata.html +++ b/scipost_django/journals/templates/journals/manage_metadata.html @@ -16,14 +16,8 @@ {% block content %} - <h1 class="highlight">Manage Publications Metadata</h1> - <ul> - <li><a href="{% url 'journals:admin_volumes_list' %}">Manage Volumes</a></li> - <li><a href="{% url 'journals:admin_issue_list' %}">Manage Issues</a></li> - <li><a href="{% url 'proceedings:proceedings' %}">Manage Proceedings Issues</a></li> - <li><a href="{% url 'journals:manage_metadata' %}" class="active">Manage Publications metadata</a></li> - <li><a href="{% url 'journals:manage_report_metadata' %}">Manage Report metadata</a></li> - </ul> + <h1 class="highlight">Manage Publication Metadata</h1> + {% include "journals/_manage_link_list.html" with active="publication" %} <h2 class="mt-4 mb-2">Publications</h2> <table class="table table-hover mb-5"> diff --git a/scipost_django/journals/templates/journals/manage_report_metadata.html b/scipost_django/journals/templates/journals/manage_report_metadata.html index 88e73ce55..e02f039f0 100644 --- a/scipost_django/journals/templates/journals/manage_report_metadata.html +++ b/scipost_django/journals/templates/journals/manage_report_metadata.html @@ -14,16 +14,7 @@ {% block content %} <h1 class="highlight">Manage Report metadata</h1> - - <ul> - <li><a href="{% url 'journals:admin_volumes_list' %}">Manage Volumes</a></li> - <li><a href="{% url 'journals:admin_issue_list' %}">Manage Issues</a></li> - <li><a href="{% url 'proceedings:proceedings' %}">Manage Proceedings Issues</a></li> - <li><a href="{% url 'journals:manage_metadata' %}">Manage Publications metadata</a></li> - <li><a href="{% url 'journals:manage_report_metadata' %}" class="active">Manage Report metadata</a></li> - <li><a href="{% url 'journals:manage_comment_metadata' %}">Manage Comment metadata</a></li> - <li><a href="{% url 'journals:manage_update_metadata' %}">Manage PublicationUpdate metadata</a></li> - </ul> + {% include "journals/_manage_link_list.html" with active="report" %} <h2 class="mt-4">Reports</h2> {% if request.GET.needing_update == '1' %} diff --git a/scipost_django/journals/templates/journals/manage_update_metadata.html b/scipost_django/journals/templates/journals/manage_update_metadata.html index d550287bb..8e62044a9 100644 --- a/scipost_django/journals/templates/journals/manage_update_metadata.html +++ b/scipost_django/journals/templates/journals/manage_update_metadata.html @@ -14,16 +14,7 @@ {% block content %} <h1 class="highlight">Manage PublicationUpdate metadata</h1> - - <ul> - <li><a href="{% url 'journals:admin_volumes_list' %}">Manage Volumes</a></li> - <li><a href="{% url 'journals:admin_issue_list' %}">Manage Issues</a></li> - <li><a href="{% url 'proceedings:proceedings' %}">Manage Proceedings Issues</a></li> - <li><a href="{% url 'journals:manage_metadata' %}">Manage Publications metadata</a></li> - <li><a href="{% url 'journals:manage_report_metadata' %}">Manage Report metadata</a></li> - <li><a href="{% url 'journals:manage_comment_metadata' %}">Manage Comment metadata</a></li> - <li><a href="{% url 'journals:manage_update_metadata' %}" class="active">Manage PublicationUpdate metadata</a></li> - </ul> + {% include "journals/_manage_link_list.html" with active="publicationupdate" %} <h2 class="mt-4">Publication Updates</h2> diff --git a/scipost_django/journals/templates/journals/volume_list.html b/scipost_django/journals/templates/journals/volume_list.html index 5ffdd8a96..09218e4c9 100644 --- a/scipost_django/journals/templates/journals/volume_list.html +++ b/scipost_django/journals/templates/journals/volume_list.html @@ -14,13 +14,7 @@ <div class="row"> <div class="col-12"> <h1 class="highlight">Manage Volumes</h1> - <ul> - <li><a href="{% url 'journals:admin_volumes_list' %}" class="active">Manage Volumes</a></li> - <li><a href="{% url 'journals:admin_issue_list' %}">Manage Issues</a></li> - <li><a href="{% url 'proceedings:proceedings' %}">Manage Proceedings Issues</a></li> - <li><a href="{% url 'journals:manage_metadata' %}">Manage Publications metadata</a></li> - <li><a href="{% url 'journals:manage_report_metadata' %}">Manage Report metadata</a></li> - </ul> + {% include "journals/_manage_link_list.html" with active="volumes" %} <h3 class="my-3">Journals overview</h3> <table class="table"> diff --git a/scipost_django/proceedings/templates/proceedings/proceedings.html b/scipost_django/proceedings/templates/proceedings/proceedings.html index 29f010b57..3848ed845 100644 --- a/scipost_django/proceedings/templates/proceedings/proceedings.html +++ b/scipost_django/proceedings/templates/proceedings/proceedings.html @@ -8,14 +8,9 @@ {% block pagetitle %}: Manage Proceedings{% endblock pagetitle %} {% block content %} - <h1>Manage Proceedings</h1> - <ul> - <li><a href="{% url 'journals:admin_volumes_list' %}">Manage Volumes</a></li> - <li><a href="{% url 'journals:admin_issue_list' %}">Manage Issues</a></li> - <li><a href="{% url 'proceedings:proceedings' %}" class="active">Manage Proceedings Issues</a></li> - <li><a href="{% url 'journals:manage_metadata' %}">Manage Publications metadata</a></li> - <li><a href="{% url 'journals:manage_report_metadata' %}">Manage Report metadata</a></li> - </ul> + <h1 class="highlight">Manage Proceedings</h1> + {% include "journals/_manage_link_list.html" with active="proceedings" %} + <a href="{% url 'proceedings:proceedings_add' %}">Add new Proceedings</a> <table class="table mt-3"> -- GitLab