From 258067fd5483411a5f822c716678c18b8b340e76 Mon Sep 17 00:00:00 2001 From: Ekaterina Chernova Date: Wed, 27 May 2015 17:26:04 +0300 Subject: [PATCH] Update templates regarding changes in horizon * Application wizard template hasn't got a wizard_create template * Templates and views were updated regarding changes in horizon * Use horizon modal form template instead of customized one * Fix padding at app wizard header Change-Id: If3f70ed2359e8d6a229f40ca36000993b29a2286 Closes-Bug: #1459221 --- muranodashboard/categories/views.py | 7 +++- muranodashboard/environments/forms.py | 2 +- muranodashboard/environments/views.py | 16 +++++++-- muranodashboard/images/views.py | 5 +++ .../static/muranodashboard/css/catalog.css | 4 --- .../templates/categories/_add.html | 26 +++----------- muranodashboard/templates/categories/add.html | 6 +--- .../templates/common/_modal_form.html | 36 ------------------- .../templates/environments/_create.html | 24 ++++++------- .../templates/environments/_fields.html | 19 ---------- .../templates/environments/_update.html | 18 +--------- .../templates/environments/create.html | 4 --- .../templates/environments/update.html | 5 --- muranodashboard/templates/images/_mark.html | 32 +++++------------ muranodashboard/templates/images/mark.html | 4 --- .../templates/packages/_modify_package.html | 12 ++----- .../templates/services/_wizard_create.html | 4 +-- .../templates/services/wizard_create.html | 11 ++++++ muranodashboard/tests/functional/base.py | 2 +- .../tests/functional/sanity_check.py | 2 +- 20 files changed, 70 insertions(+), 169 deletions(-) delete mode 100644 muranodashboard/templates/common/_modal_form.html delete mode 100644 muranodashboard/templates/environments/_fields.html create mode 100644 muranodashboard/templates/services/wizard_create.html diff --git a/muranodashboard/categories/views.py b/muranodashboard/categories/views.py index da70ee085..32a8cd840 100644 --- a/muranodashboard/categories/views.py +++ b/muranodashboard/categories/views.py @@ -13,7 +13,7 @@ # under the License. from django.core.urlresolvers import reverse_lazy - +from django.utils.translation import ugettext_lazy as _ from horizon.forms import views from horizon import tables as horizon_tables @@ -36,6 +36,11 @@ class CategoriesView(horizon_tables.DataTableView): class AddCategoryView(views.ModalFormView): form_class = forms.AddCategoryForm + form_id = 'add_category_form' + modal_header = _('Add Category') template_name = 'categories/add.html' context_object_name = 'category' + page_title = _('Add Application Category') success_url = reverse_lazy('horizon:murano:categories:index') + submit_label = _('Add') + submit_url = reverse_lazy('horizon:murano:categories:add') diff --git a/muranodashboard/environments/forms.py b/muranodashboard/environments/forms.py index ddb4d54d3..9116dcd79 100644 --- a/muranodashboard/environments/forms.py +++ b/muranodashboard/environments/forms.py @@ -58,7 +58,7 @@ class CreateEnvironmentForm(horizon_forms.SelfHandlingForm): return False -class EditEnvironmentView(horizon_forms.SelfHandlingForm): +class EditEnvironmentForm(horizon_forms.SelfHandlingForm): name = forms.CharField(label="Environment Name", validators=NAME_VALIDATORS, diff --git a/muranodashboard/environments/views.py b/muranodashboard/environments/views.py index ac17265aa..dd7a57516 100644 --- a/muranodashboard/environments/views.py +++ b/muranodashboard/environments/views.py @@ -119,8 +119,13 @@ class DetailServiceView(tabs.TabbedTableView): class CreateEnvironmentView(views.ModalFormView): form_class = env_forms.CreateEnvironmentForm + form_id = 'create_environment_form' + modal_header = _('Create Environment') template_name = 'environments/create.html' + page_title = _('Create Environment') context_object_name = 'environment' + submit_label = _('Create') + submit_url = reverse_lazy('horizon:murano:environments:create_environment') def get_form(self, form_class): if 'next' in self.request.GET: @@ -139,15 +144,20 @@ class CreateEnvironmentView(views.ModalFormView): class EditEnvironmentView(views.ModalFormView): - form_class = env_forms.EditEnvironmentView + form_class = env_forms.EditEnvironmentForm + form_id = 'update_environment_form' + modal_header = _('Edit Environment') template_name = 'environments/update.html' - context_object_name = 'environment' + page_title = _('Edit Environment') + submit_url = 'horizon:murano:environments:update_environment' + submit_label = _('Edit') success_url = reverse_lazy('horizon:murano:environments:index') def get_context_data(self, **kwargs): context = super(EditEnvironmentView, self).get_context_data(**kwargs) env_id = getattr(self.get_object(), 'id') - context["env_id"] = env_id + context['env_id'] = env_id + context['submit_url'] = reverse(self.submit_url, args=(env_id,)) return context @memoized.memoized_method diff --git a/muranodashboard/images/views.py b/muranodashboard/images/views.py index c283d9b2f..4a641708f 100644 --- a/muranodashboard/images/views.py +++ b/muranodashboard/images/views.py @@ -46,6 +46,11 @@ class MarkedImagesView(horizon_tables.DataTableView): class MarkImageView(views.ModalFormView): form_class = forms.MarkImageForm + form_id = 'mark_murano_image_form' + modal_header = _('Add Murano Metadata') template_name = 'images/mark.html' context_object_name = 'image' + page_title = _("Update Image") success_url = reverse_lazy('horizon:murano:images:index') + submit_label = _('Mark Image') + submit_url = reverse_lazy('horizon:murano:images:mark_image') diff --git a/muranodashboard/static/muranodashboard/css/catalog.css b/muranodashboard/static/muranodashboard/css/catalog.css index 0c97be7c7..8e3479d23 100644 --- a/muranodashboard/static/muranodashboard/css/catalog.css +++ b/muranodashboard/static/muranodashboard/css/catalog.css @@ -434,10 +434,6 @@ h3.link .caret { } } -.modal-header.ui-draggable-handle { - padding: 0 15px; -} - .modal-header img { margin-top: -7px; } diff --git a/muranodashboard/templates/categories/_add.html b/muranodashboard/templates/categories/_add.html index 5591ff02d..9b9109f2f 100644 --- a/muranodashboard/templates/categories/_add.html +++ b/muranodashboard/templates/categories/_add.html @@ -1,30 +1,14 @@ -{% extends 'common/_modal_form.html' %} +{% extends 'horizon/common/_modal_form.html' %} {% load i18n %} {% load url from future %} -{% block form_id %}add_category_form{% endblock %} -{% block form_attrs %}enctype='multipart/form-data'{% endblock %} -{% block form_action %}{% url 'horizon:murano:categories:add' %}{% endblock %} -{% block modal-header %}{% trans 'Add Application Category' %}{% endblock %} -{% block modal_id %}add_category_form{% endblock %} -{% block modal-body %} -
-
- {% include 'horizon/common/_form_fields.html' %} -
-
-
+{% block modal-body-right %}

