You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/03/14 03:01:51 UTC

[5/6] stratos git commit: Move cartridge groups to configure section

Move cartridge groups to configure section


Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/8e29b525
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/8e29b525
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/8e29b525

Branch: refs/heads/master
Commit: 8e29b5254f1ab8419b6eade12327eb72ed1c67ad
Parents: e69fa4b
Author: Dakshika Jayathilaka <si...@gmail.com>
Authored: Sat Mar 14 06:30:02 2015 +0530
Committer: Dakshika Jayathilaka <si...@gmail.com>
Committed: Sat Mar 14 06:30:02 2015 +0530

----------------------------------------------------------------------
 .../console/applications_form.jag               |  28 ---
 .../console/configure_form.jag                  |  22 ++-
 .../applications/application_requests.jag       |   6 -
 .../configure/configure_requests.jag            |   6 +
 .../forms/default/applications/groups.json      |   9 -
 .../forms/default/configure/groups.json         |   9 +
 .../forms/schema/applications/groups.json       |  46 -----
 .../forms/schema/configure/groups.json          |  46 +++++
 .../console/controllers/menu/menu.json          |  18 +-
 .../js/custom/applications_group_editor.js      |   2 +-
 .../theme0/partials/applications_form.hbs       |  71 -------
 .../themes/theme0/partials/configure_form.hbs   |  28 +++
 .../theme0/renderers/applications_form.js       |  66 -------
 .../themes/theme0/renderers/configure_form.js   | 193 +++++++++++++------
 14 files changed, 251 insertions(+), 299 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/components/org.apache.stratos.manager.console/console/applications_form.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/applications_form.jag b/components/org.apache.stratos.manager.console/console/applications_form.jag
index f295520..8d828bc 100644
--- a/components/org.apache.stratos.manager.console/console/applications_form.jag
+++ b/components/org.apache.stratos.manager.console/console/applications_form.jag
@@ -84,26 +84,6 @@ if (!elements) {
             editorCartridges = util.RESTCalls.getCartridges();
             editorAutoscalePolicies = util.RESTCalls.getPolicyAutoScales();
             editorDeploymentPolicies = util.RESTCalls.getPolicyDeployments();
-        }else  if(elements.formtype == 'groups' && elements.action == 'new'){
-            applicationHbs = 'applicationsGroupEditor';
-            editorCartridges = util.RESTCalls.getCartridges();
-        }else  if( (elements.formtype == 'groups' || elements.formtype == 'applicationpolicies') && elements.action != 'new'){
-            isEdit = true;
-
-            //get the detail view for each listing
-            if (elements.action != 'new' && isEdit) {
-                formTitle = formData.title + ' Details - ' + elements.action;
-
-                var formtype = elements.formtype,
-                        id = escape(elements.action);
-
-                switch (formtype) {
-
-                    case "groups":
-                        formDataEdit = util.RESTCalls.getPolicyCartridgeGroup(id);
-                        break;
-                }
-            }
         }
 
     }
