openstack/sahara-dashboard
Code Issues Proposed changes

Titles refactorings.

Browse Source 
Titles case fixed.
Some html indents fixed.

Change-Id: Ic678c659ec88ce253fa4bd20a757a73c53521d8b
This commit is contained in:
Nikita Konovalov 2013-06-14 19:25:46 +04:00
parent cec4bdaf86
commit 32af329412
25 changed files with 54 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
savannadashboard/cluster_templates/panel.py
View File

@ -23,7 +23,7 @@ from savannadashboard import dashboard
class ClusterTemplatesPanel(horizon.Panel): class ClusterTemplatesPanel(horizon.Panel):
name = _("Cluster templates") name = _("Cluster Templates")
slug = 'cluster_templates' slug = 'cluster_templates'

5
savannadashboard/clusters/tables.py
View File

@ -26,9 +26,8 @@ LOG = logging.getLogger(__name__)
class ClustersTable(tables.DataTable): class ClustersTable(tables.DataTable):
name = tables.Column("name", name = tables.Column("name",
verbose_name=_("Cluster name"), verbose_name=_("Cluster Name"),
link=("horizon:savannadashboard:clusters:" link=("horizon:savanna:clusters:details"))
"cluster_details"))
class Meta: class Meta:
name = "clusters" name = "clusters"

2
savannadashboard/clusters/urls.py
View File

@ -24,5 +24,5 @@ urlpatterns = patterns('',
url(r'^$', ClustersView.as_view(), url(r'^$', ClustersView.as_view(),
name='index'), name='index'),
url(r'^$', ClustersView.as_view(), url(r'^$', ClustersView.as_view(),
name='nodegroup-templates'), name='clusters'),
) )

6
savannadashboard/image_registry/tables.py
View File

@ -29,7 +29,7 @@ LOG = logging.getLogger(__name__)
class EditTagsAction(tables.LinkAction): class EditTagsAction(tables.LinkAction):
name = "edit_tags" name = "edit_tags"
verbose_name = _("Edit tags") verbose_name = _("Edit Tags")
url = "horizon:savanna:image_registry:edit_tags" url = "horizon:savanna:image_registry:edit_tags"
classes = ("ajax-modal", "btn-create") classes = ("ajax-modal", "btn-create")
@ -74,13 +74,13 @@ class RemoveImage(tables.DeleteAction):
class ImageRegistryTable(tables.DataTable): class ImageRegistryTable(tables.DataTable):
name = tables.Column("name", name = tables.Column("name",
verbose_name=_("Image name")) verbose_name=_("Image Name"))
tags = tables.Column(tags_to_string, tags = tables.Column(tags_to_string,
verbose_name=_("Tags")) verbose_name=_("Tags"))
class Meta: class Meta:
name = "image_registry" name = "image_registry"
verbose_name = _("Image registry") verbose_name = _("Image Registry")
table_actions = () table_actions = ()
table_actions = (RegisterImage, RemoveImages,) table_actions = (RegisterImage, RemoveImages,)
row_actions = (EditTagsAction, RemoveImage,) row_actions = (EditTagsAction, RemoveImage,)

2
savannadashboard/nodegroup_templates/panel.py
View File

@ -23,7 +23,7 @@ from savannadashboard import dashboard
class NodegroupTemplatesPanel(horizon.Panel): class NodegroupTemplatesPanel(horizon.Panel):
name = _("Node group templates") name = _("Node Group Templates")
slug = 'nodegroup_templates' slug = 'nodegroup_templates'

18
savannadashboard/nodegroup_templates/tables.py
View File

