Rename all 'Application in Environment' to 'Component'
Change-Id: I566e08bc1e321273f761eb718cc19526ec2c552d Closes-Bug: #1304901
This commit is contained in:
parent
4a21fb620e
commit
9dcbbabb5c
|
@ -287,7 +287,7 @@ def services_list(request, environment_id):
|
|||
last_operation = strip(str(reports[service_id].text))
|
||||
time = reports[service_id].updated.replace('T', ' ')
|
||||
else:
|
||||
last_operation = 'Service draft created' \
|
||||
last_operation = 'Component draft created' \
|
||||
if environment.version == 0 else ''
|
||||
try:
|
||||
time = service_data['updated'].replace('T', ' ')[:-7]
|
||||
|
|
|
@ -42,7 +42,7 @@ def creation_allowed(self, request, environment):
|
|||
|
||||
class AddApplication(tables.LinkAction):
|
||||
name = 'AddApplication'
|
||||
verbose_name = _('Add Application')
|
||||
verbose_name = _('Add Component')
|
||||
classes = ('btn-launch',)
|
||||
|
||||
def allowed(self, request, environment):
|
||||
|
@ -102,8 +102,8 @@ class EditEnvironment(tables.LinkAction):
|
|||
|
||||
|
||||
class DeleteService(tables.DeleteAction):
|
||||
data_type_singular = _('Service')
|
||||
data_type_plural = _('Services')
|
||||
data_type_singular = _('Component')
|
||||
data_type_plural = _('Components')
|
||||
|
||||
def allowed(self, request, service=None):
|
||||
environment_id = self.table.kwargs.get('environment_id')
|
||||
|
@ -187,7 +187,7 @@ class DeployThisEnvironment(tables.Action):
|
|||
|
||||
class ShowEnvironmentServices(tables.LinkAction):
|
||||
name = 'show'
|
||||
verbose_name = _('Services')
|
||||
verbose_name = _('Components')
|
||||
url = 'horizon:murano:environments:services'
|
||||
|
||||
def allowed(self, request, environment):
|
||||
|
@ -273,7 +273,7 @@ class ServicesTable(tables.DataTable):
|
|||
|
||||
class Meta:
|
||||
name = 'services'
|
||||
verbose_name = _('Services')
|
||||
verbose_name = _('Components')
|
||||
status_columns = ['status']
|
||||
row_class = UpdateServiceRow
|
||||
table_actions = (AddApplication, DeleteService,
|
||||
|
@ -324,4 +324,4 @@ class EnvConfigTable(tables.DataTable):
|
|||
|
||||
class Meta:
|
||||
name = 'environment_configuration'
|
||||
verbose_name = _('Deployed Services')
|
||||
verbose_name = _('Deployed Components')
|
||||
|
|
|
@ -28,7 +28,7 @@ LOG = logging.getLogger(__name__)
|
|||
|
||||
|
||||
class OverviewTab(tabs.Tab):
|
||||
name = _("Service")
|
||||
name = _("Component")
|
||||
slug = "_service"
|
||||
template_name = 'services/_overview.html'
|
||||
|
||||
|
@ -130,7 +130,7 @@ class EnvironmentTopologyTab(tabs.Tab):
|
|||
|
||||
|
||||
class EnvironmentServicesTab(tabs.TableTab):
|
||||
name = _("Services")
|
||||
name = _("Components")
|
||||
slug = "serviceslist"
|
||||
table_classes = (ServicesTable,)
|
||||
template_name = "services/_service_list.html"
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
{% block page_header %}
|
||||
<div class='page-header'>
|
||||
|
||||
<h2> {% blocktrans %}Service Detail: {{ service_name }} {% endblocktrans %}
|
||||
<h2> {% blocktrans %}Component Details: {{ service_name }} {% endblocktrans %}
|
||||
</h2>
|
||||
<h3>
|
||||
<a href=" {% url 'horizon:murano:environments:index' %}">
|
||||
|
@ -12,7 +12,7 @@
|
|||
<a href=" {% url 'horizon:murano:environments:services' service.environment_id %}">
|
||||
{% blocktrans %}environment {{ environment_name }}{% endblocktrans %}
|
||||
</a>
|
||||
{% blocktrans %} > service {{ service_name }}{% endblocktrans %}
|
||||
{% blocktrans %} > component {{ service_name }}{% endblocktrans %}
|
||||
|
||||
</h3>
|
||||
</div>
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{% load i18n %}
|
||||
<div class="clearfix">
|
||||
<h3 class="pull-left">{% trans "Service Logs" %}</h3>
|
||||
<h3 class="pull-left">{% trans "Component Logs" %}</h3>
|
||||
</div>
|
||||
<pre class="logs">{{ reports }}</pre>
|
|
@ -1,13 +1,13 @@
|
|||
{% load i18n %}
|
||||
{% load url from future %}
|
||||
|
||||
<h3>{% trans "Service Details" %}</h3>
|
||||
<h3>{% trans "Component Details" %}</h3>
|
||||
<div class="status row-fluid detail">
|
||||
<h4>{% blocktrans %}Info {% endblocktrans %}</h4>
|
||||
<dl>
|
||||
{% for key, value in service.items %}
|
||||
{% if key == 'instance' %}
|
||||
<dt>Service instance name</dt>
|
||||
<dt>Component instance name</dt>
|
||||
<dd>
|
||||
<a href=" {% url 'horizon:project:instances:detail' value.id %}">
|
||||
{{ value.name }}
|
||||
|
@ -31,12 +31,12 @@
|
|||
|
||||
{% for unit in units %}
|
||||
<div class="status row-fluid detail">
|
||||
<h4>{% blocktrans %}Service unit{% endblocktrans %}{{ forloop.counter }} </h4>
|
||||
<h4>{% blocktrans %}Component unit{% endblocktrans %}{{ forloop.counter }} </h4>
|
||||
<hr class="header_rule">
|
||||
<dl>
|
||||
{% for key, value in unit.items %}
|
||||
{% if key == 'instance' %}
|
||||
<dt>Service instance name</dt>
|
||||
<dt>Component instance name</dt>
|
||||
<dd>
|
||||
<a href=" {% url 'horizon:project:instances:detail' value.id %}">
|
||||
{{ value.name }}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{% extends 'base.html' %}
|
||||
{% load i18n sizeformat %}
|
||||
{% block title %}{% trans "Service Detail" %}{% endblock %}
|
||||
{% block title %}{% trans "Component Details" %}{% endblock %}
|
||||
|
||||
{% block page_header %}
|
||||
{% include "services/_detail_page_header.html" %}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{% extends 'base.html' %}
|
||||
{% load i18n %}
|
||||
{% block title %}{% trans "Environment Applications" %}{% endblock %}
|
||||
{% block title %}{% trans "Components" %}{% endblock %}
|
||||
|
||||
{% block page_header %}
|
||||
{% include "services/_page_header.html" %}
|
||||
|
|
Loading…
Reference in New Issue