openstack/deb-horizon
Code Issues Proposed changes

ngReorg - move core HTML from framework to dashboard

Browse Source 
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
This commit is contained in:
Richard Jones 2015-05-28 14:40:21 +10:00 committed by Ryan Peters
parent 78216578f0
commit fdce91b028
8 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
horizon/templates/_header.html
View File

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

1
horizon/templates/_stylesheets.html
View File

@ -1 +0,0 @@
{% comment %} This file is a placeholder for project overrides. {% endcomment %}

17
horizon/test/templates/base.html Normal file
View File

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

0
horizon/templates/base.html → openstack_dashboard/templates/base.html
View File

0
horizon/templates/horizon/_conf.html → openstack_dashboard/templates/horizon/_conf.html
View File

0
horizon/templates/horizon/_custom_head_js.html → openstack_dashboard/templates/horizon/_custom_head_js.html
View File

0
horizon/templates/horizon/_custom_meta.html → openstack_dashboard/templates/horizon/_custom_meta.html
View File

0
horizon/templates/horizon/_scripts.html → openstack_dashboard/templates/horizon/_scripts.html
View File