Updated Branches:
  refs/heads/master df8e5cc8c -> 8cf82f22f

adding stratos manager ui bits, done by chanaka jayasena


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

Branch: refs/heads/master
Commit: 8cf82f22fe8b90a864031ed172d555f35dd79df4
Parents: df8e5cc
Author: Pradeep Fernando <[email protected]>
Authored: Mon Jan 6 16:42:31 2014 +0530
Committer: Pradeep Fernando <[email protected]>
Committed: Mon Jan 6 16:42:31 2014 +0530

----------------------------------------------------------------------
 .../configure_stratos.jag                       |   7 ++
 .../themes/theme1/pages/index.hbs               |   1 +
 .../themes/theme1/partials/cartridges.hbs       |   4 +-
 .../theme1/partials/configure_stratos.hbs       | 101 +++++++++++++++++++
 .../themes/theme1/partials/header.hbs           |  27 +++--
 .../themes/theme1/partials/mycartridges.hbs     |  34 -------
 .../themes/theme1/renderers/cartridges.js       |  47 ++++++++-
 .../theme1/renderers/configure_stratos.js       |  40 ++++++++
 .../themes/theme1/renderers/index.js            |  59 ++++++++---
 .../theme1/renderers/subscribe_cartridge.js     |  27 +++--
 .../themes/theme1/ui/css/main.css               |  43 ++++++--
 .../themes/theme1/ui/custom-fonts/style.css     |  24 ++---
 12 files changed, 326 insertions(+), 88 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cf82f22/components/org.apache.stratos.manager.console/configure_stratos.jag
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager.console/configure_stratos.jag 
b/components/org.apache.stratos.manager.console/configure_stratos.jag
new file mode 100644
index 0000000..351229b
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/configure_stratos.jag
@@ -0,0 +1,7 @@
+<%
+var caramel = require('caramel');
+var partition_deployment = require('/data/partition_deployment.json');
+caramel.render({
+    partition_deployment:partition_deployment
+});
+%>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cf82f22/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs 
b/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs
index 9f98084..f0bd73c 100644
--- 
a/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs
+++ 
b/components/org.apache.stratos.manager.console/themes/theme1/pages/index.hbs
@@ -23,6 +23,7 @@
     <link rel="stylesheet" href="{{url 
"/themes/theme1/ui/css/smoothness/jqueryui-themeroller.css"}}">
     <link rel="stylesheet" href="{{url "/themes/theme1/ui/css/dialog.css"}}">
     <link rel="stylesheet" href="{{url 
"/themes/theme1/ui/custom-fonts/style.css"}}">
+    <link rel="stylesheet" href="{{url 
"/themes/theme1/ui/font-awesome/css/font-awesome.min.css"}}">
     <script src="{{url 
"/themes/theme1/ui/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js"}}"></script>
     <script src="{{url 
"/themes/theme1/ui/js/vendor/jquery-1.10.1.min.js"}}"></script>
     <script src="{{url 
"/themes/theme1/ui/js/vendor/jquery-ui-1.10.3.custom.min.js"}}"></script>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cf82f22/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridges.hbs
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridges.hbs
 
b/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridges.hbs
index 5e17e29..2e5d831 100644
--- 
a/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridges.hbs
+++ 
b/components/org.apache.stratos.manager.console/themes/theme1/partials/cartridges.hbs
@@ -19,11 +19,11 @@
                 <div class="container">
                     <div class="row">
                         <div class="col-lg-3">
-                            <div class="box-left"><i class="icon-{{type}} 
big-pro-icons"></i></div>
+                            <div class="box-left"><i 
class="icons-{{cartridgeType}} big-pro-icons"></i></div>
                             <div class="big-pro-icons-title">{{version}}</div>
                         </div>
                         <div class="col-lg-9">
-                            <a href="{{url 
"/subscribe_cartridge.jag"}}"><h3>{{version}}</h3></a>
+                            <a href="{{url 
"/subscribe_cartridge.jag"}}"><h3>{{displayName}} - {{version}}</h3></a>
                             <div 
class="cartridge-description">{{description}}</div>
 
                         </div>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cf82f22/components/org.apache.stratos.manager.console/themes/theme1/partials/configure_stratos.hbs
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager.console/themes/theme1/partials/configure_stratos.hbs
 
