openstack
/
horizon
Code Issues Proposed changes

Fix untranslated help text in Launch Instance window 

- Source tab
  Flow context is not allowed to write to inner phrasing content,
  At the moment untranslation is occurred by a incorrect value of .html().
  <p translate><li>yyy</li></p> -> elem.html() // value is ''
  <p translate>xxx<li>yyy</li></p> -> elem.html() // value is 'xxx'
  This phenomenon is caused by below.

  html in html file
    <p translate><li>yyy</li>xxx</p>

  html rendered in browser
    <p tramslate></p><li>yyy</li><p></p>

- Security Groups tab
  '&' needs html escape

Change-Id: Ic414d232063cc12333ac2d70fd8f351a35a00b6d
Closes-Bug: #1561558
This commit is contained in:
Kenji Ishii 2016-08-01 19:04:08 +09:00
parent ccc6de3430
commit e3ef7ae51c
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/security-groups/security-groups.help.html
View File

@ -1,5 +1,5 @@
<div>
<p translate>Security groups define a set of IP filter rules that determine how network traffic flows to and from an instance. Users can add additional rules to an existing security group to further define the access options for an instance. To create additional rules, go to the <b>Compute | Access & Security</b> view, then find the security group and click <b>Manage Rules</b>.</p>
<p translate>Security groups define a set of IP filter rules that determine how network traffic flows to and from an instance. Users can add additional rules to an existing security group to further define the access options for an instance. To create additional rules, go to the <b>Compute | Access &amp; Security</b> view, then find the security group and click <b>Manage Rules</b>.</p>
<p translate>Security groups are project-specific and cannot be shared across projects.</p>
<p translate>If a security group is not associated with an instance before it is launched, then you will have very limited access to the instance after it is deployed. You will only be able to access the instance from a VNC console.</p>
</div>

15
openstack_dashboard/dashboards/project/static/dashboard/project/workflow/launch-instance/source/source.help.html
View File

@ -1,9 +1,14 @@
<div>
<p translate>If you want to create an instance that uses ephemeral storage, meaning the instance data is lost when the instance is deleted, then choose one of the following boot sources:</p>
<p translate><li><b>Image</b>: This option uses an image to boot the instance.</li></p>
<p translate><li><b>Instance Snapshot</b>: This option uses an instance snapshot to boot the instance.</li></p>
<ul class="list-group">
<li translate><b>Image</b>: This option uses an image to boot the instance.</li>
<li translate><b>Instance Snapshot</b>: This option uses an instance snapshot to boot the instance.</li>
</ul>
<p translate>If you want to create an instance that uses persistent storage, meaning the instance data is saved when the instance is deleted, then select one of the following boot options:</p>
<p translate><li><b>Image (with Create New Volume checked)</b>: This options uses an image to boot the instance, and creates a new volume to persist instance data. You can specify volume size and whether to delete the volume on deletion of the instance.</li></p>
<p translate><li><b>Volume</b>: This option uses a volume that already exists. It does not create a new volume. You can choose to delete the volume on deletion of the instance. <em>Note: when selecting Volume, you can only launch one instance.</em></li></p>
<p translate><li><b>Volume Snapshot</b>: This option uses a volume snapshot to boot the instance, and creates a new volume to persist instance data. You can choose to delete the volume on deletion of the instance.</li></p>
<ul class="list-group">
<li translate><b>Image (with Create New Volume checked)</b>: This options uses an image to boot the instance, and creates a new volume to persist instance data. You can specify volume size and whether to delete the volume on deletion of the instance.</li>
<li translate><b>Volume</b>: This option uses a volume that already exists. It does not create a new volume. You can choose to delete the volume on deletion of the instance. <em>Note: when selecting Volume, you can only launch one instance.</em></li>
<li translate><b>Volume Snapshot</b>: This option uses a volume snapshot to boot the instance, and creates a new volume to persist instance data. You can choose to delete the volume on deletion of the instance.</li>
</ul>
</div>