From b60865b3c5ebb904870da48d596ef7e6e53fe550 Mon Sep 17 00:00:00 2001 From: Markus Stenberg Date: Sat, 2 Nov 2013 19:56:16 +0000 Subject: [PATCH] Took care of #841 by moving correctly outside altogether. It used to be unbalanced: , but now - Legacy-Id: 6614 --- django/template/loaders/app_directories.py | 6 ++---- ietf/templates/base.html | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/django/template/loaders/app_directories.py b/django/template/loaders/app_directories.py index 3e05bf87f..315d0ba88 100644 --- a/django/template/loaders/app_directories.py +++ b/django/template/loaders/app_directories.py @@ -17,10 +17,8 @@ from django.utils.importlib import import_module fs_encoding = sys.getfilesystemencoding() or sys.getdefaultencoding() app_template_dirs = [] for app in settings.INSTALLED_APPS: - try: - mod = import_module(app) - except ImportError, e: - raise ImproperlyConfigured('ImportError %s: %s' % (app, e.args[0])) + mod = import_module(app) + template_dir = os.path.join(os.path.dirname(mod.__file__), 'templates') if os.path.isdir(template_dir): app_template_dirs.append(template_dir.decode(fs_encoding)) diff --git a/ietf/templates/base.html b/ietf/templates/base.html index 1bd27d3d3..a6e057215 100644 --- a/ietf/templates/base.html +++ b/ietf/templates/base.html @@ -54,7 +54,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-datatracker.ietf.org {% if server_mode %}{% ifnotequal server_mode "production" %} - {{ server_mode|upper}} MODE{% endifnotequal %}{% endif %} +datatracker.ietf.org {% if server_mode %}{% ifnotequal server_mode "production" %} - {{ server_mode|upper}} MODE{% endifnotequal %}{% endif %}
{% if user %}