From 43b4dd8ddcee2ed6fb18e68ee6d3d011566e3c26 Mon Sep 17 00:00:00 2001
From: Gloria Gu <gloria.gu@hp.com>
Date: Thu, 4 Sep 2014 09:57:06 -0700
Subject: [PATCH] Description clean-up for volume actions

Some minor description clean-ups for volume action
'change volume type' and 'upload to image' to remove
'From here you can'.

Also remove unecessary 'required=True' for the field.

Closes-Bug: #1364623

Change-Id: Ia8c1a593e80abf193f26f7cb97bc1ba383383399
---
 .../project/volumes/templates/volumes/volumes/_retype.html  | 2 +-
 .../volumes/templates/volumes/volumes/_upload_to_image.html | 2 +-
 .../dashboards/project/volumes/volumes/forms.py             | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_retype.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_retype.html
index 80af3cd826b..334c702d781 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_retype.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_retype.html
@@ -17,7 +17,7 @@
   <div class="right">
     <h3>{% trans "Description:" %}</h3>
     <p>{% blocktrans %}
-        From here you can change the volume type of a volume after its creation.
+        Change the volume type of a volume after its creation.
         This is equivalent to the <tt>cinder retype</tt> command.
        {% endblocktrans %}
     </p>
diff --git a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_upload_to_image.html b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_upload_to_image.html
index 8351a57c0ad..ba56327b64d 100644
--- a/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_upload_to_image.html
+++ b/openstack_dashboard/dashboards/project/volumes/templates/volumes/volumes/_upload_to_image.html
@@ -17,7 +17,7 @@
   <div class="right">
     <h3>{% trans "Description:" %}</h3>
     <p>{% blocktrans %}
-        From here you can upload the volume to the Image Service as an image.
+        Upload the volume to the Image Service as an image.
         This is equivalent to the <tt>cinder upload-to-image</tt> command.
        {% endblocktrans %}
     </p>
diff --git a/openstack_dashboard/dashboards/project/volumes/volumes/forms.py b/openstack_dashboard/dashboards/project/volumes/volumes/forms.py
index 073386dbba6..1effdc63f61 100644
--- a/openstack_dashboard/dashboards/project/volumes/volumes/forms.py
+++ b/openstack_dashboard/dashboards/project/volumes/volumes/forms.py
@@ -520,8 +520,7 @@ class UploadToImageForm(forms.SelfHandlingForm):
     name = forms.CharField(label=_('Volume Name'),
                            widget=forms.TextInput(
                                attrs={'readonly': 'readonly'}))
-    image_name = forms.CharField(max_length="255", label=_('Image Name'),
-                                 required=True)
+    image_name = forms.CharField(max_length="255", label=_('Image Name'))
     disk_format = forms.ChoiceField(label=_('Disk Format'),
                                     widget=forms.Select(),
                                     required=False)
@@ -617,8 +616,7 @@ class RetypeForm(forms.SelfHandlingForm):
     name = forms.CharField(label=_('Volume Name'),
                            widget=forms.TextInput(
                                attrs={'readonly': 'readonly'}))
-    volume_type = forms.ChoiceField(label=_('Type'),
-                                    required=True)
+    volume_type = forms.ChoiceField(label=_('Type'))
     MIGRATION_POLICY_CHOICES = [('never', _('Never')),
                                 ('on-demand', _('On Demand'))]
     migration_policy = forms.ChoiceField(label=_('Migration Policy'),