summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Runge <mrunge@redhat.com>2014-10-01 14:00:31 +0200
committerMatthias Runge <mrunge@redhat.com>2014-10-01 14:00:31 +0200
commitb5b09140b1906d6fc401493908003f6312d720a9 (patch)
tree50bd3dda4348ccac89a54872c24ce8fe245d9ed6
parent35487bf8a00ae8c0c445637443c7ee951a29fb10 (diff)
downloadhorizon-b5b09140b1906d6fc401493908003f6312d720a9.tar.gz
Change column uptime
Renamed misleading column uptime Change-Id: Id72c10a7166943fcfef68c338a1412897ad9cc4b Closes-Bug: #1156563
-rw-r--r--openstack_dashboard/dashboards/admin/instances/tables.py2
-rw-r--r--openstack_dashboard/dashboards/project/instances/tables.py2
-rw-r--r--openstack_dashboard/usage/tables.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/openstack_dashboard/dashboards/admin/instances/tables.py b/openstack_dashboard/dashboards/admin/instances/tables.py
index 5c2afa596..6e7504748 100644
--- a/openstack_dashboard/dashboards/admin/instances/tables.py
+++ b/openstack_dashboard/dashboards/admin/instances/tables.py
@@ -149,7 +149,7 @@ class AdminInstancesTable(tables.DataTable):
filters=(title, filters.replace_underscores),
verbose_name=_("Power State"))
created = tables.Column("created",
- verbose_name=_("Uptime"),
+ verbose_name=_("Time since created"),
filters=(filters.parse_isotime,
filters.timesince_sortable),
attrs={'data-type': 'timesince'})
diff --git a/openstack_dashboard/dashboards/project/instances/tables.py b/openstack_dashboard/dashboards/project/instances/tables.py
index 4395900c8..2737529e3 100644
--- a/openstack_dashboard/dashboards/project/instances/tables.py
+++ b/openstack_dashboard/dashboards/project/instances/tables.py
@@ -911,7 +911,7 @@ class InstancesTable(tables.DataTable):
verbose_name=_("Power State"),
display_choices=POWER_DISPLAY_CHOICES)
created = tables.Column("created",
- verbose_name=_("Uptime"),
+ verbose_name=_("Time since created"),
filters=(filters.parse_isotime,
filters.timesince_sortable),
attrs={'data-type': 'timesince'})
diff --git a/openstack_dashboard/usage/tables.py b/openstack_dashboard/usage/tables.py
index 4727fbb0c..80b7478e9 100644
--- a/openstack_dashboard/usage/tables.py
+++ b/openstack_dashboard/usage/tables.py
@@ -72,7 +72,7 @@ class ProjectUsageTable(BaseUsageTable):
verbose_name=_("Instance Name"),
link=get_instance_link)
uptime = tables.Column('uptime_at',
- verbose_name=_("Uptime"),
+ verbose_name=_("Time since created"),
filters=(filters.timesince_sortable,),
attrs={'data-type': 'timesince'})