3857 breadcrumb remove currentpage href

src/templates/admin/cms/index.html

@@ -6,7 +6,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'cms_index' %}">Content Manager</a></li>
+    <li>Content Manager</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/cms/submission_item_list.html

@@ -13,7 +13,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'cms_submission_items' %}">Submisions Page Items</a></li>
+    <li>Submissions Page Items</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/copyediting/add_copyeditor_assignment.html

@@ -8,7 +8,7 @@
 
 {% block breadcrumbs %}
     {{ block.super }}
-    {% include "elements/breadcrumbs/copyediting_base.html" %}
+    {% include "elements/breadcrumbs/copyediting_base.html" with subpage="yes" %}
     <li>Add Copyedit Assignment</li>
 {% endblock breadcrumbs %}
 

src/templates/admin/copyediting/copyedit_requests.html

@@ -5,8 +5,9 @@
 {% block title-section %}Copyedit Requests{% endblock %}
 
 {% block breadcrumbs %}
-{{ block.super }}
-{% include "elements/breadcrumbs/copyediting_base.html" %}
+    {{ block.super }}
+    {% include "elements/breadcrumbs/copyediting_base.html" with subpage="yes" %}
+    <li>Copyedit Requests</li>
 {% endblock breadcrumbs %}
 
 {% block body %}

src/templates/admin/copyediting/delete_author_review.html

@@ -9,8 +9,8 @@
 
 {% block breadcrumbs %}
     {{ block.super }}
-    {% include "elements/breadcrumbs/copyediting_base.html" %}
-    <li><a href="{% url 'editor_review' article.pk copyedit.pk %}">Review Copyediting</a></li>
+    {% include "elements/breadcrumbs/copyediting_base.html" with subpage="yes" %}
+    <li>Review Copyediting</li>
 {% endblock breadcrumbs %}
 
 {% block body %}

src/templates/admin/copyediting/edit_assignment.html

@@ -7,7 +7,7 @@
 
 {% block breadcrumbs %}
     {{ block.super }}
-    {% include "elements/breadcrumbs/copyediting_base.html" %}
+    {% include "elements/breadcrumbs/copyediting_base.html" with subpage="yes" %}
     <li>Edit Assignment</li>
 {% endblock breadcrumbs %}
 

src/templates/admin/copyediting/editor_review.html

@@ -8,7 +8,7 @@
 
 {% block breadcrumbs %}
     {{ block.super }}
-    {% include "elements/breadcrumbs/copyediting_base.html" %}
+    {% include "elements/breadcrumbs/copyediting_base.html" with subpage="yes" %}
     <li>Review Copyediting</li>
 {% endblock breadcrumbs %}
 

src/templates/admin/copyediting/request_author_copyedit.html

@@ -9,8 +9,8 @@
 
 {% block breadcrumbs %}
     {{ block.super }}
-    {% include "elements/breadcrumbs/copyediting_base.html" %}
-    <li><a href="{% url 'editor_review' article.pk copyedit.pk %}">Review Copyediting</a></li>
+    {% include "elements/breadcrumbs/copyediting_base.html" with subpage="yes" %}
+    <li>Review Copyediting</li>
 {% endblock breadcrumbs %}
 
 {% block body %}

src/templates/admin/copyediting/upload_file.html

@@ -8,7 +8,7 @@
 
 {% block breadcrumbs %}
     {{ block.super }}
-    {% include "elements/breadcrumbs/copyeditor_base.html" %}
+    {% include "elements/breadcrumbs/copyeditor_base.html" with subpage="yes" %}
     <li>Upload File</li>
 {% endblock breadcrumbs %}
 

src/templates/admin/core/manager/contacts/index.html

@@ -8,7 +8,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_journal_contacts' %}">Contact Manager</a></li>
+    <li>Contact Manager</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/core/manager/editorial/index.html

@@ -9,7 +9,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_editorial_team' %}">Editorial Group Manager</a></li>
+    <li>Editorial Group Manager</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/core/manager/email/email_templates.html