@ -28,14 +28,14 @@ LOG = logging.getLogger(__name__)
class CreateNodegroupTemplate(tables.LinkAction): class CreateNodegroupTemplate(tables.LinkAction):
name = "create" name = "create"
verbose_name = _("Create Node group Template") verbose_name = _("Create Node Group Template")
url = "horizon:savanna:nodegroup_templates:create-nodegroup-template" url = "horizon:savanna:nodegroup_templates:create-nodegroup-template"
classes = ("ajax-modal", "btn-create", "create-nodegrouptemplate-btn") classes = ("ajax-modal", "btn-create", "create-nodegrouptemplate-btn")
class ConfigureNodegroupTemplate(tables.LinkAction): class ConfigureNodegroupTemplate(tables.LinkAction):
name = "configure" name = "configure"
verbose_name = _("Configure Node group Template") verbose_name = _("Configure Node Group Template")
url = "horizon:savanna:nodegroup_templates:configure-nodegroup-template" url = "horizon:savanna:nodegroup_templates:configure-nodegroup-template"
classes = ("ajax-modal", "btn-create", "configure-nodegrouptemplate-btn") classes = ("ajax-modal", "btn-create", "configure-nodegrouptemplate-btn")
@ -47,8 +47,8 @@ class DeleteTemplate(tables.BatchAction):
action_present = _("Delete") action_present = _("Delete")
action_past = _("Deleted") action_past = _("Deleted")
data_type_singular = _("Node group Template") data_type_singular = _("Node Group Template")
data_type_plural = _("Node group Templates") data_type_plural = _("Node Group Templates")
def allowed(self, request, template): def allowed(self, request, template):
return True return True
@ -66,18 +66,18 @@ def render_processes(nodegroup_template):
class NodegroupTemplatesTable(tables.DataTable): class NodegroupTemplatesTable(tables.DataTable):
name = tables.Column("name", name = tables.Column("name",
verbose_name=_("Node group template name"), verbose_name=_("Node Group Template Name"),
link=("horizon:savanna:nodegroup_templates:details")) link=("horizon:savanna:nodegroup_templates:details"))
plugin_name = tables.Column("plugin_name", plugin_name = tables.Column("plugin_name",
verbose_name=_("Plugin name")) verbose_name=_("Plugin Name"))
hadoop_version = tables.Column("hadoop_version", hadoop_version = tables.Column("hadoop_version",
verbose_name=_("Hadoop version")) verbose_name=_("Hadoop Version"))
node_processes = tables.Column(render_processes, node_processes = tables.Column(render_processes,
verbose_name=_("Node processes")) verbose_name=_("Node Processes"))
class Meta: class Meta:
name = "nodegroup_templates" name = "nodegroup_templates"
verbose_name = _("Node group Templates") verbose_name = _("Node Group Templates")
table_actions = (CreateNodegroupTemplate, table_actions = (CreateNodegroupTemplate,
ConfigureNodegroupTemplate, ConfigureNodegroupTemplate,
DeleteTemplate) DeleteTemplate)

4
savannadashboard/nodegroup_templates/tabs.py
View File

@ -27,7 +27,7 @@ LOG = logging.getLogger(__name__)
class GeneralTab(tabs.Tab): class GeneralTab(tabs.Tab):
name = _("General info") name = _("General Info")
slug = "nodegroup_template_details_tab" slug = "nodegroup_template_details_tab"
template_name = ("nodegroup_templates/_details.html") template_name = ("nodegroup_templates/_details.html")
@ -40,7 +40,7 @@ class GeneralTab(tabs.Tab):
class ConfigsTab(tabs.Tab): class ConfigsTab(tabs.Tab):
name = _("Service configurations") name = _("Service Configurations")
slug = "nodegroup_template_service_configs_tab" slug = "nodegroup_template_service_configs_tab"
template_name = ("nodegroup_templates/_service_confs.html") template_name = ("nodegroup_templates/_service_confs.html")

10
savannadashboard/nodegroup_templates/workflows.py
View File

