From d114dfe00967fa5ecb24122692c327c058ef4e23 Mon Sep 17 00:00:00 2001 From: Cindy Lu Date: Wed, 17 Sep 2014 15:03:40 -0700 Subject: [PATCH] Reduce height for "Description" text areas Textarea widget defaults to 10 rows which seems unnecessary. Reduced to 4. Change-Id: I03cfd0087ffb1225c6ce893d98481a9a66e2ab3c Closes-Bug: #1370271 --- .../dashboards/identity/domains/workflows.py | 3 ++- .../dashboards/identity/groups/forms.py | 6 ++++-- .../dashboards/identity/projects/tables.py | 2 +- .../dashboards/identity/projects/workflows.py | 3 ++- .../access_and_security/security_groups/forms.py | 8 ++++++-- .../cluster_templates/workflows/create.py | 2 +- .../data_processing/clusters/workflows/create.py | 2 +- .../data_processing/data_image_registry/forms.py | 2 +- .../data_processing/data_sources/workflows/create.py | 2 +- .../project/data_processing/job_binaries/forms.py | 3 ++- .../project/data_processing/jobs/workflows/create.py | 2 +- .../nodegroup_templates/workflows/create.py | 2 +- .../dashboards/project/instances/forms.py | 2 +- .../dashboards/project/volumes/backups/forms.py | 2 +- .../dashboards/project/volumes/snapshots/forms.py | 4 ++-- .../dashboards/project/volumes/volumes/forms.py | 10 +++++----- 16 files changed, 32 insertions(+), 23 deletions(-) diff --git a/openstack_dashboard/dashboards/identity/domains/workflows.py b/openstack_dashboard/dashboards/identity/domains/workflows.py index dd1757d0e6..a700e27b50 100644 --- a/openstack_dashboard/dashboards/identity/domains/workflows.py +++ b/openstack_dashboard/dashboards/identity/domains/workflows.py @@ -32,7 +32,8 @@ LOG = logging.getLogger(__name__) class CreateDomainInfoAction(workflows.Action): name = forms.CharField(label=_("Name")) - description = forms.CharField(widget=forms.widgets.Textarea(), + description = forms.CharField(widget=forms.widgets.Textarea( + attrs={'rows': 4}), label=_("Description"), required=False) enabled = forms.BooleanField(label=_("Enabled"), diff --git a/openstack_dashboard/dashboards/identity/groups/forms.py b/openstack_dashboard/dashboards/identity/groups/forms.py index f34f577f20..88ad989797 100644 --- a/openstack_dashboard/dashboards/identity/groups/forms.py +++ b/openstack_dashboard/dashboards/identity/groups/forms.py @@ -28,7 +28,8 @@ LOG = logging.getLogger(__name__) class CreateGroupForm(forms.SelfHandlingForm): name = forms.CharField(label=_("Name")) - description = forms.CharField(widget=forms.widgets.Textarea(), + description = forms.CharField(widget=forms.widgets.Textarea( + attrs={'rows': 4}), label=_("Description"), required=False) @@ -53,7 +54,8 @@ class CreateGroupForm(forms.SelfHandlingForm): class UpdateGroupForm(forms.SelfHandlingForm): group_id = forms.CharField(widget=forms.HiddenInput()) name = forms.CharField(label=_("Name")) - description = forms.CharField(widget=forms.widgets.Textarea(), + description = forms.CharField(widget=forms.widgets.Textarea( + attrs={'rows': 4}), label=_("Description"), required=False) diff --git a/openstack_dashboard/dashboards/identity/projects/tables.py b/openstack_dashboard/dashboards/identity/projects/tables.py index 856295b652..f7e604fa64 100644 --- a/openstack_dashboard/dashboards/identity/projects/tables.py +++ b/openstack_dashboard/dashboards/identity/projects/tables.py @@ -196,7 +196,7 @@ class TenantsTable(tables.DataTable): description = tables.Column(lambda obj: getattr(obj, 'description', None), verbose_name=_('Description'), form_field=forms.CharField( - widget=forms.Textarea(), + widget=forms.Textarea(attrs={'rows': 4}), required=False), update_action=UpdateCell) id = tables.Column('id', verbose_name=_('Project ID')) diff --git a/openstack_dashboard/dashboards/identity/projects/workflows.py b/openstack_dashboard/dashboards/identity/projects/workflows.py index 72b715fe51..a2ecb70f5c 100644 --- a/openstack_dashboard/dashboards/identity/projects/workflows.py +++ b/openstack_dashboard/dashboards/identity/projects/workflows.py @@ -124,7 +124,8 @@ class CreateProjectInfoAction(workflows.Action): widget=forms.HiddenInput()) name = forms.CharField(label=_("Name"), max_length=64) - description = forms.CharField(widget=forms.widgets.Textarea(), + description = forms.CharField(widget=forms.widgets.Textarea( + attrs={'rows': 4}), label=_("Description"), required=False) enabled = forms.BooleanField(label=_("Enabled"), diff --git a/openstack_dashboard/dashboards/project/access_and_security/security_groups/forms.py b/openstack_dashboard/dashboards/project/access_and_security/security_groups/forms.py index 46df3261c2..9476b63ae2 100644 --- a/openstack_dashboard/dashboards/project/access_and_security/security_groups/forms.py +++ b/openstack_dashboard/dashboards/project/access_and_security/security_groups/forms.py @@ -41,7 +41,9 @@ class CreateGroup(forms.SelfHandlingForm): 'invalid': _("The string may only contain" " ASCII characters and numbers.")}, validators=[validators.validate_slug]) - description = forms.CharField(label=_("Description")) + description = forms.CharField(label=_("Description"), + required=False, + widget=forms.Textarea(attrs={'rows': 4})) def handle(self, request, data): try: @@ -68,7 +70,9 @@ class UpdateGroup(forms.SelfHandlingForm): 'invalid': _("The string may only contain" " ASCII characters and numbers.")}, validators=[validators.validate_slug]) - description = forms.CharField(label=_("Description")) + description = forms.CharField(label=_("Description"), + required=False, + widget=forms.Textarea(attrs={'rows': 4})) def handle(self, request, data): try: diff --git a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/workflows/create.py b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/workflows/create.py index 9c4371d05d..902225ccb3 100644 --- a/openstack_dashboard/dashboards/project/data_processing/cluster_templates/workflows/create.py +++ b/openstack_dashboard/dashboards/project/data_processing/cluster_templates/workflows/create.py @@ -98,7 +98,7 @@ class GeneralConfigAction(workflows.Action): description = forms.CharField(label=_("Description"), required=False, - widget=forms.Textarea) + widget=forms.Textarea(attrs={'rows': 4})) anti_affinity = aa.anti_affinity_field() diff --git a/openstack_dashboard/dashboards/project/data_processing/clusters/workflows/create.py b/openstack_dashboard/dashboards/project/data_processing/clusters/workflows/create.py index b85420559c..696367fbec 100644 --- a/openstack_dashboard/dashboards/project/data_processing/clusters/workflows/create.py +++ b/openstack_dashboard/dashboards/project/data_processing/clusters/workflows/create.py @@ -72,7 +72,7 @@ class GeneralConfigAction(workflows.Action): description = forms.CharField(label=_("Description"), required=False, - widget=forms.Textarea) + widget=forms.Textarea(attrs={'rows': 4})) cluster_template = forms.ChoiceField(label=_("Cluster Template"), initial=(None, "None")) diff --git a/openstack_dashboard/dashboards/project/data_processing/data_image_registry/forms.py b/openstack_dashboard/dashboards/project/data_processing/data_image_registry/forms.py index 93edf6bce9..1ae9f5ce5b 100644 --- a/openstack_dashboard/dashboards/project/data_processing/data_image_registry/forms.py +++ b/openstack_dashboard/dashboards/project/data_processing/data_image_registry/forms.py @@ -29,7 +29,7 @@ class ImageForm(forms.SelfHandlingForm): description = forms.CharField(max_length=80, label=_("Description"), required=False, - widget=forms.Textarea()) + widget=forms.Textarea(attrs={'rows': 4})) def handle(self, request, data): try: diff --git a/openstack_dashboard/dashboards/project/data_processing/data_sources/workflows/create.py b/openstack_dashboard/dashboards/project/data_processing/data_sources/workflows/create.py index 8c8f226bf5..91f72ebf0f 100644 --- a/openstack_dashboard/dashboards/project/data_processing/data_sources/workflows/create.py +++ b/openstack_dashboard/dashboards/project/data_processing/data_sources/workflows/create.py @@ -45,7 +45,7 @@ class GeneralConfigAction(workflows.Action): data_source_description = forms.CharField( label=_("Description"), required=False, - widget=forms.Textarea) + widget=forms.Textarea(attrs={'rows': 4})) def __init__(self, request, *args, **kwargs): super(GeneralConfigAction, self).__init__(request, *args, **kwargs) diff --git a/openstack_dashboard/dashboards/project/data_processing/job_binaries/forms.py b/openstack_dashboard/dashboards/project/data_processing/job_binaries/forms.py index 8cda391182..bb59a0080b 100644 --- a/openstack_dashboard/dashboards/project/data_processing/job_binaries/forms.py +++ b/openstack_dashboard/dashboards/project/data_processing/job_binaries/forms.py @@ -63,7 +63,8 @@ class JobBinaryCreateForm(forms.SelfHandlingForm): job_binary_script = forms.CharField(label=_("Script text"), required=False, - widget=forms.Textarea()) + widget=forms.Textarea( + attrs={'rows': 4})) job_binary_username = forms.CharField(label=_("Username"), required=False) diff --git a/openstack_dashboard/dashboards/project/data_processing/jobs/workflows/create.py b/openstack_dashboard/dashboards/project/data_processing/jobs/workflows/create.py index 43c9aed36d..6eb84ada0b 100644 --- a/openstack_dashboard/dashboards/project/data_processing/jobs/workflows/create.py +++ b/openstack_dashboard/dashboards/project/data_processing/jobs/workflows/create.py @@ -64,7 +64,7 @@ class GeneralConfigAction(workflows.Action): job_description = forms.CharField(label=_("Description"), required=False, - widget=forms.Textarea) + widget=forms.Textarea(attrs={'rows': 4})) def populate_job_type_choices(self, request, context): choices = [("Pig", _("Pig")), ("Hive", _("Hive")), diff --git a/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/workflows/create.py b/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/workflows/create.py index d7cc90f3d5..8ca83a8564 100644 --- a/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/workflows/create.py +++ b/openstack_dashboard/dashboards/project/data_processing/nodegroup_templates/workflows/create.py @@ -38,7 +38,7 @@ class GeneralConfigAction(workflows.Action): description = forms.CharField(label=_("Description"), required=False, - widget=forms.Textarea) + widget=forms.Textarea(attrs={'rows': 4})) flavor = forms.ChoiceField(label=_("OpenStack Flavor")) diff --git a/openstack_dashboard/dashboards/project/instances/forms.py b/openstack_dashboard/dashboards/project/instances/forms.py index 23f50283f7..117d7a62b3 100644 --- a/openstack_dashboard/dashboards/project/instances/forms.py +++ b/openstack_dashboard/dashboards/project/instances/forms.py @@ -113,7 +113,7 @@ class DecryptPasswordInstanceForm(forms.SelfHandlingForm): _keypair_name_label = _("Key Pair Name") _keypair_name_help = _("The Key Pair name that " "was associated with the instance") - _attrs = {'readonly': 'readonly'} + _attrs = {'readonly': 'readonly', 'rows': 4} keypair_name = forms.CharField(widget=forms.widgets.TextInput(_attrs), label=_keypair_name_label, help_text=_keypair_name_help, diff --git a/openstack_dashboard/dashboards/project/volumes/backups/forms.py b/openstack_dashboard/dashboards/project/volumes/backups/forms.py index 667021dd2a..eed156deec 100644 --- a/openstack_dashboard/dashboards/project/volumes/backups/forms.py +++ b/openstack_dashboard/dashboards/project/volumes/backups/forms.py @@ -31,7 +31,7 @@ from openstack_dashboard.dashboards.project.containers \ class CreateBackupForm(forms.SelfHandlingForm): name = forms.CharField(max_length=255, label=_("Backup Name")) - description = forms.CharField(widget=forms.Textarea, + description = forms.CharField(widget=forms.Textarea(attrs={'rows': 4}), label=_("Description"), required=False) container_name = forms.CharField( diff --git a/openstack_dashboard/dashboards/project/volumes/snapshots/forms.py b/openstack_dashboard/dashboards/project/volumes/snapshots/forms.py index 5407065e91..072cb79973 100644 --- a/openstack_dashboard/dashboards/project/volumes/snapshots/forms.py +++ b/openstack_dashboard/dashboards/project/volumes/snapshots/forms.py @@ -23,8 +23,8 @@ from openstack_dashboard.api import cinder class UpdateForm(forms.SelfHandlingForm): name = forms.CharField(max_length=255, label=_("Snapshot Name")) - description = forms.CharField(max_length=255, widget=forms.Textarea, - label=_("Description"), required=False) + description = forms.CharField(max_length=255, widget=forms.Textarea( + attrs={'rows': 4}), label=_("Description"), required=False) def handle(self, request, data): snapshot_id = self.initial['snapshot_id'] diff --git a/openstack_dashboard/dashboards/project/volumes/volumes/forms.py b/openstack_dashboard/dashboards/project/volumes/volumes/forms.py index 95ec93f79f..6e9691eaba 100644 --- a/openstack_dashboard/dashboards/project/volumes/volumes/forms.py +++ b/openstack_dashboard/dashboards/project/volumes/volumes/forms.py @@ -46,7 +46,7 @@ DEFAULT_CONTAINER_FORMAT = 'bare' class CreateForm(forms.SelfHandlingForm): name = forms.CharField(max_length=255, label=_("Volume Name")) description = forms.CharField(max_length=255, widget=forms.Textarea( - attrs={'class': 'modal-body-fixed-width'}), + attrs={'class': 'modal-body-fixed-width', 'rows': 4}), label=_("Description"), required=False) volume_source_type = forms.ChoiceField(label=_("Volume Source"), required=False, @@ -470,8 +470,8 @@ class AttachForm(forms.SelfHandlingForm): class CreateSnapshotForm(forms.SelfHandlingForm): name = forms.CharField(max_length=255, label=_("Snapshot Name")) - description = forms.CharField(max_length=255, widget=forms.Textarea, - label=_("Description"), required=False) + description = forms.CharField(max_length=255, widget=forms.Textarea( + attrs={'rows': 4}), label=_("Description"), required=False) def __init__(self, request, *args, **kwargs): super(CreateSnapshotForm, self).__init__(request, *args, **kwargs) @@ -508,8 +508,8 @@ class CreateSnapshotForm(forms.SelfHandlingForm): class UpdateForm(forms.SelfHandlingForm): name = forms.CharField(max_length=255, label=_("Volume Name")) - description = forms.CharField(max_length=255, widget=forms.Textarea, - label=_("Description"), required=False) + description = forms.CharField(max_length=255, widget=forms.Textarea( + attrs={'rows': 4}), label=_("Description"), required=False) def handle(self, request, data): volume_id = self.initial['volume_id']