You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/04/17 10:30:06 UTC
[01/16] stratos git commit: remove root element from schema
Repository: stratos
Updated Branches:
refs/heads/master f3e322545 -> f6630b258
remove root element from schema
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/01dd2cab
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/01dd2cab
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/01dd2cab
Branch: refs/heads/master
Commit: 01dd2cabc81ee541f9838d34fc76a8a713a8970b
Parents: 9d8077b
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Mar 25 06:31:10 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:55 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/css/custom.css | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/01dd2cab/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom.css b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom.css
index e03e39b..bb2673a 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom.css
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom.css
@@ -196,3 +196,7 @@ button.hover-unsubscribe, button.hover-details, button.hover-delete,button.hover
button.hover-undeploy{
margin-top: .7em;
}
+
+div#textform>div>h3 {
+ display: none;
+}
\ No newline at end of file
[09/16] stratos git commit: Improve cartridge schema
Posted by im...@apache.org.
Improve cartridge schema
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d3c531d9
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d3c531d9
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d3c531d9
Branch: refs/heads/master
Commit: d3c531d953b09e7330e5a4e0c1bbbb5eb13ab753
Parents: d902dd4
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Mar 25 08:03:40 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:56 2015 +0530
----------------------------------------------------------------------
.../forms/schema/configure/cartridges.json | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d3c531d9/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
index 6f8db89..9ceb33f 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
@@ -123,6 +123,8 @@
"id": "root/portMapping/0",
"required": ["port", "protocol", "proxyPort"],
"format": "grid",
+ "title": "Port Mapping",
+ "name": "Port Mapping",
"properties": {
"protocol": {
"type": "string",
@@ -154,6 +156,8 @@
"id": "root/portMapping/1",
"required": false,
"format": "grid",
+ "title": "Port Mapping",
+ "name": "Port Mapping",
"properties": {
"protocol": {
"type": "string",
@@ -195,6 +199,8 @@
"id": "root/iaasProvider/0",
"format": "grid",
"required": ["type", "imageId"],
+ "title": "iaas Provider",
+ "name": "iaas Provider",
"properties": {
"type": {
"type": "string",
@@ -214,6 +220,8 @@
"property": {
"type": "array",
"id": "root/iaasProvider/0/property",
+ "title": "Property",
+ "name": "Property",
"required": false,
"items": [
{
@@ -221,6 +229,8 @@
"id": "root/iaasProvider/0/property/0",
"format": "grid",
"required": ["name", "value"],
+ "title": "Properties",
+ "name": "Properties",
"properties": {
"name": {
"type": "string",
@@ -239,6 +249,8 @@
"id": "root/iaasProvider/0/property/1",
"required": false,
"format": "grid",
+ "title": "Properties",
+ "name": "Properties",
"properties": {
"name": {
"type": "string",
@@ -267,6 +279,8 @@
"type":"object",
"id": "root/iaasProvider/0/networkInterfaces/0",
"required":["networkUuid"],
+ "title": "Network Interface",
+ "name": "Network Interface",
"properties":{
"networkUuid": {
"type":"string",
@@ -282,6 +296,8 @@
"type":"object",
"id": "root/iaasProvider/0/networkInterfaces/1",
"required":["networkUuid"],
+ "title": "Network Interface",
+ "name": "Network Interface",
"properties":{
"networkUuid": {
"type":"string",
[10/16] stratos git commit: update button text for network partition
Posted by im...@apache.org.
update button text for network partition
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/36ec6aac
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/36ec6aac
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/36ec6aac
Branch: refs/heads/master
Commit: 36ec6aacb2e9e240b737658f32b4bef780d6a887
Parents: 92772e5
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Fri Apr 10 16:59:51 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:58 2015 +0530
----------------------------------------------------------------------
.../console/configure_form.jag | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/36ec6aac/components/org.apache.stratos.manager.console/console/configure_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag
index 5813dbd..146d4a3 100644
--- a/components/org.apache.stratos.manager.console/console/configure_form.jag
+++ b/components/org.apache.stratos.manager.console/console/configure_form.jag
@@ -74,8 +74,8 @@ if(isEdit == false && elements.action != 'new') {
switch (formtype) {
case "partitions":
- formTitle = "Network Partition Definition",
- buttonText = "Network Partition Definition";
+ formTitle = "Network Partition",
+ buttonText = "Network Partition";
list_data = util.RESTCalls.getPartitions();
if (list_data && list_data.length === 0) {
list_data = null;
[02/16] stratos git commit: improve tenant schema
Posted by im...@apache.org.
improve tenant schema
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9d8077b4
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9d8077b4
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9d8077b4
Branch: refs/heads/master
Commit: 9d8077b4faeead7f6d38949339b1a9215dfed6d2
Parents: c2950cc
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Mar 25 01:03:31 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:55 2015 +0530
----------------------------------------------------------------------
.../controllers/forms/schema/users/tenants.json | 46 ++++++++++----------
1 file changed, 24 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/9d8077b4/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/tenants.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/tenants.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/tenants.json
index 69df31b..bbfa40a 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/tenants.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/tenants.json
@@ -10,49 +10,51 @@
},
"required":["admin","adminPassword","email", "firstname", "lastname", "tenantDomain"],
"properties":{
+ "firstname": {
+ "type":"string",
+ "id": "root/firstname",
+ "default": "Frank",
+ "title": "First Name",
+ "name": "First Name"
+ },
+ "lastname": {
+ "type":"string",
+ "id": "root/lastname",
+ "default": "Myers",
+ "title": "Last Name",
+ "name": "Last Name"
+ },
"admin": {
"type":"string",
"id": "root/admin",
"default": "admin",
- "title": "Admin user name",
- "name": "Admin user name"
+ "title": "Admin User Name",
+ "name": "Admin User Name"
},
"adminPassword": {
"type":"string",
"id": "root/adminPassword",
"format":"password",
"default": "admin123",
- "title": "Admin user password",
+ "minLength":6,
+ "title": "Admin User Password",
"description":"You need to add least 6 characters including number",
- "name": "Admin user password"
+ "name": "Admin User Password"
},
"email": {
"type":"string",
"id": "root/email",
"default": "foo@bar.com",
- "title": "Admin email",
- "name": "Admin email"
- },
- "firstname": {
- "type":"string",
- "id": "root/firstname",
- "default": "Frank",
- "title": "First name",
- "name": "First name"
- },
- "lastname": {
- "type":"string",
- "id": "root/lastname",
- "default": "Myers",
- "title": "Last name",
- "name": "Last name"
+ "format": "email",
+ "title": "Admin Email",
+ "name": "Admin Email"
},
"tenantDomain": {
"type":"string",
"id": "root/tenantDomain",
"default": "frank.com",
- "title": "Tenant domain",
- "name": "Tenant domain"
+ "title": "Tenant Domain",
+ "name": "Tenant Domain"
},
"active": {
"type":"boolean",
[05/16] stratos git commit: improve schema on application group editor
Posted by im...@apache.org.
improve schema on application group editor
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/92772e59
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/92772e59
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/92772e59
Branch: refs/heads/master
Commit: 92772e59c91885bbf6fbbef6659e3db8f473a032
Parents: d3c531d
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Mar 25 08:24:13 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:56 2015 +0530
----------------------------------------------------------------------
.../themes/theme0/js/custom/applications_group_editor.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/92772e59/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 39e066f..566a898 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
@@ -304,7 +304,8 @@ var groupBlockTemplate = {
"title": "Startup Orders: ",
"items": {
"id": "root/dependencies/startupOrders/0",
- "type": "string"
+ "type": "string",
+ "title": "Startup Order "
}
},
"scalingDependants": {
@@ -313,7 +314,8 @@ var groupBlockTemplate = {
"title": "Scaling Dependants: ",
"items": {
"id": "root/dependencies/scalingDependants/0",
- "type": "string"
+ "type": "string",
+ "title": "Scaling Dependant "
}
},
"terminationBehaviour": {
[13/16] stratos git commit: This closes #286 on GitHub
Posted by im...@apache.org.
This closes #286 on GitHub
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/f6630b25
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/f6630b25
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/f6630b25
Branch: refs/heads/master
Commit: f6630b25838c66a6f10b6254129800fb8b48a8df
Parents: 1c893e6
Author: Imesh Gunaratne <im...@apache.org>
Authored: Fri Apr 17 13:59:58 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:58 2015 +0530
----------------------------------------------------------------------
----------------------------------------------------------------------
[04/16] stratos git commit: add application editor general section
with JSON Schema
Posted by im...@apache.org.
add application editor general section with JSON Schema
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/9458c739
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/9458c739
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/9458c739
Branch: refs/heads/master
Commit: 9458c739eb5f9fd80733457c92c5898a7b9f22a6
Parents: f3e3225
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Mar 18 06:52:43 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:55 2015 +0530
----------------------------------------------------------------------
.../theme0/css/custom/application_editor.css | 4 +
.../theme0/js/custom/applications-editor.js | 141 ++++++++++++++++---
.../theme0/partials/applications_editor.hbs | 30 ----
3 files changed, 123 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/9458c739/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/application_editor.css
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/application_editor.css b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/application_editor.css
index 31d6c86..873d3b1 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/application_editor.css
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/css/custom/application_editor.css
@@ -184,4 +184,8 @@
padding-left: 4px;
color: rgb(93, 170, 254);
padding-top: 2px;
+}
+
+div#general>div>h3 {
+ display: none;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/9458c739/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 0f3b310..656a9d0 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
@@ -357,31 +357,14 @@ function generateGroupPreview(data) {
var applicationJson = {};
//Definition JSON builder
-function generateJsplumbTree(collector, connections){
+function generateJsplumbTree(collector, connections, appeditor){
- //get general data
- $('input.level-root').each(function(){
- var inputId = $(this).attr('id');
- collector[inputId] = $(this).val();
- });
+ collector = appeditor.getValue();
collector['components']={};
- collector['components']['dependencies']={};
collector['components']['groups']=[];
collector['components']['cartridges']=[];
- collector['components']['dependencies']['startupOrders']=[];
- collector['components']['dependencies']['scalingDependents']=[];
- var startupOrders = $('input#startupOrders').val().split(' ').join('').split(/["][,]+/g);
- for (var i = 0; i < startupOrders.length; i++) {
- startupOrders[i] = startupOrders[i].replace(/"/g, "");
- }
- var scalingDependents = $('input#scalingDependents').val().split(' ').join('').split(/["][,]+/g);
- for (var i = 0; i < scalingDependents.length; i++) {
- scalingDependents[i] = scalingDependents[i].replace(/"/g, "");
- }
- collector['components']['dependencies']['startupOrders'] = startupOrders;
- collector['components']['dependencies']['scalingDependents'] = scalingDependents;
- collector['components']['dependencies']['terminationBehaviour']=$('select#terminationBehaviour').val();
+ console.log(collector)
//generate raw data tree from connections
var rawtree = [];
@@ -456,6 +439,17 @@ function generateJsplumbTree(collector, connections){
return collector;
}
+//UUID generator
+function uuid() {
+ function s4() {
+ return Math.floor((1 + Math.random()) * 0x10000)
+ .toString(16)
+ .substring(1);
+ }
+ return s4() + s4() + '-' + s4() + '-' + s4() + '-' +
+ s4() + '-' + s4() + s4() + s4();
+}
+
//setting up schema and defaults
var cartridgeBlockTemplate = {
"type":"object",
@@ -610,6 +604,97 @@ var groupBlockDefault = {
"groupScalingEnabled":"false"
};
+var applicationBlockTemplate = {
+ "$schema": "http://json-schema.org/draft-04/schema#",
+ "id": "root",
+ "type": "object",
+ "title":" ",
+ "options":{
+ "disable_properties":true,
+ "disable_collapse": true
+ },
+ "properties": {
+ "applicationId": {
+ "id": "root/applicationId",
+ "type": "string",
+ "options": {
+ "hidden": true
+ }
+ },
+ "alias": {
+ "id": "root/alias",
+ "type": "string",
+ "title": "Application Alias",
+ "name": "Application Alias"
+ },
+ "multiTenant": {
+ "id": "root/multiTenant",
+ "type": "boolean",
+ "title": "Application Multi Tenancy",
+ "name": "Application Multi Tenancy"
+ },
+ "dependencies": {
+ "id": "root/dependencies",
+ "type": "object",
+ "title": "Dependencies",
+ "name": "Dependencies",
+ "options": {
+ "hidden": false,
+ "disable_properties":true,
+ "collapsed": true
+ },
+ "properties": {
+ "startupOrders": {
+ "id": "root/dependencies/startupOrders",
+ "type": "array",
+ "title": "Startup Orders",
+ "name": "Startup Orders",
+ "items": {
+ "id": "root/dependencies/startupOrders/0",
+ "type": "string",
+ "title": "Startup Order",
+ "name": "Startup Order"
+ }
+ },
+ "scalingDependents": {
+ "id": "root/dependencies/scalingDependents",
+ "type": "array",
+ "title": "Scaling Dependents",
+ "name": "Scaling Dependents",
+ "items": {
+ "id": "root/dependencies/scalingDependents/0",
+ "type": "string",
+ "title": "Scaling Dependent",
+ "name": "Scaling Dependent"
+ }
+ },
+ "terminationBehaviour": {
+ "id": "root/dependencies/terminationBehaviour",
+ "type": "string",
+ "title": "Termination Behaviour",
+ "name": "Termination Behaviour",
+ "enum": ["terminate-none","terminate-dependents","terminate-all"],
+ }
+ }
+ }
+ }
+};
+
+var applicationBlockDefault = {
+ "applicationId": "",
+ "alias": "",
+ "multiTenant": false,
+ "dependencies": {
+ "startupOrders": [
+ "group.my-group1,cartridge.my-c4"
+ ],
+ "scalingDependents": [
+ "group.my-group1,cartridge.my-c4"
+ ],
+ "terminationBehaviour": "terminate-dependents"
+ }
+};
+
//create cartridge list
var cartridgeListHtml='';
function generateCartridges(data){
@@ -685,7 +770,7 @@ $(document).ready(function(){
$('#deploy').attr('disabled','disabled');
$('#deploy').on('click', function(){
- var appJSON = generateJsplumbTree(applicationJson, jsPlumb.getConnections());
+ var appJSON = generateJsplumbTree(applicationJson, jsPlumb.getConnections(), appeditor);
var btn = $(this);
var formtype = 'applications';
btn.html("<i class='fa fa-spinner fa-spin'></i> Adding...");
@@ -717,7 +802,19 @@ $(document).ready(function(){
JSONEditor.defaults.theme = 'bootstrap3';
JSONEditor.defaults.iconlib = 'fontawesome4';
JSONEditor.defaults.show_errors = "always";
- var editor, blockId;
+ var editor, blockId, appeditor;
+
+ //set hidden UUID
+ applicationBlockDefault.applicationId = uuid();
+
+ // Initialize the editor for main section
+ appeditor = new JSONEditor(document.getElementById('general'), {
+ ajax: false,
+ disable_edit_json: true,
+ schema: applicationBlockTemplate,
+ format: "grid",
+ startval: applicationBlockDefault
+ });
DragEl(".stepnode");
http://git-wip-us.apache.org/repos/asf/stratos/blob/9458c739/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs
index 77025e3..aa51d13 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_editor.hbs
@@ -96,36 +96,6 @@
<div class="tab-content app-details-tab-content">
<div role="tabpanel" class="tab-pane active" id="general">
- <div class="form-group">
- <label class="control-label" for="applicationId">Application Id:</label>
- <input type="text" class="form-control level-root" placeholder="" id="applicationId">
- </div>
- <div class="form-group">
- <label class="control-label" for="alias">Alias:</label>
- <input type="text" class="form-control level-root" placeholder="" id="alias">
- </div>
- <div class="panel panel-default">
- <div class="panel-heading">Dependencies</div>
- <div class="panel-body">
- <div class="form-group">
- <label class="control-label" for="alias">Startup Orders:</label>
- <input type="text" class="form-control level-components" placeholder="" id="startupOrders">
- </div>
- <div class="form-group">
- <label class="control-label" for="alias">Scaling Dependents:</label>
- <input type="text" class="form-control level-components" placeholder="" id="scalingDependents">
- </div>
- <div class="form-group">
- <label class="control-label" for="alias">Termination Behaviour:</label>
- <select class="form-control level-components" id="terminationBehaviour">
- <option value="terminate-none">terminate-none</option>
- <option value="terminate-dependents">terminate-dependents</option>
- <option value="terminate-all">terminate-all</option>
- </select>
- </div>
- </div>
- </div>
-
</div>
<div role="tabpanel" class="tab-pane components" id="components">
<button type="button" class="btn btn-primary" id="component-info-update" disabled="disabled">Update</button>
[08/16] stratos git commit: set grid active by default on listing
Posted by im...@apache.org.
set grid active by default on listing
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/b90537fc
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/b90537fc
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/b90537fc
Branch: refs/heads/master
Commit: b90537fc15905fff2ffd098ef90c2a273563ae52
Parents: 68122ca
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Mar 25 06:54:15 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:56 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/js/custom/form.js | 4 ++++
.../console/themes/theme0/partials/applications_form.hbs | 2 +-
.../console/themes/theme0/partials/configure_form.hbs | 2 +-
.../console/themes/theme0/partials/users_form.hbs | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/b90537fc/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/form.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/form.js b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/form.js
index d4c1d6b..6a22077 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/form.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/js/custom/form.js
@@ -41,6 +41,8 @@ var currentJson;
$(document).ready(function() {
$('#list').click(function(event){
+ $(this).addClass('active');
+ $('#grid').removeClass('active');
// event.preventDefault();
$('.general-table .block').addClass('list-group-item');
$('.general-table .block').removeClass('grid-group-item');
@@ -48,6 +50,8 @@ $(document).ready(function() {
});
$('#grid').click(function(event){
//event.preventDefault();
+ $(this).addClass('active');
+ $('#list').removeClass('active');
$('.general-table .block').removeClass('list-group-item');
$('.general-table .block').addClass('grid-group-item');
$('.general-table .block .list-button').css({"display":"none"});
http://git-wip-us.apache.org/repos/asf/stratos/blob/b90537fc/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
index 0fa578d..c3e47ba 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
@@ -65,7 +65,7 @@
<a href="#" id="list" class="btn btn-default">
<i class="fa fa-list-ul"></i> List
</a>
- <a href="#" id="grid" class="btn btn-default">
+ <a href="#" id="grid" class="btn btn-default active">
<i class="fa fa-th"></i> Grid
</a>
</div>
http://git-wip-us.apache.org/repos/asf/stratos/blob/b90537fc/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 a33151b..cd96237 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
@@ -65,7 +65,7 @@
<a href="#" id="list" class="btn btn-default">
<i class="fa fa-list-ul"></i> List
</a>
- <a href="#" id="grid" class="btn btn-default">
+ <a href="#" id="grid" class="btn btn-default active">
<i class="fa fa-th"></i> Grid
</a>
</div>
http://git-wip-us.apache.org/repos/asf/stratos/blob/b90537fc/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
index ae7241d..ba11a26 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
@@ -48,7 +48,7 @@
<a href="#" id="list" class="btn btn-default">
<i class="fa fa-list-ul"></i> List
</a>
- <a href="#" id="grid" class="btn btn-default">
+ <a href="#" id="grid" class="btn btn-default active">
<i class="fa fa-th"></i> Grid
</a>
</div>
[16/16] stratos git commit: improve JSON logic with tabs
Posted by im...@apache.org.
improve JSON logic with tabs
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1c893e6c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1c893e6c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1c893e6c
Branch: refs/heads/master
Commit: 1c893e6caea6636b400ea05c805bb56a1788dc2c
Parents: daabf06
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Fri Apr 10 17:13:44 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:58 2015 +0530
----------------------------------------------------------------------
.../schema/configure/applicationpolicies.json | 2 +
.../schema/configure/autoscalingpolicies.json | 4 +-
.../forms/schema/configure/cartridges.json | 5 +
.../schema/configure/deploymentpolicies.json | 5 +-
.../forms/schema/configure/docker.json | 145 +++++++++++++++----
.../forms/schema/configure/partitions.json | 6 +
6 files changed, 138 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/1c893e6c/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/applicationpolicies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/applicationpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/applicationpolicies.json
index 8113dd5..b5297e0 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/applicationpolicies.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/applicationpolicies.json
@@ -27,6 +27,7 @@
"type": "array",
"title": "Network Partitions ",
"name": "Network Partitions",
+ "format":"tabs",
"items": {
"id": "root/networkPartitions/0",
"type": "string",
@@ -39,6 +40,7 @@
"type": "array",
"title": "Properties ",
"name": "Properties",
+ "format":"tabs",
"items": [
{
"id": "root/properties/0",
http://git-wip-us.apache.org/repos/asf/stratos/blob/1c893e6c/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json
index dde614d..387a770 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/autoscalingpolicies.json
@@ -23,7 +23,8 @@
"id": "root/description",
"title": "Description",
"name": "Description",
- "maxItems":1
+ "maxItems":1,
+ "format": "textarea"
},
"isPublic": {
"type":"boolean",
@@ -49,6 +50,7 @@
"options": {
"disable_properties": true
},
+ "format":"grid",
"properties":{
"requestsInFlight": {
"type":"object",
http://git-wip-us.apache.org/repos/asf/stratos/blob/1c893e6c/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
index 9ceb33f..c20de4c 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/cartridges.json
@@ -117,6 +117,7 @@
"options": {
"collapsed": true
},
+ "format": "tabs",
"items": [
{
"type": "object",
@@ -194,6 +195,7 @@
"options": {
"collapsed": true
},
+ "format":"tabs",
"items": {
"type": "object",
"id": "root/iaasProvider/0",
@@ -223,6 +225,7 @@
"title": "Property",
"name": "Property",
"required": false,
+ "format":"tabs",
"items": [
{
"type": "object",
@@ -274,6 +277,7 @@
"title": "Network Interfaces",
"name": "Network Interfaces",
"required":true,
+ "format":"tabs",
"items":[
{
"type":"object",
@@ -338,6 +342,7 @@
"id": "root/persistence/volume",
"title": "Volume",
"name": "Volume",
+ "format":"tabs",
"items": {
"type": "object",
"id": "root/persistence/volume/0",
http://git-wip-us.apache.org/repos/asf/stratos/blob/1c893e6c/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deploymentpolicies.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deploymentpolicies.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deploymentpolicies.json
index b6222bb..396a26b 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deploymentpolicies.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/deploymentpolicies.json
@@ -12,12 +12,13 @@
"id": {
"id": "root/id",
"type": "string",
- "title":"Deployment policy ID"
+ "title":"Deployment Policy ID"
},
"networkPartitions": {
"id": "root/networkPartitions",
"title":"Network Partitions",
"type": "array",
+ "format":"tabs",
"items": {
"id": "root/networkPartitions/0",
"type": "object",
@@ -39,6 +40,7 @@
"id": "root/networkPartitions/0/partitions",
"type": "array",
"title":"Partitions",
+ "format":"tabs",
"items": {
"id": "root/networkPartitions/0/partitions/0",
"type": "object",
@@ -52,6 +54,7 @@
"partitionMax": {
"id": "root/networkPartitions/0/partitions/0/partitionMax",
"type": "integer",
+ "title":"Partition Max",
"format": "number"
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/1c893e6c/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/docker.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/docker.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/docker.json
index 24f356d..865a0e6 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/docker.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/docker.json
@@ -5,73 +5,101 @@
"title": "Kubernetes Definition",
"name": "Kubernetes",
"properties":{
- "description": {
- "type":"string",
- "id": "root/description",
- "default": "Kubernetes CoreOS cluster on EC2 ",
- "required":false
- },
"clusterId": {
"type":"string",
"id": "root/clusterId",
"default": "KubGrp1",
- "required":false
+ "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
+ "required":false,
+ "title": "Host Id",
+ "name": "Host Id"
},
"privateIPAddress": {
"type":"string",
"id": "root/kubernetesHosts/0/privateIPAddress",
"default": "172.17.8.101",
- "required":true
+ "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
+ "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
+ "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
+ "required":false,
+ "uniqueItems": true,
+ "title": "Name",
+ "name": "Name",
},
"value": {
"type":"string",
"id": "root/kubernetesHosts/0/property/0/value",
"default": "val1",
- "required":false
+ "required":false,
+ "title": "Value",
+ "name": "Value",
}
}
},
@@ -79,18 +107,25 @@
"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",
- "required":false
+ "uniqueItems": true,
+ "required":false,
+ "title": "Name",
+ "name": "Name",
},
"value": {
"type":"string",
"id": "root/kubernetesHosts/0/property/1/value",
"default": "val2",
- "required":false
+ "required":false,
+ "title": "Value",
+ "name": "Value",
}
}
}
@@ -102,52 +137,71 @@
"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
+ "required":false,
+ "title": "Host Id",
+ "name": "Host Id"
},
"privateIPAddress": {
"type":"string",
"id": "root/kubernetesHosts/1/privateIPAddress",
"default": "172.17.8.102",
- "required":true
+ "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
+ "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
+ "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
+ "required":false,
+ "title": "Name",
+ "name": "Name"
},
"value": {
"type":"string",
"id": "root/kubernetesHosts/1/property/0/value",
"default": "val1",
- "required":false
+ "required":false,
+ "title": "Value",
+ "name": "Value"
}
}
},
@@ -155,18 +209,24 @@
"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
+ "required":false,
+ "title": "Name",
+ "name": "Name"
},
"value": {
"type":"string",
"id": "root/kubernetesHosts/1/property/1/value",
"default": "val2",
- "required":false
+ "required":false,
+ "title": "Value",
+ "name": "Value"
}
}
}
@@ -180,40 +240,55 @@
"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
+ "required":false,
+ "title": "Host Id",
+ "name": "Host Id"
},
"privateIPAddress": {
"type":"string",
"id": "root/kubernetesMaster/privateIPAddress",
"default": "172.17.8.100",
- "required":true
+ "required":true,
+ "title": "Private IP Address",
+ "name": "Private IP Address"
},
"publicIPAddress": {
"type":"string",
"id": "root/kubernetesMaster/publicIPAddress",
"default": "172.17.8.100",
- "required":false
+ "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
+ "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",
@@ -233,6 +308,8 @@
"type":"object",
"id": "root/kubernetesMaster/property/1",
"required":false,
+ "title": "Property",
+ "name": "Property",
"properties":{
"name": {
"type":"string",
@@ -256,17 +333,24 @@
"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
}
}
@@ -275,11 +359,16 @@
"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",
@@ -299,6 +388,8 @@
"type":"object",
"id": "root/property/1",
"required":false,
+ "title": "Property",
+ "name": "Property",
"properties":{
"name": {
"type":"string",
http://git-wip-us.apache.org/repos/asf/stratos/blob/1c893e6c/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
index 674c5cb..2f6e3dc 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
@@ -23,6 +23,7 @@
"partitions": {
"id": "root/partitions",
"type": "array",
+ "format":"tabs",
"title":"Partitions",
"items": {
"id": "root/partitions/0",
@@ -37,16 +38,21 @@
"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"
}
}
[14/16] stratos git commit: fix typo
Posted by im...@apache.org.
fix typo
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e4f56494
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e4f56494
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e4f56494
Branch: refs/heads/master
Commit: e4f564940a90ebb8e47349e8376cf8c0bc19f3b3
Parents: 4a84561
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Fri Apr 10 17:11:43 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:58 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/partials/applications_form.hbs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/e4f56494/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
index c3e47ba..5a1cb5b 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/applications_form.hbs
@@ -78,7 +78,7 @@
{{else}}
<div class="row no-item row-overide">
<div class="row title">
- <h2>No {{formTitle}} found..</h2>
+ <h2>No {{formTitle}} Found..</h2>
<a type="button" class="btn btn-primary btn-lg" href="new/">Add New {{formTitle}}</a>
</div>
</div>
[06/16] stratos git commit: improve netwwork partion schema view
Posted by im...@apache.org.
improve netwwork partion schema view
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/68122cac
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/68122cac
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/68122cac
Branch: refs/heads/master
Commit: 68122caccad47f7ab4abed9eac4311ffe7cd6c56
Parents: 01dd2ca
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Mar 25 06:46:56 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:56 2015 +0530
----------------------------------------------------------------------
.../console/controllers/forms/schema/configure/partitions.json | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/68122cac/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
index f98a3ea..674c5cb 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/partitions.json
@@ -31,7 +31,8 @@
"properties": {
"id": {
"id": "root/partitions/0/id",
- "type": "string"
+ "type": "string",
+ "title":"Partition Id"
},
"property": {
"id": "root/partitions/0/property",
@@ -57,6 +58,7 @@
},
"required": [
"id",
- "partitions"
+ "partitions",
+ "provider"
]
}
\ No newline at end of file
[12/16] stratos git commit: improve tabs on application editor
Posted by im...@apache.org.
improve tabs on application editor
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/890eb39e
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/890eb39e
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/890eb39e
Branch: refs/heads/master
Commit: 890eb39e3a8819b232f0f7d49c4c6781aae4a91f
Parents: 36ec6aa
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Fri Apr 10 17:07:44 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:58 2015 +0530
----------------------------------------------------------------------
.../themes/theme0/js/custom/applications-editor.js | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/890eb39e/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 656a9d0..2be5923 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
@@ -616,10 +616,9 @@ var applicationBlockTemplate = {
"properties": {
"applicationId": {
"id": "root/applicationId",
- "type": "string",
- "options": {
- "hidden": true
- }
+ "title": "Application Id",
+ "name": "Application Id",
+ "type": "string"
},
"alias": {
"id": "root/alias",
@@ -649,11 +648,12 @@ var applicationBlockTemplate = {
"type": "array",
"title": "Startup Orders",
"name": "Startup Orders",
+ "format":"tabs",
"items": {
"id": "root/dependencies/startupOrders/0",
"type": "string",
- "title": "Startup Order",
- "name": "Startup Order"
+ "title": "Order",
+ "name": "Order"
}
},
"scalingDependents": {
@@ -661,11 +661,12 @@ var applicationBlockTemplate = {
"type": "array",
"title": "Scaling Dependents",
"name": "Scaling Dependents",
+ "format":"tabs",
"items": {
"id": "root/dependencies/scalingDependents/0",
"type": "string",
- "title": "Scaling Dependent",
- "name": "Scaling Dependent"
+ "title": "Dependent",
+ "name": "Dependent"
}
},
"terminationBehaviour": {
[07/16] stratos git commit: fix button text space issue
Posted by im...@apache.org.
fix button text space issue
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/d902dd4b
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/d902dd4b
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/d902dd4b
Branch: refs/heads/master
Commit: d902dd4b11ecd52f008356f51fa63fa956b20a86
Parents: b90537f
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Mar 25 06:57:00 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:56 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/partials/configure_form.hbs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/d902dd4b/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 cd96237..474e90b 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
@@ -457,7 +457,7 @@
}
})
.always(function () {
- btn.html('Add' + '{{formTitle}}');
+ btn.html('Add ' + '{{formTitle}}');
});
});//end of deploy button trigger
[11/16] stratos git commit: fix typo
Posted by im...@apache.org.
fix typo
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/daabf060
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/daabf060
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/daabf060
Branch: refs/heads/master
Commit: daabf060af248bf50149b575b0fdeafc238d5d39
Parents: e4f5649
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Fri Apr 10 17:13:07 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:58 2015 +0530
----------------------------------------------------------------------
.../console/themes/theme0/partials/configure_form.hbs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/daabf060/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 474e90b..ea5cd2b 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
@@ -78,7 +78,7 @@
{{else}}
<div class="row no-item row-overide">
<div class="row title">
- <h2>No {{buttonText}} found..</h2>
+ <h2>No {{buttonText}} Found..</h2>
{{#if dependancy}}
<h3>You need to add <i>{{dependancy}}</i> before {{formTitle}}</h3>
<a type="button" class="btn btn-primary btn-lg" href="../{{dependancy}}/new/">Add New {{dependancy}}</a>
[03/16] stratos git commit: improve usability of user section
Posted by im...@apache.org.
improve usability of user section
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c2950cc3
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c2950cc3
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c2950cc3
Branch: refs/heads/master
Commit: c2950cc3f1b1b22c03d3bf35017c6a6f1c2b648f
Parents: 9458c73
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Wed Mar 25 00:40:31 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:55 2015 +0530
----------------------------------------------------------------------
.../controllers/forms/schema/users/users.json | 47 ++++++++++----------
.../themes/theme0/partials/users_form.hbs | 4 +-
2 files changed, 26 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c2950cc3/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/users.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/users.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/users.json
index 731439e..bcec499 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/users.json
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/users/users.json
@@ -9,12 +9,28 @@
},
"required":["userName","credential","role"],
"properties":{
+ "firstName": {
+ "type":"string",
+ "id": "root/firstName",
+ "title": "First Name",
+ "name": "First Name",
+ "default": "",
+ "required":false
+ },
+ "lastName": {
+ "type":"string",
+ "id": "root/lastName",
+ "title": "Last Name",
+ "name": "Last Name",
+ "default": "",
+ "required":false
+ },
"userName": {
"type":"string",
"id": "root/userName",
"title": "User Name",
"name": "User Name",
- "minLength":4,
+ "minLength":2,
"required":true,
"default": ""
},
@@ -22,19 +38,12 @@
"type":"string",
"id": "root/credential",
"minLength":6,
+ "description":"Enter six characters long password",
"format":"password",
"title": "Password",
"name": "Password",
"default": ""
},
- "role": {
- "type":"string",
- "id": "root/role",
- "title": "User Role",
- "name": "User Role",
- "enum":["admin","Internal/user"],
- "default": "Internal/user"
- },
"email": {
"type":"string",
"id": "root/email",
@@ -44,21 +53,13 @@
"default": "name@host.com",
"required":false
},
- "firstName": {
- "type":"string",
- "id": "root/firstName",
- "title": "First Name",
- "name": "First Name",
- "default": "",
- "required":false
- },
- "lastName": {
+ "role": {
"type":"string",
- "id": "root/lastName",
- "title": "Last Name",
- "name": "Last Name",
- "default": "",
- "required":false
+ "id": "root/role",
+ "title": "User Role",
+ "name": "User Role",
+ "enum":["admin","Internal/user"],
+ "default": "Internal/user"
}
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/c2950cc3/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
index 7b13618..ae7241d 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/users_form.hbs
@@ -54,7 +54,7 @@
</div>
</div>
<div class="col-md-7 col-sm-3 text-right">
- <a type="button" class="btn btn-primary btn-lg" href="new/">Add New {{formContext}}</a>
+ <a type="button" class="btn btn-primary btn-lg" href="new/">Add New {{formTitle}}</a>
</div>
</div>
{{else}}
@@ -338,7 +338,7 @@
$('.help-block').hide();
$('.fa-question-circle').click(function(){
- $(this).parent().find('.help-block').toggle();
+ $(this).parent().find('.help-block').not('.errormsg').toggle();
});
});
[15/16] stratos git commit: improve tabs on cartridge editor
Posted by im...@apache.org.
improve tabs on cartridge editor
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/4a84561c
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/4a84561c
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/4a84561c
Branch: refs/heads/master
Commit: 4a84561c9149ddfd1cd21017d0a1a9258c7ecd54
Parents: 890eb39
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Fri Apr 10 17:08:22 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Fri Apr 17 13:59:58 2015 +0530
----------------------------------------------------------------------
.../themes/theme0/js/custom/applications_group_editor.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/4a84561c/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 566a898..3bd7c1a 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
@@ -302,20 +302,22 @@ var groupBlockTemplate = {
"id": "root/dependencies/startupOrders",
"type": "array",
"title": "Startup Orders: ",
+ "format":"tabs",
"items": {
"id": "root/dependencies/startupOrders/0",
"type": "string",
- "title": "Startup Order "
+ "title": "Order"
}
},
"scalingDependants": {
"id": "root/dependencies/scalingDependants",
"type": "array",
"title": "Scaling Dependants: ",
+ "format":"tabs",
"items": {
"id": "root/dependencies/scalingDependants/0",
"type": "string",
- "title": "Scaling Dependant "
+ "title": "Dependant"
}
},
"terminationBehaviour": {