openstack
/
horizon
Code Issues Proposed changes

Remove duplicated modal_header statements 

Across the codebase we've been using modal_header values that are
identical (or very close to) the page_title values. This patch sets the
modal_header to default to the page_title value, and cleans up a few
inconsistencies. Also deleted a couple of redundant submit_label values
that were identical to the default ("Submit").

Change-Id: I88815c3801c29b3fbc41e0cb426a50653255595f
Closes-Bug: 1653960
This commit is contained in:
Rob Cresswell 2017-01-04 13:31:36 +00:00
parent 4639163d67
commit 83e3ff88ec
34 changed files with 32 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
horizon/templates/horizon/common/_modal.html
View File

@ -10,7 +10,7 @@
<span class="fa fa-times"></span>
</a>
{% endif %}
<h3 class="modal-title">{% block modal-header %}{{ modal_header }}{% endblock %}</h3>
<h3 class="modal-title">{% block modal-header %}{{ modal_header|default:page_title }}{% endblock %}</h3>
</div>
{% endblock %}
{% block content %}

1
openstack_dashboard/dashboards/admin/floating_ips/views.py
View File

@ -157,7 +157,6 @@ class AllocateView(forms.ModalFormView):
form_class = fip_forms.AdminFloatingIpAllocate
form_id = "allocate_floating_ip_form"
template_name = 'admin/floating_ips/allocate.html'
modal_header = _("Allocate Floating IP")
submit_label = _("Allocate Floating IP")
submit_url = reverse_lazy("horizon:admin:floating_ips:allocate")
cancel_url = reverse_lazy('horizon:admin:floating_ips:index')

2
openstack_dashboard/dashboards/admin/networks/agents/views.py
View File

