diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-10-10 12:04:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-10-10 12:04:15 +0000 |
| commit | 11932532a29d13d8a5d275970aa22425052da579 (patch) | |
| tree | e436e35ba094ca0620fd405b4ec761a58e41e6ff | |
| parent | 66117366816fce5e17b93203deb782859b5c0cd8 (diff) | |
| parent | 1f785a3300dad43b3c872647d422ccf0f369bd00 (diff) | |
| download | tuskar-ui-11932532a29d13d8a5d275970aa22425052da579.tar.gz | |
Merge "Add {% load url from future %} to templates"
6 files changed, 6 insertions, 0 deletions
diff --git a/tuskar_ui/infrastructure/resource_management/templates/resource_management/flavors/detail.html b/tuskar_ui/infrastructure/resource_management/templates/resource_management/flavors/detail.html index 0a66d909..80229834 100644 --- a/tuskar_ui/infrastructure/resource_management/templates/resource_management/flavors/detail.html +++ b/tuskar_ui/infrastructure/resource_management/templates/resource_management/flavors/detail.html @@ -1,5 +1,6 @@ {% extends 'infrastructure/base_detail.html' %} {% load i18n %} +{% load url from future %} {% block title %}{% trans "Flavor Detail"%}{% endblock %} {% block page_header %} diff --git a/tuskar_ui/infrastructure/resource_management/templates/resource_management/index.html b/tuskar_ui/infrastructure/resource_management/templates/resource_management/index.html index 1e49c356..11d1d8ad 100644 --- a/tuskar_ui/infrastructure/resource_management/templates/resource_management/index.html +++ b/tuskar_ui/infrastructure/resource_management/templates/resource_management/index.html @@ -1,5 +1,6 @@ {% extends 'infrastructure/base.html' %} {% load i18n %} +{% load url from future %} {% block title %}{% trans "Resource Management" %}{% endblock %} {% block page_header %} diff --git a/tuskar_ui/infrastructure/resource_management/templates/resource_management/nodes/detail.html b/tuskar_ui/infrastructure/resource_management/templates/resource_management/nodes/detail.html index 6b9278f0..6285279e 100644 --- a/tuskar_ui/infrastructure/resource_management/templates/resource_management/nodes/detail.html +++ b/tuskar_ui/infrastructure/resource_management/templates/resource_management/nodes/detail.html @@ -1,5 +1,6 @@ {% extends 'infrastructure/base_detail.html' %} {% load i18n %} +{% load url from future %} {% block title %}{% trans "Node Detail"%}{% endblock %} {% block page_header %} diff --git a/tuskar_ui/infrastructure/resource_management/templates/resource_management/nodes/unracked.html b/tuskar_ui/infrastructure/resource_management/templates/resource_management/nodes/unracked.html index 19a3145a..15c016ba 100644 --- a/tuskar_ui/infrastructure/resource_management/templates/resource_management/nodes/unracked.html +++ b/tuskar_ui/infrastructure/resource_management/templates/resource_management/nodes/unracked.html @@ -1,5 +1,6 @@ {% extends 'infrastructure/base.html' %} {% load i18n %} +{% load url from future %} {% block title %}{% trans "Resource Management" %}{% endblock %} {% block page_header %} diff --git a/tuskar_ui/infrastructure/resource_management/templates/resource_management/racks/detail.html b/tuskar_ui/infrastructure/resource_management/templates/resource_management/racks/detail.html index 4b377d73..8ac1cfa4 100644 --- a/tuskar_ui/infrastructure/resource_management/templates/resource_management/racks/detail.html +++ b/tuskar_ui/infrastructure/resource_management/templates/resource_management/racks/detail.html @@ -1,5 +1,6 @@ {% extends 'infrastructure/base_detail.html' %} {% load i18n %} +{% load url from future %} {% block title %}{% trans "Rack Detail"%}{% endblock %} {% block page_header %} diff --git a/tuskar_ui/infrastructure/resource_management/templates/resource_management/resource_classes/detail.html b/tuskar_ui/infrastructure/resource_management/templates/resource_management/resource_classes/detail.html index 9e14917e..4a1047d1 100644 --- a/tuskar_ui/infrastructure/resource_management/templates/resource_management/resource_classes/detail.html +++ b/tuskar_ui/infrastructure/resource_management/templates/resource_management/resource_classes/detail.html @@ -1,5 +1,6 @@ {% extends 'infrastructure/base_detail.html' %} {% load i18n sizeformat %} +{% load url from future %} {% block title %}{% trans "Resource Class Detail" %}{% endblock %} {% block page_header %} |