Repository: stratos Updated Branches: refs/heads/master 1e7e30065 -> 11bc6bb33
http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json new file mode 100644 index 0000000..865a0e6 --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/kubernetes-clusters.json @@ -0,0 +1,411 @@ +{ + "type":"object", + "$schema": "http://json-schema.org/draft-04/schema";, + "id": "root", + "title": "Kubernetes Definition", + "name": "Kubernetes", + "properties":{ + "clusterId": { + "type":"string", + "id": "root/clusterId", + "default": "KubGrp1", + "required":false, + "title": "Kubernetes Cluster Id", + "name": "Kubernetes Cluster Id", + }, + "description": { + "type":"string", + "id": "root/description", + "default": "Kubernetes CoreOS cluster on EC2 ", + "required":false, + "title": "Description", + "name": "Description", + "format":"textarea" + }, + "kubernetesHosts": { + "type":"array", + "id": "root/kubernetesHosts", + "required":false, + "title": "Kubernetes Hosts", + "name": "Kubernetes Hosts", + "format":"tabs", + "items":[ + { + "type":"object", + "id": "root/kubernetesHosts/0", + "required":false, + "title": "Kubernetes Host", + "name": "Kubernetes Host", + "properties":{ + "hostId": { + "type":"string", + "id": "root/kubernetesHosts/0/hostId", + "default": "KubHostSlave1", + "required":false, + "title": "Host Id", + "name": "Host Id" + }, + "privateIPAddress": { + "type":"string", + "id": "root/kubernetesHosts/0/privateIPAddress", + "default": "172.17.8.101", + "required":true, + "title": "Private IP Address", + "name": "Private IP Address" + }, + "publicIPAddress": { + "type":"string", + "id": "root/kubernetesHosts/0/publicIPAddress", + "default": "172.17.8.101", + "required":false, + "title": "Public IP Address", + "name": "Public IP Address" + }, + "hostname": { + "type":"string", + "id": "root/kubernetesHosts/0/hostname", + "default": "slave1.dev.kubernetes.example.org", + "required":false, + "title": "Hostname", + "name": "Hostname" + }, + "property": { + "type":"array", + "id": "root/kubernetesHosts/0/property", + "required":false, + "title": "Property", + "name": "Property", + "format":"tabs", + "items":[ + { + "type":"object", + "id": "root/kubernetesHosts/0/property/0", + "required":false, + "title": "Property", + "name": "Property", + "properties":{ + "name": { + "type":"string", + "id": "root/kubernetesHosts/0/property/0/name", + "default": "prop1", + "required":false, + "uniqueItems": true, + "title": "Name", + "name": "Name", + }, + "value": { + "type":"string", + "id": "root/kubernetesHosts/0/property/0/value", + "default": "val1", + "required":false, + "title": "Value", + "name": "Value", + } + } + }, + { + "type":"object", + "id": "root/kubernetesHosts/0/property/1", + "required":false, + "title": "Property", + "name": "Property", + "properties":{ + "name": { + "type":"string", + "id": "root/kubernetesHosts/0/property/1/name", + "default": "prop2", + "uniqueItems": true, + "required":false, + "title": "Name", + "name": "Name", + }, + "value": { + "type":"string", + "id": "root/kubernetesHosts/0/property/1/value", + "default": "val2", + "required":false, + "title": "Value", + "name": "Value", + } + } + } + ] + } + } + }, + { + "type":"object", + "id": "root/kubernetesHosts/1", + "required":false, + "title": "Kubernetes Host", + "name": "Kubernetes Host", + "properties":{ + "hostId": { + "type":"string", + "id": "root/kubernetesHosts/1/hostId", + "default": "KubHostSlave2", + "required":false, + "title": "Host Id", + "name": "Host Id" + }, + "privateIPAddress": { + "type":"string", + "id": "root/kubernetesHosts/1/privateIPAddress", + "default": "172.17.8.102", + "required":true, + "title": "Private IP Address", + "name": "Private IP Address" + }, + "publicIPAddress": { + "type":"string", + "id": "root/kubernetesHosts/0/publicIPAddress", + "default": "172.17.8.102", + "required":false, + "title": "Public IP Address", + "name": "Public IP Address" + }, + "hostname": { + "type":"string", + "id": "root/kubernetesHosts/1/hostname", + "default": "slave2.dev.kubernetes.example.org", + "required":false, + "title": "Hostname", + "name": "Hostname" + }, + "property": { + "type":"array", + "id": "root/kubernetesHosts/1/property", + "required":false, + "title": "Property", + "name": "Property", + "format":"tabs", + "items":[ + { + "type":"object", + "id": "root/kubernetesHosts/1/property/0", + "required":false, + "title": "Property", + "name": "Property", + "properties":{ + "name": { + "type":"string", + "id": "root/kubernetesHosts/1/property/0/name", + "default": "prop1", + "required":false, + "title": "Name", + "name": "Name" + }, + "value": { + "type":"string", + "id": "root/kubernetesHosts/1/property/0/value", + "default": "val1", + "required":false, + "title": "Value", + "name": "Value" + } + } + }, + { + "type":"object", + "id": "root/kubernetesHosts/1/property/1", + "required":false, + "title": "Property", + "name": "Property", + "properties":{ + "name": { + "type":"string", + "id": "root/kubernetesHosts/1/property/1/name", + "default": "prop2", + "required":false, + "title": "Name", + "name": "Name" + }, + "value": { + "type":"string", + "id": "root/kubernetesHosts/1/property/1/value", + "default": "val2", + "required":false, + "title": "Value", + "name": "Value" + } + } + } + ] + } + } + } + ] + }, + "kubernetesMaster": { + "type":"object", + "id": "root/kubernetesMaster", + "required":false, + "title": "Kubernetes Master", + "name": "Kubernetes Master", + "properties":{ + "hostId": { + "type":"string", + "id": "root/kubernetesMaster/hostId", + "default": "KubHostMaster1", + "required":false, + "title": "Host Id", + "name": "Host Id" + }, + "privateIPAddress": { + "type":"string", + "id": "root/kubernetesMaster/privateIPAddress", + "default": "172.17.8.100", + "required":true, + "title": "Private IP Address", + "name": "Private IP Address" + }, + "publicIPAddress": { + "type":"string", + "id": "root/kubernetesMaster/publicIPAddress", + "default": "172.17.8.100", + "required":false, + "title": "Public IP Address", + "name": "Public IP Address" + }, + "hostname": { + "type":"string", + "id": "root/kubernetesMaster/hostname", + "default": "master.dev.kubernetes.example.org", + "required":false, + "title": "Hostname", + "name": "Hostname" + }, + "property": { + "type":"array", + "id": "root/kubernetesMaster/property", + "required":false, + "title": "Property", + "name": "Property", + "format":"tabs", + "items":[ + { + "type":"object", + "id": "root/kubernetesMaster/property/0", + "required":false, + "title": "Property", + "name": "Property", + "properties":{ + "name": { + "type":"string", + "id": "root/kubernetesMaster/property/0/name", + "default": "prop1", + "required":false + }, + "value": { + "type":"string", + "id": "root/kubernetesMaster/property/0/value", + "default": "val1", + "required":false + } + } + }, + { + "type":"object", + "id": "root/kubernetesMaster/property/1", + "required":false, + "title": "Property", + "name": "Property", + "properties":{ + "name": { + "type":"string", + "id": "root/kubernetesMaster/property/1/name", + "default": "prop2", + "required":false + }, + "value": { + "type":"string", + "id": "root/kubernetesMaster/property/1/value", + "default": "val2", + "required":false + } + } + } + ] + } + } + }, + "portRange": { + "type":"object", + "id": "root/portRange", + "required":false, + "title": "Port Range", + "name": "Port Range", + "format":"grid", + "properties":{ + "lower": { + "type":"string", + "id": "root/portRange/lower", + "default": "4500", + "title": "Lower", + "name": "Lower", + "required":false + }, + "upper": { + "type":"string", + "id": "root/portRange/upper", + "default": "5000", + "title": "Upper", + "name": "Upper", + "required":false + } + } + }, + "property": { + "type":"array", + "id": "root/property", + "required":false, + "title": "Property", + "name": "Property", + "format":"tabs", + "items":[ + { + "type":"object", + "id": "root/property/0", + "required":false, + "title": "Property", + "name": "Property", + "properties":{ + "name": { + "type":"string", + "id": "root/property/0/name", + "default": "prop1", + "required":false + }, + "value": { + "type":"string", + "id": "root/property/0/value", + "default": "val1", + "required":false + } + } + }, + { + "type":"object", + "id": "root/property/1", + "required":false, + "title": "Property", + "name": "Property", + "properties":{ + "name": { + "type":"string", + "id": "root/property/1/name", + "default": "prop2", + "required":false + }, + "value": { + "type":"string", + "id": "root/property/1/value", + "default": "val2", + "required":false + } + } + } + ] + } + } +} http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json new file mode 100644 index 0000000..22d781a --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/network-partitions.json @@ -0,0 +1,94 @@ +{ + "$schema": "http://json-schema.org/draft-04/schema#";, + "id": "root", + "type": "object", + "title": "Network Partition Definition", + "name": "Network Partition Policy", + "options": { + "disable_properties": true, + "disable_collapse": true + }, + "properties": { + "id": { + "id": "root/id", + "type": "string", + "title": "Network Partition Id" + }, + "provider": { + "id": "root/provider", + "type": "string", + "title": "Network Partition provider", + "enum": ["mock", "ec2", "openstack", "kubernetes", "gce"] + }, + "partitions": { + "id": "root/partitions", + "type": "array", + "format": "tabs", + "title": "Partitions", + "items": { + "id": "root/partitions/0", + "type": "object", + "title": "Partition", + "properties": { + "id": { + "id": "root/partitions/0/id", + "type": "string", + "title": "Partition Id" + }, + "property": { + "id": "root/partitions/0/property", + "type": "array", + "title": "Property", + "format": "tabs", + "items": { + "id": "root/partitions/0/property/0", + "type": "object", + "title": "Property", + "properties": { + "name": { + "id": "root/partitions/0/property/0/name", + "title": "Name", + "type": "string" + }, + "value": { + "id": "root/partitions/0/property/0/value", + "title": "Value", + "type": "string" + } + } + } + } + } + } + }, + "properties": { + "id": "root/properties", + "type": "array", + "title": "Properties", + "format": "tabs", + "items": { + "id": "root/properties/0", + "type": "object", + "title": "Property", + "properties": { + "name": { + "id": "root/properties/0/name", + "title": "Name", + "type": "string" + }, + "value": { + "id": "root/properties/0/value", + "title": "Value", + "type": "string" + } + } + } + } + }, + + "required": [ + "id", + "partitions", + "provider" + ] +} http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/networkpartitions.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/networkpartitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/networkpartitions.json deleted file mode 100644 index 22d781a..0000000 --- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/networkpartitions.json +++ /dev/null @@ -1,94 +0,0 @@ -{ - "$schema": "http://json-schema.org/draft-04/schema#";, - "id": "root", - "type": "object", - "title": "Network Partition Definition", - "name": "Network Partition Policy", - "options": { - "disable_properties": true, - "disable_collapse": true - }, - "properties": { - "id": { - "id": "root/id", - "type": "string", - "title": "Network Partition Id" - }, - "provider": { - "id": "root/provider", - "type": "string", - "title": "Network Partition provider", - "enum": ["mock", "ec2", "openstack", "kubernetes", "gce"] - }, - "partitions": { - "id": "root/partitions", - "type": "array", - "format": "tabs", - "title": "Partitions", - "items": { - "id": "root/partitions/0", - "type": "object", - "title": "Partition", - "properties": { - "id": { - "id": "root/partitions/0/id", - "type": "string", - "title": "Partition Id" - }, - "property": { - "id": "root/partitions/0/property", - "type": "array", - "title": "Property", - "format": "tabs", - "items": { - "id": "root/partitions/0/property/0", - "type": "object", - "title": "Property", - "properties": { - "name": { - "id": "root/partitions/0/property/0/name", - "title": "Name", - "type": "string" - }, - "value": { - "id": "root/partitions/0/property/0/value", - "title": "Value", - "type": "string" - } - } - } - } - } - } - }, - "properties": { - "id": "root/properties", - "type": "array", - "title": "Properties", - "format": "tabs", - "items": { - "id": "root/properties/0", - "type": "object", - "title": "Property", - "properties": { - "name": { - "id": "root/properties/0/name", - "title": "Name", - "type": "string" - }, - "value": { - "id": "root/properties/0/value", - "title": "Value", - "type": "string" - } - } - } - } - }, - - "required": [ - "id", - "partitions", - "provider" - ] -} http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json index c7dff7d..511890f 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json +++ b/components/org.apache.stratos.manager.console/console/controllers/menu/menu.json @@ -7,10 +7,10 @@ "title": "Configurations", "icon": "fa-gears", "permissionPaths": ["/permission", "/permission/admin"], - "description": "Configure Auto-scaling policies, cartridges and manage docker groups", + "description": "Configure network partitions, policies, cartridges, cartridge groups and kubernetes clusters", "sub-menu": [ { - "link": "configure/networkpartitions/", + "link": "configure/network-partitions/", "linkexternal": false, "context": "/configure", "title": "Network Partitions", @@ -19,7 +19,7 @@ "description": "Manage network partitions." }, { - "link": "configure/autoscalingpolicies/", + "link": "configure/autoscaling-policies/", "linkexternal": false, "context": "/configure", "title": "Autoscaling Policies", @@ -28,7 +28,7 @@ "description": "Manage policies which specify autoscaling threshold values." }, { - "link": "configure/deploymentpolicies/", + "link": "configure/deployment-policies/", "linkexternal": false, "context": "/configure", "title": "Deployment Policies", @@ -37,7 +37,7 @@ "description": "Manage policies which specify cartridge deployment in partitions." }, { - "link": "configure/applicationpolicies/", + "link": "configure/application-policies/", "linkexternal": false, "context": "/configure", "title": "Application Policies", @@ -55,7 +55,7 @@ "description": "Manage single-tenant & multi-tenant cartridges." }, { - "link": "configure/cartridgegroups/", + "link": "configure/cartridge-groups/", "linkexternal": false, "context": "/configure", "title": "Cartridge Groups", @@ -64,7 +64,7 @@ "description": "Manage cartridge groups" }, { - "link": "configure/kubernetesClusters/", + "link": "configure/kubernetes-clusters/", "linkexternal": false, "context": "/configure", "title": "Kubernetes Clusters", http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag index 1ba0997..1be2708 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/wizard/wizard_requests.jag @@ -29,9 +29,9 @@ var log = new Log("apachestratos.configure_request"), include('/controllers/login/validator.jag'); try { - if(formtype == 'networkpartitions'){ + if(formtype == 'network-partitions'){ formSubmit = util.RESTCalls.deployPartitionDefinition(formPayload); - }else if(formtype == 'autoscalingpolicies'){ + }else if(formtype == 'autoscaling-policies'){ formSubmit = util.RESTCalls.deployAutoscalePolicyDefinition(formPayload); }else if(formtype == 'deployments'){ formSubmit = util.RESTCalls.deployDeploymentPolicyDefinition(formPayload); http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js index 5e85795..bd3ebce 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications-editor.js @@ -916,7 +916,7 @@ $(document).ready(function(){ } cartridgeBlockTemplate['properties']['subscribableInfo']['properties']['autoscalingPolicy']['enum'] =policiesEnum; - //get list of deploymentpolicies + //get list of deployment-policies var dpolicies = editorDeploymentPolicies; var dpoliciesEnum = []; for(var i=0; i<dpolicies.length; i++){ http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js index 4f3712d..c7898e1 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/applications_group_editor.js @@ -424,7 +424,7 @@ $(document).ready(function(){ $('#deploy').on('click', function(){ var payload = genGroupJSON({}, jsPlumb.getConnections()); var btn = $(this); - var formtype = 'cartridgegroups'; + var formtype = 'cartridge-groups'; btn.html("<i class='fa fa-spinner fa-spin'></i> Adding..."); $.ajax({ type: "POST", http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs index 9cbdea5..4c44222 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/configure_form.hbs @@ -142,7 +142,7 @@ {{/if}} <div class="row general-table row-overide"> - {{#ifCond formtype "==" "docker"}} + {{#ifCond formtype "==" "kubernetes-clusters"}} {{#each content_body.sections}} <div class="block col-md-4 grid-group-item border-right"> <div class="toggle-menu-icon"> @@ -155,10 +155,10 @@ <button class="btn btn-danger btn-lg hover-delete" type="button" id="{{clusterId}}" data-formtype="delete-kubernetes-cluster"> Delete</button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/docker/{{clusterId}}/edit" > Edit + data-url="{{url ""}}/configure/kubernetes-clusters/{{clusterId}}/edit" > Edit </button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/docker/{{clusterId}}/" > Details + data-url="{{url ""}}/configure/kubernetes-clusters/{{clusterId}}/" > Details </button> </div> <div class="bottom-bar-wrapper"> @@ -166,10 +166,10 @@ <button class="btn btn-danger btn-lg hover-delete" type="button" id="{{clusterId}}" data-formtype="delete-kubernetes-cluster"> Delete</button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/docker/{{clusterId}}/edit" > Edit + data-url="{{url ""}}/configure/kubernetes-clusters/{{clusterId}}/edit" > Edit </button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}" - data-url="{{url ""}}/configure/docker/{{clusterId}}/" > Details + data-url="{{url ""}}/configure/kubernetes-clusters/{{clusterId}}/" > Details </button> </div> </div> @@ -212,7 +212,7 @@ </div> {{/each}} {{/ifCond}} - {{#ifCond formtype "==" "autoscalingpolicies"}} + {{#ifCond formtype "==" "autoscaling-policies"}} {{#each content_body.sections}} <div class="block col-md-4 col-xs-4 grid-group-item border-right"> <div class="toggle-menu-icon"> @@ -223,30 +223,30 @@ <div class="toggle-menu-description">{{description}}</div> <div class="list-button" style="display: none;"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{id}}" data-formtype="delete-autoscalingpolicy"> Delete</button> + id="{{id}}" data-formtype="delete-autoscaling-policy"> Delete</button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/edit" > Edit + data-url="{{url ""}}/configure/autoscaling-policies/{{id}}/edit" > Edit </button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/" > Details + data-url="{{url ""}}/configure/autoscaling-policies/{{id}}/" > Details </button> </div> <div class="bottom-bar-wrapper"> <div class="bottom-bar"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{id}}" data-formtype="delete-autoscalingpolicy"> Delete</button> + id="{{id}}" data-formtype="delete-autoscaling-policy"> Delete</button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/edit" > Edit + data-url="{{url ""}}/configure/autoscaling-policies/{{id}}/edit" > Edit </button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}" - data-url="{{url ""}}/configure/autoscalingpolicies/{{id}}/" > Details + data-url="{{url ""}}/configure/autoscaling-policies/{{id}}/" > Details </button> </div> </div> </div> {{/each}} {{/ifCond}} - {{#ifCond formtype "==" "networkpartitions"}} + {{#ifCond formtype "==" "network-partitions"}} {{#each content_body.sections}} <div class="block col-md-4 col-xs-4 grid-group-item border-right"> <div class="toggle-menu-icon"> @@ -257,30 +257,30 @@ <div class="toggle-menu-description">{{description}}</div> <div class="list-button" style="display: none;"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{id}}" data-formtype="delete-networkpartitions"> Delete</button> + id="{{id}}" data-formtype="delete-network-partitions"> Delete</button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/networkpartitions/{{id}}/edit" > Edit + data-url="{{url ""}}/configure/network-partitions/{{id}}/edit" > Edit </button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/networkpartitions/{{id}}/" > Details + data-url="{{url ""}}/configure/network-partitions/{{id}}/" > Details </button> </div> <div class="bottom-bar-wrapper"> <div class="bottom-bar"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{id}}" data-formtype="delete-networkpartitions"> Delete</button> + id="{{id}}" data-formtype="delete-network-partitions"> Delete</button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/networkpartitions/{{id}}/edit" > Edit + data-url="{{url ""}}/configure/network-partitions/{{id}}/edit" > Edit </button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}" - data-url="{{url ""}}/configure/networkpartitions/{{id}}/" > Details + data-url="{{url ""}}/configure/network-partitions/{{id}}/" > Details </button> </div> </div> </div> {{/each}} {{/ifCond}} - {{#ifCond formtype "==" "deploymentpolicies"}} + {{#ifCond formtype "==" "deployment-policies"}} {{#each content_body.sections}} <div class="block col-md-4 col-xs-4 grid-group-item border-right"> <div class="toggle-menu-icon"> @@ -291,30 +291,30 @@ <div class="toggle-menu-description">{{description}}</div> <div class="list-button" style="display: none;"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{id}}" data-formtype="delete-deploymentpolicy"> Delete</button> + id="{{id}}" data-formtype="delete-deployment-policy"> Delete</button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/deploymentpolicies/{{id}}/edit" > Edit + data-url="{{url ""}}/configure/deployment-policies/{{id}}/edit" > Edit </button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/deploymentpolicies/{{id}}/" > Details + data-url="{{url ""}}/configure/deployment-policies/{{id}}/" > Details </button> </div> <div class="bottom-bar-wrapper"> <div class="bottom-bar"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{id}}" data-formtype="delete-deploymentpolicy"> Delete</button> + id="{{id}}" data-formtype="delete-deployment-policy"> Delete</button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/deploymentpolicies/{{id}}/edit" > Edit + data-url="{{url ""}}/configure/deployment-policies/{{id}}/edit" > Edit </button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}" - data-url="{{url ""}}/configure/deploymentpolicies/{{id}}/" > Details + data-url="{{url ""}}/configure/deployment-policies/{{id}}/" > Details </button> </div> </div> </div> {{/each}} {{/ifCond}} - {{#ifCond formtype "==" "applicationpolicies"}} + {{#ifCond formtype "==" "application-policies"}} {{#each content_body.sections}} <div class="block col-md-4 grid-group-item border-right"> <div class="toggle-menu-icon"> @@ -325,30 +325,30 @@ <div class="toggle-menu-description">{{description}} </div> <div class="list-button" style="display: none;"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{id}}" data-formtype="delete-applicationpolicies"> Delete</button> + id="{{id}}" data-formtype="delete-application-policies"> Delete</button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/applicationpolicies/{{id}}/edit" > Edit + data-url="{{url ""}}/configure/application-policies/{{id}}/edit" > Edit </button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/applicationpolicies/{{id}}/" > Details + data-url="{{url ""}}/configure/application-policies/{{id}}/" > Details </button> </div> <div class="bottom-bar-wrapper"> <div class="bottom-bar"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{id}}" data-formtype="delete-applicationpolicies"> Delete</button> + id="{{id}}" data-formtype="delete-application-policies"> Delete</button> <button class="btn btn-warning btn-lg hover-details" type="button" id="details_list_{{id}}" - data-url="{{url ""}}/configure/applicationpolicies/{{id}}/edit" > Edit + data-url="{{url ""}}/configure/application-policies/{{id}}/edit" > Edit </button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{id}}" - data-url="{{url ""}}/configure/applicationpolicies/{{id}}/" > Details + data-url="{{url ""}}/configure/application-policies/{{id}}/" > Details </button> </div> </div> </div> {{/each}} {{/ifCond}} - {{#ifCond formtype "==" "cartridgegroups"}} + {{#ifCond formtype "==" "cartridge-groups"}} {{#each content_body.sections}} <div class="block col-md-4 grid-group-item border-right"> <div class="toggle-menu-icon"> @@ -359,17 +359,17 @@ <div class="toggle-menu-description">{{description}} </div> <div class="list-button" style="display: none;"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{name}}" data-formtype="delete-cartridgegroups"> Delete</button> + id="{{name}}" data-formtype="delete-cartridge-groups"> Delete</button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{name}}" - data-url="{{url ""}}/configure/cartridgegroups/{{name}}/" > Details + data-url="{{url ""}}/configure/cartridge-groups/{{name}}/" > Details </button> </div> <div class="bottom-bar-wrapper"> <div class="bottom-bar"> <button class="btn btn-danger btn-lg hover-delete" type="button" - id="{{name}}" data-formtype="delete-cartridgegroups"> Delete</button> + id="{{name}}" data-formtype="delete-cartridge-groups"> Delete</button> <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{name}}" - data-url="{{url ""}}/configure/cartridgegroups/{{name}}/" > Details + data-url="{{url ""}}/configure/cartridge-groups/{{name}}/" > Details </button> </div> </div> http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/themes/theme0/partials/wizard.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/wizard.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/wizard.hbs index 540bfd8..366f7cb 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/wizard.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/wizard.hbs @@ -32,7 +32,7 @@ <div class="row title"> <a type="button" class="btn btn-primary btn-lg" href="{{url ""}}/wizard/vm/">Virtual Machine</a> <span>Or</span> - <a type="button" class="btn btn-primary btn-lg" href="{{url ""}}/wizard/docker/">Docker</a> + <a type="button" class="btn btn-primary btn-lg" href="{{url ""}}/wizard/kubernetes-clusters/">Kubernetes Cluster</a> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/stratos/blob/11bc6bb3/components/org.apache.stratos.manager.console/console/wizard.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/wizard.jag b/components/org.apache.stratos.manager.console/console/wizard.jag index 4db2b76..6ccc06f 100644 --- a/components/org.apache.stratos.manager.console/console/wizard.jag +++ b/components/org.apache.stratos.manager.console/console/wizard.jag @@ -43,15 +43,15 @@ if(elements==null){ } var vm = { - '1':'networkpartitions', - '2':'autoscalingpolicies', + '1':'network-partitions', + '2':'autoscaling-policies', '3':'deployments', '4':'loadbalancer', '5':'cartridges' , '6':'multitenant' }; -var docker = [ - 'autoscalingpolicies', +var kubernetesClusters = [ + 'autoscaling-policies', 'deployments', 'loadbalancer', 'cartridges' ,