@ -100,7 +100,7 @@ class GeneralConfigAction(workflows.Action):
return super(GeneralConfigAction, self).get_help_text(extra) return super(GeneralConfigAction, self).get_help_text(extra)
class Meta: class Meta:
name = _("Configure Node group Template") name = _("Configure Node Group Template")
help_text_template = \ help_text_template = \
("nodegroup_templates/_configure_general_help.html") ("nodegroup_templates/_configure_general_help.html")
@ -118,7 +118,7 @@ class GeneralConfig(workflows.Step):
class ConfigureNodegroupTemplate(workflows.Workflow): class ConfigureNodegroupTemplate(workflows.Workflow):
slug = "configure_nodegroup_template" slug = "configure_nodegroup_template"
name = _("Create Node group Template") name = _("Create Node Group Template")
finalize_button_name = _("Create") finalize_button_name = _("Create")
success_message = _("Created") success_message = _("Created")
failure_message = _("Could not create") failure_message = _("Could not create")
@ -222,7 +222,7 @@ class SelectPluginAction(workflows.Action):
plugin_choices = [(plugin.name, plugin.title) for plugin in plugins] plugin_choices = [(plugin.name, plugin.title) for plugin in plugins]
self.fields["plugin_name"] = forms.ChoiceField( self.fields["plugin_name"] = forms.ChoiceField(
label=_("Plugin name"), label=_("Plugin Name"),
required=True, required=True,
choices=plugin_choices, choices=plugin_choices,
widget=forms.Select(attrs={"class": "plugin_name_choice"})) widget=forms.Select(attrs={"class": "plugin_name_choice"}))
@ -230,7 +230,7 @@ class SelectPluginAction(workflows.Action):
for plugin in plugins: for plugin in plugins:
field_name = plugin.name + "_version" field_name = plugin.name + "_version"
choice_field = forms.ChoiceField( choice_field = forms.ChoiceField(
label=_("Hadoop version"), label=_("Hadoop Version"),
required=True, required=True,
choices=[(version, version) for version in plugin.versions], choices=[(version, version) for version in plugin.versions],
widget=forms.Select( widget=forms.Select(
@ -258,7 +258,7 @@ class SelectPlugin(workflows.Step):
class CreateNodegroupTemplate(workflows.Workflow): class CreateNodegroupTemplate(workflows.Workflow):
slug = "create_nodegroup_template" slug = "create_nodegroup_template"
name = _("Create Node group Template") name = _("Create Node Group Template")
finalize_button_name = _("Create") finalize_button_name = _("Create")
success_message = _("Created") success_message = _("Created")
failure_message = _("Could not create") failure_message = _("Could not create")

6
savannadashboard/plugins/tables.py
View File

@ -33,14 +33,14 @@ def render_versions(plugin):
class PluginsTable(tables.DataTable): class PluginsTable(tables.DataTable):
title = tables.Column("title", title = tables.Column("title",
verbose_name=_("Plugin name"), verbose_name=_("Plugin Name"),
link=("horizon:savanna:plugins:details")) link=("horizon:savanna:plugins:details"))
versions = tables.Column(render_versions, versions = tables.Column(render_versions,
verbose_name=_("Supported hadoop versions")) verbose_name=_("Supported Hadoop Versions"))
description = tables.Column("description", description = tables.Column("description",
verbose_name=_("Plugin description")) verbose_name=_("Plugin Description"))
class Meta: class Meta:
name = "plugins" name = "plugins"

2
savannadashboard/templates/cluster_templates/_details.html
View File

@ -12,7 +12,7 @@
<dl> <dl>
<dt>{% trans "Plugin" %}</dt> <dt>{% trans "Plugin" %}</dt>
<dd><a href="/savanna/plugins/{{ template.plugin_name }}">{{ template.plugin_name }}</a></dd> <dd><a href="/savanna/plugins/{{ template.plugin_name }}">{{ template.plugin_name }}</a></dd>
<dt>{% trans "Hadoop version" %}</dt> <dt>{% trans "Hadoop Version" %}</dt>
<dd>{{ template.hadoop_version }}</dd> <dd>{{ template.hadoop_version }}</dd>
</dl> </dl>
<dl> <dl>

2
savannadashboard/templates/cluster_templates/cluster_templates.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Savanna" %}{% endblock %} {% block title %}{% trans "Savanna" %}{% endblock %}
{% block page_header %} {% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Cluster Templates") %} {% include "horizon/common/_page_header.html" with title=_("Savanna - Cluster Templates") %}
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}

2
savannadashboard/templates/cluster_templates/details.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Cluster Template Details" %}{% endblock %} {% block title %}{% trans "Cluster Template Details" %}{% endblock %}
{% block page_header %} {% block page_header %}
{% include "horizon/common/_page_header.html" with title="Savanna Cluster Template Details: "%} {% include "horizon/common/_page_header.html" with title=_("Savanna - Cluster Template Details") %}
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}

2
savannadashboard/templates/clusters/clusters.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Savanna" %}{% endblock %} {% block title %}{% trans "Savanna" %}{% endblock %}
{% block page_header %} {% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Clusters") %} {% include "horizon/common/_page_header.html" with title=_("Savanna - Clusters") %}
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}

6
savannadashboard/templates/image_registry/_tag_form.html
View File

@ -28,7 +28,7 @@
} }
function update_image_tags() { function update_image_tags() {
var tags = [] var tags = [];
$("#image_tags_list span").each(function (el) { $("#image_tags_list span").each(function (el) {
tags.push($.trim($(this).text())); tags.push($.trim($(this).text()));
}); });
@ -36,8 +36,8 @@
} }
function remove_tag(icon) { function remove_tag(icon) {
span = icon.parentNode span = icon.parentNode;
span.parentNode.removeChild(span) span.parentNode.removeChild(span);
update_image_tags() update_image_tags()
} }
</script> </script>

4
savannadashboard/templates/image_registry/edit_tags.html
View File

@ -3,9 +3,9 @@
{% block title %}{% trans "Edit Image Tags" %}{% endblock %} {% block title %}{% trans "Edit Image Tags" %}{% endblock %}
{% block page_header %} {% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Edit Image Tags") %} {% include "horizon/common/_page_header.html" with title=_("Edit Image Tags") %}
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}
{% include 'templates/image_registry/_edit_tags.html' %} {% include 'templates/image_registry/_edit_tags.html' %}
{% endblock %} {% endblock %}

2
savannadashboard/templates/image_registry/image_registry.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Savanna" %}{% endblock %} {% block title %}{% trans "Savanna" %}{% endblock %}
{% block page_header %} {% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Image Registry") %} {% include "horizon/common/_page_header.html" with title=_("Savanna - Image Registry") %}
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}

4
savannadashboard/templates/image_registry/register_image.html
View File

@ -3,9 +3,9 @@
{% block title %}{% trans "Register Image" %}{% endblock %} {% block title %}{% trans "Register Image" %}{% endblock %}
{% block page_header %} {% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Register Image") %} {% include "horizon/common/_page_header.html" with title=_("Register Image") %}
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}
{% include 'templates/image_registry/_register_image.html' %} {% include 'templates/image_registry/_register_image.html' %}
{% endblock %} {% endblock %}

4
savannadashboard/templates/nodegroup_templates/_details.html
View File

@ -16,11 +16,11 @@
<dl> <dl>
<dt>{% trans "Plugin" %}</dt> <dt>{% trans "Plugin" %}</dt>
<dd><a href="/savanna/plugins/{{ template.plugin_name }}">{{ template.plugin_name }}</a></dd> <dd><a href="/savanna/plugins/{{ template.plugin_name }}">{{ template.plugin_name }}</a></dd>
<dt>{% trans "Hadoop version" %}</dt> <dt>{% trans "Hadoop Version" %}</dt>
<dd>{{ template.hadoop_version }}</dd> <dd>{{ template.hadoop_version }}</dd>
</dl> </dl>
<dl> <dl>
<dt>{% trans "Node processes" %}</dt> <dt>{% trans "Node Processes" %}</dt>
<dd> <dd>
<ul> <ul>
{% for process in template.node_processes %} {% for process in template.node_processes %}

2
savannadashboard/templates/nodegroup_templates/_service_confs.html
View File

@ -1,5 +1,5 @@
{% load i18n sizeformat %} {% load i18n sizeformat %}
<h3>{% trans "Service configurations" %}</h3> <h3>{% trans "Service Configurations" %}</h3>
<div class="status row-fluid detail"> <div class="status row-fluid detail">
<dl> <dl>
{% for service, config in template.node_configs.items %} {% for service, config in template.node_configs.items %}

4
savannadashboard/templates/nodegroup_templates/configure.html
View File

@ -1,9 +1,9 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans "Create Node group Template" %}{% endblock %} {% block title %}{% trans "Create Node Group Template" %}{% endblock %}
{% block page_header %} {% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Create Node group Template") %} {% include "horizon/common/_page_header.html" with title=_("Savanna - Create Node Group Template") %}
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}

