From ad74b396dc9adaa7165c84c77e33b3c89c46bddc Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 13 Mar 2012 16:55:34 -0700 Subject: [PATCH] cloudstack 3.0 UI - network page, infrastructure page - guest network - restart network action - Hide "clean up" checkbox if it's Basic zone. Show "clean up" checkbox if it's Advanced zone. --- ui/scripts/network.js | 6 +++--- ui/scripts/system.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 49e0aaa29c2..a5c7da677c9 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -451,17 +451,17 @@ }); if(zoneObj.networktype == "Basic") { args.$form.find('.form-item[rel=cleanup]').find('input').removeAttr('checked'); //unchecked - args.$form.find('.form-item[rel=cleanup]').find('input').attr('Disabled', true); //gray-out + args.$form.find('.form-item[rel=cleanup]').hide(); //hidden } else { args.$form.find('.form-item[rel=cleanup]').find('input').attr('checked', 'checked'); //checked - args.$form.find('.form-item[rel=cleanup]').find('input').removeAttr('Disabled'); //enabled + args.$form.find('.form-item[rel=cleanup]').css('display', 'inline-block'); //shown } }, fields: { cleanup: { label: 'label.clean.up', - isBoolean: true + isBoolean: true } } }, diff --git a/ui/scripts/system.js b/ui/scripts/system.js index ea651defd0b..e683451ea14 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -1444,11 +1444,11 @@ preFilter: function(args) { if(selectedZoneObj.networktype == "Basic") { args.$form.find('.form-item[rel=cleanup]').find('input').removeAttr('checked'); //unchecked - args.$form.find('.form-item[rel=cleanup]').find('input').attr('Disabled', true); //gray-out + args.$form.find('.form-item[rel=cleanup]').hide(); //hidden } else { args.$form.find('.form-item[rel=cleanup]').find('input').attr('checked', 'checked'); //checked - args.$form.find('.form-item[rel=cleanup]').find('input').removeAttr('Disabled'); //enabled + args.$form.find('.form-item[rel=cleanup]').css('display', 'inline-block'); //shown } }, fields: {