@ -33,7 +33,7 @@ class AddView(forms.ModalFormView):
failure_url = 'horizon:admin:networks:detail'
submit_url = "horizon:admin:networks:adddhcpagent"
title_and_label = _("Add DHCP Agent")
submit_label = modal_header = page_title = title_and_label
submit_label = page_title = title_and_label
def get_success_url(self):
return reverse(self.success_url,

1
openstack_dashboard/dashboards/admin/networks/ports/views.py
View File

@ -34,7 +34,6 @@ from openstack_dashboard.dashboards.project.networks.ports \
class CreateView(forms.ModalFormView):
form_class = ports_forms.CreatePort
form_id = "create_port_form"
modal_header = _("Create Port")
submit_label = _("Create Port")
submit_url = "horizon:admin:networks:addport"
page_title = _("Create Port")

1
openstack_dashboard/dashboards/admin/volumes/snapshots/views.py
View File

@ -30,7 +30,6 @@ from openstack_dashboard.dashboards.project.volumes.snapshots \
class UpdateStatusView(forms.ModalFormView):
form_class = vol_snapshot_forms.UpdateStatus
modal_header = _("Update Volume Snapshot Status")
modal_id = "update_volume_snapshot_status"
template_name = 'admin/volumes/snapshots/update_status.html'
submit_label = _("Update Status")

8
openstack_dashboard/dashboards/admin/volumes/volume_types/extras/views.py
View File

@ -60,7 +60,7 @@ class IndexView(ExtraSpecMixin, forms.ModalFormMixin, tables.DataTableView):
class CreateView(ExtraSpecMixin, forms.ModalFormView):
form_class = project_forms.CreateExtraSpec
form_id = "extra_spec_create_form"
modal_header = _("Create Volume Type Extra Spec")
page_title = _("Create Volume Type Extra Spec")
modal_id = "extra_spec_create_modal"
submit_label = _("Create")
submit_url = "horizon:admin:volumes:volume_types:extras:create"
@ -85,7 +85,7 @@ class CreateView(ExtraSpecMixin, forms.ModalFormView):
class EditView(ExtraSpecMixin, forms.ModalFormView):
form_class = project_forms.EditExtraSpec
form_id = "extra_spec_edit_form"
modal_header = _('Edit Extra Spec Value: %s')
page_title = _('Edit Extra Spec Value: %s')
modal_id = "extra_spec_edit_modal"
submit_label = _("Save")
submit_url = "horizon:admin:volumes:volume_types:extras:edit"
@ -117,12 +117,12 @@ class EditView(ExtraSpecMixin, forms.ModalFormView):
context = super(EditView, self).get_context_data(**kwargs)
args = (self.kwargs['type_id'], self.kwargs['key'],)
context['submit_url'] = reverse(self.submit_url, args=args)
context['modal_header'] = self.modal_header % self.kwargs['key']
context['page_title'] = self.page_title % self.kwargs['key']
return context
def form_invalid(self, form):
context = super(EditView, self).get_context_data()
context = self._populate_context(context)
context['form'] = form
context['modal_header'] = self.modal_header % self.kwargs['key']
context['page_title'] = self.page_title % self.kwargs['key']
return self.render_to_response(context)

6
openstack_dashboard/dashboards/admin/volumes/volume_types/qos_specs/views.py
View File

@ -70,13 +70,12 @@ class CreateKeyValuePairView(QosSpecMixin, forms.ModalFormView):
# this for creating a spec key-value pair for an existing QOS Spec
form_class = project_forms.CreateKeyValuePair
form_id = "extra_spec_create_form"
modal_header = _("Create Spec")
modal_id = "qos_spec_create_modal"
template_name = 'admin/volumes/volume_types/qos_specs/create.html'
submit_label = _("Create")
submit_url = "horizon:admin:volumes:volume_types:qos_specs:create"
url = 'horizon:admin:volumes:volume_types_tab'
page_title = _("Spec: {{ qos_spec_name }}")
page_title = _("Create Extra Spec For {{ qos_spec_name }}")
def get_initial(self):
qos_spec_id = self.kwargs['qos_spec_id']
@ -97,13 +96,12 @@ class CreateKeyValuePairView(QosSpecMixin, forms.ModalFormView):
class EditKeyValuePairView(QosSpecMixin, forms.ModalFormView):
form_class = project_forms.EditKeyValuePair
form_id = "qos_spec_edit_form"
modal_header = _("Edit Spec Value")
modal_id = "qos_spec_edit_modal"
template_name = 'admin/volumes/volume_types/qos_specs/edit.html'
submit_label = _("Save")
submit_url = "horizon:admin:volumes:volume_types:qos_specs:edit"
url = 'horizon:admin:volumes:volume_types_tab'
page_title = _("QoS Spec: {{ qos_spec_name }}")
page_title = _("Edit {{ qos_spec_name }} Spec Value")
def get_success_url(self):
return reverse(self.url)

10
openstack_dashboard/dashboards/admin/volumes/volume_types/views.py
View File

@ -30,13 +30,12 @@ from openstack_dashboard.dashboards.admin.volumes.volume_types \
class CreateVolumeTypeView(forms.ModalFormView):
form_class = volume_types_forms.CreateVolumeType
modal_header = _("Create Volume Type")
modal_id = "create_volume_type_modal"
template_name = 'admin/volumes/volume_types/create_volume_type.html'
submit_label = _("Create Volume Type")
submit_url = reverse_lazy("horizon:admin:volumes:volume_types:create_type")
success_url = reverse_lazy('horizon:admin:volumes:volume_types_tab')
page_title = _("Create a Volume Type")
page_title = _("Create Volume Type")
class VolumeTypeEncryptionDetailView(views.HorizonTemplateView):
@ -75,7 +74,6 @@ class VolumeTypeEncryptionDetailView(views.HorizonTemplateView):
class CreateVolumeTypeEncryptionView(forms.ModalFormView):
form_class = volume_types_forms.CreateVolumeTypeEncryption
form_id = "create_volume_form"
modal_header = _("Create Volume Type Encryption")
modal_id = "create_volume_type_modal"
template_name = ("admin/volumes/volume_types/"
"create_volume_type_encryption.html")
@ -156,7 +154,6 @@ def _get_volume_type_name(request, kwargs):
class UpdateVolumeTypeEncryptionView(forms.ModalFormView):
form_class = volume_types_forms.UpdateVolumeTypeEncryption
form_id = "update_volume_form"
modal_header = _("Update Volume Type Encryption")
modal_id = "update_volume_type_modal"
template_name = ("admin/volumes/volume_types/"
"update_volume_type_encryption.html")
@ -204,11 +201,10 @@ class UpdateVolumeTypeEncryptionView(forms.ModalFormView):
class CreateQosSpecView(forms.ModalFormView):
form_class = volume_types_forms.CreateQosSpec
modal_header = _("Create QoS Spec")
modal_id = "create_volume_type_modal"
template_name = 'admin/volumes/volume_types/create_qos_spec.html'
success_url = reverse_lazy('horizon:admin:volumes:volume_types_tab')
page_title = _("Create a QoS Spec")
page_title = _("Create QoS Spec")
submit_label = _("Create")
submit_url = reverse_lazy(
"horizon:admin:volumes:volume_types:create_qos_spec")
@ -216,7 +212,6 @@ class CreateQosSpecView(forms.ModalFormView):
class EditQosSpecConsumerView(forms.ModalFormView):
form_class = volume_types_forms.EditQosSpecConsumer
modal_header = _("Edit Consumer of QoS Spec")
modal_id = "edit_qos_spec_modal"
template_name = 'admin/volumes/volume_types/edit_qos_spec_consumer.html'
submit_label = _("Modify Consumer")
@ -252,7 +247,6 @@ class EditQosSpecConsumerView(forms.ModalFormView):
class ManageQosSpecAssociationView(forms.ModalFormView):
form_class = volume_types_forms.ManageQosSpecAssociation
modal_header = _("Associate QoS Spec with Volume Type")
modal_id = "associate_qos_spec_modal"
template_name = 'admin/volumes/volume_types/associate_qos_spec.html'
submit_label = _("Associate")

8
openstack_dashboard/dashboards/admin/volumes/volumes/views.py
View File

@ -41,13 +41,12 @@ class DetailView(volumes_views.DetailView):
class ManageVolumeView(forms.ModalFormView):
form_class = volumes_forms.ManageVolume
template_name = 'admin/volumes/volumes/manage_volume.html'
modal_header = _("Manage Volume")
form_id = "manage_volume_modal"
submit_label = _("Manage")
success_url = reverse_lazy('horizon:admin:volumes:volumes_tab')
submit_url = reverse_lazy('horizon:admin:volumes:volumes:manage')
cancel_url = reverse_lazy("horizon:admin:volumes:index")
page_title = _("Manage a Volume")
page_title = _("Manage Volume")
def get_context_data(self, **kwargs):
context = super(ManageVolumeView, self).get_context_data(**kwargs)
@ -57,13 +56,12 @@ class ManageVolumeView(forms.ModalFormView):
class UnmanageVolumeView(forms.ModalFormView):
form_class = volumes_forms.UnmanageVolume
template_name = 'admin/volumes/volumes/unmanage_volume.html'
modal_header = _("Confirm Unmanage Volume")
form_id = "unmanage_volume_modal"
submit_label = _("Unmanage")
success_url = reverse_lazy('horizon:admin:volumes:volumes_tab')
submit_url = 'horizon:admin:volumes:volumes:unmanage'
cancel_url = reverse_lazy("horizon:admin:volumes:index")
page_title = _("Unmanage a Volume")
page_title = _("Unmanage Volume")
def get_context_data(self, **kwargs):
context = super(UnmanageVolumeView, self).get_context_data(**kwargs)
@ -92,7 +90,6 @@ class UnmanageVolumeView(forms.ModalFormView):
class MigrateVolumeView(forms.ModalFormView):
form_class = volumes_forms.MigrateVolume
template_name = 'admin/volumes/volumes/migrate_volume.html'
modal_header = _("Migrate Volume")
form_id = "migrate_volume_modal"
submit_label = _("Migrate")
success_url = reverse_lazy('horizon:admin:volumes:volumes_tab')
@ -136,7 +133,6 @@ class MigrateVolumeView(forms.ModalFormView):
class UpdateStatusView(forms.ModalFormView):
form_class = volumes_forms.UpdateStatus
modal_header = _("Update Volume Status")
modal_id = "update_volume_status_modal"
template_name = 'admin/volumes/volumes/update_status.html'
submit_label = _("Update Status")

2
openstack_dashboard/dashboards/identity/groups/views.py
View File

@ -58,7 +58,6 @@ class IndexView(tables.DataTableView):
class CreateView(forms.ModalFormView):
template_name = constants.GROUPS_CREATE_VIEW_TEMPLATE
modal_header = _("Create Group")
form_id = "create_group_form"
form_class = project_forms.CreateGroupForm
submit_label = _("Create Group")
@ -69,7 +68,6 @@ class CreateView(forms.ModalFormView):
class UpdateView(forms.ModalFormView):
template_name = constants.GROUPS_UPDATE_VIEW_TEMPLATE
modal_header = _("Update Group")
form_id = "update_group_form"
form_class = project_forms.UpdateGroupForm
submit_url = "horizon:identity:groups:update"

1
openstack_dashboard/dashboards/identity/identity_providers/protocols/views.py
View File

@ -23,7 +23,6 @@ from openstack_dashboard.dashboards.identity.identity_providers.protocols \
class AddProtocolView(forms.ModalFormView):
template_name = 'identity/identity_providers/protocols/create.html'
modal_header = _("Create Protocol")
form_id = "create_protocol_form"
form_class = protocol_forms.AddProtocolForm
submit_label = _("Create Protocol")

2
openstack_dashboard/dashboards/identity/identity_providers/views.py
View File

@ -103,7 +103,6 @@ class DetailView(tabs.TabbedTableView):
class UpdateView(forms.ModalFormView):
template_name = 'identity/identity_providers/update.html'
modal_header = _("Update Identity Provider")
form_id = "update_identity_providers_form"
form_class = idp_forms.UpdateIdPForm
submit_label = _("Update Identity Provider")
@ -140,7 +139,6 @@ class UpdateView(forms.ModalFormView):
class RegisterView(forms.ModalFormView):
template_name = 'identity/identity_providers/register.html'
modal_header = _("Register Identity Provider")
form_id = "register_identity_provider_form"
form_class = idp_forms.RegisterIdPForm
submit_label = _("Register Identity Provider")

2
openstack_dashboard/dashboards/identity/mappings/views.py
View File

@ -57,7 +57,6 @@ class IndexView(tables.DataTableView):
class UpdateView(forms.ModalFormView):
template_name = 'identity/mappings/update.html'
modal_header = _("Update Mapping")
form_id = "update_mapping_form"
form_class = mapping_forms.UpdateMappingForm
submit_label = _("Update Mapping")
@ -92,7 +91,6 @@ class UpdateView(forms.ModalFormView):
class CreateView(forms.ModalFormView):
template_name = 'identity/mappings/create.html'
modal_header = _("Create Mapping")
form_id = "create_mapping_form"
form_class = mapping_forms.CreateMappingForm
submit_label = _("Create Mapping")

2
openstack_dashboard/dashboards/identity/roles/views.py
View File

@ -55,7 +55,6 @@ class IndexView(tables.DataTableView):
class UpdateView(forms.ModalFormView):
template_name = 'identity/roles/update.html'
modal_header = _("Update Role")
form_id = "update_role_form"
form_class = project_forms.UpdateRoleForm
submit_label = _("Update Role")
@ -87,7 +86,6 @@ class UpdateView(forms.ModalFormView):
class CreateView(forms.ModalFormView):
template_name = 'identity/roles/create.html'
modal_header = _("Create Role")
form_id = "create_role_form"
form_class = project_forms.CreateRoleForm
submit_label = _("Create Role")

3
openstack_dashboard/dashboards/identity/users/views.py
View File

@ -84,7 +84,6 @@ class IndexView(tables.DataTableView):
class UpdateView(forms.ModalFormView):
template_name = 'identity/users/update.html'
modal_header = _("Update User")
form_id = "update_user_form"
form_class = project_forms.UpdateUserForm
submit_label = _("Update User")
@ -147,7 +146,6 @@ class UpdateView(forms.ModalFormView):
class CreateView(forms.ModalFormView):
template_name = 'identity/users/create.html'
modal_header = _("Create User")
form_id = "create_user_form"
form_class = project_forms.CreateUserForm
submit_label = _("Create User")
@ -250,7 +248,6 @@ class DetailView(views.HorizonTemplateView):
class ChangePasswordView(forms.ModalFormView):
template_name = 'identity/users/change_password.html'
modal_header = _("Change Password")
form_id = "change_user_password_form"
form_class = project_forms.ChangePasswordForm
submit_url = "horizon:identity:users:change_password"

2
openstack_dashboard/dashboards/project/access_and_security/api_access/views.py
View File

@ -181,7 +181,7 @@ class CredentialsView(forms.ModalFormMixin, views.HorizonTemplateView):
class RecreateCredentialsView(forms.ModalFormView):
form_class = project_forms.RecreateCredentials
form_id = "recreate_credentials"
modal_header = _("Recreate EC2 Credentials")
page_title = _("Recreate EC2 Credentials")
template_name = \
'project/access_and_security/api_access/recreate_credentials.html'
submit_label = _("Recreate EC2 Credentials")

2
openstack_dashboard/dashboards/project/access_and_security/floating_ips/views.py
View File

@ -46,7 +46,7 @@ class AssociateView(workflows.WorkflowView):
class AllocateView(forms.ModalFormView):
form_class = project_forms.FloatingIpAllocate
form_id = "associate_floating_ip_form"
modal_header = _("Allocate Floating IP")
page_title = _("Allocate Floating IP")
template_name = 'project/access_and_security/floating_ips/allocate.html'
submit_label = _("Allocate IP")
submit_url = reverse_lazy(

2
openstack_dashboard/dashboards/project/access_and_security/keypairs/views.py
View File

@ -43,7 +43,6 @@ from openstack_dashboard.dashboards.project.access_and_security.keypairs \
class CreateView(forms.ModalFormView):
form_class = project_forms.CreateKeypair
form_id = "create_keypair_form"
modal_header = _("Create Key Pair")
template_name = 'project/access_and_security/keypairs/create.html'
submit_label = _("Create Key Pair")
submit_url = reverse_lazy(
@ -61,7 +60,6 @@ class CreateView(forms.ModalFormView):
class ImportView(forms.ModalFormView):
form_class = project_forms.ImportKeypair
form_id = "import_keypair_form"
modal_header = _("Import Key Pair")
template_name = 'project/access_and_security/keypairs/import.html'
submit_label = _("Import Key Pair")
submit_url = reverse_lazy(

3
openstack_dashboard/dashboards/project/access_and_security/security_groups/views.py
View File

@ -70,7 +70,6 @@ class DetailView(tables.DataTableView):
class UpdateView(forms.ModalFormView):
form_class = project_forms.UpdateGroup
form_id = "update_security_group_form"
modal_header = _("Edit Security Group")
modal_id = "update_security_group_modal"
template_name = 'project/access_and_security/security_groups/update.html'
submit_label = _("Edit Security Group")
@ -105,7 +104,6 @@ class UpdateView(forms.ModalFormView):
class AddRuleView(forms.ModalFormView):
form_class = project_forms.AddRule
form_id = "create_security_group_rule_form"
modal_header = _("Add Rule")
modal_id = "create_security_group_rule_modal"
template_name = 'project/access_and_security/security_groups/add_rule.html'
submit_label = _("Add")
@ -153,7 +151,6 @@ class AddRuleView(forms.ModalFormView):
class CreateView(forms.ModalFormView):
form_class = project_forms.CreateGroup
form_id = "create_security_group_form"
modal_header = _("Create Security Group")
modal_id = "create_security_group_modal"
template_name = 'project/access_and_security/security_groups/create.html'
submit_label = _("Create Security Group")

7
openstack_dashboard/dashboards/project/firewalls/views.py
View File

@ -203,7 +203,6 @@ class UpdateRuleView(forms.ModalFormView):
form_id = "update_rule_form"
template_name = "project/firewalls/updaterule.html"
context_object_name = 'rule'
modal_header = _("Edit Rule")
submit_label = _("Save Changes")
submit_url = "horizon:project:firewalls:updaterule"
success_url = reverse_lazy("horizon:project:firewalls:index")
@ -244,7 +243,6 @@ class UpdatePolicyView(forms.ModalFormView):
form_id = "update_policy_form"
template_name = "project/firewalls/updatepolicy.html"
context_object_name = 'policy'
modal_header = _("Edit Policy")
submit_label = _("Save Changes")
submit_url = "horizon:project:firewalls:updatepolicy"
success_url = reverse_lazy("horizon:project:firewalls:index")
@ -282,7 +280,6 @@ class UpdateFirewallView(forms.ModalFormView):
form_id = "update_firewall_form"
template_name = "project/firewalls/updatefirewall.html"
context_object_name = 'firewall'
modal_header = _("Edit Firewall")
submit_label = _("Save Changes")
submit_url = "horizon:project:firewalls:updatefirewall"
success_url = reverse_lazy("horizon:project:firewalls:index")
@ -319,7 +316,6 @@ class UpdateFirewallView(forms.ModalFormView):
class InsertRuleToPolicyView(forms.ModalFormView):
form_class = InsertRuleToPolicy
form_id = "update_policy_form"
modal_header = _("Insert Rule into Policy")
template_name = "project/firewalls/insert_rule_to_policy.html"
context_object_name = 'policy'
submit_url = "horizon:project:firewalls:insertrule"
@ -359,7 +355,6 @@ class InsertRuleToPolicyView(forms.ModalFormView):
class RemoveRuleFromPolicyView(forms.ModalFormView):
form_class = RemoveRuleFromPolicy
form_id = "update_policy_form"
modal_header = _("Remove Rule from Policy")
template_name = "project/firewalls/remove_rule_from_policy.html"
context_object_name = 'policy'
submit_label = _("Save Changes")
@ -432,7 +427,6 @@ class RouterCommonView(forms.ModalFormView):
class AddRouterToFirewallView(RouterCommonView):
form_class = AddRouterToFirewall
modal_header = _("Add Router to Firewall")
template_name = "project/firewalls/add_router_to_firewall.html"
submit_url = "horizon:project:firewalls:addrouter"
page_title = _("Add Router to Firewall")
@ -440,7 +434,6 @@ class AddRouterToFirewallView(RouterCommonView):
class RemoveRouterFromFirewallView(RouterCommonView):
form_class = RemoveRouterFromFirewall
modal_header = _("Remove Router from Firewall")
template_name = "project/firewalls/remove_router_from_firewall.html"
submit_url = "horizon:project:firewalls:removerouter"
page_title = _("Remove Router from Firewall")

2
openstack_dashboard/dashboards/project/images/images/views.py
View File

@ -43,7 +43,6 @@ from openstack_dashboard.dashboards.project.images.images \
class CreateView(forms.ModalFormView):
form_class = project_forms.CreateImageForm
form_id = "create_image_form"
modal_header = _("Create An Image")
submit_label = _("Create Image")
submit_url = reverse_lazy('horizon:project:images:images:create')
template_name = 'project/images/images/create.html'
@ -81,7 +80,6 @@ class CreateView(forms.ModalFormView):
class UpdateView(forms.ModalFormView):
form_class = project_forms.UpdateImageForm
form_id = "update_image_form"
modal_header = _("Edit Image")
submit_label = _("Edit Image")
submit_url = "horizon:project:images:images:update"
template_name = 'project/images/images/update.html'

3
openstack_dashboard/dashboards/project/images/snapshots/views.py
View File

@ -33,12 +33,11 @@ class CreateView(forms.ModalFormView):
form_class = project_forms.CreateSnapshot
form_id = "create_snapshot_form"
modal_id = "create_snapshot_modal"
modal_header = _("Create Snapshot")
submit_label = _("Create Snapshot")
submit_url = "horizon:project:images:snapshots:create"
template_name = 'project/images/snapshots/create.html'
success_url = reverse_lazy("horizon:project:images:index")
page_title = _("Create a Snapshot")
page_title = _("Create Snapshot")
def get_initial(self):
return {"instance_id": self.kwargs["instance_id"]}

8
openstack_dashboard/dashboards/project/instances/views.py
View File

@ -449,7 +449,7 @@ class ResizeView(workflows.WorkflowView):
class AttachInterfaceView(forms.ModalFormView):
form_class = project_forms.AttachInterface
template_name = 'project/instances/attach_interface.html'
modal_header = _("Attach Interface")
page_title = _("Attach Interface")
form_id = "attach_interface_form"
submit_label = _("Attach Interface")
success_url = reverse_lazy('horizon:project:instances:index')
@ -469,7 +469,7 @@ class AttachInterfaceView(forms.ModalFormView):
class AttachVolumeView(forms.ModalFormView):
form_class = project_forms.AttachVolume
template_name = 'project/instances/attach_volume.html'
modal_header = _("Attach Volume")
page_title = _("Attach Volume")
modal_id = "attach_volume_modal"
submit_label = _("Attach Volume")
success_url = reverse_lazy('horizon:project:instances:index')
@ -505,7 +505,7 @@ class AttachVolumeView(forms.ModalFormView):
class DetachVolumeView(forms.ModalFormView):
form_class = project_forms.DetachVolume
template_name = 'project/instances/detach_volume.html'
modal_header = _("Detach Volume")
page_title = _("Detach Volume")
modal_id = "detach_volume_modal"
submit_label = _("Detach Volume")
success_url = reverse_lazy('horizon:project:instances:index')
@ -534,7 +534,7 @@ class DetachVolumeView(forms.ModalFormView):
class DetachInterfaceView(forms.ModalFormView):
form_class = project_forms.DetachInterface
template_name = 'project/instances/detach_interface.html'
modal_header = _("Detach Interface")
page_title = _("Detach Interface")
form_id = "detach_interface_form"
submit_label = _("Detach Interface")
success_url = reverse_lazy('horizon:project:instances:index')

3
openstack_dashboard/dashboards/project/networks/ports/extensions/allowed_address_pairs/views.py
View File

@ -25,13 +25,12 @@ from openstack_dashboard.dashboards.project.networks.ports.extensions.\
class AddAllowedAddressPair(forms.ModalFormView):
form_class = addr_pairs_forms.AddAllowedAddressPairForm
form_id = "addallowedaddresspair_form"
modal_header = _("Add allowed address pair")
template_name = 'project/networks/ports/add_addresspair.html'
context_object_name = 'port'
submit_label = _("Submit")
submit_url = "horizon:project:networks:ports:addallowedaddresspairs"
success_url = 'horizon:project:networks:ports:detail'
page_title = _("Add allowed address pair")
page_title = _("Add Allowed Address Pair")
def get_success_url(self):
return reverse(self.success_url, args=(self.kwargs['port_id'],))

1
openstack_dashboard/dashboards/project/networks/ports/views.py
View File

@ -110,7 +110,6 @@ class DetailView(tabs.TabbedTableView):
class UpdateView(forms.ModalFormView):
form_class = project_forms.UpdatePort
form_id = "update_port_form"
modal_header = _("Edit Port")
template_name = 'project/networks/ports/update.html'
context_object_name = 'port'
submit_label = _("Save Changes")

1
openstack_dashboard/dashboards/project/networks/views.py
View File

@ -83,7 +83,6 @@ class UpdateView(forms.ModalFormView):
context_object_name = 'network'
form_class = project_forms.UpdateNetwork
form_id = "update_network_form"
modal_header = _("Edit Network")
submit_label = _("Save Changes")
submit_url = "horizon:project:networks:update"
success_url = reverse_lazy("horizon:project:networks:index")

2
openstack_dashboard/dashboards/project/routers/views.py
View File

@ -175,7 +175,6 @@ class DetailView(tabs.TabbedTableView):
class CreateView(forms.ModalFormView):
form_class = project_forms.CreateForm
form_id = "create_router_form"
modal_header = _("Create Router")
template_name = 'project/routers/create.html'
success_url = reverse_lazy("horizon:project:routers:index")
page_title = _("Create Router")
@ -186,7 +185,6 @@ class CreateView(forms.ModalFormView):
class UpdateView(forms.ModalFormView):
form_class = project_forms.UpdateForm
form_id = "update_router_form"
modal_header = _("Edit Router")
template_name = 'project/routers/update.html'
success_url = reverse_lazy("horizon:project:routers:index")
page_title = _("Update Router")

6
openstack_dashboard/dashboards/project/stacks/views.py
View File

@ -85,7 +85,6 @@ class IndexView(tables.DataTableView):
class SelectTemplateView(forms.ModalFormView):
template_name = 'project/stacks/select_template.html'
modal_header = _("Select Template")
form_id = "select_template"
form_class = project_forms.TemplateForm
submit_label = _("Next")
@ -115,7 +114,6 @@ class SelectTemplateView(forms.ModalFormView):
class ChangeTemplateView(forms.ModalFormView):
template_name = 'project/stacks/change_template.html'
modal_header = _("Select Template")
form_id = "change_template"
form_class = project_forms.ChangeTemplateForm
submit_label = _("Next")
@ -155,7 +153,6 @@ class ChangeTemplateView(forms.ModalFormView):
class PreviewTemplateView(forms.ModalFormView):
template_name = 'project/stacks/preview_template.html'
modal_header = _("Preview Template")
form_id = "preview_template"
form_class = project_forms.PreviewTemplateForm
submit_label = _("Next")
@ -171,7 +168,6 @@ class PreviewTemplateView(forms.ModalFormView):
class CreateStackView(forms.ModalFormView):
template_name = 'project/stacks/create.html'
modal_header = _("Launch Stack")
form_id = "launch_stack"
form_class = project_forms.CreateStackForm
submit_label = _("Launch")
@ -200,7 +196,6 @@ class CreateStackView(forms.ModalFormView):
# edit stack parameters, coming from template selector
class EditStackView(CreateStackView):
template_name = 'project/stacks/update.html'
modal_header = _("Update Stack Parameters")
form_id = "update_stack"
form_class = project_forms.EditStackForm
submit_label = _("Update")
@ -241,7 +236,6 @@ class EditStackView(CreateStackView):
class PreviewStackView(CreateStackView):
template_name = 'project/stacks/preview.html'
modal_header = _("Preview Stack")
form_id = "preview_stack"
form_class = project_forms.PreviewStackForm
submit_label = _("Preview")

6
openstack_dashboard/dashboards/project/volumes/backups/views.py
View File

@ -30,12 +30,11 @@ from openstack_dashboard.dashboards.project.volumes.backups \
class CreateBackupView(forms.ModalFormView):
form_class = backup_forms.CreateBackupForm
modal_header = _("Create Volume Backup")
template_name = 'project/volumes/backups/create_backup.html'
submit_label = _("Create Volume Backup")
submit_url = "horizon:project:volumes:volumes:create_backup"
success_url = reverse_lazy("horizon:project:volumes:backups_tab")
page_title = _("Create a Volume Backup")
page_title = _("Create Volume Backup")
def get_context_data(self, **kwargs):
context = super(CreateBackupView, self).get_context_data(**kwargs)
@ -85,12 +84,11 @@ class BackupDetailView(tabs.TabView):
class RestoreBackupView(forms.ModalFormView):
form_class = backup_forms.RestoreBackupForm
modal_header = _("Restore Volume Backup")
template_name = 'project/volumes/backups/restore_backup.html'
submit_label = _("Restore Backup to Volume")
submit_url = "horizon:project:volumes:backups:restore"
success_url = reverse_lazy('horizon:project:volumes:index')
page_title = _("Restore a Volume Backup")
page_title = _("Restore Volume Backup")
def get_context_data(self, **kwargs):
context = super(RestoreBackupView, self).get_context_data(**kwargs)

3
openstack_dashboard/dashboards/project/volumes/cg_snapshots/views.py
View File

@ -93,11 +93,10 @@ class DetailView(tabs.TabView):
class CreateCGroupView(forms.ModalFormView):
form_class = cg_snapshot_forms.CreateCGroupForm
modal_header = _("Create Consistency Group")
template_name = 'project/volumes/cg_snapshots/create.html'
submit_url = "horizon:project:volumes:cg_snapshots:create_cgroup"
success_url = reverse_lazy('horizon:project:volumes:cgroups_tab')
page_title = _("Create a Volume Consistency Group from Snapshot")
page_title = _("Create Volume Consistency Group")
def get_context_data(self, **kwargs):
context = super(CreateCGroupView, self).get_context_data(**kwargs)

19
openstack_dashboard/dashboards/project/volumes/cgroups/views.py
View File

@ -47,12 +47,10 @@ class CreateView(workflows.WorkflowView):
class UpdateView(forms.ModalFormView):
template_name = 'project/volumes/cgroups/update.html'
modal_header = _("Edit Consistency Group")
page_title = _("Edit Consistency Group")
form_class = vol_cgroup_forms.UpdateForm
success_url = reverse_lazy('horizon:project:volumes:index')
submit_url = "horizon:project:volumes:cgroups:update"
submit_label = _("Submit")
page_title = modal_header
def get_initial(self):
cgroup = self.get_object()
@ -81,12 +79,10 @@ class UpdateView(forms.ModalFormView):
class RemoveVolumesView(forms.ModalFormView):
template_name = 'project/volumes/cgroups/remove_vols.html'
modal_header = _("Remove Volumes from Consistency Group")
page_title = _("Remove Volumes from Consistency Group")
form_class = vol_cgroup_forms.RemoveVolsForm
success_url = reverse_lazy('horizon:project:volumes:index')
submit_url = "horizon:project:volumes:cgroups:remove_volumes"
submit_label = _("Submit")
page_title = modal_header
def get_initial(self):
cgroup = self.get_object()
@ -114,12 +110,11 @@ class RemoveVolumesView(forms.ModalFormView):
class DeleteView(forms.ModalFormView):
template_name = 'project/volumes/cgroups/delete.html'
modal_header = _("Delete Consistency Group")
page_title = _("Delete Consistency Group")
form_class = vol_cgroup_forms.DeleteForm
success_url = reverse_lazy('horizon:project:volumes:index')
submit_url = "horizon:project:volumes:cgroups:delete"
submit_label = modal_header
page_title = modal_header
submit_label = page_title
def get_initial(self):
cgroup = self.get_object()
@ -174,12 +169,11 @@ class ManageView(workflows.WorkflowView):
class CreateSnapshotView(forms.ModalFormView):
form_class = vol_cgroup_forms.CreateSnapshotForm
modal_header = _("Create Consistency Group Snapshot")
page_title = _("Create Consistency Group Snapshot")
template_name = 'project/volumes/cgroups/create_snapshot.html'
submit_label = _("Create Snapshot")
submit_url = "horizon:project:volumes:cgroups:create_snapshot"
success_url = reverse_lazy('horizon:project:volumes:cg_snapshots_tab')
page_title = modal_header
def get_context_data(self, **kwargs):
context = super(CreateSnapshotView, self).get_context_data(**kwargs)
@ -217,12 +211,11 @@ class CreateSnapshotView(forms.ModalFormView):
class CloneCGroupView(forms.ModalFormView):
form_class = vol_cgroup_forms.CloneCGroupForm
modal_header = _("Clone Consistency Group")
page_title = _("Clone Consistency Group")
template_name = 'project/volumes/cgroups/clone_cgroup.html'
submit_label = _("Clone Consistency Group")
submit_url = "horizon:project:volumes:cgroups:clone_cgroup"
success_url = reverse_lazy('horizon:project:volumes:cgroups_tab')
page_title = modal_header
def get_context_data(self, **kwargs):
context = super(CloneCGroupView, self).get_context_data(**kwargs)

1
openstack_dashboard/dashboards/project/volumes/snapshots/views.py
View File

@ -32,7 +32,6 @@ from openstack_dashboard.dashboards.project.volumes \
class UpdateView(forms.ModalFormView):
form_class = vol_snapshot_forms.UpdateForm
form_id = "update_snapshot_form"
modal_header = _("Edit Snapshot")
template_name = 'project/volumes/snapshots/update.html'
submit_label = _("Save Changes")
submit_url = "horizon:project:volumes:snapshots:update"

16
openstack_dashboard/dashboards/project/volumes/volumes/views.py
View File

@ -95,12 +95,11 @@ class DetailView(tabs.TabView):
class CreateView(forms.ModalFormView):
form_class = project_forms.CreateForm
modal_header = _("Create Volume")
template_name = 'project/volumes/volumes/create.html'
submit_label = _("Create Volume")
submit_url = reverse_lazy("horizon:project:volumes:volumes:create")
success_url = reverse_lazy('horizon:project:volumes:volumes_tab')
page_title = _("Create a Volume")
page_title = _("Create Volume")
def get_initial(self):
initial = super(CreateView, self).get_initial()
@ -150,7 +149,6 @@ class CreateView(forms.ModalFormView):
class ExtendView(forms.ModalFormView):
form_class = project_forms.ExtendForm
modal_header = _("Extend Volume")
template_name = 'project/volumes/volumes/extend.html'
submit_label = _("Extend Volume")
submit_url = "horizon:project:volumes:volumes:extend"
@ -191,11 +189,10 @@ class ExtendView(forms.ModalFormView):
class CreateSnapshotView(forms.ModalFormView):
form_class = project_forms.CreateSnapshotForm
modal_header = _("Create Volume Snapshot")
template_name = 'project/volumes/volumes/create_snapshot.html'
submit_url = "horizon:project:volumes:volumes:create_snapshot"
success_url = reverse_lazy('horizon:project:volumes:snapshots_tab')
page_title = _("Create a Volume Snapshot")
page_title = _("Create Volume Snapshot")
def get_context_data(self, **kwargs):
context = super(CreateSnapshotView, self).get_context_data(**kwargs)
@ -224,7 +221,6 @@ class CreateSnapshotView(forms.ModalFormView):
class UploadToImageView(forms.ModalFormView):
form_class = project_forms.UploadToImageForm
modal_header = _("Upload Volume to Image")
template_name = 'project/volumes/volumes/upload_to_image.html'
submit_label = _("Upload")
submit_url = "horizon:project:volumes:volumes:upload_to_image"
@ -266,10 +262,9 @@ class CreateTransferView(forms.ModalFormView):
template_name = 'project/volumes/volumes/create_transfer.html'
success_url = reverse_lazy('horizon:project:volumes:volumes_tab')
modal_id = "create_volume_transfer_modal"
modal_header = _("Create Volume Transfer")
submit_label = _("Create Volume Transfer")
submit_url = "horizon:project:volumes:volumes:create_transfer"
page_title = _("Create a Volume Transfer")
page_title = _("Create Volume Transfer")
def get_context_data(self, *args, **kwargs):
context = super(CreateTransferView, self).get_context_data(**kwargs)
@ -287,7 +282,6 @@ class AcceptTransferView(forms.ModalFormView):
template_name = 'project/volumes/volumes/accept_transfer.html'
success_url = reverse_lazy('horizon:project:volumes:volumes_tab')
modal_id = "accept_volume_transfer_modal"
modal_header = _("Accept Volume Transfer")
submit_label = _("Accept Volume Transfer")
submit_url = reverse_lazy(
"horizon:project:volumes:volumes:accept_transfer")
@ -299,7 +293,6 @@ class ShowTransferView(forms.ModalFormView):
template_name = 'project/volumes/volumes/show_transfer.html'
success_url = reverse_lazy('horizon:project:volumes:volumes_tab')
modal_id = "show_volume_transfer_modal"
modal_header = _("Volume Transfer")
submit_url = "horizon:project:volumes:volumes:show_transfer"
cancel_label = _("Close")
download_label = _("Download transfer credentials")
@ -339,7 +332,6 @@ class ShowTransferView(forms.ModalFormView):
class UpdateView(forms.ModalFormView):
form_class = project_forms.UpdateForm
modal_header = _("Edit Volume")
modal_id = "update_volume_modal"
template_name = 'project/volumes/volumes/update.html'
submit_url = "horizon:project:volumes:volumes:update"
@ -376,7 +368,6 @@ class EditAttachmentsView(tables.DataTableView, forms.ModalFormView):
table_class = project_tables.AttachmentsTable
form_class = project_forms.AttachForm
form_id = "attach_volume_form"
modal_header = _("Manage Volume Attachments")
modal_id = "attach_volume_modal"
template_name = 'project/volumes/volumes/attach.html'
submit_url = "horizon:project:volumes:volumes:attach"
@ -450,7 +441,6 @@ class EditAttachmentsView(tables.DataTableView, forms.ModalFormView):
class RetypeView(forms.ModalFormView):
form_class = project_forms.RetypeForm
modal_id = "retype_volume_modal"
modal_header = _("Change Volume Type")
template_name = 'project/volumes/volumes/retype.html'
submit_label = _("Change Volume Type")
submit_url = "horizon:project:volumes:volumes:retype"

4
openstack_dashboard/dashboards/project/vpn/views.py
View File

@ -203,7 +203,6 @@ class IPSecSiteConnectionDetailsView(tabs.TabView):
class UpdateVPNServiceView(forms.ModalFormView):
form_class = vpn_forms.UpdateVPNService
form_id = "update_vpnservice_form"
modal_header = _("Edit VPN Service")
template_name = "project/vpn/update_vpnservice.html"
context_object_name = 'vpnservice'
submit_label = _("Save Changes")
@ -239,7 +238,6 @@ class UpdateVPNServiceView(forms.ModalFormView):
class UpdateIKEPolicyView(forms.ModalFormView):
form_class = vpn_forms.UpdateIKEPolicy
form_id = "update_ikepolicy_form"
modal_header = _("Edit IKE Policy")
template_name = "project/vpn/update_ikepolicy.html"
context_object_name = 'ikepolicy'
submit_label = _("Save Changes")
@ -282,7 +280,6 @@ class UpdateIKEPolicyView(forms.ModalFormView):
class UpdateIPSecPolicyView(forms.ModalFormView):
form_class = vpn_forms.UpdateIPSecPolicy
form_id = "update_ipsecpolicy_form"
modal_header = _("Edit IPSec Policy")
template_name = "project/vpn/update_ipsecpolicy.html"
context_object_name = 'ipsecpolicy'
submit_label = _("Save Changes")
@ -324,7 +321,6 @@ class UpdateIPSecPolicyView(forms.ModalFormView):
class UpdateIPSecSiteConnectionView(forms.ModalFormView):
form_class = vpn_forms.UpdateIPSecSiteConnection
form_id = "update_ipsecsiteconnection_form"
modal_header = _("Edit IPSec Site Connection")
template_name = "project/vpn/update_ipsecsiteconnection.html"
context_object_name = 'ipsecsiteconnection'
submit_label = _("Save Changes")