settings.py cleanup (#200): remove org name / logo. These belong in local templates, not settings.

This commit is contained in:
Ross Poulton 2014-01-29 22:30:26 +11:00
parent 77f0512c76
commit a9c7e3ab72
5 changed files with 7 additions and 12 deletions

View File

@ -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)

View File

@ -101,8 +101,7 @@
<body id="helpdesk-body">
<div id='container' class="container">
<div id='header' class="row">
{% if helpdesk_settings.HELPDESK_ORG_LOGO %}<img class="brand pull-right" src="{{ helpdesk_settings.HELPDESK_ORG_LOGO }}" />{% endif %}
<h1>{% block h1_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk" %}{% endblock %}</h1>
<h1>{% block h1_title %}{% trans "Helpdesk" %}{% endblock %}</h1>
{% include "helpdesk/navigation.html" %}
</div>

View File

@ -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 %}
<script type='text/javascript' language='javascript' src='{{ STATIC_URL }}helpdesk/hover.js'></script>
{% endblock %}

View File

@ -3,7 +3,7 @@
{% with request|load_helpdesk_settings as helpdesk_settings %}
<html>
<head>
<title>{% block helpdesk_title %}{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk" %}{% endblock %}</title>
<title>{% block helpdesk_title %}{% trans "Helpdesk" %}{% endblock %}</title>
<script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
<script src="http://netdna.bootstrapcdn.com/bootstrap/3.0.2/js/bootstrap.min.js"></script>
<link href="http://netdna.bootstrapcdn.com/bootstrap/3.0.2/css/bootstrap.min.css" rel="stylesheet">
@ -13,8 +13,9 @@
<body id="helpdesk-body">
<div id='container' class="container">
<div id='header' class="row">
{% if helpdesk_settings.HELPDESK_ORG_LOGO %}<img class="brand pull-right" src="{{ helpdesk_settings.HELPDESK_ORG_LOGO }}" />{% endif %}
<h1>{{ helpdesk_settings.HELPDESK_PREPEND_ORG_NAME|default:'' }} {% trans "Helpdesk" %}</h1>
<!-- Put your logo here if necessary: -->
<!-- <img class="brand pull-right" src="/media/logo.png"> -->
<h1>{% trans "Helpdesk" %}</h1>
{% include "helpdesk/navigation.html" %}
</div>
<div id='body' class="row">

View File

@ -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 %}