ngReorg - move core HTML from framework to dashboard

This patch moves the base.html file and related files (where appropriate) to the dashboard. In short: - base.html its *dashboard configuration* components _header.html, _stylesheets.html, horizon/_conf.html, horizon/_custom_head_js.html, horizon/_custom_meta.html and horizon/_scripts.html all move to the dashboard - other components in base.html which are effectively widgets or default content (horizon/_messages.html, horizon/common/_sidebar.html, horizon/common/_page_header.html, horizon/client_side/_script_loader.html) stay in the framework The framework test suite also includes a need for a base.html which can construct *part* of the application's base.html structure, and this is created in horizon/test/templates/base.html (this file is only used to test Django templating, so does not need most of the content in the real base.html). Change-Id: I9b3c4f21036d08e1d79aeab1ab35d47e3eedd3a3 Partial-Bug: #1458697
2015-05-28 14:40:21 +10:00 · 2015-05-28 14:40:21 +10:00 · fdce91b028
commit fdce91b028
parent 78216578f0
8 changed files with 17 additions and 11 deletions
--- a/horizon/templates/_header.html
+++ b/horizon/templates/_header.html
@ -1,10 +0,0 @@
 {% load branding i18n %}
 {% load url from future %}
 <h1 class="brand"><a href="{% site_branding_link %}">{% site_branding %}</a></h1>
 <div id="user_info" class="pull-right">
  <span>{% blocktrans with username=request.user.username %}Logged in as: {{ username }}{% endblocktrans %}</span>
  {% if HORIZON_CONFIG.help_url %}
  <a href="{{ HORIZON_CONFIG.help_url }}" target="_blank">{% trans "Help" %}</a>
  {% endif %}
  <a href="{% url 'logout' %}">{% trans "Sign Out" %}</a>
 </div>
--- a/horizon/templates/_stylesheets.html
+++ b/horizon/templates/_stylesheets.html
@ -1 +0,0 @@
 {% comment %} This file is a placeholder for project overrides. {% endcomment %}
--- a/horizon/test/templates/base.html
+++ b/horizon/test/templates/base.html
@ -0,0 +1,17 @@
 <!--
  This is the base html used by Python unit tests which are
  just testing Django templating - no Javascript.
 -->
 <html>
 <body>
 {% block sidebar %}
  {% include 'horizon/common/_sidebar.html' %}
 {% endblock %}
 {% block content %}
  {% block main %}{% endblock %}
 {% endblock %}
 </body>
 </html>
--- a/openstack_dashboard/templates/base.html
+++ b/openstack_dashboard/templates/base.html
--- a/openstack_dashboard/templates/horizon/_conf.html
+++ b/openstack_dashboard/templates/horizon/_conf.html
--- a/openstack_dashboard/templates/horizon/_custom_head_js.html
+++ b/openstack_dashboard/templates/horizon/_custom_head_js.html
--- a/openstack_dashboard/templates/horizon/_custom_meta.html
+++ b/openstack_dashboard/templates/horizon/_custom_meta.html
--- a/openstack_dashboard/templates/horizon/_scripts.html
+++ b/openstack_dashboard/templates/horizon/_scripts.html
		`@ -1 +0,0 @@`
			`{% comment %} This file is a placeholder for project overrides. {% endcomment %}`