4
savannadashboard/templates/nodegroup_templates/create.html
View File

@ -1,9 +1,9 @@
{% extends 'base.html' %} {% extends 'base.html' %}
{% load i18n %} {% load i18n %}
{% block title %}{% trans "Create Node group Template" %}{% endblock %} {% block title %}{% trans "Create Node Group Template" %}{% endblock %}
{% block page_header %} {% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Create Node group Template") %} {% include "horizon/common/_page_header.html" with title=_("Savanna - Create Node Group Template") %}
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}

4
savannadashboard/templates/nodegroup_templates/details.html
View File

@ -3,13 +3,13 @@
{% block title %}{% trans "Nodegroup Template Details" %}{% endblock %} {% block title %}{% trans "Nodegroup Template Details" %}{% endblock %}
{% block page_header %} {% block page_header %}
{% include "horizon/common/_page_header.html" with title="Savanna node group template details: "%} {% include "horizon/common/_page_header.html" with title=_("Savanna node group template details") %}
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ tab_group.render }} {{ tab_group.render }}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

2
savannadashboard/templates/nodegroup_templates/nodegroup_templates.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Savanna" %}{% endblock %} {% block title %}{% trans "Savanna" %}{% endblock %}
{% block page_header %} {% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Node group Templates") %} {% include "horizon/common/_page_header.html" with title=_("Savanna - Node Group Templates") %}
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}

8
savannadashboard/templates/plugins/details.html
View File

@ -3,13 +3,13 @@
{% block title %}{% trans "Plugin Detail" %}{% endblock %} {% block title %}{% trans "Plugin Detail" %}{% endblock %}
{% block page_header %} {% block page_header %}
{% include "horizon/common/_page_header.html" with title="Savanna plugin details: "%} {% include "horizon/common/_page_header.html" with title=_("Savanna Plugin Details") %}
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}
<div class="row-fluid"> <div class="row-fluid">
<div class="span12"> <div class="span12">
{{ tab_group.render }} {{ tab_group.render }}
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

2
savannadashboard/templates/plugins/plugins.html
View File

@ -3,7 +3,7 @@
{% block title %}{% trans "Savanna" %}{% endblock %} {% block title %}{% trans "Savanna" %}{% endblock %}
{% block page_header %} {% block page_header %}
{% include "horizon/common/_page_header.html" with title=_("Savanna - Plugins") %} {% include "horizon/common/_page_header.html" with title=_("Savanna - Plugins") %}
{% endblock page_header %} {% endblock page_header %}
{% block main %} {% block main %}