@@ -114,14 +94,6 @@ if (!elements) {
 var formtype = elements.formtype;
 
 switch (formtype) {
-    case "groups":
-        formTitle = "Cartridge Group Definition",
-                buttonText = "Cartridge Group Definition";
-        list_data = util.RESTCalls.getGroups();
-        if (list_data && list_data.length === 0) {
-            list_data = null;
-        }
-        break;
     case "applications":
         formTitle = "Application Definition",
                 buttonText = "Application Definition";

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/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 20ba8e9..5813dbd 100644
--- a/components/org.apache.stratos.manager.console/console/configure_form.jag
+++ b/components/org.apache.stratos.manager.console/console/configure_form.jag
@@ -33,7 +33,7 @@ var log = new Log("apachestratos.configure_form"),
         uriMatcher = new URIMatcher(request.getRequestURI()),
         elements = uriMatcher.match('/{context}/configure/{formtype}/'),
         breadcrumbPathLevelOne = 'configure',
-        formDataEdit = '',
+        formDataEdit = editorCartridges = applicationHbs = '',
         isEdit = false,
         dependancy = '',
         isForm = false;
@@ -60,6 +60,11 @@ if (!elements) {
             error.push({"errorMessage": e.message});
     }
 
+    if(elements.formtype == 'groups' && elements.action == 'new'){
+        applicationHbs = 'applicationsGroupEditor';
+        editorCartridges = util.RESTCalls.getCartridges();
+    }
+
 }
 
 //get data for listing pages
@@ -104,6 +109,15 @@ if(isEdit == false && elements.action != 'new') {
             }
             break;
 
+        case "groups":
+            formTitle = "Cartridge Group Definition",
+                    buttonText = "Cartridge Group Definition";
+            list_data = util.RESTCalls.getGroups();
+            if (list_data && list_data.length === 0) {
+                list_data = null;
+            }
+            break;
+
         case "docker":
             formTitle = "Kubernetes Cluster",
                     buttonText = "Kubernetes Cluster";
@@ -157,6 +171,10 @@ if (elements.action != 'new' && isEdit) {
             formDataEdit = util.RESTCalls.getCartridge(id);
             break;
 
+        case "groups":
+            formDataEdit = util.RESTCalls.getPolicyCartridgeGroup(id);
+            break;
+
         case "docker":
             formDataEdit = util.RESTCalls.getKubernetesCluster(id);
             break;
@@ -175,6 +193,8 @@ var caramelData = {
     isForm: isForm,
     isEdit: isEdit,
     dependancy:dependancy,
+    editorCartridges: JSON.stringify(editorCartridges),
+    applicationHbs: applicationHbs,
     formDataEdit: JSON.stringify(formDataEdit),
     formTitle: formTitle,
     formDataRaw: JSON.stringify(formDataRaw),

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag
index 9f0d6f6..7867505 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/applications/application_requests.jag
@@ -31,12 +31,6 @@ include('/controllers/login/validator.jag');
 
 try {
     switch (formtype) {
-        case "groups":
-            formSubmit = util.RESTCalls.deployGroupDefinition(formPayload);
-            break;
-        case "deletegroups":
-            formSubmit = util.RESTCalls.deleteGroup(formPayload);
-            break;
         case "applications":
             formSubmit = util.RESTCalls.deployApplicationDefinition(formPayload);
             break;

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
index 5142a1d..caa8df1 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag
@@ -42,12 +42,18 @@ try {
         case "cartridges":
             formSubmit = util.RESTCalls.deployCartridgeDefinition(formPayload);
             break;
+        case "groups":
+            formSubmit = util.RESTCalls.deployGroupDefinition(formPayload);
+            break;
         case "docker":
             formSubmit = util.RESTCalls.deployKubernetesClusterDefinition(formPayload);
             break;
         case "applicationpolicies":
             formSubmit = util.RESTCalls.deployApplicationPolicyDefinition(formPayload);
             break;
+        case "delete-groups":
+            formSubmit = util.RESTCalls.deleteGroup(formPayload);
+            break;
         case "delete-applicationpolicies":
             formSubmit = util.RESTCalls.deleteApplicationPolicyDefinition(formPayload);
             break;

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/groups.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/groups.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/groups.json
deleted file mode 100644
index 4156f39..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/default/applications/groups.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "name": "group1",
-    "cartridges": [
-        "tomcat"
-    ],
-    "dependencies": {
-        "terminationBehaviour": "terminate-none"
-    }
-}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/groups.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/groups.json b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/groups.json
new file mode 100644
index 0000000..4156f39
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/default/configure/groups.json
@@ -0,0 +1,9 @@
+{
+    "name": "group1",
+    "cartridges": [
+        "tomcat"
+    ],
+    "dependencies": {
+        "terminationBehaviour": "terminate-none"
+    }
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/groups.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/groups.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/groups.json
deleted file mode 100644
index a97c609..0000000
--- a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/applications/groups.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "type":"object",
-    "$schema": "http://json-schema.org/draft-04/schema",
-    "id": "root",
-    "title": "Cartridge Group Definition",
-    "name": "Cartridge Group",
-    "options": {
-        "disable_properties": true,
-        "disable_collapse": true
-    },
-    "properties":{
-        "cartridges": {
-            "type":"array",
-            "id": "root/cartridges",
-            "required":false,
-            "items":
-            {
-                "type":"string",
-                "id": "root/cartridges/0",
-                "default": "tomcat",
-                "required":false
-            }
-
-
-        },
-        "dependencies": {
-            "type":"object",
-            "id": "root/dependencies",
-            "required":false,
-            "properties":{
-                "terminationBehaviour": {
-                    "type":"string",
-                    "id": "root/dependencies/terminationBehaviour",
-                    "default": "terminate-none",
-                    "required":false
-                }
-            }
-        },
-        "name": {
-            "type":"string",
-            "id": "root/name",
-            "default": "group1",
-            "required":false
-        }
-    }
-}

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/groups.json
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/groups.json b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/groups.json
new file mode 100644
index 0000000..a97c609
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/controllers/forms/schema/configure/groups.json
@@ -0,0 +1,46 @@
+{
+    "type":"object",
+    "$schema": "http://json-schema.org/draft-04/schema",
+    "id": "root",
+    "title": "Cartridge Group Definition",
+    "name": "Cartridge Group",
+    "options": {
+        "disable_properties": true,
+        "disable_collapse": true
+    },
+    "properties":{
+        "cartridges": {
+            "type":"array",
+            "id": "root/cartridges",
+            "required":false,
+            "items":
+            {
+                "type":"string",
+                "id": "root/cartridges/0",
+                "default": "tomcat",
+                "required":false
+            }
+
+
+        },
+        "dependencies": {
+            "type":"object",
+            "id": "root/dependencies",
+            "required":false,
+            "properties":{
+                "terminationBehaviour": {
+                    "type":"string",
+                    "id": "root/dependencies/terminationBehaviour",
+                    "default": "terminate-none",
+                    "required":false
+                }
+            }
+        },
+        "name": {
+            "type":"string",
+            "id": "root/name",
+            "default": "group1",
+            "required":false
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/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 c3dc76a..6dd015a 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
@@ -55,6 +55,15 @@
                     "description": "Define and manage single/multi tenant cartridges."
                 },
                 {
+                    "link": "configure/groups/",
+                    "linkexternal": false,
+                    "context": "/configure",
+                    "title": "Cartridge Groups",
+                    "icon": "fa-briefcase",
+                    "permissionPaths": ["/permission", "/permission/admin", "/permission/admin/manage/view/subscription"],
+                    "description": "Manage cartridge groups"
+                },
+                {
                     "link": "configure/docker/",
                     "linkexternal": false,
                     "context": "/configure",
@@ -104,15 +113,6 @@
             "description": "Manage cartridge groups, application policies and applications",
             "sub-menu": [
                 {
-                    "link": "applications/groups/",
-                    "linkexternal": false,
-                    "context": "/applications",
-                    "title": "Cartridge Groups",
-                    "icon": "fa-briefcase",
-                    "permissionPaths": ["/permission", "/permission/admin", "/permission/admin/manage/view/subscription"],
-                    "description": "Manage cartridge groups"
-                },
-                {
                     "link": "applications/applications/",
                     "linkexternal": false,
                     "context": "/applications",

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/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 b67b9b5..39e066f 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
@@ -361,7 +361,7 @@ $(document).ready(function(){
         btn.html("<i class='fa fa-spinner fa-spin'></i> Adding...");
         $.ajax({
             type: "POST",
-            url: caramel.context + "/controllers/applications/application_requests.jag",
+            url: caramel.context + "/controllers/configure/configure_requests.jag",
             dataType: 'json',
             data: { "formPayload": JSON.stringify(payload), "formtype": formtype },
             success: function (data) {

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/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 c6a1067..0fa578d 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
@@ -146,34 +146,6 @@
                         </div>
                     {{/each}}
                 {{/ifCond}}
-                {{#ifCond formtype "==" "groups"}}
-                    {{#each content_body.sections}}
-                        <div class="block col-md-4 grid-group-item border-right">
-                            <div class="toggle-menu-icon">
-                                <i class="fa fa-th-large"></i>
-                            </div>
-                            <h2 class="truncate">{{name}} </h2>
-
-                            <div class="toggle-menu-description">{{description}} </div>
-                            <div class="list-button" style="display: none;">
-                                <button class="btn btn-danger btn-lg hover-delete-group" type="button"
-                                        id="{{name}}"> Delete</button>
-                                <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{name}}"
-                                        data-url="{{url ""}}/applications/groups/{{name}}/" > Details
-                                </button>
-                            </div>
-                            <div class="bottom-bar-wrapper">
-                                <div class="bottom-bar">
-                                    <button class="btn btn-danger btn-lg hover-delete-group" type="button"
-                                            id="{{name}}"> Delete</button>
-                                    <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{name}}"
-                                            data-url="{{url ""}}/applications/groups/{{name}}/" > Details
-                                    </button>
-                                </div>
-                            </div>
-                        </div>
-                    {{/each}}
-                {{/ifCond}}
             </div>
         </div>
     </div>
@@ -398,49 +370,6 @@
         });
     });
 
-    $('.general-table').on('click', '.hover-delete-group', function (event) {
-
-        var payload =$(this).attr("id");
-        noty({
-            layout: 'bottomRight',
-            type: 'warning',
-            text: 'Are you sure you want to delete group: <strong>'+$(this).attr("id") + "</strong> ?",
-            buttons: [
-                {addClass: 'btn btn-primary', text: 'Yes', onClick: function($noty) {
-                    var formtype = 'deletegroups';
-                    $noty.close();
-
-                    $.ajax({
-                        type: "POST",
-                        url: caramel.context + "/controllers/applications/application_requests.jag",
-                        dataType: 'json',
-                        data: { "formPayload": payload, "formtype": formtype },
-                        success: function (data) {
-                            if (data.status == 'error') {
-                                var n = noty({text: data.message, layout: 'bottomRight', type: 'error'});
-                            } else if (data.status == 'warning') {
-                                var n = noty({text: data.message, layout: 'bottomRight', type: 'warning'});
-                            } else {
-                                var n = noty({text: data.message, layout: 'bottomRight', type: 'success'});
-                            }
-                            window.setTimeout(function(){
-                                location.reload();
-                            }, 1000);
-                        }
-                    }).always(function () {
-
-                    });
-
-                }
-                },
-                {addClass: 'btn btn-danger', text: 'No', onClick: function($noty) {
-                    $noty.close();
-                }
-                }
-            ]
-        });
-    });
-
     $('.general-table').on('click', '.hover-undeploy', function (event) {
 
         var payload =$(this).attr("id");

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/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 608bff6..a33151b 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
@@ -261,6 +261,34 @@
                         </div>
                     {{/each}}
                 {{/ifCond}}
+                {{#ifCond formtype "==" "groups"}}
+                    {{#each content_body.sections}}
+                        <div class="block col-md-4 grid-group-item border-right">
+                            <div class="toggle-menu-icon">
+                                <i class="fa fa-th-large"></i>
+                            </div>
+                            <h2 class="truncate">{{name}} </h2>
+
+                            <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-groups"> Delete</button>
+                                <button class="btn btn-info btn-lg hover-details" type="button" id="details_list_{{name}}"
+                                        data-url="{{url ""}}/configure/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-groups"> Delete</button>
+                                    <button class="btn btn-info btn-lg hover-details" type="button" id="details_{{name}}"
+                                            data-url="{{url ""}}/configure/groups/{{name}}/" > Details
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    {{/each}}
+                {{/ifCond}}
             </div>
         </div>
     </div>

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js
index 1e69d1b..85bac5e 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/applications_form.js
@@ -291,72 +291,6 @@ var render = function (theme, data, meta, require) {
                 });
             break;
 
-            case "applicationsGroupEditor":
-                theme('index', {
-                    page_meta: [
-                        {
-                            partial: 'index_title',
-                            context: {
-                                page_title: 'Apache Stratos - Application Managment',
-                                page_description: 'Apache Stratos - Application Managment'
-                            }
-                        }
-                    ],
-                    header: [
-                        {
-                            partial: 'index_header',
-                            context: {
-                            }
-                        }
-                    ],
-                    sub_header: [
-                        {
-                            partial: 'index_sub_header',
-                            context: {
-                                breadcrumbPathLevelOne: data.breadcrumbPathLevelOne,
-                                breadcrumbPathLevelTwo: data.breadcrumbPathLevelTwo
-                            }
-                        }
-                    ],
-                    left_menu: [
-                        {
-                            partial: 'index_left_menu',
-                            context: {
-                                left_menu: data.left_menu
-                            }
-                        }
-                    ],
-                    right_menu_help: [
-                        {
-                            partial: 'index_right_menu_help',
-                            context: {
-
-                            }
-                        }
-                    ],
-                    content: [
-                        {
-                            partial: 'applications_group_editor',
-                            context: {
-                                formContext: data.breadcrumbPathLevelTwo,
-                                appName: data.appName,
-                                editorCartridges: data.editorCartridges,
-                                editorGroups:data.editorGroups,
-                                form_action: data.form_action,
-                                formHtml: data.formHtml,
-                                formData: data.formData,
-                                formDataRaw: data.formDataRaw,
-                                formDataEdit: data.formDataEdit,
-                                isForm: data.isForm,
-                                isEdit: data.isEdit,
-                                formTitle: data.formTitle
-
-                            }
-                        }
-
-                    ]
-                });
-            break;
             default:
                 theme('index', {
                     page_meta: [

http://git-wip-us.apache.org/repos/asf/stratos/blob/8e29b525/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js
index 1c198f2..a4992ed 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/configure_form.js
@@ -21,71 +21,140 @@
 var render = function (theme, data, meta, require) {
 
     if(data.error.length === 0 ){
-        theme('index', {
-            page_meta: [
-                {
-                    partial: 'index_title',
-                    context: {
-                        page_title: 'Apache Stratos - Configure',
-                        page_description: 'Apache Stratos - Configure'
-                    }
-                }
-            ],
-            header:[
-                {
-                    partial: 'index_header',
-                    context:{
-                    }
-                }
-            ],
-            sub_header:[
-                {
-                    partial:'index_sub_header',
-                    context:{
-                        breadcrumbPathLevelOne:data.breadcrumbPathLevelOne,
-                        breadcrumbPathLevelTwo:data.breadcrumbPathLevelTwo
-                    }
-                }
-            ],
-            left_menu:[
-                {
-                    partial:'index_left_menu',
-                    context:{
-                        left_menu:data.left_menu
-                    }
-                }
-            ],
-            right_menu_help:[
-                {
-                    partial:'index_right_menu_help',
-                    context:{
+        switch (data.applicationHbs) {
+            case "applicationsGroupEditor":
+                theme('index', {
+                    page_meta: [
+                        {
+                            partial: 'index_title',
+                            context: {
+                                page_title: 'Apache Stratos - Application Managment',
+                                page_description: 'Apache Stratos - Application Managment'
+                            }
+                        }
+                    ],
+                    header: [
+                        {
+                            partial: 'index_header',
+                            context: {
+                            }
+                        }
+                    ],
+                    sub_header: [
+                        {
+                            partial: 'index_sub_header',
+                            context: {
+                                breadcrumbPathLevelOne: data.breadcrumbPathLevelOne,
+                                breadcrumbPathLevelTwo: data.breadcrumbPathLevelTwo
+                            }
+                        }
+                    ],
+                    left_menu: [
+                        {
+                            partial: 'index_left_menu',
+                            context: {
+                                left_menu: data.left_menu
+                            }
+                        }
+                    ],
+                    right_menu_help: [
+                        {
+                            partial: 'index_right_menu_help',
+                            context: {
 
-                    }
-                }
-            ],
-            content: [
-                {
-                    partial:'configure_form',
-                    context:{
-                        formContext: data.breadcrumbPathLevelTwo,
-                        form_action: data.form_action,
-                        formData: data.formData,
-                        formDataRaw: data.formDataRaw,
-                        formTitle: data.formTitle,
-                        formtype: data.formtype,
-                        buttonText: data.buttonText,
-                        dependancy:data.dependancy,
-                        isForm: data.isForm,
-                        isEdit:data.isEdit,
-                        formDataEdit:data.formDataEdit,
-                        content_body: {sections:
-                                        data.list_data
+                            }
                         }
-                    }
-                }
+                    ],
+                    content: [
+                        {
+                            partial: 'applications_group_editor',
+                            context: {
+                                formContext: data.breadcrumbPathLevelTwo,
+                                appName: data.appName,
+                                editorCartridges: data.editorCartridges,
+                                form_action: data.form_action,
+                                formHtml: data.formHtml,
+                                formData: data.formData,
+                                formDataRaw: data.formDataRaw,
+                                formDataEdit: data.formDataEdit,
+                                isForm: data.isForm,
+                                isEdit: data.isEdit,
+                                formTitle: data.formTitle
 
-            ]
-        });
+                            }
+                        }
+
+                    ]
+                });
+                break;
+
+            default:
+            theme
+                ('index', {
+                    page_meta: [
+                        {
+                            partial: 'index_title',
+                            context: {
+                                page_title: 'Apache Stratos - Configure',
+                                page_description: 'Apache Stratos - Configure'
+                            }
+                        }
+                    ],
+                    header: [
+                        {
+                            partial: 'index_header',
+                            context: {
+                            }
+                        }
+                    ],
+                    sub_header: [
+                        {
+                            partial: 'index_sub_header',
+                            context: {
+                                breadcrumbPathLevelOne: data.breadcrumbPathLevelOne,
+                                breadcrumbPathLevelTwo: data.breadcrumbPathLevelTwo
+                            }
+                        }
+                    ],
+                    left_menu: [
+                        {
+                            partial: 'index_left_menu',
+                            context: {
+                                left_menu: data.left_menu
+                            }
+                        }
+                    ],
+                    right_menu_help: [
+                        {
+                            partial: 'index_right_menu_help',
+                            context: {
+
+                            }
+                        }
+                    ],
+                    content: [
+                        {
+                            partial: 'configure_form',
+                            context: {
+                                formContext: data.breadcrumbPathLevelTwo,
+                                form_action: data.form_action,
+                                formData: data.formData,
+                                formDataRaw: data.formDataRaw,
+                                formTitle: data.formTitle,
+                                formtype: data.formtype,
+                                buttonText: data.buttonText,
+                                dependancy: data.dependancy,
+                                isForm: data.isForm,
+                                isEdit: data.isEdit,
+                                formDataEdit: data.formDataEdit,
+                                content_body: {sections: data.list_data
+                                }
+                            }
+                        }
+
+                    ]
+                });
+        }
 
     }else{