b/components/org.apache.stratos.manager.console/themes/theme1/partials/configure_stratos.hbs
new file mode 100644
index 0000000..de28e72
--- /dev/null
+++ 
b/components/org.apache.stratos.manager.console/themes/theme1/partials/configure_stratos.hbs
@@ -0,0 +1,101 @@
+<div class="container content-starter">
+    <div class="row">
+        <div class="col-lg-12">
+            <h1>{{title}} - Partition Deployments</h1>
+        </div>
+    </div>
+</div>
+
+
+<div class="container">
+
+    <div class="row">
+        <div class="col-md-12">
+
+
+            <div class="panel-group" id="accordion">
+
+
+                {{#each partition_deployment}}
+                <div class="panel panel-default">
+                    <div class="panel-heading">
+                        <h4 class="panel-title">
+                            <a data-toggle="collapse" data-parent="#accordion" 
href="#collapse{{key}}">
+                                {{name}}
+                            </a>
+                        </h4>
+                    </div>
+                    <div id="collapse{{key}}" class="panel-collapse collapse 
in">
+                        <div class="panel-body">
+                            <pre>{{policy}}</pre>
+                            <textarea style="display:none" 
class="jsonEditor">{{policy}}</textarea>
+                            <button class="btn btn-primary 
js_jsonEdit">Edit</button>
+                            <button class="btn btn-primary js_jsonSave" 
style="display:none">Save</button>
+                            <a class="js_jsonCancel" 
style="display:none">Cancel</a>
+                        </div>
+                    </div>
+                </div>
+                {{/each}}
+
+
+
+            </div>
+        </div>
+    </div>
+</div>
+
+        <script>
+        $(function(){
+            $('pre').each(function () {
+                var jsonStr = $(this).html();
+                jsonStr = jsonStr.replace(/\'/g,'\"');
+                var obj = jQuery.parseJSON(jsonStr);
+                jsonStr = JSON.stringify(obj, undefined, 2);
+                $('textarea',$(this).parent()).val(jsonStr);
+                $(this).html(syntaxHighlight(jsonStr));
+            });
+            $('.js_jsonEdit').click(function(){
+                var $container = $(this).parent();
+                $(this).hide();
+                var preHeight = $('pre',$container).height();
+                $('.js_jsonEdit',$container).hide();
+                $('pre',$container).hide();
+                $('textarea',$container).show().height(preHeight);
+                $('.js_jsonCancel',$container).show();
+                $('.js_jsonSave',$container).show();
+            });
+            $('.js_jsonSave').click(function(){
+                alert('save - ' + $('textarea',$(this).parent()).val())
+            });
+            $('.js_jsonCancel').click(function(){
+                var $container = $(this).parent();
+                $('.js_jsonEdit', $container).show();
+                $('pre', $container).show();
+                $('textarea', $container).hide();
+                $('.js_jsonCancel', $container).hide();
+                $('.js_jsonSave', $container).hide();
+            });
+        });
+
+        function syntaxHighlight(json) {
+            if (typeof json != 'string') {
+                 json = JSON.stringify(json, undefined, 2);
+            }
+            json = json.replace(/&/g, '&amp;').replace(/</g, 
'&lt;').replace(/>/g, '&gt;');
+            return 
json.replace(/("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"(\s*:)?|\b(true|false|null)\b|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?)/g,
 function (match) {
+                var cls = 'number';
+                if (/^"/.test(match)) {
+                    if (/:$/.test(match)) {
+                        cls = 'key';
+                    } else {
+                        cls = 'string';
+                    }
+                } else if (/true|false/.test(match)) {
+                    cls = 'boolean';
+                } else if (/null/.test(match)) {
+                    cls = 'null';
+                }
+                return '<span class="' + cls + '">' + match + '</span>';
+            });
+        }
+        </script>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cf82f22/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs
 
b/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs
index aee6f98..a782926 100644
--- 
a/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs
+++ 
b/components/org.apache.stratos.manager.console/themes/theme1/partials/header.hbs
@@ -10,7 +10,7 @@
 {{/if}}
 {{#unless login}}
 <div class="navbar navbar-inverse navbar-fixed-top main-menu">
-    <div class="shadow-wrapper">
+<div class="shadow-wrapper">
         <div class="top-blue-strip"></div>
         <div class="container">
             <div class="row">
@@ -19,11 +19,13 @@
                  </div>
                  <div class="col-lg-9 custom-nav">
                     <ul class="pull-left">
-                        <li {{#if my_cartridges}} class="active" {{/if}}><a 
href="{{url "/"}}"><i class="icon-cartridge"></i> <span><br>My 
Cartridges</span></a></li>
-                        <li><a href="{{url "/"}}"><i 
class="icon-dashboard"></i> <span><br>Dashboard</span></a></li>
+                        <li {{#if dashboard}} class="active" {{/if}}><a 
href="{{url "/"}}"><i class="icon-dashboard"></i> 
<span><br>Dashboard</span></a></li>
+                        <li {{#if configure_stratos}} class="active" 
{{/if}}><a href="{{url "/configure_stratos.jag"}}"><i class="icon-cogs"></i> 
<span><br>Configure Stratos</span></a></li>
+                        <li {{#if tenant_mgt}} class="active" {{/if}}><a 
href="{{url "/"}}"><i class="icon-user"></i> <span><br>Tenant 
Mgt</span></a></li>
+                        <li {{#if my_cartridges}} class="active" {{/if}}><a 
href="{{url "/"}}"><i class="icons-cartridge"></i> <span><br>My 
Cartridges</span></a></li>
                      </ul>
                      <ul class="pull-right">
-                         <li><a><i class="icon-tenant"></i><br> logout 
section</a></li>
+                         <li><a><i class="icon-user"></i><br> logout 
section</a></li>
                      </ul>
                  </div>
             </div>
@@ -35,11 +37,22 @@
             <div class="row">
 
                 <div class="col-lg-3">
-                    <a class="btn {{css}}" href="{{link}}">{{name}}</a>
+                    <a class="btn {{button.class_name}}" href="{{url 
button.link }}"><i class="{{button.class_icon}}"></i> {{button.name}}</a>
                 </div>
                 <div class="col-lg-9 help-section">
-                    <i class="icon-help"></i>
-                    <p>Create cartridges like PHP, Python, Ruby etc.. Or 
create data cartridges with mySql, PostgreSQL. Directly install applications 
like Drupal, Wordpress etc..</p>
+                    {{#if has_help}}
+                        <i class="icons-help"></i>
+                        <p>{{help}}</p>
+                    {{/if}}
+                    {{#unless has_help}}
+                    <ul class="sub-menu">
+                        <li {{#if pa_deploy}} class="active" {{/if}}><a 
href="{{url "/" }}">Partition Deployments</a></li>
+                        <li {{#if po_deploy}} class="active" {{/if}}><a 
href="{{url "/" }}">Policy Deployments</a></li>
+                        <li {{#if lbs}} class="active" {{/if}}><a href="{{url 
"/" }}">LBs</a></li>
+                        <li {{#if c_deploy}} class="active" {{/if}}><a 
href="{{url "/" }}">Cartridge Deployments</a></li>
+                        <li {{#if mt_deploy}} class="active" {{/if}}><a 
href="{{url "/" }}">Multi-Tenant Service Deployments</a></li>
+                    </ul>
+                    {{/unless}}
                 </div>
             </div>
         </div>

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cf82f22/components/org.apache.stratos.manager.console/themes/theme1/partials/mycartridges.hbs
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager.console/themes/theme1/partials/mycartridges.hbs
 
b/components/org.apache.stratos.manager.console/themes/theme1/partials/mycartridges.hbs
index 855d472..0964be9 100644
--- 
a/components/org.apache.stratos.manager.console/themes/theme1/partials/mycartridges.hbs
+++ 
b/components/org.apache.stratos.manager.console/themes/theme1/partials/mycartridges.hbs
@@ -5,37 +5,3 @@
         </div>
     </div>
 </div>
-{{#each mycartridges}}
-<div class="container">
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="h2-wrapper"><h2>{{kind}}</h2></div>
-        </div>
-    </div>
-    <div class="row">
-        {{#each cartridges}}
-        <div class="col-md-6">
-            <div class="box-container">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-lg-3">
-                            <div class="state-box {{state}}-state"><i 
class="icon-{{state}}"></i> {{state}}</div>
-                            <div class="box-left"><i class="icon-{{type}} 
big-pro-icons"></i></div>
-                            <div class="big-pro-icons-title">{{version}}</div>
-                        </div>
-                        <div class="col-lg-9">
-                            <a><h3>{{name}}</h3></a>
-                            <h4>LB IP:</h4>
-                            <div>{{lb_ip}}</div>
-
-                            <h4>Access URL:</h4>
-                            <div><a>{{access_url}}</a></div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        {{/each}}
-    </div>
-</div>
-{{/each}}

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cf82f22/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridges.js
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridges.js
 
b/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridges.js
index d73a3a6..8deaed4 100644
--- 
a/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridges.js
+++ 
b/components/org.apache.stratos.manager.console/themes/theme1/renderers/cartridges.js
@@ -1,11 +1,45 @@
 var render = function (theme, data, meta, require) {
+    // Re-create the data structure of the cartridges.
+    var log = new Log();
+    var cartridges_old = data.cartridges.cartridge;
+    var cartridges_new = [
+        {
+            kind: "Cartridges",
+            cartridges: []}
+    ];
+    var cartridgesToPush;
+    for (var i = 0; i < cartridges_old.length; i++) {
+        if (cartridges_old[i].category == undefined) {
+            cartridgesToPush = null;
+            for (var j = 0; j < cartridges_new.length; j++) {
+                if (cartridges_new[j].kind == "Cartridges") {
+                    cartridgesToPush = cartridges_new[j].cartridges;
+                }
+            }
+            cartridgesToPush.push(cartridges_old[i]);
+            log.info(cartridges_old[i]);
+        } else {
+            cartridgesToPush = null;
+            for (var j = 0; j < cartridges_new.length; j++) {
+                if (cartridges_new[j].kind == cartridges_old[i].category) {
+                    cartridgesToPush = cartridges_new[j].cartridges;
+                }
+            }
+            if (cartridgesToPush == null) {
+                cartridges_new.push({kind: cartridges_old[i].category, 
cartridges: [cartridges_old[i]]})
+            } else {
+                cartridgesToPush.push(cartridges_old[i]);
+            }
+        }
+    }
+    log.info(cartridges_new);
     theme('index', {
         body: [
             {
                 partial: 'cartridges',
                 context: {
                     title:'Cartridges',
-                    cartridges:data.cartridges
+                    cartridges:cartridges_new
                 }
             }
         ],
@@ -15,9 +49,14 @@ var render = function (theme, data, meta, require) {
                 context:{
                     title:'Cartridges',
                     my_cartridges:true,
-                    link:'/',
-                    name:'Back To My Cartridges',
-                    css:"btn-back"
+                    button:{
+                        link:'/',
+                        name:'Back To My Cartridges',
+                        class_name:"btn-default",
+                        class_icon: 'icon-arrow-left'
+                    },
+                    has_help:true,
+                    help:'Create cartridges like PHP, Python, Ruby etc.. Or 
create data cartridges with mySql, PostgreSQL. Directly install applications 
like Drupal, Wordpress etc..'
                 }
             }
         ],

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cf82f22/components/org.apache.stratos.manager.console/themes/theme1/renderers/configure_stratos.js
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager.console/themes/theme1/renderers/configure_stratos.js
 
b/components/org.apache.stratos.manager.console/themes/theme1/renderers/configure_stratos.js
new file mode 100644
index 0000000..cb203a5
--- /dev/null
+++ 
b/components/org.apache.stratos.manager.console/themes/theme1/renderers/configure_stratos.js
@@ -0,0 +1,40 @@
+var render = function (theme, data, meta, require) {
+    for(var i=0;i<data.partition_deployment.length;i++){
+        data.partition_deployment[i].key = 
data.partition_deployment[i].name.replace(/ /g,'');
+    }
+    theme('index', {
+        body: [
+            {
+                partial: 'configure_stratos',
+                context: {
+                    title:'Configure Stratos',
+                    partition_deployment:data.partition_deployment
+                }
+            }
+        ],
+        header: [
+            {
+                partial: 'header',
+                context:{
+                    title:'Configure Stratos',
+                    configure_stratos:true,
+                    button:{
+                        link:'/',
+                        name:'Deploy New Partition',
+                        class_name:"btn-important"
+                    },
+                    has_help:false,
+                    pa_deploy:true
+                }
+            }
+        ],
+        title:[
+            {
+                partial:'title',
+                context:{
+                    title:"My Cartridges"
+                }
+            }
+        ]
+    });
+};
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cf82f22/components/org.apache.stratos.manager.console/themes/theme1/renderers/index.js
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager.console/themes/theme1/renderers/index.js
 
b/components/org.apache.stratos.manager.console/themes/theme1/renderers/index.js
index c995ae4..35c4375 100644
--- 
a/components/org.apache.stratos.manager.console/themes/theme1/renderers/index.js
+++ 
b/components/org.apache.stratos.manager.console/themes/theme1/renderers/index.js
@@ -1,31 +1,66 @@
 var render = function (theme, data, meta, require) {
+    // Re-create the data structure of the cartridges.
+    /* var mycartridges = [
+     {
+     kind: "cartridges",
+     cartridges: []}
+     ];
+     var cartridgesToPush;
+     for(var i=0;i<data.mycartridges.length;i++){
+     if(data.mycartridges[i].category == undefined){
+     cartridgesToPush = null;
+     for(var j=0;j<mycartridges.length;j++){
+     if(mycartridges[j].kind == "cartridges" ){
+     cartridgesToPush = mycartridges[j].cartridges;
+     }
+     }
+     cartridgesToPush.push(data.mycartridges[i]);
+     }else{
+     cartridgesToPush = null;
+     for (var j = 0; j < mycartridges.length; j++) {
+     if (mycartridges[j].kind == data.mycartridges[i].category) {
+     cartridgesToPush = mycartridges[j].cartridges;
+     }
+     }
+     if(cartridgesToPush == null){
+     
mycartridges.push({kind:data.mycartridges[i].category,cartridges:[data.mycartridges[i]]})
+     }else{
+     cartridgesToPush.push(data.mycartridges[i]);
+     }
+     }
+     }*/
+
     theme('index', {
         body: [
             {
                 partial: 'mycartridges',
                 context: {
-                    title:'My Cartridges',
-                    mycartridges:data.mycartridges
+                    title: 'My Cartridges',
+                    mycartridges: {}
                 }
             }
         ],
         header: [
             {
                 partial: 'header',
-                context:{
-                    title:'My Cartridges',
-                    my_cartridges:true,
-                    link:'/cartridges.jag',
-                    name:'Subscribe to Cartridge',
-                    css:"btn-important"
+                context: {
+                    title: 'My Cartridges',
+                    my_cartridges: true,
+                    button: {
+                        link: '/cartridges.jag',
+                        name: 'Subscribe to Cartridge',
+                        class_name: 'btn-important'
+                    },
+                    has_help: true,
+                    help: 'Create cartridges like PHP, Python, Ruby etc.. Or 
create data cartridges with mySql, PostgreSQL. Directly install applications 
like Drupal, Wordpress etc..'
                 }
             }
         ],
-        title:[
+        title: [
             {
-                partial:'title',
-                context:{
-                    title:"My Cartridges"
+                partial: 'title',
+                context: {
+                    title: "My Cartridges"
                 }
             }
         ]

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cf82f22/components/org.apache.stratos.manager.console/themes/theme1/renderers/subscribe_cartridge.js
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager.console/themes/theme1/renderers/subscribe_cartridge.js
 
b/components/org.apache.stratos.manager.console/themes/theme1/renderers/subscribe_cartridge.js
index 6fbd1e7..c431470 100644
--- 
a/components/org.apache.stratos.manager.console/themes/theme1/renderers/subscribe_cartridge.js
+++ 
b/components/org.apache.stratos.manager.console/themes/theme1/renderers/subscribe_cartridge.js
@@ -9,17 +9,22 @@ var render = function (theme, data, meta, require) {
             }
         ],
         header: [
-            {
-                partial: 'header',
-                context:{
-                    title:'Subscribe Cartridge',
-                    my_cartridges:true,
-                    link: '/cartridges.jag',
-                    name: 'Select different Cartridge',
-                    css: "btn-back"
-                }
-            }
-        ],
+                    {
+                        partial: 'header',
+                        context:{
+                            title:'Subscribe Cartridge',
+                            my_cartridges:true,
+                            button:{
+                                link: '/cartridges.jag',
+                                name: 'Select different Cartridge',
+                                class_name: "btn-default",
+                                class_icon: "icon-arrow-left"
+                            },
+                            has_help:true,
+                            help:'Create cartridges like PHP, Python, Ruby 
etc.. Or create data cartridges with mySql, PostgreSQL. Directly install 
applications like Drupal, Wordpress etc..'
+                        }
+                    }
+                ],
         title:[
             {
                 partial:'title',

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cf82f22/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css 
b/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css
index 348d412..0350589 100644
--- 
a/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css
+++ 
b/components/org.apache.stratos.manager.console/themes/theme1/ui/css/main.css
@@ -149,7 +149,7 @@ body {
         box-shadow: 1px 3px 4px 1px rgba(71,71,71,1);
 }
 .breadcrumb-strip{
-    min-height: 78px;
+    min-height: 58px;
     z-index: 1;
     padding-top:10px;
 }
@@ -169,9 +169,9 @@ body {
     border-right:solid 1px #9eafbc;
 }
 .custom-nav ul li a{
-    height: 73px;
+    height: 64px;
     display: block;
-    padding:10px 20px;
+    padding:5px 20px;
     text-align: center;
     font-size: 14px;
     color:#444;
@@ -207,17 +207,17 @@ body {
     margin-right:10px;
 }
 .content-starter{
-    margin-top: 157px;
+    margin-top: 130px;
 }
 h1{
     color:#575757;
-    font-size:44px;
+    font-size:37px;
 }
 h2{
     background: #fff;
     display: inline-block;
     padding:0 10px 0 0;
-    margin:10px 0;
+    margin:10px 0 20px;
     color:#575757;
     text-transform:capitalize;
 
@@ -301,4 +301,35 @@ h4{
 }
 #credential_container h2{
     background: transparent;
+}
+.sub-menu{
+    padding:0;
+    margin:-7px 0 0;
+}
+.sub-menu li{
+    list-style: none;
+    float:left;
+}
+.sub-menu li a{
+    display:block;
+    padding:15px 10px;
+    border-left: solid 1px #f2f5f5;
+    border-right: solid 1px #d1d3d3;
+    height: 55px;
+}
+.sub-menu li.active a{
+    background: #ffae00;
+    color:#3d3d3d;
+}
+
+
+pre {border:none;background: transparent }
+.string { color: green; }
+.number { color: darkorange; }
+.boolean { color: blue; }
+.null { color: magenta; }
+.key { color: red; }
+textarea{display: block;}
+textarea.jsonEditor{
+    width:100%;
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/8cf82f22/components/org.apache.stratos.manager.console/themes/theme1/ui/custom-fonts/style.css
----------------------------------------------------------------------
diff --git 
a/components/org.apache.stratos.manager.console/themes/theme1/ui/custom-fonts/style.css
 
b/components/org.apache.stratos.manager.console/themes/theme1/ui/custom-fonts/style.css
index eef84a7..49ff76e 100644
--- 
a/components/org.apache.stratos.manager.console/themes/theme1/ui/custom-fonts/style.css
+++ 
b/components/org.apache.stratos.manager.console/themes/theme1/ui/custom-fonts/style.css
@@ -9,7 +9,7 @@
        font-style: normal;
 }
 
-[class^="icon-"], [class*=" icon-"] {
+[class^="icons-"], [class*=" icons-"] {
        font-family: 'stratos';
        speak: none;
        font-style: normal;
@@ -23,36 +23,36 @@
        -moz-osx-font-smoothing: grayscale;
 }
 
-.icon-active:before {
+.icons-active:before {
        content: "\e600";
 }
-.icon-refresh:before {
+.icons-refresh:before {
        content: "\e601";
 }
-.icon-mysql:before {
+.icons-mysql:before {
        content: "\e602";
 }
-.icon-ruby:before {
+.icons-ruby:before {
        content: "\e603";
 }
-.icon-php:before {
+.icons-php:before {
        content: "\e604";
 }
-.icon-cakephp:before {
+.icons-cakephp:before {
        content: "\e605";
 }
-.icon-python:before {
+.icons-python:before {
        content: "\e606";
 }
-.icon-topology:before {
+.icons-topology:before {
        content: "\e607";
 }
-.icon-help:before {
+.icons-help:before {
        content: "\e608";
 }
-.icon-cartridge:before {
+.icons-cartridge:before {
        content: "\e609";
 }
-.icon-tenant:before {
+.icons-tenant:before {
        content: "\e60a";
 }

Reply via email to