x/tuskar-ui
Code Issues Proposed changes

Cleanup of splash page error messages and keystone error handling.

Browse Source 
Removed several templates which have not been in use for some time.

Moved messages tempalte snippet into horizon since we're using it
there and it's generic anyway.

Fixed bug 871871.

Change-Id: I4c9aa22e022b41c5d353c05b0b32cf3e85c376ea
This commit is contained in:
Gabriel Hurley
2011-12-07 13:07:26 -08:00
parent 16af5d4024
commit 0cb30bf803
10 changed files with 6 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/horizon/dashboards/nova/templates/nova/base.html
View File

@@ -7,7 +7,7 @@
{% block main %}
<div id='main_content' class="content">
{% block page_header %}{% endblock %}
{% include "_messages.html" %}
{% include "horizon/_messages.html" %}
{% block dash_main %}{% endblock %}
</div>
{% endblock %}

2
horizon/horizon/dashboards/settings/templates/settings/base.html
View File

@@ -7,7 +7,7 @@
{% block main %}
<div id='main_content' class="content">
{% block page_header %}{% endblock %}
{% include "_messages.html" %}
{% include "horizon/_messages.html" %}
{% block settings_main %}{% endblock %}
</div>
{% endblock %}

2
horizon/horizon/dashboards/syspanel/templates/syspanel/base.html
View File

@@ -7,7 +7,7 @@
{% block main %}
<div id='main_content' class="content">
{% block page_header %}{% endblock %}
{% include "_messages.html" %}
{% include "horizon/_messages.html" %}
{% block syspanel_main %}{% endblock %}
</div>
{% endblock %}

0
openstack-dashboard/dashboard/templates/_messages.html → horizon/horizon/templates/horizon/_messages.html
View File

9
horizon/horizon/templates/horizon/auth/_login.html
View File

@@ -7,14 +7,7 @@
{% block form-action %}{% url horizon:auth_login %}{% endblock %}
{% block modal-body %}
{% for message in messages %}
{% if message.tags == "login error" %}
<div class="alert-message error">
<strong>{% trans "Error: " %}</strong>
{{ message }}
</div>
{% endif %}
{% endfor %}
{% include "horizon/_messages.html" %}
<fieldset>
{% include "horizon/common/_form_fields.html" %}
</fieldset>

26
openstack-dashboard/dashboard/templates/login_required.html
View File

@@ -1,26 +0,0 @@
{% extends 'base.html' %}
{%load i18n%}
{# pleasant landing page if not logged in #}
{# redirected to overview if logged in #}
{% block sidebar %}
<div id="sidebar" class="empty-sidebar"></div>
{% endblock %}
{% block main %}
<div id='page_header'>
<h2><span>Compute:</span>{% trans "Login"%}</h2>
<p class='desc'><span>&mdash;</span>{% trans "Login to OpenStack via Keystone auth."%}</p>
</div>
<div class='main_content'>
{% include "_messages.html" %}
<div class="dash_block" id="login_wrapper">
<div class='table_title narrow'>
<h3>{% trans "Login"%}</h3>
</div>
{% include '_login.html' %}
</div>
{% endblock %}

27
openstack-dashboard/dashboard/templates/permission_denied.html
View File

@@ -1,27 +0,0 @@
{% extends "base.html" %}
{% load i18n %}
{% block title %} - {% trans "Permission Denied"%}{% endblock %}
{% block content %}
<div id="right_content">
<div id="page_head">
<h2 id="page_heading">{% trans "Permission Denied"%}</h2>
<p id="page_description">{% trans "You do not have permission to view the requested page."%}</p>
</div>
</div>
{% endblock %}
{% block sidebar %}
<div id="sidebar">
<ul id="navigation">
{% block nav_home %}
<li><h3><a href="{% url index %}">{% trans "Home"%}</a></h3></li>
{% endblock %}
{% block nav_projects %}
<li><h3><a href="{% url index %}">{% trans "Projects"%}</a></h3></li>
{% endblock %}
</ul>
</div> <!-- end sidebar -->
{% endblock %}

3
openstack-dashboard/dashboard/templates/splash.html
View File

@@ -9,8 +9,7 @@
<body id="splash">
<div class="container">
<div class="row large-rounded">
{% include "_messages.html" %}
{% include '_login.html' %}
{% include '_login.html' %}
</div>
</div>
</body>

3
openstack-dashboard/dashboard/templates/switch_tenants.html
View File

@@ -9,9 +9,8 @@
<body id="standalone">
<div id="login_wrapper">
<div class='large-rounded' id='login'>
<h3>{% trans "Log-in to tenant"%}: <i>{{ to_tenant }}</i></h3>
<h3>{% trans "Log-in to tenant" %}: <i>{{ to_tenant }}</i></h3>
<br/>
{% include "_messages.html" %}
{% include '_login.html' %}
<ul id='alternate_links'>
<li>&nbsp;</li>

12
openstack-dashboard/dashboard/templates/unavailable.html
View File

@@ -1,12 +0,0 @@
{% extends "base.html" %}
{% load i18n %}
{% block title %} - {% trans "Service Unavailable"%}{% endblock %}
{% block pageclass %}unavailable{% endblock %}
{% block content %}
<div id="page_head">
<h2 id="page_heading">{% trans "Service Unavailable"%}</h2>
<p id="page_description">{% trans "This service is temporarily unavailable. Please check back soon."%}</p>
</div>
{% endblock %}