etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cloudstack 3.0 new UI - add zone wizard - guest traffic - show different description for basic zone and advanced zone.

This commit is contained in:
Jessica Wang 2012-02-17 10:54:10 -08:00 committed by Salvatore Orlando
parent aa8d3bca8f
commit 08e28b8905
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/index.jsp
View File

@ -741,8 +741,13 @@
</ul>
<div class="info-desc" id="add_zone_guest_traffic_desc">
<<<<<<< HEAD
>>>>>>> 2f682ea... cloudstack 3.0 new UI - add zone wizard - localize text in html code.
=======
<span id="for_basic_zone" style="display:none"><fmt:message key="message.guest.traffic.in.basic.zone"/></span>
<span id="for_advanced_zone" style="display:none"><fmt:message key="message.guest.traffic.in.advanced.zone"/></span>
>>>>>>> f0e3cad... cloudstack 3.0 new UI - add zone wizard - guest traffic - show different description for basic zone and advanced zone.
</div>
<div class="content input-area">
<div class="select-container"></div>

13
ui/scripts/zoneWizard.js
View File

@ -790,6 +790,7 @@
guestTraffic: {
preFilter: function(args) {
<<<<<<< HEAD
var $guestTrafficDesc = $('.zone-wizard:visible').find('#add_zone_guest_traffic_desc');
if (args.data['network-model'] == 'Basic') {
$guestTrafficDesc.find('#for_basic_zone').css('display', 'inline');
@ -799,6 +800,18 @@
$guestTrafficDesc.find('#for_advanced_zone').css('display', 'inline');
$guestTrafficDesc.find('#for_basic_zone').hide();
}
=======
var $guestTrafficDesc = $("#add_zone_guest_traffic_desc");
//debugger;
if (args.data['network-model'] == 'Basic') {
$guestTrafficDesc.find("#for_basic_zone").css('display', 'inline');
$guestTrafficDesc.find("#for_advanced_zone").hide();
}
else { //args.data['network-model'] == 'Advanced'
$guestTrafficDesc.find("#for_advanced_zone").css('display', 'inline');
$guestTrafficDesc.find("#for_basic_zone").hide();
}
>>>>>>> f0e3cad... cloudstack 3.0 new UI - add zone wizard - guest traffic - show different description for basic zone and advanced zone.
var selectedZoneObj = {
networktype: args.data['network-model']