SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit 2cbf4c36 authored by Jean-Sébastien Caux's avatar Jean-Sébastien Caux
Browse files

Reorganize edadmin templates into stage-level folders

parent 7246039b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 54 additions and 29 deletions
scipost_django/edadmin/templates/edadmin/_hx_submission_details_contents.html
+ 1
− 1
View file @ 2cbf4c36
......@@ -5,7 +5,7 @@
</details>
{% if submission.in_stage_incoming %}
{% include "edadmin/_hx_submission_incoming.html" with submission=submission %}
{% include "edadmin/incoming/_hx_submission_incoming.html" with submission=submission %}
{% endif %}
<hr class="my-2">
......
scipost_django/edadmin/templates/edadmin/_hx_submission_tab_contents_edadmin.html
+ 1
− 1
View file @ 2cbf4c36
<h1>Editorial administration</h1>
{% if submission.in_stage_incoming %}
{% include "edadmin/_submission_incoming.html" with submission=submission %}
{% include "edadmin/incoming/_submission_incoming.html" with submission=submission %}
{% endif %}
scipost_django/edadmin/templates/edadmin/_submission_incoming.html
+ 4
− 4
View file @ 2cbf4c36
......@@ -4,7 +4,7 @@
{% if submission.status == submission.INCOMING %}
<div id="submission-{{ submission.pk }}-admissibility-form"
class="m-2"
hx-get="{% url 'edadmin:_hx_submission_admissibility' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-get="{% url 'edadmin:incoming:_hx_submission_admissibility' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-trigger="load"
>
</div>
......@@ -21,7 +21,7 @@
<div class="p-2 mb-4">
<div id="submission-{{ submission.pk }}-plagiarism-internal"
class="m-2"
hx-get="{% url 'edadmin:_hx_plagiarism_internal' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-get="{% url 'edadmin:incoming:_hx_plagiarism_internal' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-trigger="load"
>
</div>
......@@ -29,7 +29,7 @@
<div class="p-2">
<div id="submission-{{ submission.pk }}-plagiarism-iThenticate"
class="m-2"
hx-get="{% url 'edadmin:_hx_plagiarism_iThenticate' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-get="{% url 'edadmin:incoming:_hx_plagiarism_iThenticate' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-trigger="load"
>
</div>
......@@ -43,7 +43,7 @@
>
<div id="submission-{{ submission.pk }}-admission-form"
class="m-2"
hx-get="{% url 'edadmin:_hx_submission_admission' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-get="{% url 'edadmin:incoming:_hx_submission_admission' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-trigger="load"
>
</div>
......
scipost_django/edadmin/templates/edadmin/_hx_plagiarism_assessment.html → scipost_django/edadmin/templates/edadmin/incoming/_hx_plagiarism_assessment.html
+ 2
− 2
View file @ 2cbf4c36
......@@ -4,14 +4,14 @@
Assessment
{% if assessment %}
<span class="ms-4">
{% include "edadmin/plagiarism_assessment_status_span.html" with assessment=assessment %}
{% include "edadmin/incoming/plagiarism_assessment_status_span.html" with assessment=assessment %}
{% if assessment.date_set %}
&emsp;<span>set on {{ assessment.date_set }}</span>&emsp;
{% endif %}
</span>
{% endif %}
<button class="m-2 btn btn-primary"
hx-get="{% if method == 'internal' %}{% url 'edadmin:_hx_plagiarism_internal_assess' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}{% elif method == 'iThenticate' %}{% url 'edadmin:_hx_plagiarism_iThenticate_assess' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}{% endif %}"
hx-get="{% if method == 'internal' %}{% url 'edadmin:incoming:_hx_plagiarism_internal_assess' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}{% elif method == 'iThenticate' %}{% url 'edadmin:incoming:_hx_plagiarism_iThenticate_assess' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}{% endif %}"
hx-target="#submission-{{ submission.pk }}-plagiarism-{{ method }}-assessment"
hx-trigger="click"
hx-indicator="#indicator-{{ submission.pk }}-plagiarism-{{ method }}-assess"
......
scipost_django/edadmin/templates/edadmin/_hx_plagiarism_iThenticate.html → scipost_django/edadmin/templates/edadmin/incoming/_hx_plagiarism_iThenticate.html
+ 3
− 3
View file @ 2cbf4c36
......@@ -5,7 +5,7 @@
<h2>
iThenticate checks&emsp;
{% if submission.iThenticate_plagiarism_assessment %}
{% include "edadmin/plagiarism_assessment_status_span.html" with assessment=submission.iThenticate_plagiarism_assessment %}
{% include "edadmin/incoming/plagiarism_assessment_status_span.html" with assessment=submission.iThenticate_plagiarism_assessment %}
{% else %}
<span class="text-danger">[not started]</span>
{% endif %}
......@@ -53,7 +53,7 @@
{% else %}
<form
class="mt-3" enctype="multipart/form-data"
hx-post="{% url 'edadmin:_hx_plagiarism_iThenticate' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-post="{% url 'edadmin:incoming:_hx_plagiarism_iThenticate' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-target="#submission-{{ submission.pk }}-plagiarism-iThenticate"
hx-indicator="#indicator-{{ submission.pk }}-plagiarism-iThenticate"
>
......@@ -74,7 +74,7 @@
<div id="submission-{{ submission.pk }}-plagiarism-iThenticate-assessment"
class="m-2 p-2 border border-2 border-warning"
>
{% include "edadmin/_hx_plagiarism_assessment.html" with submission=submission assessment=submission.iThenticate_plagiarism_assessment method="iThenticate" %}
{% include "edadmin/incoming/_hx_plagiarism_assessment.html" with submission=submission assessment=submission.iThenticate_plagiarism_assessment method="iThenticate" %}
</div>
</details>
scipost_django/edadmin/templates/edadmin/_hx_plagiarism_iThenticate_assess.html → scipost_django/edadmin/templates/edadmin/incoming/_hx_plagiarism_iThenticate_assess.html
+ 1
− 1
View file @ 2cbf4c36
......@@ -2,7 +2,7 @@
<h3>Update assessment of iThenticate plagiarism</h3>
<form
class="mt-3"
hx-post="{% url 'edadmin:_hx_plagiarism_iThenticate_assess' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-post="{% url 'edadmin:incoming:_hx_plagiarism_iThenticate_assess' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-target="#submission-{{ submission.pk }}-plagiarism-iThenticate-assessment"
hx-confirm="Confirm this assessment of iThenticate plagiarism?"
>
......
scipost_django/edadmin/templates/edadmin/_hx_plagiarism_internal.html → scipost_django/edadmin/templates/edadmin/incoming/_hx_plagiarism_internal.html
+ 2
− 2
View file @ 2cbf4c36
......@@ -3,7 +3,7 @@
<h2>
Internal plagiarism checks&emsp;
{% if submission.internal_plagiarism_assessment %}
{% include "edadmin/plagiarism_assessment_status_span.html" with assessment=submission.internal_plagiarism_assessment %}
{% include "edadmin/incoming/plagiarism_assessment_status_span.html" with assessment=submission.internal_plagiarism_assessment %}
{% else %}
<span class="text-danger">[not started]</span>
{% endif %}
......@@ -87,7 +87,7 @@
<div id="submission-{{ submission.pk }}-plagiarism-internal-assessment"
class="m-2 p-2 border border-2 border-warning"
>
{% include "edadmin/_hx_plagiarism_assessment.html" with submission=submission assessment=submission.internal_plagiarism_assessment method="internal" %}
{% include "edadmin/incoming/_hx_plagiarism_assessment.html" with submission=submission assessment=submission.internal_plagiarism_assessment method="internal" %}
</div>
</details>
scipost_django/edadmin/templates/edadmin/_hx_plagiarism_internal_assess.html → scipost_django/edadmin/templates/edadmin/incoming/_hx_plagiarism_internal_assess.html
+ 1
− 1
View file @ 2cbf4c36
......@@ -2,7 +2,7 @@
<h3>Update assessment of internal plagiarism</h3>
<form
class="mt-3"
hx-post="{% url 'edadmin:_hx_plagiarism_internal_assess' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-post="{% url 'edadmin:incoming:_hx_plagiarism_internal_assess' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-target="#submission-{{ submission.pk }}-plagiarism-internal-assessment"
hx-confirm="Confirm this assessment of internal plagiarism?"
>
......
scipost_django/edadmin/templates/edadmin/_hx_submission_admissibility_form.html → scipost_django/edadmin/templates/edadmin/incoming/_hx_submission_admissibility_form.html
+ 1
− 1
View file @ 2cbf4c36
......@@ -2,7 +2,7 @@
<h3>Assess admissibility of this Submission</h3>
<form
class="mt-3"
hx-post="{% url 'edadmin:_hx_submission_admissibility' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-post="{% url 'edadmin:incoming:_hx_submission_admissibility' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-target="#submission-{{ submission.pk }}-admissibility-form"
>
{% crispy form %}
......
scipost_django/edadmin/templates/edadmin/_hx_submission_admission_form.html → scipost_django/edadmin/templates/edadmin/incoming/_hx_submission_admission_form.html
+ 1
− 1
View file @ 2cbf4c36
{% load crispy_forms_tags %}
<form
class="mt-3"
hx-post="{% url 'edadmin:_hx_submission_admission' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-post="{% url 'edadmin:incoming:_hx_submission_admission' identifier_w_vn_nr=submission.preprint.identifier_w_vn_nr %}"
hx-target="#submission-{{ submission.pk }}-admission-form"
hx-confirm="Proceed with this Admission decision?"
>
......
scipost_django/edadmin/urls/__init__.py
+ 8
− 1
View file @ 2cbf4c36
......@@ -9,5 +9,12 @@ app_name = "edadmin"
urlpatterns = [
path("", include("edadmin.urls.base")),
path("incoming/", include("edadmin.urls.incoming")),
path(
"incoming/",
include("edadmin.urls.incoming", namespace="incoming"),
),
path(
"preassignment/",
include("edadmin.urls.preassignment", namespace="preassignment"),
),
]
scipost_django/edadmin/urls/incoming.py
+ 7
− 5
View file @ 2cbf4c36
......@@ -6,20 +6,22 @@ from django.urls import include, path
from ..views import incoming
app_name = "incoming"
urlpatterns = [ # building on /edadmin/incoming/
path( # <identifier>/
"<identifier:identifier_w_vn_nr>/",
include([
path( # incoming/<identifier>/admissibility
path( # /edadmin/incoming/<identifier>/admissibility
"admissibility",
incoming._hx_submission_admissibility,
name="_hx_submission_admissibility",
),
path( # incoming/<identifier>/plagiarism/
path( # /edadmin/incoming/<identifier>/plagiarism/
"plagiarism/",
include([
path( # incoming/<identifier>/plagiarism/internal/
path( # /edadmin/incoming/<identifier>/plagiarism/internal/
"internal/",
include([
path(
......@@ -34,7 +36,7 @@ urlpatterns = [ # building on /edadmin/incoming/
),
]),
), # end internal/
path( # incoming/<identifier>/plagiarism/iThenticate/
path( # /edadmin/incoming/<identifier>/plagiarism/iThenticate/
"iThenticate/",
include([
path(
......@@ -51,7 +53,7 @@ urlpatterns = [ # building on /edadmin/incoming/
), # end iThenticate/
]),
), # end plagiarism/
path( # incoming/<identifier>/admission
path( # /edadmin/incoming/<identifier>/admission
"admission",
incoming._hx_submission_admission,
name="_hx_submission_admission",
......
scipost_django/edadmin/views/incoming.py
+ 22
− 6
View file @ 2cbf4c36
......@@ -59,7 +59,11 @@ def _hx_submission_admissibility(request, identifier_w_vn_nr):
response["HX-Trigger"] = f"submission-{submission.pk}-tab-edadmin-updated"
return response
context = {"submission": submission, "form": form,}
return render(request, "edadmin/_hx_submission_admissibility_form.html", context)
return render(
request,
"edadmin/incoming/_hx_submission_admissibility_form.html",
context,
)
......@@ -100,7 +104,7 @@ def _hx_plagiarism_internal(request, identifier_w_vn_nr):
"ratio_abstract": pub_match["ratio_abstract"],
}
)
return render(request, "edadmin/_hx_plagiarism_internal.html", context)
return render(request, "edadmin/incoming/_hx_plagiarism_internal.html", context)
@login_required
......@@ -129,7 +133,11 @@ def _hx_plagiarism_internal_assess(request, identifier_w_vn_nr):
"submission": submission,
"form": form,
}
return render(request, "edadmin/_hx_plagiarism_internal_assess.html", context)
return render(
request,
"edadmin/incoming/_hx_plagiarism_internal_assess.html",
context,
)
###########################
......@@ -150,7 +158,7 @@ def _hx_plagiarism_iThenticate(request, identifier_w_vn_nr):
"submission": submission,
"form": form,
}
return render(request, "edadmin/_hx_plagiarism_iThenticate.html", context)
return render(request, "edadmin/incoming/_hx_plagiarism_iThenticate.html", context)
@login_required
......@@ -179,7 +187,11 @@ def _hx_plagiarism_iThenticate_assess(request, identifier_w_vn_nr):
"submission": submission,
"form": form,
}
return render(request, "edadmin/_hx_plagiarism_iThenticate_assess.html", context)
return render(
request,
"edadmin/incoming/_hx_plagiarism_iThenticate_assess.html",
context,
)
#############
......@@ -221,4 +233,8 @@ def _hx_submission_admission(request, identifier_w_vn_nr):
response["HX-Redirect"] = reverse("submissions:pool:pool")
return response
context = {"submission": submission, "form": form,}
return render(request, "edadmin/_hx_submission_admission_form.html", context)
return render(
request,
"edadmin/incoming/_hx_submission_admission_form.html",
context,
)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

SciPost Code Repository