diff --git a/reviewboard/settings.py b/reviewboard/settings.py --- a/reviewboard/settings.py +++ b/reviewboard/settings.py @@ -37,6 +37,8 @@ LANGUAGES = ( # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( + 'reviewboard.template_loader.ExtensionLoader', +# 'reviewboard.template_loader.DefaultLoader', 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', ) diff --git a/reviewboard/template_loader.py b/reviewboard/template_loader.py --- /dev/null +++ b/reviewboard/template_loader.py @@ -0,0 +1,24 @@ +from django.conf import settings +from django.template.loaders import app_directories +from django.template import Template + +class ExtensionLoader(app_directories.Loader): + is_usable = True + + def load_template(self, template_name, template_dirs=None): + """Template loader that loads templates with the _extended suffix or + reviewboard/ prefix""" + + template_dirs = getattr(settings, "TEMPLATE_DIRS", []) + + # if the path starts with reviewboard/ then this is an extended template + # that is including a default template, so load the default + # otherwise try to load an extended version first + if template_name.startswith("reviewboard/"): + template_name.replace("reviewboard/") + else: + template_name.replace(".html", "_extended.html") + + source, origin = self.load_template_source(template_name, template_dirs) + template = Template(source) + return template, origin diff --git a/reviewboard/templates/admin/dashboard.html b/reviewboard/templates/admin/dashboard.html --- a/reviewboard/templates/admin/dashboard.html +++ b/reviewboard/templates/admin/dashboard.html @@ -14,89 +14,20 @@ {% block content %}
- {# "Manage" section #} -
- - - - - - - - - - - - - - - - - - - - -
{% trans "Manage" %}
{% trans "Users" %} - ({{user_count}}){% trans "Add" %}
{% trans "Review groups" %} - ({{reviewgroup_count}}){% trans "Add" %}
{% trans "Default reviewers" %} - ({{defaultreviewer_count}}){% trans "Add" %}
{% trans "Repositories" %} - ({{repository_count}}){% trans "Add" %}
-
+ {# manage section #} + {% include "admin/dashboard_manage.html" %}
{# content-main #}
{# "Server Info" section #} -
- - - - - - - - - - -{% if settings.LOGGING_ENABLED and settings.LOGGING_DIRECTORY %} - - - -{% endif %} - -
{% trans "Server Information" %}
{% trans "Review Board version" %}{{version}}
{% trans "Server Cache" %}
{% trans "Server Log" %}
-
+ {% include "admin/dashboard_server_info.html" %}
{# content-related #}
{# colMS #}
{# "News" section #} -
- - - - - - - -
- {% trans "News" %} - - View All News - | - {% trans "Reload" %} - | - - - RSS - - -
- - {% trans "Loading..." %} -
-
+ {% include "admin/dashboard_news.html" %}