You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by gi...@apache.org on 2015/12/22 17:15:02 UTC
syncope git commit: [SYNCOPE-719] UI improvements
Repository: syncope
Updated Branches:
refs/heads/master 19e3f21d3 -> c9e66925f
[SYNCOPE-719] UI improvements
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c9e66925
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c9e66925
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c9e66925
Branch: refs/heads/master
Commit: c9e66925fada4ccd822caf16536354b1c1052e86
Parents: 19e3f21
Author: giacomolm <gi...@hotmail.it>
Authored: Tue Dec 22 17:13:59 2015 +0100
Committer: giacomolm <gi...@hotmail.it>
Committed: Tue Dec 22 17:14:25 2015 +0100
----------------------------------------------------------------------
.../META-INF/resources/app/css/editUser.css | 14 ++--
.../META-INF/resources/app/css/login.css | 73 ++++++++++++++++++--
.../META-INF/resources/app/views/editUser.html | 2 +-
.../resources/app/views/navigationButtons.html | 2 +-
.../META-INF/resources/app/views/self.html | 54 +++++++--------
.../resources/app/views/user-credentials.html | 6 +-
.../resources/app/views/user-groups.html | 8 +--
.../resources/app/views/user-plain-schemas.html | 6 +-
.../resources/app/views/user-resources.html | 6 +-
9 files changed, 117 insertions(+), 54 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/c9e66925/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index ee13bd0..992505f 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -97,7 +97,7 @@ under the License.
background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* IE10+ */
float: left;
color: black;
- width: 30%;
+ //width: 30%;
}
#previous:hover {
background: #658D5D;
@@ -109,10 +109,10 @@ under the License.
background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* IE10+ */
- margin-top: 5px;
+ margin-left: 5px;
float: right;
color: black;
- width: 30%;
+ //width: 30%;
}
#next:hover {
background: #658D5D;
@@ -125,15 +125,15 @@ under the License.
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* IE10+ */
color: black;
- margin-top: 5%;
- width: 15%;
+ margin-left: 5px;
+ //width: 15%;
}
#save:hover {
background: #658D5D;
}
#cancel {
- margin-top: 5%;
- width: 15%;
+ //margin-top: 5%;
+ //width: 15%;
}
#form-views { width:auto; }
http://git-wip-us.apache.org/repos/asf/syncope/blob/c9e66925/client/enduser/src/main/resources/META-INF/resources/app/css/login.css
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/css/login.css b/client/enduser/src/main/resources/META-INF/resources/app/css/login.css
index fdc9e3e..7b0192e 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/login.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/login.css
@@ -18,13 +18,20 @@
*/
body, html {
- margin: 45px 0;
+ /*margin: 45px 0;*/
height: 100%;
background-repeat: no-repeat;
/*background-image: linear-gradient(rgb(104, 145, 162), #00a65a);*/
- background-color: #EEEEEE;
+ /*background-color: #00A65A;
+ height: 100%;
+ background-image: linear-gradient(#6891A2, #00A65A);*/
+}
+
+body{
+ margin: 45px 0;
}
-#login-container {
+
+/*#login-container {
position: relative;
width: 100%;
margin: 0 auto;
@@ -65,7 +72,7 @@ body, html {
#login-container #signup-btn:hover {
background-color: #1d1d1d;
border-color: #181818;
-}
+}*/
.login-btn {
background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /* FF3.6+ */
@@ -80,6 +87,7 @@ body, html {
background: #658D5D;
}
+/*
#login {
position: relative;
padding: 25px 25px 50px 25px;
@@ -93,11 +101,66 @@ body, html {
#login-form{
padding: 0 195px;
margin: 7%;
-}
+}*/
#languageContainer {
padding: 0 25px;
}
.logout{
float: right;
+}
+
+.card-container.card {
+ width: 350px;
+ padding: 40px 40px 0px;
+}
+
+.card {
+ background-color: #F7F7F7;
+ /* just in case there no content*/
+ padding: 20px 25px 30px;
+ margin: 0 auto 25px;
+ margin-top: 50px;
+ /* shadows and rounded borders */
+ -moz-border-radius: 2px;
+ -webkit-border-radius: 2px;
+ border-radius: 2px;
+ -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+ -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+ box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+}
+
+.login-logo {
+ width: 200px;
+ margin: 0px auto 10px;
+ display: block;
+}
+
+.form-signin input[type=password],
+.form-signin input[type=text],
+.form-signin button {
+ width: 100%;
+ display: block;
+ margin-bottom: 10px;
+ z-index: 1;
+ position: relative;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
+}
+
+.form-control {
+ display: block;
+ width: 100%;
+ height: 34px;
+ padding: 6px 12px;
+ font-size: 14px;
+ line-height: 1.42857;
+ color: #555;
+ background-color: #FFF;
+ background-image: none;
+ border: 1px solid #CCC;
+ border-radius: 4px;
+ box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset;
+ transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/c9e66925/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html b/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
index 398cbcf..53c0130 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
@@ -20,7 +20,7 @@ under the License.
<div ng-cloak class="container">
<div class="login-container" ng-controller="UserController" ng-init="initUser();" style="box-sizing: border-box; ">
- <div id="form-container" class="col-md-6 col-md-offset-3">
+ <div id="form-container" class="col-md-6 col-md-offset-3" style="box-sizing: border-box; background-color: #F7F7F7;">
<div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/c9e66925/client/enduser/src/main/resources/META-INF/resources/app/views/navigationButtons.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/navigationButtons.html b/client/enduser/src/main/resources/META-INF/resources/app/views/navigationButtons.html
index 793334d..9fd86f3 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/navigationButtons.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/navigationButtons.html
@@ -1,4 +1,4 @@
-<div class="col-xs-6 col-xs-offset-3">
+<div class="pull-right">
<a ng-show="next !== 'none'" id="next" ui-sref="{{next}}" class="btn btn-default">
Next <span class="glyphicon glyphicon-circle-arrow-right"></span>
</a>
http://git-wip-us.apache.org/repos/asf/syncope/blob/c9e66925/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/self.html b/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
index fe7f00f..bfd2fa3 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/self.html
@@ -37,7 +37,7 @@ under the License.
<img class="login-logo" src="img/logo-green.png" />
</a>
</div>-->
- <div id="login">
+ <div id="login" class="card card-container">
<div class="logout">
<a href="javascript:void(0);" class="btn btn-danger btn-signin" ng-click="logout()" ng-show="isLogged()" title="Logout">
<i class="glyphicon glyphicon-off"></i>
@@ -53,45 +53,45 @@ under the License.
</div>
</div>-->
- <h3>Welcome to Apache Syncope Enduser</h3>
- <h5 ng-show="!isLogged()">please login to self update</h5>
+ <img class="login-logo" src="img/logo-green.png" />
<div id="login-form" class="form">
<div growl reference="1" inline="true"></div>
</div>
-
- <form id="login-form" class="form" novalidate ng-show="!isLogged()" >
- <div class="form-group">
- <input autofocus="autofocus" type="text" class="form-control" id="login-username" placeholder="Username"
- ng-required ng-model="credentials.username" placeholder="username">
- </div>
+ <form id="login-form" class="form form-signin" novalidate ng-show="!isLogged()" >
- <div class="form-group">
- <input type="password" class="form-control" id="login-password" placeholder="Password"
- ng-required ng-model="credentials.password" placeholder="password">
- </div>
+ <fieldset class="form-group input-group">
- <div class="form-group">
+ <div class="form-group">
+ <input autofocus="autofocus" type="text" class="form-control" id="login-username" placeholder="Username"
+ ng-required ng-model="credentials.username" placeholder="username">
+ </div>
- <button type="submit" id="login-btn" class="btn btn-default btn-signin login-btn" ng-click="login(credentials)">Login</button>
- <a href="javascript:void(0);" class="btn btn-link" ng-click="selfCreate()">Self Registration</a>
- <!--<a href="javascript:void(0);" class="btn btn-link" ng-click="passwordReset()">Password Reset</a>-->
- </div>
+ <div class="form-group">
+ <input type="password" class="form-control" id="login-password" placeholder="Password"
+ ng-required ng-model="credentials.password" placeholder="password">
+ </div>
+
+ <div class="form-group">
+
+ <button type="submit" id="login-btn" class="btn btn-default btn-signin login-btn" ng-click="login(credentials)">Login</button>
+ </div>
+ </fieldset>
</form>
</div>
</div>
-
- </div>
-
- </div> <!-- /#login -->
-
- <!-- <div id="initialLoaderDiv">
- <img src="img/busy.gif" class="ajax-loader"/>
- </div>-->
- </div> <!-- /#login-container -->
+ <div class="text-center" ng-show="!isLogged()">
+ <a href="javascript:void(0);" class="btn btn-link" ng-click="selfCreate()">Self Registration</a>
+ <!--<a href="javascript:void(0);" class="btn btn-link" ng-click="passwordReset()">Password Reset</a>-->
+ <!-- <div id="initialLoaderDiv">
+ <img src="img/busy.gif" class="ajax-loader"/>
+ </div>-->
+ </div> <!-- /#login-container -->
+ </div> <!-- /#login -->
+ </div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/c9e66925/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html b/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html
index b51a45a..1dfade1 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html
@@ -51,10 +51,10 @@ under the License.
placeholder="security answer">
</div>
-<div class="form-group row">
+<div id="attribute" class="form-group row">
<navigation-buttons ng-show="createMode" next="create.groups" previous="none"></navigation-buttons>
<navigation-buttons ng-show="!createMode" next="update.groups" previous="none"></navigation-buttons>
- <div class="col-xs-6 col-xs-offset-3">
- <a id="cancel" href="#/self" class="btn btn-danger">Cancel</a>
+ <div class="pull-left">
+ <a id="cancel" href="#/self" class="btn btn-default pull-left">Cancel</a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/c9e66925/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html b/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html
index 5413fc5..a7e9edc 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
under the License.
-->
-<div class="form-group row upper-select">
+<div id="attribute" class="form-group row upper-select">
<label>Realm</label>
<select class="form-control"
ng-disabled="true"
@@ -28,10 +28,10 @@ under the License.
</select>
</div>
-<div class="form-group row">
+<div id="attribute" class="form-group row">
<navigation-buttons ng-show="createMode" next="create.plainSchemas" previous="create.credentials"></navigation-buttons>
<navigation-buttons ng-show="!createMode" next="update.plainSchemas" previous="update.credentials"></navigation-buttons>
- <div class="col-xs-6 col-xs-offset-3">
- <a id="cancel" href="#/self" class="btn btn-danger">Cancel</a>
+ <div class="pull-left">
+ <a id="cancel" href="#/self" class="btn btn-default pull-left">Cancel</a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/c9e66925/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html b/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html
index 211ab1e..7ebfd3a 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html
@@ -28,10 +28,10 @@ under the License.
<!--</div>-->
<!--</div>-->
-<div class="form-group row">
+<div id="attribute" class="form-group row">
<navigation-buttons ng-show="createMode" next="create.resources" previous="create.groups"></navigation-buttons>
<navigation-buttons ng-show="!createMode" next="update.resources" previous="update.groups"></navigation-buttons>
- <div class="col-xs-6 col-xs-offset-3">
- <a id="cancel" href="#/self" class="btn btn-danger">Cancel</a>
+ <div class="pull-left">
+ <a id="cancel" href="#/self" class="btn btn-default pull-left">Cancel</a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/c9e66925/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html b/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html
index 3ee2e78..b5c5bee 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html
@@ -18,11 +18,11 @@ specific language governing permissions and limitations
under the License.
-->
-<div class="form-group row">
+<div id="attribute" class="form-group row">
+ <button id="save" type="submit" class="btn btn-default pull-right">Save</button>
<navigation-buttons ng-show="createMode" next="none" previous="create.plainSchemas"></navigation-buttons>
<navigation-buttons ng-show="!createMode" next="none" previous="update.plainSchemas"></navigation-buttons>
- <div class="col-xs-6 col-xs-offset-3">
+ <div class="pull-left">
<a id="cancel" href="#/self" class="btn btn-danger">Cancel</a>
- <button id="save" type="submit" class="btn btn-success">Save</button>
</div>
</div>
\ No newline at end of file