cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pran...@apache.org
Subject [03/25] git commit: updated refs/heads/master to 2f29185
Date Fri, 31 May 2013 04:35:53 GMT
Cluster/Pod/Host Explicit Dedication front end UI


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4d5033f2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4d5033f2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4d5033f2

Branch: refs/heads/master
Commit: 4d5033f263c86694af4029b2a1401c035af490a6
Parents: dd9b750
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Mon May 6 10:31:13 2013 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
Committed: Thu May 30 21:57:09 2013 +0530

----------------------------------------------------------------------
 ui/scripts/docs.js   |   16 +++++
 ui/scripts/system.js |  144 ++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 159 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d5033f2/ui/scripts/docs.js
----------------------------------------------------------------------
diff --git a/ui/scripts/docs.js b/ui/scripts/docs.js
index 65233c1..48db443 100755
--- a/ui/scripts/docs.js
+++ b/ui/scripts/docs.js
@@ -16,6 +16,22 @@
 // under the License.
 cloudStack.docs = {
 
+  //Dedicate Resource
+
+   helpDedicateResource:{
+
+    desc:'Check this box to dedicate the resources to specific domain/account',
+    externalLink:''
+
+  },
+
+   helpAccountForDedication:{
+
+   desc:'Please enter an account name which belongs to the above selected domain in order
to dedicate this resource to this account',
+   externalLink:''
+
+  },
+
 
  //Delete/archive events
   helpEventsDeleteType:{

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4d5033f2/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 8b9a81f..b90a11d 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -8507,7 +8507,54 @@
                     label: 'label.end.reserved.system.IP',
                     docID: 'helpPodEndIP',
                     validation: { required: false }
+                  },
+
+                   isDedicated:{
+                       label:'Dedicate',
+                       isBoolean:true,
+                       isChecked:false,
+                       docID:'helpDedicateResource'
+
+
+                   },
+
+                   domainId:{
+                      label:'Domain',
+                      isHidden:true,
+                      validation:{required:true},
+                      dependsOn:'isDedicated',
+                      select:function(args){
+                         $.ajax({
+                              url:createURL("listDomains&listAll=true"),
+                              dataType:"json",
+                              async:false,
+                               success: function(json) {
+                                  var domainObjs= json.listdomainsresponse.domain;
+                                  var items=[];
+
+                                  $(domainObjs).each(function() {
+                                  items.push({id:this.id ,description:this.name });
+                                  });
+
+                                  args.response.success({
+                                  data: items
+                                });
+                               }
+
+
+                        });
+                      }
+                   },
+
+                    accountId:{
+                     label:'Account',
+                     isHidden:true,
+                     dependsOn:'isDedicated',
+                     docID:'helpAccountForDedication',
+                     validation:{required:false}
+
                   }
+
                 }
               },
 
@@ -9007,8 +9054,55 @@
 
                    },
 
-                  //hypervisor==VMWare begins here
+                  
+                   isDedicated:{
+                       label:'Dedicate',
+                       isBoolean:true,
+                       isChecked:false,
+                       docID:'helpDedicateResource'
+
+
+                   },
+
+                   domainId:{
+                      label:'Domain',
+                      isHidden:true,
+                      validation:{required:true},
+                      dependsOn:'isDedicated',
+                      select:function(args){
+                         $.ajax({
+                              url:createURL("listDomains&listAll=true"),
+                              dataType:"json",
+                              async:false,
+                               success: function(json) {
+                                  var domainObjs= json.listdomainsresponse.domain;
+                                  var items=[];
+
+                                  $(domainObjs).each(function() {
+                                  items.push({id:this.id ,description:this.name });
+                                  });
+
+                                  args.response.success({
+                                  data: items
+                                });
+                               }
 
+
+                        });
+                      }
+                   },
+
+                    accountId:{
+                     label:'Account',
+                     isHidden:true,
+                     dependsOn:'isDedicated',
+                     docID:'helpAccountForDedication',
+                     validation:{required:false}
+
+                  },
+
+                  //hypervisor==VMWare begins here
+ 
                   vCenterHost: {
                     label: 'label.vcenter.host',
                     docID: 'helpClustervCenterHost',
@@ -9996,7 +10090,55 @@
                     validation: { required: true },
                     isHidden: true,
                     isPassword: true
+                  }, 
+
+                   isDedicated:{
+                       label:'Dedicate',
+                       isBoolean:true,
+                       isChecked:false,
+                       docID:'helpDedicateResource'
+
+
+                   },
+
+                   domainId:{
+                      label:'Domain',
+                      isHidden:true,
+                      validation:{required:true},
+                      dependsOn:'isDedicated',
+                      select:function(args){
+                         $.ajax({
+                              url:createURL("listDomains&listAll=true"),
+                              dataType:"json",
+                              async:false,
+                               success: function(json) {
+                                  var domainObjs= json.listdomainsresponse.domain;
+                                  var items=[];
+
+                                  $(domainObjs).each(function() {
+                                  items.push({id:this.id ,description:this.name });
+                                  });
+
+                                  args.response.success({
+                                  data: items
+                                });
+                               }
+
+
+                        });
+
+                      }
+                   },
+
+                   accountId:{
+                     label:'Account',
+                     isHidden:true,
+                     dependsOn:'isDedicated',
+                     docID:'helpAccountForDedication',
+                     validation:{required:false}
+
                   },
+
                   //input_group="general" ends here
 
                   //input_group="VMWare" starts here


Mime
View raw message