diff --git a/helpdesk/settings.py b/helpdesk/settings.py index f51e229a..4be31409 100644 --- a/helpdesk/settings.py +++ b/helpdesk/settings.py @@ -28,11 +28,6 @@ if type(DEFAULT_USER_SETTINGS) != type(dict()): # redirect to login page instead of the default homepage when users visits "/"? HELPDESK_REDIRECT_TO_LOGIN_BY_DEFAULT = getattr(settings, 'HELPDESK_REDIRECT_TO_LOGIN_BY_DEFAULT', False) -# customize helpdesk name on a few pages, i.e., your organization. -HELPDESK_PREPEND_ORG_NAME = getattr(settings, 'HELPDESK_PREPEND_ORG_NAME', False) - -HELPDESK_ORG_LOGO = getattr(settings, 'HELPDESK_ORG_LOGO', False) - # show knowledgebase links? HELPDESK_KB_ENABLED = getattr(settings, 'HELPDESK_KB_ENABLED', True) diff --git a/helpdesk/templates/helpdesk/base.html b/helpdesk/templates/helpdesk/base.html index 2e297357..6924d6ee 100644 --- a/helpdesk/templates/helpdesk/base.html +++ b/helpdesk/templates/helpdesk/base.html @@ -101,8 +101,7 @@
diff --git a/helpdesk/templates/helpdesk/dashboard.html b/helpdesk/templates/helpdesk/dashboard.html index 6895c223..ab97bc6c 100644 --- a/helpdesk/templates/helpdesk/dashboard.html +++ b/helpdesk/templates/helpdesk/dashboard.html @@ -1,5 +1,5 @@ {% extends "helpdesk/base.html" %}{% load i18n %}{% load url from future %} -{% block helpdesk_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk Dashboard" %}{% endblock %} +{% block helpdesk_title %}{% trans "Helpdesk Dashboard" %}{% endblock %} {% block helpdesk_head %} {% endblock %} diff --git a/helpdesk/templates/helpdesk/public_base.html b/helpdesk/templates/helpdesk/public_base.html index 31743c96..e2297d24 100644 --- a/helpdesk/templates/helpdesk/public_base.html +++ b/helpdesk/templates/helpdesk/public_base.html @@ -3,7 +3,7 @@ {% with request|load_helpdesk_settings as helpdesk_settings %} -{% block helpdesk_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk" %}{% endblock %} +{% block helpdesk_title %}{% trans "Helpdesk" %}{% endblock %} @@ -13,8 +13,9 @@
diff --git a/helpdesk/templates/helpdesk/registration/login.html b/helpdesk/templates/helpdesk/registration/login.html index a3cd2b2c..62cda1bc 100644 --- a/helpdesk/templates/helpdesk/registration/login.html +++ b/helpdesk/templates/helpdesk/registration/login.html @@ -1,5 +1,5 @@ {% extends "helpdesk/public_base.html" %}{% load i18n bootstrap %} -{% block helpdesk_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk Login" %}{% endblock %} +{% block helpdesk_title %}{% trans "Helpdesk Login" %}{% endblock %} {% block helpdesk_body %}