You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/05/18 15:06:28 UTC
stratos git commit: Redesigning the login page of the web UI
Repository: stratos
Updated Branches:
refs/heads/master 7b275d1cc -> dac81ac18
Redesigning the login page of the web UI
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/dac81ac1
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/dac81ac1
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/dac81ac1
Branch: refs/heads/master
Commit: dac81ac181dbf17ca2ca9da84aa11e51c0344798
Parents: 7b275d1
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon May 18 18:35:54 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon May 18 18:36:21 2015 +0530
----------------------------------------------------------------------
.../console/controllers/login/login.jag | 6 +-
.../console/themes/theme0/css/custom.css | 5 ++
.../themes/theme0/images/stratos-trans.png | Bin 0 -> 14789 bytes
.../console/themes/theme0/pages/login.hbs | 64 +++++++++++++++++++
.../themes/theme0/partials/login_body.hbs | 6 +-
.../console/themes/theme0/renderers/login.js | 7 +-
6 files changed, 77 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/dac81ac1/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/login/login.jag b/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
index 5700de9..e60e31f 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
@@ -33,7 +33,7 @@ if (hostName === null || hostName === '') {
}
var httpPort = 9763 + parseInt(offset, 10),
- httpsPort = 9443 + parseInt(offset, 10);
+ httpsPort = 9443 + parseInt(offset, 10);
process.setProperty('server.host', hostName);
process.setProperty('http.port', httpPort.toString());
@@ -41,7 +41,7 @@ process.setProperty('https.port', httpsPort.toString());
var username = request.getParameter('username').trim(),
- password = request.getParameter('password');
+ password = request.getParameter('password');
if (username || password) {
session.put("error", "Enter your username and password.");
@@ -84,6 +84,4 @@ try {
session.put("error", e.toString());
print({status: e.toString()});
}
-
-
%>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/dac81ac1/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 f7a62c1..6f5cdeb 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
@@ -220,4 +220,9 @@ button.hover-undeploy{
div#textform>div>h3 {
display: none;
+}
+
+.login-logo img {
+ width: 210px;
+ padding-bottom: 25px;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/dac81ac1/components/org.apache.stratos.manager.console/console/themes/theme0/images/stratos-trans.png
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/images/stratos-trans.png b/components/org.apache.stratos.manager.console/console/themes/theme0/images/stratos-trans.png
new file mode 100644
index 0000000..9c70b05
Binary files /dev/null and b/components/org.apache.stratos.manager.console/console/themes/theme0/images/stratos-trans.png differ
http://git-wip-us.apache.org/repos/asf/stratos/blob/dac81ac1/components/org.apache.stratos.manager.console/console/themes/theme0/pages/login.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/pages/login.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/pages/login.hbs
new file mode 100644
index 0000000..e4b134b
--- /dev/null
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/pages/login.hbs
@@ -0,0 +1,64 @@
+<!DOCTYPE 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.
+ *
+ * -->
+<!--[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">
+ {{include page_meta}}
+ <meta name="viewport" content="width=device-width, initial-scale=1">
+ <link rel="shortcut icon" href="{{url "/themes/theme0/images/favicon.png"}}">
+ <link rel="stylesheet" href="{{url "/themes/theme0/css/web-fonts/open_sans.css"}}" type="text/css" >
+ <link rel="stylesheet" href="{{url "/themes/theme0/css/bootstrap-3.2.0/bootstrap.min.css"}}" type="text/css" >
+ <link rel="stylesheet" href="{{url "/themes/theme0/css/custom.css"}}" type="text/css" >
+ <link rel="stylesheet" href="{{url "/themes/theme0/css/font-awesome-4.2.0/font-awesome.min.css"}}" type="text/css" >
+ {{css .}}
+ <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
+ <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+ <!--[if lt IE 9]>
+ <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+ <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+ <![endif]-->
+ <!--[if lte IE 8]><script language="javascript" type="text/javascript" src="{{url "/themes/theme0/ui/js/excanvas.min.js"}}"></script><![endif]-->
+ <script type="text/javascript" src="{{url "/themes/theme0/js/jquery-1.11.1/jquery-1.11.1.js"}}"></script>
+</head>
+<body>
+
+<div class="container-fluid">
+{{include content}}
+</div>
+<!-- Include all compiled plugins (below), or include individual files as needed -->
+<!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+
+<script type="text/javascript" src="{{url "/themes/theme0/js/bootstrap-3.2.0/bootstrap.min.js"}}"></script>
+<script type="text/javascript" src="{{url "/themes/theme0/js/noty-2.2.9/noty-2.2.9.js"}}"></script>
+<script type="text/javascript" src="{{url "/themes/theme0/js/custom.js"}}"></script>
+{{js .}}
+
+</body>
+</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/dac81ac1/components/org.apache.stratos.manager.console/console/themes/theme0/partials/login_body.hbs
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/login_body.hbs b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/login_body.hbs
index 294a31c..99aefb1 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/partials/login_body.hbs
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/partials/login_body.hbs
@@ -20,8 +20,8 @@
-->
<div class="row title">
- <div class="title-main text-center">
- <h1>{{content_title}}</h1>
+ <div class="title-main text-center login-logo">
+ <img src="{{url "/themes/theme0/images/stratos-trans.png"}}">
</div>
</div>
<div class="container">
@@ -29,7 +29,7 @@
<div class="col-md-4 col-md-offset-4">
<div class="panel panel-default">
<div class="panel-heading">
- <h3 class="panel-title">Sign in to continue to Apache Stratos</h3>
+ <h3 class="panel-title">Log in to your account</h3>
</div>
<div class="panel-body login">
<form accept-charset="UTF-8" role="form" method="POST">
http://git-wip-us.apache.org/repos/asf/stratos/blob/dac81ac1/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/login.js
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/login.js b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/login.js
index 380840a..65bd46d 100644
--- a/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/login.js
+++ b/components/org.apache.stratos.manager.console/console/themes/theme0/renderers/login.js
@@ -21,7 +21,7 @@
var render = function (theme, data, meta, require) {
if(data.error.length == 0 ){
- theme('index', {
+ theme('login', {
page_meta: [
{
partial:'index_title',
@@ -43,7 +43,7 @@ var render = function (theme, data, meta, require) {
{
partial: 'login_body',
context:{
- content_title:'The most comprehensive enterprise grade PaaS Framework'
+ content_title:''
}
}
@@ -52,7 +52,7 @@ var render = function (theme, data, meta, require) {
}else{
- theme('index', {
+ theme('login', {
page_meta: [
{
partial:'index_title',
@@ -84,6 +84,5 @@ var render = function (theme, data, meta, require) {
}
]
});
-
}
};
\ No newline at end of file