Repository: stratos Updated Branches: refs/heads/stratos-4.1.x ff1e1bd1a -> 270066786
UI changes in stratos to integrate DAS monitoring dashboard Signed-off-by: gayangunarathne <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/27006678 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/27006678 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/27006678 Branch: refs/heads/stratos-4.1.x Commit: 270066786b35aafe185240632348e0fd8460408f Parents: 0c64d22 Author: Thanuja <[email protected]> Authored: Fri Nov 6 16:40:47 2015 +0530 Committer: gayangunarathne <[email protected]> Committed: Fri Nov 6 18:54:34 2015 +0530 ---------------------------------------------------------------------- .../console/controllers/menu/menu.json | 14 +++++++- .../console/controllers/menu/menu_generator.jag | 33 +++++++++++++------ .../console/themes/theme0/css/custom.css | 11 +++++++ .../themes/theme0/partials/metro_menu.hbs | 34 ++++++++++++-------- 4 files changed, 69 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/27006678/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 2105883..8d8dcb9 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 @@ -32,7 +32,7 @@ "/permission/admin/stratos/kubernetesclusters/manage", "/permission/admin/stratos/kubernetesclusters/view" ], - "description": "Configure network partitions, policies, cartridges, cartridge groups and kubernetes clusters", + "description": "Configure network partitions, policies, cartridges, cartridge groups and kubernetes clusters.", "sub-menu": [ { "link": "configure/network-partitions/", @@ -190,6 +190,18 @@ "description": "Manage applications." }, { + "link": "", + "linkexternal": true, + "context": "/", + "title": "Monitoring", + "icon": "fa-laptop", + "permissionPaths": [ + "/permission", + "/permission/admin" + ], + "description": "Monitor health statistics of clusters and members." + }, + { "link": "https://issues.apache.org/jira/";, "linkexternal": true, "context": "/", http://git-wip-us.apache.org/repos/asf/stratos/blob/27006678/components/org.apache.stratos.manager.console/console/controllers/menu/menu_generator.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/menu/menu_generator.jag b/components/org.apache.stratos.manager.console/console/controllers/menu/menu_generator.jag index 5cd8e26..ee6b6ea 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/menu/menu_generator.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/menu/menu_generator.jag @@ -29,7 +29,7 @@ var log = new Log("controller.menu_generator"); */ function menuGenerator(context, jsonobject, permissions) { var menupermission, - link='', + link = '', target = '_self', menu_html = ''; @@ -39,15 +39,27 @@ function menuGenerator(context, jsonobject, permissions) { hasPermission = intersection(jsonPermission.permissionPaths, permissions); if (hasPermission.length > 0) { - if(jsonPermission.linkexternal){ - link = jsonPermission.link; - target = "_blank"; - }else{ - link = context + '/' + jsonPermission.link; + if (jsonPermission.title == "Monitoring") { + if (application.get("dasStatsPublisherEnabled") == true) { + link = application.get("monitoringDashboardUrl"); + menu_html += '<li><a href="' + link + '" target="' + target + '">'; + } else { + link = jsonPermission.link; + target = "_blank"; + menu_html += '<li><a href="' + link + '" target="' + target + '" class="disabled">'; + } + } else { + if (jsonPermission.linkexternal) { + link = jsonPermission.link; + target = "_blank"; + } else { + link = context + '/' + jsonPermission.link; + } + menu_html += '<li><a href="' + link + '" target="' + target + '">'; } - menu_html += '<li><a href="'+ link + '" target="'+target+'">' + - '<i class="fa ' + jsonPermission.icon + '"></i>' + + menu_html += '<i class="fa ' + jsonPermission.icon + '"></i>' + jsonPermission.title + '</a>'; + if (jsonPermission.hasOwnProperty('sub-menu')) { menu_html += '<i class="fa fa-angle-down"></i>'; menu_html += '<ul>'; @@ -57,7 +69,7 @@ function menuGenerator(context, jsonobject, permissions) { if (hasSubmenuPermission.length > 0) { menu_html += '<li><a href="' + context + '/' + jsonSubmenuPermission.link + - '" target="'+target+'"><i class="fa ' + jsonSubmenuPermission.icon + '"></i>' + jsonSubmenuPermission.title + '</a></li>'; + '" target="' + target + '"><i class="fa ' + jsonSubmenuPermission.icon + '"></i>' + jsonSubmenuPermission.title + '</a></li>'; } } menu_html += '</ul></li>'; @@ -103,6 +115,9 @@ function metroGenerator(context, jsonobject, permissions) { hasPermission = intersection(jsonPermission.permissionPaths, permissions); if (hasPermission.length > 0 && jsonPermission.context == context) { + if (jsonPermission.title == "Monitoring" && application.get("dasStatsPublisherEnabled") == true) { + jsonPermission.link = application.get("monitoringDashboardUrl"); + } metroJSON.push(jsonPermission); } http://git-wip-us.apache.org/repos/asf/stratos/blob/27006678/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 0689f91..6b302dd 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 @@ -94,6 +94,7 @@ body{ background: url('../images/stratos_background.png') no-repeat; background .slidewindow-content ul.menu li:last-child { border-bottom: none; } .slidewindow-content ul.menu li ul { display: none; } .slidewindow-content ul.menu li a:hover { text-decoration:none; } +.slidewindow-content ul.menu li a.disabled { pointer-events: none; color: grey; } .slidewindow-content .text { padding: 15px; max-width: 300px; font-size: 13px; } .slidewindow-handle { @@ -125,11 +126,21 @@ body{ background: url('../images/stratos_background.png') no-repeat; background cursor: pointer; } +.content-menu-block-disabled{ + pointer-events: none; + color: grey; +} + .content-menu-block i{ font-size: 10em; color:#7fbee8; } +.content-menu-block-disabled i{ + font-size: 10em; + color: grey; +} + .content-menu-block i:hover { color: #7b828c; } http://git-wip-us.apache.org/repos/asf/stratos/blob/27006678/components/org.apache.stratos.manager.console/console/themes/theme0/partials/metro_menu.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/metro_menu.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/metro_menu.hbs index 6218794..b02e831 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/metro_menu.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/metro_menu.hbs @@ -28,20 +28,28 @@ <div class="row text-center"> {{#each content_body.sections}} <a href="{{#if linkexternal}} - {{link}} - {{else}} - {{url ""}}/{{link}} - {{/if}}" {{#if linkexternal}} target="_blank"{{/if}} class="block"> - <div class="col-md-4 content-menu-block border-right" > - <div class="content-menu-icon"> - <i class="fa {{icon}} block"></i> - </div> - <div class="content-menu-title"> - <h2>{{title}}</h2> - </div> - <div class="content-menu-description">{{description}} </div> - + {{link}} + {{else}} + {{url ""}}/{{link}} + {{/if}}"{{#if linkexternal}} target="_blank"{{/if}} class="block"> + {{#ifCond title "==" "Monitoring" }} + {{#ifCond link "!=" "" }} + <div class="col-md-4 content-menu-block border-right"> + {{else}} + <div class="col-md-4 content-menu-block-disabled border-right"> + {{/ifCond}} + {{else}} + <div class="col-md-4 content-menu-block border-right"> + {{/ifCond}} + <div class="content-menu-icon"> + <i class="fa {{icon}} block"></i> + </div> + <div class="content-menu-title"> + <h2>{{title}}</h2> </div> + <div class="content-menu-description">{{description}} </div> + + </div> </a> {{/each}}
