openstack
/
manila-ui
Code Issues Proposed changes

Merge "Fix tables layout"

This commit is contained in:
Jenkins 2016-08-30 12:55:53 +00:00 committed by Gerrit Code Review
parent 36c48db1c0 9e04f768c4
commit a21e789560
4 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
manila_ui/dashboards/admin/shares/tables.py
View File

@ -110,7 +110,7 @@ class UpdateShareType(tables.LinkAction):
class ShareTypesTable(tables.DataTable):
name = tables.Column("name", verbose_name=_("Name"))
name = tables.WrappingColumn("name", verbose_name=_("Name"))
extra_specs = tables.Column("extra_specs", verbose_name=_("Extra specs"), )
visibility = tables.Column(
"is_public", verbose_name=_("Visibility"),
@ -136,9 +136,9 @@ class ShareTypesTable(tables.DataTable):
class SharesTable(shares_tables.SharesTable):
name = tables.Column("name",
verbose_name=_("Name"),
link="horizon:admin:shares:detail")
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),
link="horizon:admin:shares:detail")
host = tables.Column("host", verbose_name=_("Host"))
project = tables.Column("project_name", verbose_name=_("Project"))
@ -219,9 +219,9 @@ class SnapshotsTable(tables.DataTable):
("creating", pgettext_lazy("Current status of snapshot", u"Creating")),
("error", pgettext_lazy("Current status of snapshot", u"Error")),
)
name = tables.Column("name",
verbose_name=_("Name"),
link="horizon:admin:shares:snapshot-detail")
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),
link="horizon:admin:shares:snapshot-detail")
description = tables.Column("description",
verbose_name=_("Description"),
truncate=40)
@ -282,9 +282,9 @@ class DeleteShareServer(tables.DeleteAction):
class SecurityServiceTable(tables.DataTable):
name = tables.Column("name",
verbose_name=_("Name"),
link="horizon:admin:shares:security_service_detail")
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),
link="horizon:admin:shares:security_service_detail")
project = tables.Column("project_name", verbose_name=_("Project"))
dns_ip = tables.Column("dns_ip", verbose_name=_("DNS IP"))
server = tables.Column("server", verbose_name=_("Server"))
@ -316,9 +316,9 @@ class UpdateShareServerRow(tables.Row):
class NovaShareNetworkTable(tables.DataTable):
name = tables.Column("name",
verbose_name=_("Name"),
link="horizon:admin:shares:share_network_detail")
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),
link="horizon:admin:shares:share_network_detail")
project = tables.Column("project_name", verbose_name=_("Project"))
nova_net = tables.Column("nova_net", verbose_name=_("Nova Net"))
ip_version = tables.Column("ip_version", verbose_name=_("IP Version"))
@ -345,8 +345,9 @@ class NovaShareNetworkTable(tables.DataTable):
class NeutronShareNetworkTable(tables.DataTable):
name = tables.Column("name", verbose_name=_("Name"),
link="horizon:project:shares:share_network_detail")
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),
link="horizon:project:shares:share_network_detail")
project = tables.Column("project_name", verbose_name=_("Project"))
neutron_net = tables.Column("neutron_net", verbose_name=_("Neutron Net"))
neutron_subnet = tables.Column(

6
manila_ui/dashboards/project/shares/security_services/tables.py
View File

@ -45,9 +45,9 @@ class Edit(tables.LinkAction):
class SecurityServiceTable(tables.DataTable):
name = tables.Column("name",
verbose_name=_("Name"),
link="horizon:project:shares:security_service_detail")
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),
link="horizon:project:shares:security_service_detail")
dns_ip = tables.Column("dns_ip", verbose_name=_("DNS IP"))
server = tables.Column("server", verbose_name=_("Server"))
domain = tables.Column("domain", verbose_name=_("Domain"))

10
manila_ui/dashboards/project/shares/share_networks/tables.py
View File

@ -88,8 +88,9 @@ class UpdateRow(tables.Row):
class NovaShareNetworkTable(tables.DataTable):
name = tables.Column("name", verbose_name=_("Name"),
link="horizon:project:shares:share_network_detail")
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),
link="horizon:project:shares:share_network_detail")
nova_net = tables.Column("nova_net", verbose_name=_("Nova Net"))
ip_version = tables.Column("ip_version", verbose_name=_("IP Version"))
network_type = tables.Column("network_type",
@ -129,8 +130,9 @@ class NeutronShareNetworkTable(tables.DataTable):
u"Inactive")),
("ERROR", pgettext_lazy("Current status of share network", u"Error")),
)
name = tables.Column("name", verbose_name=_("Name"),
link="horizon:project:shares:share_network_detail")
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),
link="horizon:project:shares:share_network_detail")
neutron_net = tables.Column("neutron_net", verbose_name=_("Neutron Net"))
neutron_subnet = tables.Column(
"neutron_subnet", verbose_name=_("Neutron Subnet"))

12
manila_ui/dashboards/project/shares/shares/tables.py
View File

@ -190,9 +190,9 @@ class SharesTableBase(tables.DataTable):
("extending_error", pgettext_lazy("Current status of share",
u"Extending Error")),
)
name = tables.Column("name",
verbose_name=_("Name"),
link="horizon:project:shares:detail")
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),
link="horizon:project:shares:detail")
description = tables.Column("description",
verbose_name=_("Description"),
truncate=40)
@ -290,9 +290,9 @@ def get_share_network(share):
class SharesTable(SharesTableBase):
name = tables.Column("name",
verbose_name=_("Name"),
link="horizon:project:shares:detail")
name = tables.WrappingColumn(
"name", verbose_name=_("Name"),
link="horizon:project:shares:detail")
visibility = tables.Column(
"is_public", verbose_name=_("Visibility"),
help_text=("Whether this share visible to all tenants (public) or "