Repository: incubator-stratos Updated Branches: refs/heads/master 68d137166 -> 5c2b5a0cc
applying patch for STRATOS-461 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/5c2b5a0c Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/5c2b5a0c Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/5c2b5a0c Branch: refs/heads/master Commit: 5c2b5a0cc8a152c32fef5904731af7385287feb5 Parents: 68d1371 Author: rekathiru <[email protected]> Authored: Tue Feb 18 18:32:03 2014 +0530 Committer: rekathiru <[email protected]> Committed: Tue Feb 18 18:32:03 2014 +0530 ---------------------------------------------------------------------- .../console/tenant_management.jag | 2 +- .../console/themes/theme1/pages/index.hbs | 1 + .../console/themes/theme1/pages/plain.hbs | 2 +- .../themes/theme1/partials/cartridges.hbs | 2 +- .../themes/theme1/partials/tenant_new.hbs | 97 +++++++++++--------- .../console/themes/theme1/ui/css/main.css | 12 ++- .../themes/theme1/ui/js/tenant_management.js | 4 +- 7 files changed, 69 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5c2b5a0c/components/org.apache.stratos.manager.console/console/tenant_management.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/tenant_management.jag b/components/org.apache.stratos.manager.console/console/tenant_management.jag index ca341fd..45f7182 100644 --- a/components/org.apache.stratos.manager.console/console/tenant_management.jag +++ b/components/org.apache.stratos.manager.console/console/tenant_management.jag @@ -4,7 +4,7 @@ var caramel = require('caramel'); var utils = require('/util/utility.jag'); var tenants = utils.consoleAppUtil.getTenants(); var config_status = require('/data/config_status.json'); -log.info(tenants); +log.debug(tenants); caramel.render({ tenants:tenants.tenantInfoBean, config_status:config_status http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5c2b5a0c/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs index 1f261a9..f8f3fe2 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/index.hbs @@ -13,6 +13,7 @@ {{include title}} <meta name="description" content=""> <meta name="viewport" content="width=device-width"> + <link rel="shortcut icon" href="{{url "/themes/theme1/ui/img/favicon.png"}}"> <link href='http://fonts.googleapis.com/css?family=Open+Sans:400,700,800' rel='stylesheet' type='text/css'> <link href="{{url "/themes/theme1/ui/css/bootstrap.css"}}" rel="stylesheet"> <link href="{{url "/themes/theme1/ui/css/bootstrap-theme.css"}}" rel="stylesheet"> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5c2b5a0c/components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs index b33b1d0..b4a9eb6 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/pages/plain.hbs @@ -18,7 +18,7 @@ <link href="{{url "/themes/theme1/ui/css/bootstrap-theme.css"}}" rel="stylesheet"> <link href="{{url "/themes/theme1/ui/css/bootstrap-missing.css"}}" rel="stylesheet"> <link href="{{url "/themes/theme1/ui/css/main.css"}}" rel="stylesheet"> - + <link rel="shortcut icon" href="{{url "/themes/theme1/ui/img/favicon.png"}}"> </head> <body> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5c2b5a0c/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 79d60a4..317ce42 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 @@ -24,7 +24,7 @@ {{#if loadBalancer}} <h3>{{displayName}} - {{version}}</h3> <div class="cartridge-description">{{description}}</div> - <div class="lb-description">This will be auto subscribe for you</div> + <div class="lb-description">This will be auto subscribed for you</div> {{else}} <a href="{{url "/subscribe_cartridge.jag"}}?cartridgeType={{cartridgeType}}"><h3>{{displayName}} - {{version}}</h3></a> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5c2b5a0c/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs index e3b9306..58981e3 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs @@ -8,60 +8,67 @@ <div class="container"> <div class="row"> <div class="col-md-12"> - <form method="post" action="{{url "/controllers/newTenantSubmit.jag" }}"> - <div class="h2-wrapper"><h2>Domain Information</h2></div> - <label class="required">Domain:</label> - <div class="form-inline"><input name="tenantDomain" id="tenantDomain" type="text" placeholder="example.com"/> <button class="btn btn-default" onclick="checkAvailability()" type="button">Check Availability</button></div> - <div id="domainMessage"></div> - <label><input type="checkbox"/> Validate the domain now (Optional)</label> + <form method="post" action="{{url "/controllers/newTenantSubmit.jag" }}" id="newTenantForm"> + <div class="h2-wrapper"><h2>Domain Information</h2></div> + <label class="required">Domain:</label> + <div class="form-inline"><input name="tenantDomain" id="tenantDomain" type="text" class="required" placeholder="example.com"/> <button class="btn btn-default" onclick="checkAvailability()" type="button">Check Availability</button></div> + <div id="domainMessage"></div> + <label><input type="checkbox"/> Validate the domain now (Optional)</label> - <div class="h2-wrapper"><h2>Usage Plan Information</h2></div> - <label class="required">Select usage plan:</label> - <select> - <option>Enterprise</option> - <option>Demo</option> - </select> - <a>More Info</a> + <div class="h2-wrapper"><h2>Usage Plan Information</h2></div> + <label class="required">Select usage plan:</label> + <select> + <option>Enterprise</option> + <option>Demo</option> + </select> + <a>More Info</a> - <div class="h2-wrapper"><h2>Contact Details</h2></div> + <div class="h2-wrapper"><h2>Contact Details</h2></div> - <div class="col-md-3 padding-remover-left"> - <label class="required">First Name:</label> - <input name="firstName" type="text"/> - </div> - <div class="col-md-3"> - <label class="required">Last Name:</label> - <input name="lastName" type="text"/> - </div> - <div class="clearfix"></div> - <label class="required">Admin User Name:</label> - <input name="adminName" type="text"/> - <div class="clearfix"></div> + <div class="col-md-3 padding-remover-left"> + <label class="required">First Name:</label> + <input class="required" name="firstName" type="text"/> + </div> + <div class="col-md-3"> + <label>Last Name:</label> + <input name="lastName" type="text"/> + </div> + <div class="clearfix"></div> + <label class="required">Admin User Name:</label> + <input class="required" name="adminName" type="text"/> + <div class="clearfix"></div> - <div class="col-md-3 padding-remover-left"> - <label class="required">Admin Password:</label> - <input name="adminPassword" type="password"/> - </div> - <div class="col-md-3"> - <label class="required">Admin Password (Repeat):</label> - <input type="password"/> - </div> + <div class="col-md-3 padding-remover-left"> + <label class="required">Admin Password:</label> + <input class="required" name="adminPassword" type="password"/> + </div> + <div class="col-md-3"> + <label class="required">Admin Password (Repeat):</label> + <input class="required" type="password"/> + </div> - <div class="clearfix"></div> - <label class="required">Email:</label> - <input name="email" type="text"/> + <div class="clearfix"></div> + <label class="required">Email:</label> + <input class="required" name="email" type="text"/> - <label class="required">Are you human?</label> - <div style="padding-bottom:10px;"><i class="icons-help icons-small-size"></i> Type the characters you see in the picture below.</div> - <div class="clearfix"></div> - <input type="text"/> + <label class="required">Are you human?</label> + <div style="padding-bottom:10px;"><i class="icons-help icons-small-size"></i> Type the characters you see in the picture below.</div> + <div class="clearfix"></div> + <input type="text"/> - <div class="h2-wrapper"><h2>Terms of Use</h2></div> - <div class="terms-of-use">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.</div> - <label><input type="checkbox"/> I agree</label> + <div class="h2-wrapper"><h2>Terms of Use</h2></div> + <div class="terms-of-use">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.</div> - <button class="btn btn-primary" type="submit">Add new Tenant</button> + <label for="terms_of_use" class="checkbox terms-of-use-check"> + <input type="checkbox" class="checkbox" id="terms_of_use" name="terms_of_use" required minlength="1"> + I agree + </label> + + + + <button class="btn btn-primary" type="submit">Add new Tenant</button> </form> + </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5c2b5a0c/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 f3c9c6b..4c4ebcb 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 @@ -467,8 +467,8 @@ textarea.jsonEditor{ margin-top:-10px; } div.error{ - background:#fa6f3e; - color:#444; + background: none repeat scroll 0 0 #FF2222; + color: #FFFFFF; } div.success{ @@ -566,4 +566,12 @@ label.error{ } .un-subscribe-container i{ font-size:20px; +} +.terms-of-use-check{ + padding-bottom:20px; +} +.terms-of-use-check label.error{ + position: absolute; + margin-left: 0; + margin-top: 20px; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/5c2b5a0c/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js index 86b94ac..3c37f33 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js @@ -5,7 +5,9 @@ $(function(){ } else{ $('table input.js_domainCheck').prop('checked',false); } - }) + }); + + $('#newTenantForm').validate(); }); function manage_selected(action){ var checked = "";
