Repository: incubator-stratos Updated Branches: refs/heads/master 3cd4c3407 -> 414a2b4ea
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/414a2b4e/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 old mode 100755 new mode 100644 index 8597271..08a9804 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -1,3 +1,24 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + <% function E4XtoJSON(xml, ignored) { http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/414a2b4e/components/org.apache.stratos.manager.console/sso/views/login.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/sso/views/login.jag b/components/org.apache.stratos.manager.console/sso/views/login.jag index fd87a3d..2890c02 100644 --- a/components/org.apache.stratos.manager.console/sso/views/login.jag +++ b/components/org.apache.stratos.manager.console/sso/views/login.jag @@ -1,128 +1,149 @@ -<% -var e = request.getParameter('authFailure'); -if( e == null){ - e = ""; - } -%> -<!DOCTYPE html> -<!--[if lt IE 7]> -<html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]--> -<!--[if IE 7]> -<html class="no-js lt-ie9 lt-ie8"> <![endif]--> -<!--[if IE 8]> -<html class="no-js lt-ie9"> <![endif]--> -<!--[if gt IE 8]><!--> -<html class="no-js"> <!--<![endif]--> -<head> - <meta charset="utf-8"> - <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> - - <meta name="description" content=""> - <meta name="viewport" content="width=device-width"> - <link href="views/stratos-resources/css/bootstrap.css" rel="stylesheet"> - <link href="views/stratos-resources/css/bootstrap-theme.css" rel="stylesheet"> - <link href="views/stratos-resources/css/bootstrap-missing.css" rel="stylesheet"> - - <link rel="stylesheet" href="views/stratos-resources/css/main.css"> -</head> -<body> - -<div id="dcontainer"></div> - -<!--[if lt IE 7]> -<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/";>upgrade - your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true";>activate Google Chrome Frame</a> to - improve your experience.</p> -<![endif]--> - - -<!-- Part 1: Wrap all page content here --> -<div id="wrap"> - - - <div class="top-blue-strip"></div> - <div class="login-logo-section"><a href="/console/"><img src="views/stratos-resources/img/logo-login.png"/></a></div> - <style> - body { - padding-top: 0; - padding-bottom: 0; - } - </style> - - - <h1 class="login-title">The most comprehensive enterprise grade PaaS Framework</h1> -<div class="container"> - <div class="row"> - <div class="col-lg-12 login-box-wrapper"> - <form id="loginForm" action="/commonauth" method="POST" > - <div class="login-box"> - <div class="login-box-top"> - <h2 class="login-sub-title">Login to create cartridges</h2> - - - - <div class="username-wrapper"> - <input class="input-username" type="text" placeholder="Email" id="username" name="username" /> - </div> - <div class="password-wrapper"> - <input class="input-password" type="password" placeholder="Password" id="password" name="password" /> - </div> - <div class="login-button-wrapper"> - <input type="hidden" name="sessionDataKey" value="<%=request.getParameter("sessionDataKey")%>"> - <button class="btn btn-primary login-button" type="submit">Sign in</button> - </div> - <% if(e){ %> - <div class="login-error">Username or password is invalid</div> - <% } %> - - </div> - <div class="login-box-bottom"> - <label class="checkbox lblRemember"> - <input type="checkbox" value="remember-me"> Stay Signed In - </label> - - <label class="pull-right"><a>Create an account</a></label> - <div style="clear: both"></div> - </div> - </div> - </form> - <br /> - <div class="login-box-footer"></div> - </div> - </div> -</div> - - - <!-- /container --> - <div id="push"></div> -</div> - -<footer id="footer"> - <div class="container"> - <div class="pull-left"><img src="views/stratos-resources/img/egg-logo.png" /></div> - <div class="pull-right footer-right"> - Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. - Apache SIS, Apache, the Apache feather logo are trademarks of The Apache Software Foundation. - </div> - <div style="clear:both"></div> - </div> -</footer> - - -<!-- Le javascript - ================================================== --> - <!-- Placed at the end of the document so the pages load faster --> - <script src="views/js/jquery-1.8.3.min.js"></script> - <script src="views/js/bootstrap.min.js"></script> - <script src="views/js/jquery.validate.js"></script> - <script type="text/javascript"> - $(function(){ - jQuery.validator.addMethod("usrName", function(value, element) { - return this.optional(element) || /^[a-zA-Z0-9\-]*$/.test(value); - }, "Only alphanumeric characters and '-' allowed"); - }); - -</script> - -</body> -</html> +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, + software distributed under the License is distributed on an + "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + KIND, either express or implied. See the License for the + specific language governing permissions and limitations + under the License. + +--> + +<% +var e = request.getParameter('authFailure'); +if( e == null){ + e = ""; + } +%> +<!DOCTYPE html> +<!--[if lt IE 7]> +<html class="no-js lt-ie9 lt-ie8 lt-ie7"> <![endif]--> +<!--[if IE 7]> +<html class="no-js lt-ie9 lt-ie8"> <![endif]--> +<!--[if IE 8]> +<html class="no-js lt-ie9"> <![endif]--> +<!--[if gt IE 8]><!--> +<html class="no-js"> <!--<![endif]--> +<head> + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> + + <meta name="description" content=""> + <meta name="viewport" content="width=device-width"> + <link href="views/stratos-resources/css/bootstrap.css" rel="stylesheet"> + <link href="views/stratos-resources/css/bootstrap-theme.css" rel="stylesheet"> + <link href="views/stratos-resources/css/bootstrap-missing.css" rel="stylesheet"> + + <link rel="stylesheet" href="views/stratos-resources/css/main.css"> +</head> +<body> + +<div id="dcontainer"></div> + +<!--[if lt IE 7]> +<p class="chromeframe">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/";>upgrade + your browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true";>activate Google Chrome Frame</a> to + improve your experience.</p> +<![endif]--> + + +<!-- Part 1: Wrap all page content here --> +<div id="wrap"> + + + <div class="top-blue-strip"></div> + <div class="login-logo-section"><a href="/console/"><img src="views/stratos-resources/img/logo-login.png"/></a></div> + <style> + body { + padding-top: 0; + padding-bottom: 0; + } + </style> + + + <h1 class="login-title">The most comprehensive enterprise grade PaaS Framework</h1> +<div class="container"> + <div class="row"> + <div class="col-lg-12 login-box-wrapper"> + <form id="loginForm" action="/commonauth" method="POST" > + <div class="login-box"> + <div class="login-box-top"> + <h2 class="login-sub-title">Login to create cartridges</h2> + + + + <div class="username-wrapper"> + <input class="input-username" type="text" placeholder="Email" id="username" name="username" /> + </div> + <div class="password-wrapper"> + <input class="input-password" type="password" placeholder="Password" id="password" name="password" /> + </div> + <div class="login-button-wrapper"> + <input type="hidden" name="sessionDataKey" value="<%=request.getParameter("sessionDataKey")%>"> + <button class="btn btn-primary login-button" type="submit">Sign in</button> + </div> + <% if(e){ %> + <div class="login-error">Username or password is invalid</div> + <% } %> + + </div> + <div class="login-box-bottom"> + <label class="checkbox lblRemember"> + <input type="checkbox" value="remember-me"> Stay Signed In + </label> + + <label class="pull-right"><a>Create an account</a></label> + <div style="clear: both"></div> + </div> + </div> + </form> + <br /> + <div class="login-box-footer"></div> + </div> + </div> +</div> + + + <!-- /container --> + <div id="push"></div> +</div> + +<footer id="footer"> + <div class="container"> + <div class="pull-left"><img src="views/stratos-resources/img/egg-logo.png" /></div> + <div class="pull-right footer-right"> + Copyright © 2013 The Apache Software Foundation, Licensed under the Apache License, Version 2.0. + Apache SIS, Apache, the Apache feather logo are trademarks of The Apache Software Foundation. + </div> + <div style="clear:both"></div> + </div> +</footer> + + +<!-- Le javascript + ================================================== --> + <!-- Placed at the end of the document so the pages load faster --> + <script src="views/js/jquery-1.8.3.min.js"></script> + <script src="views/js/bootstrap.min.js"></script> + <script src="views/js/jquery.validate.js"></script> + <script type="text/javascript"> + $(function(){ + jQuery.validator.addMethod("usrName", function(value, element) { + return this.optional(element) || /^[a-zA-Z0-9\-]*$/.test(value); + }, "Only alphanumeric characters and '-' allowed"); + }); + +</script> + +</body> +</html> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/414a2b4e/components/org.apache.stratos.manager.console/sso/views/stratos-resources/css/main.css ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/sso/views/stratos-resources/css/main.css b/components/org.apache.stratos.manager.console/sso/views/stratos-resources/css/main.css index 48833fd..655a9bd 100644 --- a/components/org.apache.stratos.manager.console/sso/views/stratos-resources/css/main.css +++ b/components/org.apache.stratos.manager.console/sso/views/stratos-resources/css/main.css @@ -1,146 +1,167 @@ -body, div, h1,h2,h3,h4,h5, p, span{ - font-family: 'Open Sans', sans-serif; -} -a{cursor: pointer} -a:hover{text-decoration: none} -.top-blue-strip{ - background: #18c3f4; - height: 6px; -} -.login-logo-section{ - text-align: center; - width: 100%; - padding:20px 0; -} -h1.login-title{ - font-size:28px; - text-align: center; - padding-bottom:20px; - margin:0; -} -h2.login-sub-title{ - font-size:14px; - background: transparent url(../img/transparent-white.png) repeat left top; - padding:5px; - margin:20px 0; -} -.login-box-wrapper{ - text-align: center; -} -.login-box{ - width:415px; - display: inline-block; -} -.login-error{ - color: #FF0000; - margin: -18px 0 0; - padding: 0; - position: absolute; - text-align: center; - width: 415px; -} -.login-box-top{ - background: #e8ebeb url(../img/clouds.png) no-repeat 40px 10px; - border-radius: 0; - -webkit-border-top-left-radius: 8px; - -webkit-border-top-right-radius: 8px; - -moz-border-radius-topleft: 8px; - -moz-border-radius-topright: 8px; - border-top-left-radius: 8px; - border-top-right-radius: 8px; - padding-top:10px; - padding-bottom:10px; -} -.login-box-bottom{ - background: #c1c1c1; - border-radius: 0; - -webkit-border-bottom-right-radius: 8px; - -webkit-border-bottom-left-radius: 8px; - -moz-border-radius-bottomright: 8px; - -moz-border-radius-bottomleft: 8px; - border-bottom-right-radius: 8px; - border-bottom-left-radius: 8px; - padding:20px 10px; - text-align: left; -} -.login-box-footer{ - background: transparent url(../img/login-shadow.png) no-repeat left top; - width:440px; - height: 64px; - margin-top:10px; - display: inline-block; -} -.username-wrapper{ - background: #c1c1c1 url(../img/icon-user.png) no-repeat 8px 16px; - -webkit-border-top-left-radius: 5px; - -webkit-border-bottom-left-radius: 5px; - -moz-border-radius-topleft: 5px; - -moz-border-radius-bottomleft: 5px; - border-top-left-radius: 5px; - border-bottom-left-radius: 5px; - height:60px; - margin:0 10px; - padding-left:40px; -} -.password-wrapper{ - background: #c1c1c1 url(../img/icon-lock.png) no-repeat 8px 16px; - -webkit-border-top-left-radius: 5px; - -webkit-border-bottom-left-radius: 5px; - -moz-border-radius-topleft: 5px; - -moz-border-radius-bottomleft: 5px; - border-top-left-radius: 5px; - border-bottom-left-radius: 5px; - height:60px; - margin:0 10px; - padding-left:40px; -} -.login-button-wrapper{ - margin:20px 10px; -} -div.username-wrapper input.input-username{ - height:60px; - width:100%; - font-size: 16px; -} -div.password-wrapper input.input-password{ - height:60px; - width:100%; - font-size: 16px; -} -.login-button{ - height:40px; - width:100%; - font-size: 16px; -} -.footer-right{ - width:400px; - font-size: 11px; -} -/* Sticky footer styles - -------------------------------------------------- */ - -html, -body { - height: 100%; - /* The html and body elements cannot have any padding or margin. */ -} - -/* Wrapper for page content to push down footer */ -#wrap { - min-height: 100%; - height: auto !important; - height: 100%; - /* Negative indent footer by it's height */ - margin: 0 auto -60px; -} - -/* Set the fixed height of the footer here */ -#push, -#footer { - height: 62px; - padding-top:10px; - -} -#footer{ - background: #e8ebeb; -} +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * +*/ + +body, div, h1,h2,h3,h4,h5, p, span{ + font-family: 'Open Sans', sans-serif; +} +a{cursor: pointer} +a:hover{text-decoration: none} +.top-blue-strip{ + background: #18c3f4; + height: 6px; +} +.login-logo-section{ + text-align: center; + width: 100%; + padding:20px 0; +} +h1.login-title{ + font-size:28px; + text-align: center; + padding-bottom:20px; + margin:0; +} +h2.login-sub-title{ + font-size:14px; + background: transparent url(../img/transparent-white.png) repeat left top; + padding:5px; + margin:20px 0; +} +.login-box-wrapper{ + text-align: center; +} +.login-box{ + width:415px; + display: inline-block; +} +.login-error{ + color: #FF0000; + margin: -18px 0 0; + padding: 0; + position: absolute; + text-align: center; + width: 415px; +} +.login-box-top{ + background: #e8ebeb url(../img/clouds.png) no-repeat 40px 10px; + border-radius: 0; + -webkit-border-top-left-radius: 8px; + -webkit-border-top-right-radius: 8px; + -moz-border-radius-topleft: 8px; + -moz-border-radius-topright: 8px; + border-top-left-radius: 8px; + border-top-right-radius: 8px; + padding-top:10px; + padding-bottom:10px; +} +.login-box-bottom{ + background: #c1c1c1; + border-radius: 0; + -webkit-border-bottom-right-radius: 8px; + -webkit-border-bottom-left-radius: 8px; + -moz-border-radius-bottomright: 8px; + -moz-border-radius-bottomleft: 8px; + border-bottom-right-radius: 8px; + border-bottom-left-radius: 8px; + padding:20px 10px; + text-align: left; +} +.login-box-footer{ + background: transparent url(../img/login-shadow.png) no-repeat left top; + width:440px; + height: 64px; + margin-top:10px; + display: inline-block; +} +.username-wrapper{ + background: #c1c1c1 url(../img/icon-user.png) no-repeat 8px 16px; + -webkit-border-top-left-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-topleft: 5px; + -moz-border-radius-bottomleft: 5px; + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; + height:60px; + margin:0 10px; + padding-left:40px; +} +.password-wrapper{ + background: #c1c1c1 url(../img/icon-lock.png) no-repeat 8px 16px; + -webkit-border-top-left-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-radius-topleft: 5px; + -moz-border-radius-bottomleft: 5px; + border-top-left-radius: 5px; + border-bottom-left-radius: 5px; + height:60px; + margin:0 10px; + padding-left:40px; +} +.login-button-wrapper{ + margin:20px 10px; +} +div.username-wrapper input.input-username{ + height:60px; + width:100%; + font-size: 16px; +} +div.password-wrapper input.input-password{ + height:60px; + width:100%; + font-size: 16px; +} +.login-button{ + height:40px; + width:100%; + font-size: 16px; +} +.footer-right{ + width:400px; + font-size: 11px; +} +/* Sticky footer styles + -------------------------------------------------- */ + +html, +body { + height: 100%; + /* The html and body elements cannot have any padding or margin. */ +} + +/* Wrapper for page content to push down footer */ +#wrap { + min-height: 100%; + height: auto !important; + height: 100%; + /* Negative indent footer by it's height */ + margin: 0 auto -60px; +} + +/* Set the fixed height of the footer here */ +#push, +#footer { + height: 62px; + padding-top:10px; + +} +#footer{ + background: #e8ebeb; +}
