You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by ma...@apache.org on 2017/01/16 15:40:22 UTC
syncope git commit: [SYNCOPE-993] fix enduser buttons style
Repository: syncope
Updated Branches:
refs/heads/2_0_X 578601dd2 -> 13d7ad2fb
[SYNCOPE-993] fix enduser buttons style
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/13d7ad2f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/13d7ad2f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/13d7ad2f
Branch: refs/heads/2_0_X
Commit: 13d7ad2fb9144c8dbd49ca89cfd88a4e13b0c4d1
Parents: 578601d
Author: Matteo Di Carlo <ma...@tirasa.net>
Authored: Mon Jan 16 16:38:32 2017 +0100
Committer: Matteo Di Carlo <ma...@tirasa.net>
Committed: Mon Jan 16 16:38:32 2017 +0100
----------------------------------------------------------------------
.../META-INF/resources/app/css/editUser.css | 115 ++++++++++++++-----
.../resources/app/views/user-credentials.html | 15 ++-
.../app/views/user-derived-schemas.html | 20 ++--
.../resources/app/views/user-form-finish.html | 15 ++-
.../resources/app/views/user-groups.html | 16 ++-
.../resources/app/views/user-plain-schemas.html | 16 ++-
.../resources/app/views/user-resources.html | 14 ++-
.../app/views/user-virtual-schemas.html | 18 +--
8 files changed, 156 insertions(+), 73 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/13d7ad2f/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 bb4a6c6..d88cebf 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
@@ -101,10 +101,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+*/
- float: right;
+ display: inline-block;
color: black;
- width: 80px;
- padding-left: 4px;
+ padding-left: 8px;
+ padding-right: 8px;
margin-left: 5px;
}
@@ -118,10 +118,12 @@ 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+ */
+ display: inline-block;
margin-left: 5px;
+ padding-left: 8px;
+ padding-right: 8px;
float: right;
color: black;
- width: 78px;
}
#next:hover {
@@ -135,10 +137,11 @@ 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;
+ display: inline-block;
+ padding-left: 8px;
+ padding-right: 8px;
margin-left: 5px;
- /*margin-right: 5px;*/
- width: 70px;
- float: right;
+ margin-right: 5px;
}
#save:hover {
@@ -151,11 +154,13 @@ 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+*/
+ display: inline-block;
+ margin-left:5px;
+ padding-left: 8px;
+ padding-right: 8px;
color: black;
margin-left: 5px;
- /*margin-right: 5px;*/
- width: 78px;
- float:right;
+ margin-right: 5px;
}
#finish:hover {
@@ -164,10 +169,8 @@ under the License.
#cancel {
margin-top: 0%;
- width: 70px;
}
-
.container-fluid {
padding-right: 15px;
padding-left: 15px;
@@ -317,7 +320,6 @@ under the License.
padding: 1px 0px 0px 0px;
}
-
.panel-body {
padding: 0px;
}
@@ -340,19 +342,30 @@ under the License.
padding: 0px 0px 1px 0px
}
- /*.container-fluid {
- padding-right: 15px;
- padding-left: 31px;
- margin-right: auto;
- margin-left: auto;
- width: 100%;
- }
-
- #captchaButtons {
- width: 20%;
- margin-left: 100px;
- padding-bottom: 5px;
- }*/
+ #finish{
+ padding-left: 2px;
+ padding-right: 2px;
+ margin-left:-27px;
+ margin-top: 2px;
+ }
+ #next{
+ padding-left: 2px;
+ padding-right: 2px;
+ margin-left: 1px;
+ }
+ #previous{
+ padding-left: 2px;
+ padding-right: 2px;
+ margin-left:-126px;
+ }
+ #save{
+ margin-top: 4px;
+ padding-left: 2px;
+ padding-right: 2px;
+ margin-top:-31px;
+ margin-left: -42px;
+ margin-right: 15px;
+ }
}
@@ -404,10 +417,29 @@ under the License.
.btn-breadcrumb .btn:last-child {
padding:6px 18px 6px 24px;
}
- /*
- #refresh{
- margin-top:1px;
- }*/
+
+ #finish{
+ padding-left: 2px;
+ padding-right: 2px;
+ margin-right: -3px;
+ margin-left: 0px;
+ }
+ #next{
+ padding-left: 2px;
+ padding-right: 2px;
+ margin-right: 23px;
+ }
+ #previous{
+ padding-left: 2px;
+ padding-right: 2px;
+ margin-left: 0px
+ }
+ #save{
+ padding-left: 2px;
+ padding-right: 0px;
+ margin-left: -21px;
+ margin-top: 4px;
+ }
}
@@ -601,6 +633,29 @@ under the License.
width: 82%;
}
+ #finish{
+ padding-left: 4px;
+ padding-right: 4px;
+ margin-top: 4px;
+ margin-right: 16px;
+ }
+ #next{
+ padding-left: 6px;
+ padding-right: 4px;
+ margin-right:-15px;
+ }
+ #previous{
+ padding-left: 4px;
+ padding-right: 4px;
+ margin-left: -87px
+ }
+ #save{
+ padding-left: 4px;
+ padding-right: 4px;
+ margin-top:4px;
+ margin-right:25px;
+
+ }
}
/*style for devices max width 800) */
http://git-wip-us.apache.org/repos/asf/syncope/blob/13d7ad2f/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 a0c3b08..39f02bf 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
@@ -60,13 +60,16 @@ under the License.
ng-model="user.securityAnswer"
placeholder="{{'SECURITYANSWER_PLACEHOLDER'| translate}}">
</div>
-
<div id="attribute" class="form-group row">
- <div id="navButtons">
- <navigation-buttons ng-show="createMode" base="create" current="credentials" wizard="{{wizard}}"></navigation-buttons>
- <navigation-buttons ng-show="!createMode" base= "update" current="credentials" wizard="{{wizard}}"></navigation-buttons>
- <button id="finish" ng-show="!createMode" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
- <button id="finish" ng-show="createMode && endReached" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ <div class="pull-right">
+ <div id="navButtons" class="pull-left">
+ <navigation-buttons ng-show="createMode" base="create" current="credentials" wizard="{{wizard}}"></navigation-buttons>
+ <navigation-buttons ng-show="!createMode" base="update" current="credentials" wizard="{{wizard}}"></navigation-buttons>
+ </div>
+ <div class="pull-right">
+ <button id="finish" ng-show="!createMode" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ <button id="finish" ng-show="createMode && endReached" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ </div>
</div>
<div class="pull-left">
<a id="cancel" href="#/self" class="btn btn-danger pull-left" ng-click="logout()">{{'CANCEL'| translate}}</a>
http://git-wip-us.apache.org/repos/asf/syncope/blob/13d7ad2f/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html b/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
index 48e0ac2..abbe2c9 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
@@ -19,14 +19,18 @@ under the License.
<div>
<dynamic-derived-attributes user="user" form="dynamicForm"></dynamic-derived-attributes>
</div>
-
<div id="attribute" class="form-group row">
- <div id="navButtons">
- <navigation-buttons ng-show="createMode" base="create" current="derivedSchemas" wizard="{{wizard}}"></navigation-buttons>
- <navigation-buttons ng-show="!createMode" base="update" current="derivedSchemas" wizard="{{wizard}}"></navigation-buttons>
- <button id="finish" ng-show="!createMode" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
- <button id="finish" ng-show="createMode && endReached" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
- </div> <div class="pull-left">
- <a id="cancel" href="#/self" class="btn btn-danger" ng-click="logout()">{{'CANCEL'| translate}}</a>
+ <div class="pull-right">
+ <div id="navButtons" class="pull-left">
+ <navigation-buttons ng-show="createMode" base="create" current="derivedSchemas" wizard="{{wizard}}"></navigation-buttons>
+ <navigation-buttons ng-show="!createMode" base="update" current="derivedSchemas" wizard="{{wizard}}"></navigation-buttons>
+ </div>
+ <div class="pull-right">
+ <button id="finish" ng-show="!createMode" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ <button id="finish" ng-show="createMode && endReached" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ </div>
+ </div>
+ <div class="pull-left">
+ <a id="cancel" href="#/self" class="btn btn-danger pull-left" ng-click="logout()">{{'CANCEL'| translate}}</a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/13d7ad2f/client/enduser/src/main/resources/META-INF/resources/app/views/user-form-finish.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-form-finish.html b/client/enduser/src/main/resources/META-INF/resources/app/views/user-form-finish.html
index 87be0cb..f941235 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-form-finish.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-form-finish.html
@@ -21,12 +21,17 @@ under the License.
<div class="form-group row">
<captcha input="captchaInput" enabled="captchaEnabled"></captcha>
</div>
- <div id="navButtons">
- <navigation-buttons ng-show="createMode" base="create" current="finish" wizard="{{wizard}}"></navigation-buttons>
- <navigation-buttons ng-show="!createMode" base="update" current="finish" wizard="{{wizard}}"></navigation-buttons>
- <button id="save" type="submit" class="btn btn-default pull-right">{{'SAVE'| translate}}</button>
+ <!--navigation buttons-->
+ <div class="pull-right">
+ <div id="navButtons" class="pull-left">
+ <navigation-buttons ng-show="createMode" base="create" current="finish" wizard="{{wizard}}"></navigation-buttons>
+ <navigation-buttons ng-show="!createMode" base="update" current="finish" wizard="{{wizard}}"></navigation-buttons>
+ </div>
+ <div class="pull-right">
+ <button id="save" type="submit" class="btn btn-default pull-right">{{'SAVE'| translate}}</button>
+ </div>
</div>
<div class="pull-left">
- <a id="cancel" href="#/self" class="btn btn-danger" ng-click="logout()">{{'CANCEL'| translate}}</a>
+ <a id="cancel" href="#/self" class="btn btn-danger pull-left" ng-click="logout()">{{'CANCEL'| translate}}</a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/13d7ad2f/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 2ff040b..33c554a 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
@@ -33,12 +33,16 @@ under the License.
<auxiliary form="dynamicForm" user="user"></auxiliary>
</div>
<div id="attribute" class="form-group row">
-
- <div id="navButtons">
- <navigation-buttons ng-show="createMode" base="create" current="groups" wizard="{{wizard}}"></navigation-buttons>
- <navigation-buttons ng-show="!createMode" base="update" current="groups" wizard="{{wizard}}"></navigation-buttons>
- <button id="finish" ng-show="!createMode" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
- <button id="finish" ng-show="createMode && endReached" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button> </div>
+ <div class="pull-right">
+ <div id="navButtons" class="pull-left">
+ <navigation-buttons ng-show="createMode" base="create" current="groups" wizard="{{wizard}}"></navigation-buttons>
+ <navigation-buttons ng-show="!createMode" base="update" current="groups" wizard="{{wizard}}"></navigation-buttons>
+ </div>
+ <div class="pull-right">
+ <button id="finish" ng-show="!createMode" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ <button id="finish" ng-show="createMode && endReached" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ </div>
+ </div>
<div class="pull-left">
<a id="cancel" href="#/self" class="btn btn-danger pull-left" ng-click="logout()">{{'CANCEL'| translate}}</a>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/13d7ad2f/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 8351aa3..6bae9b4 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
@@ -19,13 +19,17 @@ under the License.
<div>
<dynamic-plain-attributes form="dynamicForm" user="user"></dynamic-plain-attributes>
</div>
-
<div id="attribute" class="form-group row">
- <div id="navButtons">
- <navigation-buttons ng-show="createMode" base="create" current="plainSchemas" wizard="{{wizard}}"></navigation-buttons>
- <navigation-buttons ng-show="!createMode" base="update" current="plainSchemas" wizard="{{wizard}}"></navigation-buttons>
- <button id="finish" ng-show="!createMode" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
- <button id="finish" ng-show="createMode && endReached" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button> </div>
+ <div class="pull-right">
+ <div id="navButtons" class="pull-left">
+ <navigation-buttons ng-show="createMode" base="create" current="plainSchemas" wizard="{{wizard}}"></navigation-buttons>
+ <navigation-buttons ng-show="!createMode" base="update" current="plainSchemas" wizard="{{wizard}}"></navigation-buttons>
+ </div>
+ <div class="pull-right">
+ <button id="finish" ng-show="!createMode" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ <button id="finish" ng-show="createMode && endReached" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ </div>
+ </div>
<div class="pull-left">
<a id="cancel" href="#/self" class="btn btn-danger pull-left" ng-click="logout()">{{'CANCEL'| translate}}</a>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/13d7ad2f/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 56a3ce4..c030be8 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
@@ -20,11 +20,17 @@ under the License.
<resources form="dynamicForm" user="user"></resources>
</div>
<div id="attribute" class="form-group row">
- <div id="navButtons">
- <navigation-buttons ng-show="createMode" base="create" current="resources" wizard="{{wizard}}"></navigation-buttons>
- <navigation-buttons ng-show="!createMode" base="update" current="resources" wizard="{{wizard}}"></navigation-buttons>
+ <div class="pull-right">
+ <div id="navButtons" class="pull-left">
+ <navigation-buttons ng-show="createMode" base="create" current="resources" wizard="{{wizard}}"></navigation-buttons>
+ <navigation-buttons ng-show="!createMode" base="update" current="resources" wizard="{{wizard}}"></navigation-buttons>
+ </div>
+ <div class="pull-right">
+ <button id="finish" ng-show="!createMode" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ <button id="finish" ng-show="createMode && endReached" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ </div>
</div>
<div class="pull-left">
- <a id="cancel" href="#/self" class="btn btn-danger" ng-click="logout()">{{'CANCEL'| translate}}</a>
+ <a id="cancel" href="#/self" class="btn btn-danger pull-left" ng-click="logout()">{{'CANCEL'| translate}}</a>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/13d7ad2f/client/enduser/src/main/resources/META-INF/resources/app/views/user-virtual-schemas.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-virtual-schemas.html b/client/enduser/src/main/resources/META-INF/resources/app/views/user-virtual-schemas.html
index 114e2ed..ceb6b78 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-virtual-schemas.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-virtual-schemas.html
@@ -16,19 +16,21 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
<div>
<dynamic-virtual-attributes form="dynamicForm" user="user"></dynamic-virtual-attributes>
</div>
-
<div id="attribute" class="form-group row">
- <div id="navButtons">
- <navigation-buttons ng-show="createMode" base="create" current="virtualSchemas" wizard="{{wizard}}"></navigation-buttons>
- <navigation-buttons ng-show="!createMode" base="update" current="virtualSchemas" wizard="{{wizard}}"></navigation-buttons>
- <button id="finish" ng-show="!createMode" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
- <button id="finish" ng-show="createMode && endReached" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ <div class="pull-right">
+ <div id="navButtons" class="pull-left">
+ <navigation-buttons ng-show="createMode" base="create" current="virtualSchemas" wizard="{{wizard}}"></navigation-buttons>
+ <navigation-buttons ng-show="!createMode" base="update" current="virtualSchemas" wizard="{{wizard}}"></navigation-buttons>
+ </div>
+ <div class="pull-right">
+ <button id="finish" ng-show="!createMode" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ <button id="finish" ng-show="createMode && endReached" type="button" class="btn btn-default pull-right" ng-click="finish()">{{'FINISH'| translate}}</button>
+ </div>
</div>
<div class="pull-left">
- <a id="cancel" href="#/self" class="btn btn-danger" ng-click="logout()">{{'CANCEL'| translate}}</a>
+ <a id="cancel" href="#/self" class="btn btn-danger pull-left" ng-click="logout()">{{'CANCEL'| translate}}</a>
</div>
</div>