@@ -4,7 +4,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_email_templates' %}">Email Templates</a></li>
+    <li>Email Templates</li>
 {% endblock %}
 
 {% block title-section %}Email Templates{% endblock %}

src/templates/admin/core/manager/images/articles.html

@@ -8,7 +8,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_article_images' %}">Article Images Manager</a></li>
+    <li>Article Images Manager</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/core/manager/news/index.html

@@ -8,7 +8,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_manager_news' %}">News Manager</a></li>
+    <li>News Manager</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/core/manager/plugins.html

@@ -7,7 +7,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_plugin_list' %}">Plugins</a></li>
+    <li>Plugins</li>
 {% endblock %}
 
 

src/templates/admin/core/manager/roles/role.html

@@ -10,7 +10,7 @@
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
     <li><a href="{% url 'core_manager_roles' %}">Roles</a></li>
-    <li><a href="{% url 'core_manager_role' role.slug %}">{{ role.name }}</a></li>
+    <li>{{ role.name }}</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/core/manager/roles/roles.html

@@ -9,7 +9,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_manager_roles' %}">Roles</a></li>
+    <li>Roles</li>
 {% endblock %}
 
 

src/templates/admin/core/manager/sections/section_articles.html

@@ -10,7 +10,7 @@
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">{% trans 'Manager' %}</a></li>
     <li><a href="{% url 'core_manager_sections' %}">{% trans 'Sections' %}</a></li>
-    <li><a href="{% url 'core_manager_section' section.pk %}">{{ section.name }} {% trans 'Articles' %}</a></li>
+    <li>{{ section.name }} {% trans 'Articles' %}</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/core/manager/sections/section_list.html

@@ -12,7 +12,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_manager_sections' %}">Sections</a></li>
+    <li>Sections</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/core/manager/settings/edit_setting.html

@@ -8,24 +8,17 @@
 
 {% block breadcrumbs %}
     {{ block.super }}
+    <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
     {% if request.GET.email_template %}
-        <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
         <li><a href="{% url 'core_email_templates' %}">Email Templates</a></li>
-        <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
     {% else %}
         {% if request.journal %}
-            <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
             <li><a href="{% url 'core_settings_index' %}">Settings</a></li>
-            <li>
-                <a href="{% url 'core_edit_setting' setting.group.name setting.name %}">Edit {{ setting.pretty_name }}</a>
-            </li>
         {% else %}
             <li><a href="{% url 'core_default_settings_index' %}">Settings</a></li>
-            <li>
-                <a href="{% url 'core_edit_default_setting' setting.group.name setting.name %}">Edit {{ setting.pretty_name }}</a>
-            </li>
         {% endif %}
     {% endif %}
+    <li>Edit {{ setting.pretty_name }}</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/core/manager/settings/group.html

@@ -8,7 +8,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_edit_settings_group' group %}">{{ group|capfirst }} Settings</a></li>
+    <li>{{ group|capfirst }} Settings</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/core/manager/settings/index.html

@@ -8,7 +8,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_settings_index' %}">Settings</a></li>
+    <li>Settings</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/core/manager/users/edit.html

@@ -12,7 +12,7 @@
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
     <li><a href="{% url 'core_manager_users' %}">Users</a></li>
-    <li>{% if active == 'add' %}Add New User{% else %}Edit User{% endif %}</li>
+    <li>{% if active == 'add' %}Add User{% else %}Edit {{user_to_edit.full_name}} {% endif %}</li>
 {% endblock %}
 
 {% block title-section %}Users{% endblock %}
@@ -23,7 +23,7 @@
 
     <div class="box">
         <div class="title-area">
-            <h2>{% if active == 'add' %}Add User{% else %}Edit {{ registration_form.email.value }}{% endif %}</h2>
+            <h2>{% if active == 'add' %}Add User{% else %}Edit {{user_to_edit.full_name}} ({{ registration_form.email.value }}) {% endif %}</h2>
         </div>
 
         <div class="content">

