Updated Branches: refs/heads/master 317c8e060 -> e88352644
CLOUDSTACK-1763: Better confirm message for acquire NIC IP Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e8835264 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e8835264 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e8835264 Branch: refs/heads/master Commit: e883526449398daa3bc386460c5f6c79007ed939 Parents: 317c8e0 Author: Brian Federle <[email protected]> Authored: Tue Jun 4 15:25:50 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Tue Jun 4 15:25:50 2013 -0700 ---------------------------------------------------------------------- .../WEB-INF/classes/resources/messages.properties | 1 + ui/css/cloudstack3.css | 4 ++++ ui/dictionary.jsp | 1 + ui/scripts/network.js | 2 +- 4 files changed, 7 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8835264/client/WEB-INF/classes/resources/messages.properties ---------------------------------------------------------------------- diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index ce20fa4..0de4cff 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -14,6 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +message.acquire.ip.nic=Please confirm that you would like to acquire a new secondary IP for this NIC.<br/>NOTE: You need to manually configure the newly-acquired secondary IP inside the virtual machine. message.select.affinity.groups=Please select any affinity groups you want this VM to belong to: message.no.affinity.groups=You do not have any affinity groups. Please continue to the next step. label.action.delete.nic=Remove NIC http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8835264/ui/css/cloudstack3.css ---------------------------------------------------------------------- diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index 0514586..c2d0526 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -3748,6 +3748,10 @@ Dialogs*/ font-size: 15px; } +.ui-dialog div.form-container span.message br { + margin-bottom: 13px; +} + .ui-dialog div.form-container div.form-item { width: 100%; display: inline-block; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8835264/ui/dictionary.jsp ---------------------------------------------------------------------- diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index d7f7dd5..e1f9a30 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -25,6 +25,7 @@ under the License. <% long now = System.currentTimeMillis(); %> <script language="javascript"> dictionary = { +'message.acquire.ip.nic': '<fmt:message key="message.acquire.ip.nic" />', 'message.select.affinity.groups': '<fmt:message key="message.select.affinity.groups" />', 'message.no.affinity.groups': '<fmt:message key="message.no.affinity.groups" />', 'label.action.delete.nic': '<fmt:message key="label.action.delete.nic" />', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8835264/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index f7d3ea4..6ab15c3 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1551,7 +1551,7 @@ addRow: 'true', createForm: { title: 'label.acquire.new.ip', - desc: 'message.acquire.new.ip', + desc: 'message.acquire.ip.nic', fields: { ipaddr: { label: 'label.ip.address' } }
