diff --git a/demo/demodesk/config/settings.py b/demo/demodesk/config/settings.py index 256f1f15..409cdf1d 100644 --- a/demo/demodesk/config/settings.py +++ b/demo/demodesk/config/settings.py @@ -38,7 +38,7 @@ INSTALLED_APPS = [ 'django.contrib.sites', 'django.contrib.humanize', 'markdown_deux', - 'bootstrapform', + 'bootstrap4form', 'helpdesk' ] diff --git a/helpdesk/templates/helpdesk/create_ticket.html b/helpdesk/templates/helpdesk/create_ticket.html index bc5f3677..d080ccdf 100644 --- a/helpdesk/templates/helpdesk/create_ticket.html +++ b/helpdesk/templates/helpdesk/create_ticket.html @@ -1,4 +1,4 @@ -{% extends "helpdesk/base.html" %}{% load i18n bootstrap %} +{% extends "helpdesk/base.html" %}{% load i18n bootstrap4form %} {% block helpdesk_title %}{% trans "Create Ticket" %}{% endblock %} diff --git a/helpdesk/templates/helpdesk/kb_category.html b/helpdesk/templates/helpdesk/kb_category.html index e3859c90..4d0c1ea4 100644 --- a/helpdesk/templates/helpdesk/kb_category.html +++ b/helpdesk/templates/helpdesk/kb_category.html @@ -1,5 +1,12 @@ {% extends "helpdesk/public_base.html" %}{% load i18n humanize %} +{% block helpdesk_breadcrumb %} +
  • + {% trans "Knowledgebase" %} +
    • +
  • {% blocktrans with category.title as kbcat %}{{ kbcat }}{% endblocktrans %}
    • +{% endblock %} + {% block helpdesk_body %}

    {% trans 'Knowledgebase Category' %}:{% blocktrans with category.title as kbcat %}{{ kbcat }}{% endblocktrans %}

    diff --git a/helpdesk/templates/helpdesk/kb_index.html b/helpdesk/templates/helpdesk/kb_index.html index 810d0caf..556c3054 100644 --- a/helpdesk/templates/helpdesk/kb_index.html +++ b/helpdesk/templates/helpdesk/kb_index.html @@ -1,5 +1,14 @@ {% extends "helpdesk/public_base.html" %}{% load i18n %} +{% block helpdesk_title %}{% trans "Knowledgebase" %}{% endblock %} + +{% block helpdesk_breadcrumb %} +
  • + {% trans "Knowledgebase" %} +
    • +
  • Overview
    • +{% endblock %} + {% block helpdesk_body %}

    {% trans "Knowledgebase" %}

    diff --git a/helpdesk/templates/helpdesk/kb_item.html b/helpdesk/templates/helpdesk/kb_item.html index e48007fa..7e446f3b 100644 --- a/helpdesk/templates/helpdesk/kb_item.html +++ b/helpdesk/templates/helpdesk/kb_item.html @@ -1,5 +1,15 @@ {% extends "helpdesk/public_base.html" %}{% load i18n %}{% load markdown_deux_tags %} +{% block helpdesk_breadcrumb %} +
  • + {% trans "Knowledgebase" %} +
    • +
  • + {% blocktrans with category.title as kbcat %}{{ kbcat }}{% endblocktrans %} +
    • +
  • Overview
    • +{% endblock %} + {% block helpdesk_body %}

    {% trans 'Knowledgebase' %}:{% blocktrans with item.title as item %}{{ item }}{% endblocktrans %}

    diff --git a/helpdesk/templates/helpdesk/navigation-sidebar.html b/helpdesk/templates/helpdesk/navigation-sidebar.html index 496fcc9b..21a90f77 100644 --- a/helpdesk/templates/helpdesk/navigation-sidebar.html +++ b/helpdesk/templates/helpdesk/navigation-sidebar.html @@ -39,7 +39,7 @@
  • - {% trans "Stats" %} + {% trans "Reports" %}
    • {% if helpdesk_settings.HELPDESK_KB_ENABLED %} diff --git a/helpdesk/templates/helpdesk/public_base.html b/helpdesk/templates/helpdesk/public_base.html index ac0d7b3b..09b9b8c4 100644 --- a/helpdesk/templates/helpdesk/public_base.html +++ b/helpdesk/templates/helpdesk/public_base.html @@ -13,7 +13,7 @@ - {% block helpdesk_title %}{% trans 'Helpdesk' %}{% endblock %} + {% block helpdesk_title %}{% trans 'Helpdesk' %}{% endblock %} :: {% trans "Powered by django-helpdesk" %} {% if helpdesk_settings.HELPDESK_USE_CDN %} diff --git a/helpdesk/templates/helpdesk/report_index.html b/helpdesk/templates/helpdesk/report_index.html index cea3d458..2831d2e3 100644 --- a/helpdesk/templates/helpdesk/report_index.html +++ b/helpdesk/templates/helpdesk/report_index.html @@ -2,6 +2,13 @@ {% block helpdesk_title %}{% trans "Reports & Statistics" %}{% endblock %} +{% block helpdesk_breadcrumb %} +
  • + {% trans "Reports & Statistics" %} +
    • +
  • Overview
    • +{% endblock %} + {% block helpdesk_body %}

    {% trans "Reports & Statistics" %}

    diff --git a/helpdesk/templates/helpdesk/report_output.html b/helpdesk/templates/helpdesk/report_output.html index 6e036586..373a7786 100644 --- a/helpdesk/templates/helpdesk/report_output.html +++ b/helpdesk/templates/helpdesk/report_output.html @@ -25,6 +25,13 @@ {% endblock %} +{% block helpdesk_breadcrumb %} +
  • + {% trans "Reports & Statistics" %} +
    • +
  • {{ title }}
    • +{% endblock %} + {% block helpdesk_body %}

    {% trans "Reports & Statistics" %}

    diff --git a/helpdesk/templates/helpdesk/ticket.html b/helpdesk/templates/helpdesk/ticket.html index ca02660a..43fc5c0b 100644 --- a/helpdesk/templates/helpdesk/ticket.html +++ b/helpdesk/templates/helpdesk/ticket.html @@ -1,5 +1,5 @@ {% extends "helpdesk/base.html" %} -{% load i18n bootstrap humanize %} +{% load i18n bootstrap4form humanize %} {% load static from staticfiles %} {% block helpdesk_title %}{{ ticket.queue.slug }}-{{ ticket.id }} : {% trans "View Ticket Details" %}{% endblock %} diff --git a/helpdesk/templates/helpdesk/ticket_desc_table.html b/helpdesk/templates/helpdesk/ticket_desc_table.html index 760121fc..82c1aba2 100644 --- a/helpdesk/templates/helpdesk/ticket_desc_table.html +++ b/helpdesk/templates/helpdesk/ticket_desc_table.html @@ -13,9 +13,9 @@ @@ -50,14 +50,14 @@ - + + {% if user.is_superuser %} {% if submitter_userprofile_url %}{% endif %} + {% endif %} @@ -67,19 +67,19 @@ - + diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html index 82797318..01674c89 100644 --- a/helpdesk/templates/helpdesk/ticket_list.html +++ b/helpdesk/templates/helpdesk/ticket_list.html @@ -1,9 +1,10 @@ {% extends "helpdesk/base.html" %} {% load i18n humanize %} {% load static from staticfiles %} -{% block helpdesk_title %}{% trans "Tickets" %}{% endblock %} -{% block helpdesk_head %} +{% block helpdesk_title %}{% trans "Tickets" %}{% endblock %} + +{% block helpdesk_head %} {% endblock %} -{% block h1_title %}Tickets - {% if from_saved_query %} [{{ saved_query.title }}]{% endif %}{% endblock %} -{% block helpdesk_body %} +{% block h1_title %}Tickets + {% if from_saved_query %} [{{ saved_query.title }}]{% endif %} +{% endblock %} + +{% block helpdesk_breadcrumb %} +
  • + {% trans "Tickets" %} +
    • +
  • Overview
    • +{% endblock %} + +{% block helpdesk_body %} {% load in_list %}
    diff --git a/helpdesk/templates/helpdesk/user_settings.html b/helpdesk/templates/helpdesk/user_settings.html index 584f3aa6..8ea8efb3 100644 --- a/helpdesk/templates/helpdesk/user_settings.html +++ b/helpdesk/templates/helpdesk/user_settings.html @@ -1,4 +1,4 @@ -{% extends "helpdesk/base.html" %}{% load i18n bootstrap %} +{% extends "helpdesk/base.html" %}{% load i18n bootstrap4form %} {% block helpdesk_title %}{% trans "Change User Settings" %}{% endblock %} @@ -8,7 +8,7 @@

    {% blocktrans %}Use the following options to change the way your helpdesk system works for you. These settings do not impact any other user.{% endblocktrans %}

    - {{ form|bootstrap }} + {{ form|bootstrap4form }}
    diff --git a/helpdesk/views/kb.py b/helpdesk/views/kb.py index a7e7a1e8..a84b0ffa 100644 --- a/helpdesk/views/kb.py +++ b/helpdesk/views/kb.py @@ -37,6 +37,7 @@ def category(request, slug): def item(request, item): item = get_object_or_404(KBItem, pk=item) return render(request, 'helpdesk/kb_item.html', { + 'category': item.category, 'item': item, 'helpdesk_settings': helpdesk_settings, }) diff --git a/requirements.txt b/requirements.txt index dbd87059..d85322e3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -Django>=1.11,<3 -django-bootstrap-form>=3.3,<4 +Django>=2,<3 +django-bootstrap4-form email-reply-parser django-markdown-deux beautifulsoup4

    {{ ticket.queue.slug }}-{{ ticket.id }}. {{ ticket.title }} [{{ ticket.get_status }}]

    - - | - {% if ticket.on_hold %} | {% else %} | {% endif %} + + | + {% if ticket.on_hold %} | {% else %} | {% endif %}
    {% blocktrans with ticket.queue as queue %}Queue: {{ queue }}{% endblocktrans %}
    {% trans "Assigned To" %}{{ ticket.get_assigned_to }}{% ifequal ticket.get_assigned_to _('Unassigned') %} {% endifequal %}{{ ticket.get_assigned_to }}{% ifequal ticket.get_assigned_to _('Unassigned') %} {% endifequal %}
    {% trans "Submitter E-Mail" %} {{ ticket.submitter_email }} - {% if user.is_superuser %} {% if submitter_userprofile_url %}{% endif %} - {% endif %}
    {% trans "Copies To" %}{{ ticketcc_string }} {% if SHOW_SUBSCRIBE %}, {% endif %}{{ ticketcc_string }} {% if SHOW_SUBSCRIBE %}, {% endif %}
    {% trans "Dependencies" %} {% for dep in ticket.ticketdependency.all %} {% if forloop.first %}

    {% trans "This ticket cannot be resolved until the following ticket(s) are resolved" %}

    {% endif %} {% empty %}

    {% trans "This ticket has no dependencies." %}

    {% endfor %} -

    +