{% trans 'Description:' %}

{% trans 'Add new category to the application catalog. ' %}

- {% trans 'Name' %}: - {% blocktrans %}Provide desired name for a new category{% endblocktrans %} + {% trans 'Name' %}: + {% blocktrans %}Provide desired name for a new + category{% endblocktrans %}

-
-{% endblock %} - -{% block modal-footer %} - - {% trans "Cancel" %} {% endblock %} diff --git a/muranodashboard/templates/categories/add.html b/muranodashboard/templates/categories/add.html index 81aeb2f8e..e5b5748b5 100644 --- a/muranodashboard/templates/categories/add.html +++ b/muranodashboard/templates/categories/add.html @@ -1,10 +1,6 @@ {% extends 'base.html' %} {% load i18n %} -{% block title %}{% trans "Add category" %}{% endblock %} - -{% block page_header %} - {% include 'horizon/common/_page_header.html' with title=_('Add Category') %} -{% endblock page_header %} +{% block title %}{% trans "Add Category" %}{% endblock %} {% block main %} {% include 'categories/_add.html' %} diff --git a/muranodashboard/templates/common/_modal_form.html b/muranodashboard/templates/common/_modal_form.html deleted file mode 100644 index 4387134ba..000000000 --- a/muranodashboard/templates/common/_modal_form.html +++ /dev/null @@ -1,36 +0,0 @@ - -{% block modal-js %} -{% endblock %} diff --git a/muranodashboard/templates/environments/_create.html b/muranodashboard/templates/environments/_create.html index b381ef2e3..494b75d2f 100644 --- a/muranodashboard/templates/environments/_create.html +++ b/muranodashboard/templates/environments/_create.html @@ -1,17 +1,15 @@ -{% extends 'common/_modal_form.html' %} +{% extends 'horizon/common/_modal_form.html' %} {% load i18n %} {% load url from future %} -{% block form_id %}create_environment_form{% endblock %} -{% block form_attrs %}enctype='multipart/form-data'{% endblock %} -{% block form_action %}{% url 'horizon:murano:environments:create_environment' %}{% endblock %} -{% block modal-header %}{% trans 'Create Environment' %}{% endblock %} -{% block modal_id %}create_environment_form{% endblock %} -{% block modal-body %} - {% include "environments/_fields.html" %} -{% endblock %} - -{% block modal-footer %} - - {% trans 'Cancel' %} +{% block modal-body-right %} +

{% trans 'Description:' %}

+

+ {% trans 'Environment Name' %}: + {% blocktrans %}Create a name for the environment{% endblocktrans %} +

+

+ {% blocktrans %} An environment is a collection of instances that + are meant to operate under similar conditions.{% endblocktrans %} +

{% endblock %} diff --git a/muranodashboard/templates/environments/_fields.html b/muranodashboard/templates/environments/_fields.html deleted file mode 100644 index 4f69abf82..000000000 --- a/muranodashboard/templates/environments/_fields.html +++ /dev/null @@ -1,19 +0,0 @@ -{% load i18n %} - -
-
- {% include 'horizon/common/_form_fields.html' %} -
-
-
-

{% trans 'Description:' %}

-

- {% trans 'Environment Name' %}: - {% blocktrans %}Create a name for the environment{% endblocktrans %} -

-

- {% blocktrans %} An environment is a collection of instances that - are meant to operate under similar conditions.{% endblocktrans %} -

- -
diff --git a/muranodashboard/templates/environments/_update.html b/muranodashboard/templates/environments/_update.html index 71eb154bd..43e4fa501 100644 --- a/muranodashboard/templates/environments/_update.html +++ b/muranodashboard/templates/environments/_update.html @@ -1,17 +1 @@ -{% extends 'common/_modal_form.html' %} -{% load i18n %} -{% load url from future %} - -{% block form_id %}update_environment_form{% endblock %} -{% block form_attrs %}enctype='multipart/form-data'{% endblock %} -{% block form_action %}{% url 'horizon:murano:environments:update_environment' env_id %}{% endblock %} -{% block modal-header %}{% trans 'Edit Environment' %}{% endblock %} -{% block modal_id %}update_environment_form{% endblock %} -{% block modal-body %} - {% include "environments/_fields.html" %} -{% endblock %} - -{% block modal-footer %} - - {% trans "Cancel" %} -{% endblock %} +{% include 'environments/_create.html' %} \ No newline at end of file diff --git a/muranodashboard/templates/environments/create.html b/muranodashboard/templates/environments/create.html index 92274264e..c343ee087 100644 --- a/muranodashboard/templates/environments/create.html +++ b/muranodashboard/templates/environments/create.html @@ -2,10 +2,6 @@ {% load i18n %} {% block title %}{% trans "Create Environment" %}{% endblock %} -{% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Create Environment") %} -{% endblock page_header %} - {% block main %} {% include 'environments/_create.html' %} {% endblock %} diff --git a/muranodashboard/templates/environments/update.html b/muranodashboard/templates/environments/update.html index 67ecc48df..a40f28cee 100644 --- a/muranodashboard/templates/environments/update.html +++ b/muranodashboard/templates/environments/update.html @@ -2,11 +2,6 @@ {% load i18n %} {% block title %}{% trans "Edit Environment" %}{% endblock %} -{% block page_header %} - {% include "horizon/common/_page_header.html" with title=_("Edit Environment") %} -{% endblock page_header %} - {% block main %} {% include 'environments/_update.html' %} {% endblock %} - diff --git a/muranodashboard/templates/images/_mark.html b/muranodashboard/templates/images/_mark.html index 27ca104e8..dca901bc6 100644 --- a/muranodashboard/templates/images/_mark.html +++ b/muranodashboard/templates/images/_mark.html @@ -1,37 +1,23 @@ -{% extends 'common/_modal_form.html' %} +{% extends 'horizon/common/_modal_form.html' %} {% load i18n %} {% load url from future %} -{% block form_id %}mark_murano_image_form{% endblock %} -{% block form_attrs %}enctype='multipart/form-data'{% endblock %} -{% block form_action %}{% url 'horizon:murano:images:mark_image' %}{% endblock %} -{% block modal-header %}{% trans 'Mark Image' %}{% endblock %} -{% block modal_id %}mark_murano_image_form{% endblock %} -{% block modal-body %} -
-
- {% include 'horizon/common/_form_fields.html' %} -
-
-
+{% block modal-body-right %}

{% trans 'Description:' %}

{% trans 'Mark an image with Murano specific metadata to be added to the selected image.' %}

- {% trans 'Image' %}: - {% blocktrans %}Select an image registered in Glance Image Services.{% endblocktrans %} + {% trans 'Image' %}: + {% blocktrans %}Select an image registered in Glance Image + Services.{% endblocktrans %}

- {% trans 'Image Title' %}: + {% trans 'Image Title' %}: {% blocktrans %}Create a title for an image.{% endblocktrans %}

- {% trans 'Image Type' %}: - {% blocktrans %}Select an image type supported by Murano.{% endblocktrans %} + {% trans 'Image Type' %}: + {% blocktrans %}Select an image type supported by + Murano.{% endblocktrans %}

-
-{% endblock %} -{% block modal-footer %} - - {% trans "Cancel" %} {% endblock %} diff --git a/muranodashboard/templates/images/mark.html b/muranodashboard/templates/images/mark.html index cd31c45f8..05e7f8ef5 100644 --- a/muranodashboard/templates/images/mark.html +++ b/muranodashboard/templates/images/mark.html @@ -2,10 +2,6 @@ {% load i18n %} {% block title %}{% trans "Mark Image" %}{% endblock %} -{% block page_header %} - {% include 'horizon/common/_page_header.html' with title=_('Mark image with Metadata') %} -{% endblock page_header %} - {% block main %} {% include 'images/_mark.html' %} {% endblock %} diff --git a/muranodashboard/templates/packages/_modify_package.html b/muranodashboard/templates/packages/_modify_package.html index ea5e90186..2679f154d 100644 --- a/muranodashboard/templates/packages/_modify_package.html +++ b/muranodashboard/templates/packages/_modify_package.html @@ -1,4 +1,4 @@ -{% extends 'common/_modal_form.html' %} +{% extends 'horizon/common/_modal_form.html' %} {% load i18n %} {% load url from future %} @@ -7,16 +7,10 @@ {% block modal-header %}{% trans 'Modify Package' %}{% endblock %} {% block modal_id %}modify_package_modal{% endblock %} -{% block modal-body %} -
-
- {% include 'horizon/common/_form_fields.html' %} -
-
-
+ +{% block modal-body-right %} {% include 'packages/_package_params.html' %}

{% blocktrans %}Categories Select up to multiple categories for a package.{% endblocktrans %}

-
{% endblock %} {% block modal-footer %} diff --git a/muranodashboard/templates/services/_wizard_create.html b/muranodashboard/templates/services/_wizard_create.html index 64aad00ba..487d5f6d5 100644 --- a/muranodashboard/templates/services/_wizard_create.html +++ b/muranodashboard/templates/services/_wizard_create.html @@ -1,6 +1,6 @@ -{% extends "common/_modal_form.html" %} +{% extends "horizon/common/_modal_form.html" %} {% load i18n humanize %} -{% load url from future %} {# fix for django 1.4.9 on CentOS #} +{% load url from future %} {% block form_action %} {% url 'horizon:murano:catalog:add' app_id environment_id do_redirect drop_wm_form %} {% endblock %} diff --git a/muranodashboard/templates/services/wizard_create.html b/muranodashboard/templates/services/wizard_create.html new file mode 100644 index 000000000..22449a8f2 --- /dev/null +++ b/muranodashboard/templates/services/wizard_create.html @@ -0,0 +1,11 @@ +{% extends 'base.html' %} +{% load i18n %} +{% block title %}{% trans "Add Application" %}{% endblock %} + +{% block page_header %} + {% include "horizon/common/_page_header.html" with title=_("Add Application") %} +{% endblock page_header %} + +{% block main %} + {% include 'services/_wizard_create.html' %} +{% endblock %} diff --git a/muranodashboard/tests/functional/base.py b/muranodashboard/tests/functional/base.py index 240bb78cd..6c66c3d10 100644 --- a/muranodashboard/tests/functional/base.py +++ b/muranodashboard/tests/functional/base.py @@ -288,7 +288,7 @@ class ImageTestCase(PackageBase): self.select_from_list('image', self.image.id) self.fill_field(by.By.ID, 'id_title', self.image_title) self.select_from_list('type', 'linux') - self.select_and_click_element('Mark') + self.select_and_click_element('Mark Image') self.check_element_on_page(by.By.XPATH, consts.TestImage.format(self.image_title)) diff --git a/muranodashboard/tests/functional/sanity_check.py b/muranodashboard/tests/functional/sanity_check.py index b80b72265..5b42d00df 100644 --- a/muranodashboard/tests/functional/sanity_check.py +++ b/muranodashboard/tests/functional/sanity_check.py @@ -109,7 +109,7 @@ class TestSuiteImage(base.ImageTestCase): new_title = 'RenamedImage ' + str(time.time()) self.fill_field(by.By.ID, 'id_title', new_title) self.select_from_list('type', 'linux') - self.select_and_click_element('Mark') + self.select_and_click_element('Mark Image') self.check_element_on_page(by.By.XPATH, c.TestImage.format(new_title)) self.repair_image()