src/templates/admin/core/manager/users/enrol_users.html

@@ -4,7 +4,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_manager_users' %}">Enrol Users</a></li>
+    <li>Enrol Users</li>
 {% endblock %}
 
 {% block title %}Enrol Users{% endblock %}

src/templates/admin/core/manager/users/history.html

@@ -6,7 +6,7 @@
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
     <li><a href="{% url 'core_manager_users' %}">Users</a></li>
-    <li>History</li>
+    <li>History of {{user.first_name}} {{user.last_name}} </li>
 {% endblock %}
 
 {% block title-section %}User History{% endblock %}

src/templates/admin/core/manager/users/inactive.html

@@ -4,7 +4,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_manager_inactive_users' %}">Inactive Users</a></li>
+    <li>Inactive Users</li>
 {% endblock %}
 
 {% block title-section %}Users{% endblock %}

src/templates/admin/core/manager/users/index.html

@@ -4,7 +4,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_manager_users' %}">Users</a></li>
+    <li>Users</li>
 {% endblock %}
 
 {% block title %}Enrolled Users{% endblock %}

src/templates/admin/core/manager/users/logged_in_users.html

@@ -4,7 +4,7 @@
 {% block breadcrumbs %}
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
-    <li><a href="{% url 'core_manager_inactive_users' %}">Authenticated Users</a></li>
+    <li>Authenticated Users</li>
 {% endblock %}
 
 {% block title-section %}Users{% endblock %}

src/templates/admin/cron/create_template.html

@@ -9,7 +9,7 @@
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
     <li><a href="{% url 'cron_home' %}">Cron</a></li>
-    <li><a href="{% url 'cron_create_template' reminder.pk template_name %}">Create Reminder Template</a></li>
+    <li>Create Reminder Template</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/cron/manage_reminder.html

@@ -10,8 +10,8 @@
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
     <li><a href="{% url 'cron_home' %}">Cron</a></li>
     <li><a href="{% url 'cron_reminders' %}">Reminders</a></li>
-    <li><a href="{% url 'cron_reminders' %}" class="active">{% if not reminder %}Add New Reminder{% else %}Edit
-        Reminder{% endif %}</a></li>
+    <li>{% if not reminder %}Add New Reminder{% else %}Edit
+        Reminder{% endif %}</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/cron/readers.html

@@ -9,7 +9,7 @@
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
     <li><a href="{% url 'cron_home' %}">Cron</a></li>
-    <li><a href="{% url 'cron_readers' %}">Publication Notifications</a></li>
+    <li>Publication Notifications</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/cron/reminders.html

@@ -9,7 +9,7 @@
     {{ block.super }}
     <li><a href="{% url 'core_manager_index' %}">Manager</a></li>
     <li><a href="{% url 'cron_home' %}">Cron</a></li>
-    <li><a href="{% url 'cron_reminders' %}">Reminders</a></li>
+    <li>Reminders</li>
 {% endblock %}
 
 {% block body %}

src/templates/admin/elements/breadcrumbs/copyediting_base.html

@@ -1,3 +1,12 @@
-<li><a href="{% url 'copyediting' %}">Articles in Copyediting</a></li>
-{% if article %}<li><a href="{% url 'article_copyediting' article.pk %}">{{ article.safe_title }}</a></li>{% endif %}
-{% if assignment %} <li><a href="{% url 'review_view_review' assignment.article.id assignment.id %}">Copyeditor Assignment</a></li>{% endif %}
+{% if subpage %}
+    <li><a href="{% url 'copyediting' %}">Articles in Copyediting</a></li>
+    {% if article %}<li><a href="{% url 'article_copyediting' article.pk %}">{{ article.safe_title }}</a></li>
+    {% elif assignment %} <li><a href="{% url 'review_view_review' assignment.article.id assignment.id %}">Copyeditor Assignment</a></li>
+    {% endif %}
+{% elif article or assignment %}
+    <li><a href="{% url 'copyediting' %}">Articles in Copyediting</a></li>
+    {% if article %}<li>{{ article.safe_title }}</li>{% endif %}
+    {% if assignment %} <li>{{ assignment.safe_title }}</li>{% endif %}
+{% else %}
+    <li>Articles in Copyediting</li>
+{% endif %}

