Fixup trove screens for Bootstrap 3 changes
Changed row-fluid Selected new icons in a few places Cleanup html for details pages Added default button to resize dialog Change-Id: I80fbccf77e6a27a51f84dd55cab7944f23d38d66 Closes-Bug: #1350514
This commit is contained in:
parent
6bc854f831
commit
0c68097dd4
|
@ -36,8 +36,8 @@ class LaunchLink(tables.LinkAction):
|
||||||
name = "create"
|
name = "create"
|
||||||
verbose_name = _("Create Backup")
|
verbose_name = _("Create Backup")
|
||||||
url = "horizon:project:database_backups:create"
|
url = "horizon:project:database_backups:create"
|
||||||
classes = ("ajax-modal", "btn-launch")
|
classes = ("ajax-modal", "btn-create")
|
||||||
icon = "cloud-upload"
|
icon = "camera"
|
||||||
|
|
||||||
|
|
||||||
class RestoreLink(tables.LinkAction):
|
class RestoreLink(tables.LinkAction):
|
||||||
|
@ -59,7 +59,7 @@ class DownloadBackup(tables.LinkAction):
|
||||||
name = "download"
|
name = "download"
|
||||||
verbose_name = _("Download Backup")
|
verbose_name = _("Download Backup")
|
||||||
url = 'horizon:project:containers:object_download'
|
url = 'horizon:project:containers:object_download'
|
||||||
classes = ("btn-launch",)
|
classes = ("btn-download",)
|
||||||
|
|
||||||
def get_link_url(self, datum):
|
def get_link_url(self, datum):
|
||||||
ref = datum.locationRef.split('/')
|
ref = datum.locationRef.split('/')
|
||||||
|
@ -73,16 +73,11 @@ class DownloadBackup(tables.LinkAction):
|
||||||
return datum.status == 'COMPLETED'
|
return datum.status == 'COMPLETED'
|
||||||
|
|
||||||
|
|
||||||
class DeleteBackup(tables.BatchAction):
|
class DeleteBackup(tables.DeleteAction):
|
||||||
name = "delete"
|
|
||||||
action_present = _("Delete")
|
|
||||||
action_past = _("Scheduled deletion of %(data_type)s")
|
|
||||||
data_type_singular = _("Backup")
|
data_type_singular = _("Backup")
|
||||||
data_type_plural = _("Backups")
|
data_type_plural = _("Backups")
|
||||||
classes = ("ajax-modal",)
|
|
||||||
icon = "remove"
|
|
||||||
|
|
||||||
def action(self, request, obj_id):
|
def delete(self, request, obj_id):
|
||||||
api.trove.backup_delete(request, obj_id)
|
api.trove.backup_delete(request, obj_id)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% if backup.parent %}
|
{% if backup.parent %}
|
||||||
<div class="status row-fluid detail">
|
<div class="status row detail">
|
||||||
<h4>{% trans "Incremental Backup" %}</h4>
|
<h4>{% trans "Incremental Backup" %}</h4>
|
||||||
<hr class="header_rule">
|
<hr class="header_rule">
|
||||||
<dl>
|
<dl>
|
||||||
|
|
|
@ -35,7 +35,7 @@ class TerminateInstance(tables.BatchAction):
|
||||||
action_past = _("Scheduled termination of %(data_type)s")
|
action_past = _("Scheduled termination of %(data_type)s")
|
||||||
data_type_singular = _("Instance")
|
data_type_singular = _("Instance")
|
||||||
data_type_plural = _("Instances")
|
data_type_plural = _("Instances")
|
||||||
classes = ("ajax-modal",)
|
classes = ("btn-danger", )
|
||||||
icon = "off"
|
icon = "off"
|
||||||
|
|
||||||
def action(self, request, obj_id):
|
def action(self, request, obj_id):
|
||||||
|
@ -59,9 +59,6 @@ class RestartInstance(tables.BatchAction):
|
||||||
|
|
||||||
|
|
||||||
class DeleteUser(tables.DeleteAction):
|
class DeleteUser(tables.DeleteAction):
|
||||||
name = "delete"
|
|
||||||
action_present = _("Delete")
|
|
||||||
action_past = _("Deleted")
|
|
||||||
data_type_singular = _("User")
|
data_type_singular = _("User")
|
||||||
data_type_plural = _("Users")
|
data_type_plural = _("Users")
|
||||||
|
|
||||||
|
@ -75,9 +72,6 @@ class DeleteUser(tables.DeleteAction):
|
||||||
|
|
||||||
|
|
||||||
class DeleteDatabase(tables.DeleteAction):
|
class DeleteDatabase(tables.DeleteAction):
|
||||||
name = "delete"
|
|
||||||
action_present = _("Delete")
|
|
||||||
action_past = _("Deleted")
|
|
||||||
data_type_singular = _("Database")
|
data_type_singular = _("Database")
|
||||||
data_type_plural = _("Databases")
|
data_type_plural = _("Databases")
|
||||||
|
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
</dl>
|
</dl>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="specs row-fluid detail">
|
<div class="specs row detail">
|
||||||
<h4>{% trans "Specs" %}</h4>
|
<h4>{% trans "Specs" %}</h4>
|
||||||
<hr class="header_rule">
|
<hr class="header_rule">
|
||||||
<dl>
|
<dl>
|
||||||
|
@ -40,18 +40,3 @@
|
||||||
|
|
||||||
{% block connection_info %}
|
{% block connection_info %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
<div class="addresses row detail">
|
|
||||||
<h4>{% trans "Connection Info" %}</h4>
|
|
||||||
<hr class="header_rule">
|
|
||||||
<dl>
|
|
||||||
{% with instance.host as host %}
|
|
||||||
<dt>{% trans "Host" %}</dt>
|
|
||||||
<dd>{{ host }}</dd>
|
|
||||||
<dt>{% trans "Database Port" %}</dt>
|
|
||||||
<dd>3306</dd> {# TODO: This should be a config #}
|
|
||||||
<dt>{% trans "Connection Examples" %}</dt>
|
|
||||||
<dd>mysql -h {{ host }} -u USERNAME -p</dd>
|
|
||||||
<dd>mysql://USERNAME:PASSWORD@{{ host }}:3306/DATABASE</dd>
|
|
||||||
{% endwith %}
|
|
||||||
</dl>
|
|
||||||
</div>
|
|
||||||
|
|
|
@ -2,19 +2,16 @@
|
||||||
{% load i18n sizeformat %}
|
{% load i18n sizeformat %}
|
||||||
|
|
||||||
{% block connection_info %}
|
{% block connection_info %}
|
||||||
<div class="addresses row-fluid detail">
|
<div class="addresses row detail">
|
||||||
<h4>{% trans "Connection Info" %}</h4>
|
<h4>{% trans "Connection Info" %}</h4>
|
||||||
<hr class="header_rule">
|
<hr class="header_rule">
|
||||||
<dl>
|
<dl>
|
||||||
{% with instance.host as host %}
|
{% with instance.host as host %}
|
||||||
<dt>{% trans "Host" %}</dt>
|
<dt>{% trans "Host" %}</dt>
|
||||||
<dd>
|
|
||||||
{% if not host %}
|
{% if not host %}
|
||||||
{% trans "Not Assigned" %}
|
<dd>{% trans "Not Assigned" %}</dd>
|
||||||
</dd>
|
|
||||||
{% else %}
|
{% else %}
|
||||||
{{ host }}
|
<dd>{{ host }}</dd>
|
||||||
</dd>
|
|
||||||
<dt>{% trans "Database Port" %}</dt>
|
<dt>{% trans "Database Port" %}</dt>
|
||||||
<dd>9160</dd>
|
<dd>9160</dd>
|
||||||
<dt>{% trans "Connection Examples" %}</dt>
|
<dt>{% trans "Connection Examples" %}</dt>
|
||||||
|
|
|
@ -2,19 +2,16 @@
|
||||||
{% load i18n sizeformat %}
|
{% load i18n sizeformat %}
|
||||||
|
|
||||||
{% block connection_info %}
|
{% block connection_info %}
|
||||||
<div class="addresses row-fluid detail">
|
<div class="addresses row detail">
|
||||||
<h4>{% trans "Connection Info" %}</h4>
|
<h4>{% trans "Connection Info" %}</h4>
|
||||||
<hr class="header_rule">
|
<hr class="header_rule">
|
||||||
<dl>
|
<dl>
|
||||||
{% with instance.host as host %}
|
{% with instance.host as host %}
|
||||||
<dt>{% trans "Host" %}</dt>
|
<dt>{% trans "Host" %}</dt>
|
||||||
<dd>
|
|
||||||
{% if not host %}
|
{% if not host %}
|
||||||
{% trans "Not Assigned" %}
|
<dd>{% trans "Not Assigned" %}</dd>
|
||||||
</dd>
|
|
||||||
{% else %}
|
{% else %}
|
||||||
{{ host }}
|
<dd>{{ host }}</dd>
|
||||||
</dd>
|
|
||||||
<dt>{% trans "Connection Examples" %}</dt>
|
<dt>{% trans "Connection Examples" %}</dt>
|
||||||
<dd>http://{{ host }}:8091</dd>
|
<dd>http://{{ host }}:8091</dd>
|
||||||
{% endif %} <!-- ends else block -->
|
{% endif %} <!-- ends else block -->
|
||||||
|
|
|
@ -2,19 +2,16 @@
|
||||||
{% load i18n sizeformat %}
|
{% load i18n sizeformat %}
|
||||||
|
|
||||||
{% block connection_info %}
|
{% block connection_info %}
|
||||||
<div class="addresses row-fluid detail">
|
<div class="addresses row detail">
|
||||||
<h4>{% trans "Connection Info" %}</h4>
|
<h4>{% trans "Connection Info" %}</h4>
|
||||||
<hr class="header_rule">
|
<hr class="header_rule">
|
||||||
<dl>
|
<dl>
|
||||||
{% with instance.host as host %}
|
{% with instance.host as host %}
|
||||||
<dt>{% trans "Host" %}</dt>
|
<dt>{% trans "Host" %}</dt>
|
||||||
<dd>
|
|
||||||
{% if not host %}
|
{% if not host %}
|
||||||
{% trans "Not Assigned" %}
|
<dd>{% trans "Not Assigned" %}</dd>
|
||||||
</dd>
|
|
||||||
{% else %}
|
{% else %}
|
||||||
{{ host }}
|
<dd>{{ host }}</dd>
|
||||||
</dd>
|
|
||||||
<dt>{% trans "Database Port" %}</dt>
|
<dt>{% trans "Database Port" %}</dt>
|
||||||
<dd>27017</dd>
|
<dd>27017</dd>
|
||||||
<dt>{% trans "Connection Examples" %}</dt>
|
<dt>{% trans "Connection Examples" %}</dt>
|
||||||
|
|
|
@ -2,19 +2,16 @@
|
||||||
{% load i18n sizeformat %}
|
{% load i18n sizeformat %}
|
||||||
|
|
||||||
{% block connection_info %}
|
{% block connection_info %}
|
||||||
<div class="addresses row-fluid detail">
|
<div class="addresses row detail">
|
||||||
<h4>{% trans "Connection Info" %}</h4>
|
<h4>{% trans "Connection Info" %}</h4>
|
||||||
<hr class="header_rule">
|
<hr class="header_rule">
|
||||||
<dl>
|
<dl>
|
||||||
{% with instance.host as host %}
|
{% with instance.host as host %}
|
||||||
<dt>{% trans "Host" %}</dt>
|
<dt>{% trans "Host" %}</dt>
|
||||||
<dd>
|
|
||||||
{% if not host %}
|
{% if not host %}
|
||||||
{% trans "Not Assigned" %}
|
<dd>{% trans "Not Assigned" %}</dd>
|
||||||
</dd>
|
|
||||||
{% else %}
|
{% else %}
|
||||||
{{ host }}
|
<dd>{{ host }}</dd>
|
||||||
</dd>
|
|
||||||
<dt>{% trans "Database Port" %}</dt>
|
<dt>{% trans "Database Port" %}</dt>
|
||||||
<dd>3306</dd>
|
<dd>3306</dd>
|
||||||
<dt>{% trans "Connection Examples" %}</dt>
|
<dt>{% trans "Connection Examples" %}</dt>
|
||||||
|
|
|
@ -2,19 +2,16 @@
|
||||||
{% load i18n sizeformat %}
|
{% load i18n sizeformat %}
|
||||||
|
|
||||||
{% block connection_info %}
|
{% block connection_info %}
|
||||||
<div class="addresses row-fluid detail">
|
<div class="addresses row detail">
|
||||||
<h4>{% trans "Connection Info" %}</h4>
|
<h4>{% trans "Connection Info" %}</h4>
|
||||||
<hr class="header_rule">
|
<hr class="header_rule">
|
||||||
<dl>
|
<dl>
|
||||||
{% with instance.host as host %}
|
{% with instance.host as host %}
|
||||||
<dt>{% trans "Host" %}</dt>
|
<dt>{% trans "Host" %}</dt>
|
||||||
<dd>
|
|
||||||
{% if not host %}
|
{% if not host %}
|
||||||
{% trans "Not Assigned" %}
|
<dd>{% trans "Not Assigned" %}</dd>
|
||||||
</dd>
|
|
||||||
{% else %}
|
{% else %}
|
||||||
{{ host }}
|
<dd>{{ host }}</dd>
|
||||||
</dd>
|
|
||||||
<dt>{% trans "Connection Examples" %}</dt>
|
<dt>{% trans "Connection Examples" %}</dt>
|
||||||
<dd>redis-cli -h {{ host }}</dd>
|
<dd>redis-cli -h {{ host }}</dd>
|
||||||
{% endif %} <!-- ends else block -->
|
{% endif %} <!-- ends else block -->
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
{% load i18n %}
|
|
||||||
|
|
||||||
{{ table.render }}
|
|
|
@ -22,6 +22,6 @@
|
||||||
|
|
||||||
{% block modal-footer %}
|
{% block modal-footer %}
|
||||||
<input class="btn btn-primary pull-right" type="submit" value="{% trans "Resize Database Volume" %}" />
|
<input class="btn btn-primary pull-right" type="submit" value="{% trans "Resize Database Volume" %}" />
|
||||||
<a href="{% url "horizon:project:databases:index" %}" class="btn secondary cancel close">{% trans "Cancel" %}</a>
|
<a href="{% url "horizon:project:databases:index" %}" class="btn btn-default secondary cancel close">{% trans "Cancel" %}</a>
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue