diff --git a/gbpui/common/__init__.py b/gbpui/common/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/gbpui/common/forms.py b/gbpui/common/forms.py
new file mode 100644
index 0000000..09473a5
--- /dev/null
+++ b/gbpui/common/forms.py
@@ -0,0 +1,33 @@
+# Copyright 2012 Nebula, Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+from horizon import forms
+
+from django.core.urlresolvers import reverse
+
+
+class ReversingModalFormView(forms.ModalFormView):
+ def get_context_data(self, **kwargs):
+ context = super(ReversingModalFormView, self).get_context_data(
+ **kwargs)
+ context['submit_url'] = self.get_submit_url(**kwargs)
+ return context
+
+ def get_submit_url_params(self, **kwargs):
+ return {}
+
+ def get_submit_url(self, **kwargs):
+ submit_params = self.get_submit_url_params(**kwargs)
+ submit_url = reverse(self.submit_url, kwargs=submit_params)
+ return submit_url
diff --git a/gbpui/panels/policytargets/tabs.py b/gbpui/panels/policytargets/tabs.py
index bb21e4b..c191a18 100644
--- a/gbpui/panels/policytargets/tabs.py
+++ b/gbpui/panels/policytargets/tabs.py
@@ -84,7 +84,7 @@ class PTGDetailsTab(tabs.Tab):
name = _("Group Details")
slug = "policy_targetdetails"
template_name = "project/policytargets/_policy_target_details.html"
- failure_url = reverse_lazy('horizon:project:policy_target_group:index')
+ failure_url = reverse_lazy('horizon:project:policytargets:index')
def get_context_data(self, request):
policy_targetid = self.tab_group.kwargs['policy_target_id']
diff --git a/gbpui/panels/policytargets/templates/policytargets/_add_consumed.html b/gbpui/panels/policytargets/templates/policytargets/_add_consumed.html
deleted file mode 100644
index 1e793ae..0000000
--- a/gbpui/panels/policytargets/templates/policytargets/_add_consumed.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{% extends "horizon/common/_modal_form.html" %}
-{% load i18n %}
-{% load url from future %}
-
-{% block form_id %}add_consumed_form{% endblock %}
-{% block form_action %}{% url 'horizon:project:policytargets:add_consumed' policy_target_id %}{% endblock %}
-
-{% block modal-header %}{% trans "Add " %}{% endblock %}
-
-{% block modal-body %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Add Consumed Policy Rule Set. Press Ctrl to select multiple items." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Add Consumed Policy Rule Set. Press Ctrl to select multiple items." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Add Policy Rule Set. Press Ctrl to select multiple items." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Add L3 Policy." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Add Policy Rule Set. Press Ctrl to select multiple items." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Add Provided Policy Rule Set. Press Ctrl to select multiple items." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Launch instance here." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Launch instance here." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Add Consumed Policy Rule Set. Press Ctrl to select multiple items." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Add Consumed Policy Rule Set. Press Ctrl to select multiple items." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Remove Consumed Policy Rule Set. Press Ctrl to select multiple items." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Remove Consumed Policy Rule Set. Press Ctrl to select multiple items." %}
-
-
-
- - {% trans "Name" %}
- - {{ l3policy.name|default:_("-") }}
-
- - {% trans "Description" %}
- - {{ l3policy.description|default:_("-") }}
-
- - {% trans "ID" %}
- - {{ l3policy.id }}
-
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Remove Consumed Policy Rule Set. Press Ctrl to select multiple items." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Remove Consumed Policy Rule Set. Press Ctrl to select multiple items." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Remove Policy Rule Set. Press Ctrl to select multiple items." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Remove Consumed Policy Rule Set. Press Ctrl to select multiple items." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "You may update external group details here." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "Update L3 Policy." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "You may update group details here." %}
-
-
-
-
-
{% trans "Description:" %}
-
{% trans "You may update policy_target details here." %}
-
diff --git a/gbpui/panels/policytargets/templates/policytargets/group_details.html b/gbpui/panels/policytargets/templates/policytargets/group_details.html
index bb0b140..c7ae02a 100644
--- a/gbpui/panels/policytargets/templates/policytargets/group_details.html
+++ b/gbpui/panels/policytargets/templates/policytargets/group_details.html
@@ -2,10 +2,6 @@
{% load i18n %}
{% block title %}{% trans "Groups Details" %}{% endblock %}
-{% block page_header %}
-{% include "horizon/common/_page_header.html" with title=_("Group : ")|add:policy_target.name %}
-{% endblock page_header %}
-
{% block main %}
diff --git a/gbpui/panels/policytargets/templates/policytargets/updateepg.html b/gbpui/panels/policytargets/templates/policytargets/updateepg.html
deleted file mode 100644
index b49e42f..0000000
--- a/gbpui/panels/policytargets/templates/policytargets/updateepg.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends 'base.html' %}
-{% load i18n %}
-{% block title %}{% trans "Edit Endpoint Group" %}{% endblock %}
-
-{% block page_header %}
- {% include "horizon/common/_page_header.html" with title=_("Edit Group ")|add:name %}
-{% endblock page_header %}
-
-{% block main %}
- {% include 'project/policy_target_groups/_updatepolicy_target.html' %}
-{% endblock %}
diff --git a/gbpui/panels/policytargets/views.py b/gbpui/panels/policytargets/views.py
index ca9ae3a..1a161d5 100644
--- a/gbpui/panels/policytargets/views.py
+++ b/gbpui/panels/policytargets/views.py
@@ -24,6 +24,8 @@ from horizon.utils import memoized
from horizon import workflows
from gbpui import client
+from gbpui.common import forms as gbforms
+
import forms as policy_target_forms
import tabs as policy_target_tabs
@@ -103,13 +105,13 @@ class UpdatePTGView(forms.ModalFormView):
form_class = policy_target_forms.UpdatePolicyTargetForm
form_id = "update_policy_target_form"
modal_header = _("Edit Group")
- template_name = "project/policytargets/update_policy_target.html"
+ template_name = "gbpui/form_with_description.html"
context_object_name = 'policy_target'
submit_label = _("Save Changes")
submit_url = "horizon:project:policytargets:updatepolicy_target"
success_url = reverse_lazy("horizon:project:policytargets:index")
page_title = _("Edit Group")
- help_text = _("You may update policy details here.")
+ help_text = _("You may update group details here.")
def get_context_data(self, **kwargs):
context = super(UpdatePTGView, self).get_context_data(**kwargs)
@@ -143,7 +145,7 @@ class UpdateExternalPTGView(forms.ModalFormView):
form_class = policy_target_forms.UpdateExternalPolicyTargetForm
form_id = "update_policy_target_form"
modal_header = _("Edit Group")
- template_name = "project/policytargets/update_external_policy_target.html"
+ template_name = "gbpui/form_with_description.html"
context_object_name = 'external_policy_target'
submit_label = _("Save Changes")
submit_url = "horizon:project:policytargets:update_ext_policy_target"
@@ -179,11 +181,11 @@ class UpdateExternalPTGView(forms.ModalFormView):
return self.kwargs
-class ExtAddProvidedPRSView(forms.ModalFormView):
+class ExtAddProvidedPRSView(gbforms.ReversingModalFormView):
form_class = policy_target_forms.ExtAddProvidedPRSForm
form_id = "ext_add_provided_form"
modal_header = _("Add Provided PRS")
- template_name = "project/policytargets/ext_add_provided_prs.html"
+ template_name = "gbpui/form_with_description.html"
submit_label = _("Save Changes")
submit_url = "horizon:project:policytargets:ext_add_provided_prs"
page_title = _("Add Provided PRS")
@@ -191,20 +193,20 @@ class ExtAddProvidedPRSView(forms.ModalFormView):
"Add provided policy rule set. Press Ctrl to select multiple items."
)
- def get_context_data(self, **kwargs):
- context = super(ExtAddProvidedPRSView, self).get_context_data(**kwargs)
- context["ext_policy_target_id"] = self.kwargs['ext_policy_target_id']
- return context
+ def get_submit_url_params(self, **kwargs):
+ return {
+ 'ext_policy_target_id': self.kwargs['ext_policy_target_id']
+ }
def get_initial(self):
return self.kwargs
-class ExtRemoveProvidedPRSView(forms.ModalFormView):
+class ExtRemoveProvidedPRSView(gbforms.ReversingModalFormView):
form_class = policy_target_forms.ExtRemoveProvidedPRSForm
form_id = "ext_remove_provided_form"
modal_header = _("Remove Provided PRS")
- template_name = "project/policytargets/ext_remove_provided_prs.html"
+ template_name = "gbpui/form_with_description.html"
submit_label = _("Save Changes")
submit_url = "horizon:project:policytargets:ext_remove_provided_prs"
page_title = _("Remove Provided PRS")
@@ -212,21 +214,20 @@ class ExtRemoveProvidedPRSView(forms.ModalFormView):
"Remove provided policy rule set. Press Ctrl to select multiple items."
)
- def get_context_data(self, **kwargs):
- context = super(ExtRemoveProvidedPRSView, self).get_context_data(
- **kwargs)
- context["ext_policy_target_id"] = self.kwargs['ext_policy_target_id']
- return context
+ def get_submit_url_params(self, **kwargs):
+ return {
+ "ext_policy_target_id": self.kwargs['ext_policy_target_id']
+ }
def get_initial(self):
return self.kwargs
-class AddProvidedPRSView(forms.ModalFormView):
+class AddProvidedPRSView(gbforms.ReversingModalFormView):
form_class = policy_target_forms.AddProvidedPRSForm
form_id = "add_provided_form"
modal_header = _("Add Provided PRS")
- template_name = "project/policytargets/add_provided_prs.html"
+ template_name = "gbpui/form_with_description.html"
submit_label = _("Save Changes")
submit_url = "horizon:project:policytargets:add_provided_prs"
page_title = _("Add Provided PRS")
@@ -234,20 +235,20 @@ class AddProvidedPRSView(forms.ModalFormView):
"Add provided policy rule set. Press Ctrl to select multiple items."
)
- def get_context_data(self, **kwargs):
- context = super(AddProvidedPRSView, self).get_context_data(**kwargs)
- context["policy_target_id"] = self.kwargs['policy_target_id']
- return context
+ def get_submit_url_params(self, **kwargs):
+ return {
+ "policy_target_id": self.kwargs['policy_target_id']
+ }
def get_initial(self):
return self.kwargs
-class RemoveProvidedPRSView(forms.ModalFormView):
+class RemoveProvidedPRSView(gbforms.ReversingModalFormView):
form_class = policy_target_forms.RemoveProvidedPRSForm
form_id = "remove_provided_form"
modal_header = _("Remove Provided PRS")
- template_name = "project/policytargets/remove_provided_prs.html"
+ template_name = "gbpui/form_with_description.html"
submit_label = _("Save Changes")
submit_url = "horizon:project:policytargets:remove_provided_prs"
page_title = _("Remove Provided PRS")
@@ -255,20 +256,20 @@ class RemoveProvidedPRSView(forms.ModalFormView):
"Remove provided policy rule set. Press Ctrl to select multiple items."
)
- def get_context_data(self, **kwargs):
- context = super(RemoveProvidedPRSView, self).get_context_data(**kwargs)
- context["policy_target_id"] = self.kwargs['policy_target_id']
- return context
+ def get_submit_url_params(self, **kwargs):
+ return {
+ "policy_target_id": self.kwargs['policy_target_id']
+ }
def get_initial(self):
return self.kwargs
-class ExtAddConsumedPRSView(forms.ModalFormView):
+class ExtAddConsumedPRSView(gbforms.ReversingModalFormView):
form_class = policy_target_forms.ExtAddConsumedPRSForm
form_id = "ext_add_consumed_form"
modal_header = _("Add Policy Rule Set")
- template_name = "project/policytargets/ext_add_consumed_prs.html"
+ template_name = "gbpui/form_with_description.html"
submit_label = _("Save Changes")
submit_url = "horizon:project:policytargets:ext_add_consumed_prs"
page_title = _("Add Policy Rule Set")
@@ -276,20 +277,20 @@ class ExtAddConsumedPRSView(forms.ModalFormView):
"Add consumed policy rule set. Press Ctrl to select multiple items."
)
- def get_context_data(self, **kwargs):
- context = super(ExtAddConsumedPRSView, self).get_context_data(**kwargs)
- context["ext_policy_target_id"] = self.kwargs['ext_policy_target_id']
- return context
+ def get_submit_url_params(self, **kwargs):
+ return {
+ "ext_policy_target_id": self.kwargs['ext_policy_target_id']
+ }
def get_initial(self):
return self.kwargs
-class ExtRemoveConsumedPRSView(forms.ModalFormView):
+class ExtRemoveConsumedPRSView(gbforms.ReversingModalFormView):
form_class = policy_target_forms.ExtRemoveConsumedPRSForm
form_id = "remove_contract_form"
modal_header = _("Remove Policy Rule Set")
- template_name = "project/policytargets/ext_remove_consumed_prs.html"
+ template_name = "gbpui/form_with_description.html"
submit_label = _("Save Changes")
submit_url = "horizon:project:policytargets:ext_remove_consumed_prs"
page_title = _("Remove Policy Rule Set")
@@ -297,21 +298,20 @@ class ExtRemoveConsumedPRSView(forms.ModalFormView):
"Remove consumed policy rule set. Press Ctrl to select multiple items."
)
- def get_context_data(self, **kwargs):
- context = super(ExtRemoveConsumedPRSView, self).get_context_data(
- **kwargs)
- context["ext_policy_target_id"] = self.kwargs['ext_policy_target_id']
- return context
+ def get_submit_url_params(self, **kwargs):
+ return {
+ "ext_policy_target_id": self.kwargs['ext_policy_target_id']
+ }
def get_initial(self):
return self.kwargs
-class AddConsumedPRSView(forms.ModalFormView):
+class AddConsumedPRSView(gbforms.ReversingModalFormView):
form_class = policy_target_forms.AddConsumedPRSForm
form_id = "add_consumed_form"
modal_header = _("Add ")
- template_name = "project/policytargets/add_consumed_prs.html"
+ template_name = "gbpui/form_with_description.html"
submit_label = _("Save Changes")
submit_url = "horizon:project:policytargets:add_consumed_prs"
page_title = _("Add ")
@@ -319,20 +319,20 @@ class AddConsumedPRSView(forms.ModalFormView):
"Add consumed policy rule set. Press Ctrl to select multiple items."
)
- def get_context_data(self, **kwargs):
- context = super(AddConsumedPRSView, self).get_context_data(**kwargs)
- context["policy_target_id"] = self.kwargs['policy_target_id']
- return context
+ def get_submit_url_params(self, **kwargs):
+ return {
+ "policy_target_id": self.kwargs['policy_target_id']
+ }
def get_initial(self):
return self.kwargs
-class RemoveConsumedPRSView(forms.ModalFormView):
+class RemoveConsumedPRSView(gbforms.ReversingModalFormView):
form_class = policy_target_forms.RemoveConsumedPRSForm
form_id = "remove_contract_form"
modal_header = _("Remove Policy Rule Set")
- template_name = "project/policytargets/remove_consumed_prs.html"
+ template_name = "gbpui/form_with_description.html"
submit_label = _("Save Changes")
submit_url = "horizon:project:policytargets:remove_consumed_prs"
page_title = _("Remove Policy Rule Set")
@@ -340,10 +340,10 @@ class RemoveConsumedPRSView(forms.ModalFormView):
"Remove consumed policy rule set. Press Ctrl to select multiple items."
)
- def get_context_data(self, **kwargs):
- context = super(RemoveConsumedPRSView, self).get_context_data(**kwargs)
- context["policy_target_id"] = self.kwargs['policy_target_id']
- return context
+ def get_submit_url_params(self, **kwargs):
+ return {
+ "policy_target_id": self.kwargs['policy_target_id']
+ }
def get_initial(self):
return self.kwargs
diff --git a/gbpui/templates/gbpui/_form_with_description.html b/gbpui/templates/gbpui/_form_with_description.html
new file mode 100644
index 0000000..8ffa7ac
--- /dev/null
+++ b/gbpui/templates/gbpui/_form_with_description.html
@@ -0,0 +1,7 @@
+{% extends "horizon/common/_modal_form.html" %}
+{% load i18n %}
+
+{% block modal-body-right %}
+
{% trans "Description:" %}
+
{{ help_text }}
+{% endblock %}
diff --git a/gbpui/templates/gbpui/form_with_description.html b/gbpui/templates/gbpui/form_with_description.html
new file mode 100644
index 0000000..b519af1
--- /dev/null
+++ b/gbpui/templates/gbpui/form_with_description.html
@@ -0,0 +1,7 @@
+{% extends 'base.html' %}
+{% load i18n %}
+{% block title %}{% if base_form_title %}{{ base_form_title }}{% else %}{{ page_title }}{% endif %}{% endblock %}
+
+{% block main %}
+ {% include 'gbpui/_form_with_description.html' %}
+{% endblock %}