Repository: stratos Updated Branches: refs/heads/master 7f6c8c228 -> c7f56428c
add cartridge info blocks on editors Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c7f56428 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c7f56428 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c7f56428 Branch: refs/heads/master Commit: c7f56428c734e87490a309927832c25dcb68dbf2 Parents: 7f6c8c2 Author: Dakshika Jayathilaka <[email protected]> Authored: Tue May 12 18:43:41 2015 +0530 Committer: Dakshika Jayathilaka <[email protected]> Committed: Tue May 12 18:43:54 2015 +0530 ---------------------------------------------------------------------- .../themes/theme0/js/custom/applications-editor.js | 14 ++++++++++++-- .../theme0/js/custom/applications_group_editor.js | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/c7f56428/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 dd262ca..71676b5 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 @@ -733,8 +733,9 @@ function generateCartridges(data){ }else{ for(var cartridge in data){ var cartridgeData = data[cartridge]; + var cartridgeInfo = encodeURIComponent(JSON.stringify(cartridgeData)); cartridgeListHtml += '<div class="block-cartridge" ' + - 'data-info="'+cartridgeData.description+ '"'+ + 'data-info="'+cartridgeInfo+ '"'+ 'data-toggle="tooltip" data-placement="bottom" title="Single Click to view details. Double click to add"'+ 'id="'+cartridgeData.type+'">' + cartridgeData.displayName+ @@ -960,7 +961,16 @@ $(document).ready(function(){ //handle single click for cartridge $('#cartridge-list').on('click', ".block-cartridge", function(){ - $('.description-section').html($(this).attr('data-info')); + var info = JSON.parse(decodeURIComponent($(this).attr('data-info'))); + var cartridgeInfoBlock = '<table class="table table-condensed table-hover">' + + '<tr><td>Name:</td><td>'+ info.displayName +'</td></tr>' + + '<tr><td>Type:</td><td>'+ info.type + '</td></tr>' + + '<tr><td>Description:</td><td>' +info.description+ '</td></tr>' + + '<tr><td>Category:</td><td>'+info.category+'</td></tr>' + + '<tr><td>Provider:</td><td>'+info.provider+'</td></tr>' + + '<tr><td>Version:</td><td>'+info.version+'</td></tr>' + + '</table>'; + $('.description-section').html(cartridgeInfoBlock); }); //handle double click for cartridge $('#cartridge-list').on('dblclick', ".block-cartridge", function(){ http://git-wip-us.apache.org/repos/asf/stratos/blob/c7f56428/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 2206a28..91da7b3 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 @@ -132,8 +132,9 @@ function generateCartridges(data){ }else{ for(var cartridge in data){ var cartridgeData = data[cartridge]; + var cartridgeInfo = encodeURIComponent(JSON.stringify(cartridgeData)); cartridgeListHtml += '<div class="block-cartridge" ' + - 'data-info="'+cartridgeData.description+ '"'+ + 'data-info="'+cartridgeInfo+ '"'+ 'data-toggle="tooltip" data-placement="bottom" title="Single Click to view details. Double click to add"'+ 'id="'+cartridgeData.type+'">' + cartridgeData.displayName+ @@ -503,7 +504,16 @@ $(document).ready(function(){ //handle single click for cartridge $('#cartridge-list').on('click', ".block-cartridge", function(){ - $('.description-section').html($(this).attr('data-info')); + var info = JSON.parse(decodeURIComponent($(this).attr('data-info'))); + var cartridgeInfoBlock = '<table class="table table-condensed table-hover">' + + '<tr><td>Name:</td><td>'+ info.displayName +'</td></tr>' + + '<tr><td>Type:</td><td>'+ info.type + '</td></tr>' + + '<tr><td>Description:</td><td>' +info.description+ '</td></tr>' + + '<tr><td>Category:</td><td>'+info.category+'</td></tr>' + + '<tr><td>Provider:</td><td>'+info.provider+'</td></tr>' + + '<tr><td>Version:</td><td>'+info.version+'</td></tr>' + + '</table>'; + $('.description-section').html(cartridgeInfoBlock); }); //handle double click for cartridge $('#cartridge-list').on('dblclick', ".block-cartridge", function(){
