Updated Branches: refs/heads/master 8a7f78122 -> 66f843e6c
applying patch for STRATOS-424 and fixing cartridge catergorization Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/66f843e6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/66f843e6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/66f843e6 Branch: refs/heads/master Commit: 66f843e6c1582320cb8b2c9d551199a7af896cba Parents: 8a7f781 Author: rekathiru <[email protected]> Authored: Tue Feb 11 14:08:20 2014 +0530 Committer: rekathiru <[email protected]> Committed: Tue Feb 11 14:08:20 2014 +0530 ---------------------------------------------------------------------- .../console/cartridge_info.jag | 9 ++++ .../console/index.jag | 1 - .../console/modules/pinch.min.js | 4 ++ .../console/subscribe_cartridge.jag | 6 +-- .../themes/theme1/partials/cartridge_info.hbs | 37 ++++++++++++++ .../themes/theme1/partials/cartridges.hbs | 18 +++---- .../themes/theme1/partials/mycartridges.hbs | 18 +++---- .../theme1/partials/subscribe_cartridge.hbs | 53 +++++++++++++------- .../themes/theme1/renderers/cartridge_info.js | 42 ++++++++++++++++ .../theme1/renderers/subscribe_cartridge.js | 8 ++- .../console/themes/theme1/ui/css/main.css | 6 ++- .../themes/theme1/ui/custom-fonts/style.css | 25 +++++---- .../console/util/utility.jag | 7 +++ 13 files changed, 178 insertions(+), 56 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66f843e6/components/org.apache.stratos.manager.console/console/cartridge_info.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/cartridge_info.jag b/components/org.apache.stratos.manager.console/console/cartridge_info.jag new file mode 100644 index 0000000..9424fbb --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/cartridge_info.jag @@ -0,0 +1,9 @@ +<% +var caramel = require('caramel'); +var utils = require('/util/utility.jag'); +var alias = request.getParameter("alias"); +var cartridgeInfo = utils.consoleAppUtil.getCartridgeInfo(alias).cartridge; +caramel.render({ + cartridgeInfo:cartridgeInfo +}); +%> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66f843e6/components/org.apache.stratos.manager.console/console/index.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/index.jag b/components/org.apache.stratos.manager.console/console/index.jag index e0b4ad9..7a6f3af 100644 --- a/components/org.apache.stratos.manager.console/console/index.jag +++ b/components/org.apache.stratos.manager.console/console/index.jag @@ -3,7 +3,6 @@ var log = new Log("console.index"); var caramel = require('caramel'); var utils = require('/util/utility.jag'); var subscribedCartridges = utils.consoleAppUtil.getSubscribedCartridges(); -log.info(subscribedCartridges); caramel.render({ mycartridges:subscribedCartridges }); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66f843e6/components/org.apache.stratos.manager.console/console/modules/pinch.min.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/modules/pinch.min.js b/components/org.apache.stratos.manager.console/console/modules/pinch.min.js new file mode 100644 index 0000000..a9f4618 --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/modules/pinch.min.js @@ -0,0 +1,4 @@ +(function(){var k=function(a,c){return a.length!==c.length?!1:a.every(function(a,b){return c[b]===a})},j=function(a,c,d){var b,e;if("[object Array]"===Object.prototype.toString.call(a)){b=0;for(e=a.length;b<e;b++)c.apply(d,[b,a[b],a])}else for(b in a)a.hasOwnProperty(b)&&c.apply(d,[b,a[b],a])},h=function(a){for(var c=[],d=!1,b=0,e=a.length,f="",g=function(){f&&(c.push(f),f="")};b<e;b++)a[b].match(/\[|\]/)?(g(),d="]"===a[b]?!1:!0):'"'!==a[b]&&"'"!==a[b]&&("."===a[b]&&!d?g():f+=a[b]),b===e-1&&g();return c}, +g=function(a,c,d){var b=-1!==["string","object"].indexOf(typeof a),e="string"===typeof c||c&&c.test&&c.exec,f=-1!==["string","object","function"].indexOf(typeof d);b&&e&&f&&("string"===typeof a?(this.instance=JSON.parse(a),this.json=!0):this.instance=a,this.pattern="string"===typeof c?c.replace(/'/g,'"'):c,this.replacement=d,this.createIndex(this.instance))};g.prototype.createIndex=function(a,c){var d=this;this.index=this.index||[];c=c||"";j(a,function(a,e){var f,a=a+"";f=a.match(/^[a-zA-Z]+$/)?c? +c+"."+a:a:a.match(/\d+/)?c+"["+a+"]":c+'["'+a+'"]';d.index.push(f);"object"===typeof e&&d.createIndex(e,f)})};g.prototype.replace=function(){var a=this;j(this.index,function(c,d){if(a.pattern&&a.pattern.test&&a.pattern.exec&&d.match(a.pattern))return a.replaceValue(d);if("string"===typeof a.pattern){var b=h(d),e=h(a.pattern);if(k(b,e))return a.replaceValue(d)}});return this.json?JSON.stringify(this.instance):this.instance};g.prototype.replaceValue=function(a){var c=this,d=h(a);d.reduce(function(b, +e,f){if(f===d.length-1)f="function"===typeof c.replacement?c.replacement(a,e,b[e]):c.replacement,b[e]=f;else return b[e]},this.instance)};var i=function(a,c,d,b){a=(new g(a,c,d)).replace();return"function"===typeof b?b(null,a):a};"undefined"!==typeof module&&module.exports?module.exports=i:"undefined"!==typeof define?define(function(){return i}):this.pinch=i})(); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66f843e6/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag b/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag index c333a38..3fd8f78 100644 --- a/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag +++ b/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag @@ -2,12 +2,12 @@ var log = new Log("subscribe_cartridge"); var caramel = require('caramel'); var utils = require('/util/utility.jag'); +var type = request.getParameter('cartridgeType'); var autoScalePolicies = utils.consoleAppUtil.getAutoScalePolicies(); -log.info(autoScalePolicies); var deploymentPolicies = utils.consoleAppUtil.getDeploymentPolicies(); -log.info(deploymentPolicies); +var cartridge = utils.consoleAppUtil.getSingleTenantCartridgeInfo(type); caramel.render({ - name:"PHP 5.4 Cartridge", + cartridge:cartridge, autoScalePolicies:autoScalePolicies, deploymentPolicies:deploymentPolicies }); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66f843e6/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs new file mode 100644 index 0000000..1a6410d --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridge_info.hbs @@ -0,0 +1,37 @@ +<div class="container content-starter"> + <div class="row"> + <div class="col-lg-12"> + <h1><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i> {{cartridgeInfo.cartridgeAlias}}-<span>({{cartridgeInfo.displayName}} - {{cartridgeInfo.version}})</span></h1> + </div> + </div> +</div> + +<div class="container"> +<div class="row"> + <div class="col-lg-12"> + <div style="margin-bottom:20px;">{{cartridgeInfo.description}}</div> + + <strong>activeInstances</strong> + <div>{{cartridgeInfo.activeInstances}}</div> + + <strong>cartridgeAlias</strong> + <div>{{cartridgeInfo.cartridgeAlias}}</div> + + <strong>cartridgeType</strong> + <div>{{cartridgeInfo.cartridgeType}}</div> + + + <strong>hostName</strong> + <div>{{cartridgeInfo.hostName}}</div> + + <strong>multiTenant</strong> + <div>{{cartridgeInfo.multiTenant}}</div> + + <strong>provider</strong> + <div>{{cartridgeInfo.provider}}</div> + + <strong>repoURL</strong> + <div>{{cartridgeInfo.repoURL}}</div> + </div> +</div> +</div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66f843e6/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs index db55a2f..fe07cac 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/cartridges.hbs @@ -16,17 +16,15 @@ {{#each cartridges}} <div class="col-md-6"> <div class="box-container"> - <div class="container"> - <div class="row"> - <div class="col-lg-3"> - <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"}}?cartridgeType={{cartridgeType}}"><h3>{{displayName}} - {{version}}</h3></a> - <div class="cartridge-description">{{description}}</div> + <div class="row"> + <div class="col-lg-3"> + <div class="box-left"><i class="icons-default 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"}}?cartridgeType={{cartridgeType}}"><h3>{{displayName}} - {{version}}</h3></a> + <div class="cartridge-description">{{description}}</div> - </div> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66f843e6/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs index a69cdb3..563394a 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/mycartridges.hbs @@ -16,17 +16,15 @@ {{#each cartridges}} <div class="col-md-6"> <div class="box-container"> - <div class="container"> - <div class="row"> - <div class="col-lg-3"> - <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>{{displayName}} - {{version}}</h3></a> - <div class="cartridge-description">{{description}}</div> + <div class="row"> + <div class="col-lg-3"> + <div class="box-left"><i class="icons-default icons-{{cartridgeType}} big-pro-icons"></i></div> + </div> + <div class="col-lg-9"> + <a href="{{url "/cartridge_info.jag?alias="}}{{cartridgeAlias}}"><h3>{{cartridgeAlias}}-<span>({{displayName}} - {{version}})</span></h3></a> + <div class="cartridge-description">{{description}}</div> + <div class="cartridge-description">{{repoURL}}</div> - </div> </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66f843e6/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs index 8fb7977..ac4b5ed 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs @@ -1,7 +1,7 @@ <div class="container content-starter"> <div class="row"> <div class="col-lg-12"> - <h1>{{title}}</h1> + <h1>{{cartridgeType}} {{cartridge.version}} Cartridge</h1> </div> </div> </div> @@ -15,26 +15,36 @@ <div class="form-inline"> <input name="cartridgeType" type="hidden" value="{{cartridgeType}}"/> <input name="alias" - type="text" + type="text" class="form-control input-xlarge js-help" - data-help="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium, at lobortis - nulla vulputate. Duis et cursus justo, vel fermentum neque. Praesent bibendum turpis vel tincidunt sollicitudin. - Integer nibh est, pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien." + data-help="Specify a unique alias which can be used to generate the hostname as alias.hostname from cartridge" data-help-x-offset="200" data-help-y-offset="-10" placeholder="myphp" /> - <label>-lakmal.php.stratos.com</label> + <label>.{{cartridge.hostName}}</label> </div> </div> - <div class="form-group"> + {{#ifCond cartridge.provider "==" "data"}} + <label class="required">Persistence Storage:</label> + <div class="checkbox"> + <label> + <input name="backed By Volume" type="checkbox" checked="checked" id="volume_check" /> Persistence storage for the cartridge instance + </label> + </div> + {{else}} + + + {{#ifCond cartridge.provider "==" "application"}} + + + {{else}} + <div class="form-group"> <label class="required">Repo URL:</label> <div class="form-inline"> <input name="repoURL" - type="text" + type="text" class="form-control input-xlarge js-help" - data-help="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium, at lobortis - nulla vulputate. Duis et cursus justo, vel fermentum neque. Praesent bibendum turpis vel tincidunt sollicitudin. - Integer nibh est, pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien." + data-help="Specify a repository URL of the artifacts." data-help-x-offset="200" data-help-y-offset="-10" placeholder="myphp" /> @@ -60,15 +70,17 @@ </div> </div> </div> - <div class="form-group"> + {{/ifCond}} + + {{/ifCond}} + + <div class="form-group"> <label class="required">Autoscale Policy:</label> <div class="form-inline"> <select name="autoscalePolicy" class="form-control input-xlarge js-help" - data-help="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium, at lobortis - nulla vulputate. Duis et cursus justo, vel fermentum neque. Praesent bibendum turpis vel tincidunt sollicitudin. - Integer nibh est, pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien." + data-help="Please choose a applicable autoscaling policy for the subscription." data-help-x-offset="50" data-help-y-offset="-10" > {{#each autoScalePolicies}} @@ -83,9 +95,7 @@ <select name="deploymentPolicy" class="form-control input-xlarge js-help" - data-help="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas condimentum eros nec risus pretium, at lobortis - nulla vulputate. Duis et cursus justo, vel fermentum neque. Praesent bibendum turpis vel tincidunt sollicitudin. - Integer nibh est, pretium nec nunc vitae, auctor pharetra elit. Fusce at ornare sapien." + data-help="Please choose a applicable deployment policy for the subscription.." data-help-x-offset="50" data-help-y-offset="-10" > {{#each deploymentPolicies}} @@ -129,4 +139,11 @@ }); }); + $('#alias').keyup(function(){ + if($(this).val() != ""){ + $('#domainMessage').show().html('Domain is not available').addClass('noDomain').removeClass('hasDomain'); + } + + }); + </script> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66f843e6/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js new file mode 100644 index 0000000..07d7c5b --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_info.js @@ -0,0 +1,42 @@ +var render = function (theme, data, meta, require) { + // Re-create the data structure of the cartridges. + var log = new Log(); + log.info("#########################"); + log.info(data.cartridgeInfo); + theme('index', { + body: [ + { + partial: 'cartridge_info', + context: { + title:'Cartridges', + cartridgeInfo:data.cartridgeInfo + } + } + ], + header: [ + { + partial: 'header', + context:{ + title:'Cartridges', + my_cartridges:true, + 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..' + } + } + ], + title:[ + { + partial:'title', + context:{ + title:"My Cartridges" + } + } + ] + }); +}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66f843e6/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js index e3eed2a..9f886e9 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js @@ -4,9 +4,9 @@ var render = function (theme, data, meta, require) { { partial: 'subscribe_cartridge', context: { - title:data.name, autoScalePolicies:data.autoScalePolicies.autoscalePolicy, deploymentPolicies:data.deploymentPolicies.deploymentPolicy, + cartridge:data.cartridge.cartridge, cartridgeType:meta.request.getParameter('cartridgeType') } } @@ -32,9 +32,13 @@ var render = function (theme, data, meta, require) { { partial:'title', context:{ - title:"Subscribe Cartridge -" + data.name + title:"Subscribe Cartridge -" + data.cartridge.cartridge.cartridgeType + " " + data.cartridge.cartridge.version + " Cartridge", + cartridge:data.cartridge.cartridge, } } ] }); + + var log = new Log(); + log.info("jssssss...: " + stringify(data.cartridge.cartridge)); }; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66f843e6/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css index 28e1a3d..09862cb 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css @@ -123,7 +123,7 @@ body { height: auto !important; height: 100%; /* Negative indent footer by it's height */ - margin: 0 auto -60px; + margin: 0 auto -35px; } /* Set the fixed height of the footer here */ @@ -232,6 +232,9 @@ h3{ padding: 15px 0 0 0; margin: 0; } +h3 span{ + color:#999; +} h4{ font-weight: bold; padding: 0; @@ -245,6 +248,7 @@ h4{ min-height: 160px; margin-top:10px ; margin-bottom: 20px; + padding:10px; } .box-left{ padding-top: 20px; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66f843e6/components/org.apache.stratos.manager.console/console/themes/theme1/ui/custom-fonts/style.css ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/custom-fonts/style.css b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/custom-fonts/style.css index 49ff76e..671c4f9 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/custom-fonts/style.css +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/custom-fonts/style.css @@ -24,35 +24,38 @@ } .icons-active:before { - content: "\e600"; + content: "\e600" !important; } .icons-refresh:before { - content: "\e601"; + content: "\e601" !important; } .icons-mysql:before { - content: "\e602"; + content: "\e602" !important; } .icons-ruby:before { - content: "\e603"; + content: "\e603" !important; } .icons-php:before { - content: "\e604"; + content: "\e604" !important; } .icons-cakephp:before { - content: "\e605"; + content: "\e605" !important; } .icons-python:before { - content: "\e606"; + content: "\e606" !important; } .icons-topology:before { - content: "\e607"; + content: "\e607" !important; } .icons-help:before { - content: "\e608"; + content: "\e608" !important; } .icons-cartridge:before { - content: "\e609"; + content: "\e609" !important; } .icons-tenant:before { - content: "\e60a"; + content: "\e60a" !important; +} +.icons-default:before { + content: "\e607"; } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/66f843e6/components/org.apache.stratos.manager.console/console/util/utility.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/util/utility.jag b/components/org.apache.stratos.manager.console/console/util/utility.jag index 8b59e8c..6b390f3 100644 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -150,6 +150,10 @@ consoleAppUtil = new function(){ return this.sendReceive("GET","/partition",{}).data; }; + this.getSingleTenantCartridgeInfo = function(cartridgeType){ + return this.sendReceive("GET","/cartridge/available/info/" + cartridgeType,{}).data; + }; + this.getPolicyAutoScale = function(){ return this.sendReceive("GET","/policy/autoscale",{}).data; }; @@ -161,6 +165,9 @@ consoleAppUtil = new function(){ this.getCartridges = function(){ return this.sendReceive("GET","/cartridge/list",{}).data; }; + this.getCartridgeInfo = function(alias){ + return this.sendReceive("GET","/cartridge/info/"+alias,{}).data; + }; this.getConfigStatus = function(){ var configStatus = {}; if(this.sendReceive("GET","/partition",{}).data.partition.length == 0){
