Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrected usage of the title block for the main_django template

Browse Source 
ECOM-4610
This commit is contained in:
Clinton Blackburn
2016-06-06 13:54:45 -04:00
parent 6bc0fa2bd3
commit 77f605b30a
5 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
common/djangoapps/microsite_configuration/context_processors.py Normal file
View File

@@ -0,0 +1,11 @@
""" Django template ontext processors. """
from django.conf import settings
from microsite_configuration import microsite
def microsite_context(request): # pylint: disable=unused-argument
return {
'platform_name': microsite.get_value('platform_name', settings.PLATFORM_NAME)
}

21
common/djangoapps/microsite_configuration/tests/test_context_processors.py Normal file
View File

@@ -0,0 +1,21 @@
""" Tests for Django template context processors. """
from django.test import TestCase
from django.test.client import RequestFactory
from django.test.utils import override_settings
from microsite_configuration.context_processors import microsite_context
PLATFORM_NAME = 'Test Platform'
@override_settings(PLATFORM_NAME=PLATFORM_NAME)
class MicrositeContextProcessorTests(TestCase):
""" Tests for the microsite context processor. """
def setUp(self):
request = RequestFactory().get('/')
self.context = microsite_context(request)
def test_platform_name(self):
""" Verify the context includes the platform name. """
self.assertEqual(self.context['platform_name'], PLATFORM_NAME)

1
lms/envs/common.py
View File

@@ -499,6 +499,7 @@ TEMPLATES = [
'django.template.context_processors.i18n',
'django.contrib.auth.context_processors.auth', # this is required for admin
'django.template.context_processors.csrf',
'microsite_configuration.context_processors.microsite_context',
# Added for django-wiki
'django.template.context_processors.media',

2
lms/templates/main_django.html
View File

@@ -4,7 +4,7 @@
<html lang="{{LANGUAGE_CODE}}">
<head>
<meta charset="UTF-8">
{% block title %}<title>{% platform_name %}</title>{% endblock %}
<title>{% block title %}{{ platform_name }}{% endblock %}</title>
<link rel="icon" type="image/x-icon" href="{% favicon_path %}" />

4
lms/templates/wiki/base.html
View File

@@ -2,7 +2,9 @@
{% with online_help_token="wiki" %}
{% load pipeline %}{% load sekizai_tags i18n microsite %}{% load url from future %}{% load staticfiles %}
{% block title %}<title>{% block pagetitle %}{% endblock %} | {% trans "Wiki" %} | {% platform_name %}</title>{% endblock %}
{% block title %}
{% block pagetitle %}{% endblock %} | {% trans "Wiki" %} | {% platform_name %}
{% endblock %}
{% block bodyclass %}view-in-course view-wiki{% endblock %}