src/templates/admin/elements/breadcrumbs/copyeditor_base.html

@@ -1,2 +1,7 @@
-<li><a href="{% url 'copyedit_requests' %}">Copyediting Requests</a></li>
-{% if copyedit %}<li><a href="{% url 'do_copyedit' copyedit.pk %}">Copyedit for {{ copyedit.article.safe_title }}</a></li>{% endif %}
+{% if subpage %}
+    <li><a href="{% url 'copyedit_requests' %}">Copyediting Requests</a></li>
+    {% if copyedit %}<li><a href="{% url 'do_copyedit' copyedit.pk %}">Copyedit for {{ copyedit.article.safe_title }}</a></li>{% endif %}
+{% else %}
+    <li><a href="{% url 'copyedit_requests' %}">Copyediting Requests</a></li>   
+    {% if copyedit %}<li>Copyedit for {{ copyedit.article.safe_title }}</li>{% endif %}
+{% endif %}

src/templates/admin/elements/breadcrumbs/issue_management.html

@@ -1,2 +1,9 @@
-<li><a href="{% url 'manage_issues' %}">Issue Management</a></li>
-{% if issue %}<li><a href="{% url 'manage_issues_id' issue.id %}">{{ issue.display_title }}</a></li>{% endif %}
+{% if subpage %}
+    <li><a href="{% url 'manage_issues' %}">Issue Management</a></li>
+    {% if issue %}<li><a href="{% url 'manage_issues_id' issue.id %}">{{ issue.display_title }}</a></li>{% endif %}
+{% elif issue %}
+    <li><a href="{% url 'manage_issues' %}">Issue Management</a></li>
+    {% if issue %}<li>{{ issue.display_title }}</li>{% endif %}
+{% else %}
+    <li>Issue Management</li>
+{% endif %}

src/templates/admin/elements/breadcrumbs/proofing_manager_base.html

@@ -1,2 +1,9 @@
-<li><a href="{% url 'proofing_list' %}">Articles in Proofing</a></li>
-{% if article %}<li><a href="{% url 'proofing_article' article.pk %}">{{ article.safe_title }}</a></li>{% endif %}
+{% if subpage %}
+    <li><a href="{% url 'proofing_list' %}">Articles in Proofing</a></li>
+     {% if article %}<li><a href="{% url 'proofing_article' article.pk %}"> {{ article.safe_title }}</a></li>{% endif %}
+{% elif article %}
+    <li><a href="{% url 'proofing_list' %}">Articles in Proofing</a></li>
+    {% if article %}<li> {{ article.safe_title }}</li>{% endif %}
+{% else %}
+    <li>Articles in Proofing</li>
+{% endif %}

src/templates/admin/elements/breadcrumbs/proofreader_base.html

@@ -1,2 +1,9 @@
-<li><a href="{% url 'proofing_requests' %}">Proofing Requests</a></li>
-{% if article %}<li><a href="{% url 'proofing_article' article.pk %}">{{ article.safe_title }}</a></li>{% endif %}
+{% if subpage %}
+    <li><a href="{% url 'proofing_requests' %}">Proofing Requests</a></li>  
+    {% if article %}<li><a href="{% url 'proofing_article' article.pk %}">{{ article.safe_title }}</a></li>{% endif %}
+{% elif article %}
+    <li><a href="{% url 'proofing_requests' %}">Proofing Requests</a></li>
+    {% if article %}<li>{{ article.safe_title }}</li>{% endif %}
+{% else %}
+    <li>Proofing Requests</li>
+{% endif %}