You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by an...@apache.org on 2015/12/30 12:37:05 UTC
[3/3] syncope git commit: some minor refinements
some minor refinements
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/421c0f8b
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/421c0f8b
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/421c0f8b
Branch: refs/heads/master
Commit: 421c0f8b431ddc34fffc3670c6d019b4333fd80b
Parents: ae05dee
Author: Andrea Patricelli <an...@tirasa.net>
Authored: Wed Dec 30 12:35:14 2015 +0100
Committer: Andrea Patricelli <an...@tirasa.net>
Committed: Wed Dec 30 12:35:14 2015 +0100
----------------------------------------------------------------------
.../META-INF/resources/app/css/editUser.css | 8 ++++----
.../js/directives/dynamicDerivedAttributes.js | 21 --------------------
.../app/js/directives/dynamicPlainAttributes.js | 4 ++--
.../js/directives/dynamicVirtualAttributes.js | 4 ++--
.../app/views/user-derived-schemas.html | 16 +++++++--------
.../resources/app/views/user-plain-schemas.html | 1 -
.../app/views/user-virtual-schemas.html | 17 +++++++---------
7 files changed, 22 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/421c0f8b/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 992505f..eb03a60 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
@@ -29,8 +29,8 @@ 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: 1% 16%;
- width: 72%; padding:10px;
+ margin: 1% 9%;
+ width: 83%; padding:10px;
/* shadows and rounded borders */
-moz-border-radius: 5px;
-webkit-border-radius: 5px;
@@ -40,8 +40,8 @@ under the License.
box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
}
#form-container .breadcrumb-header {
- margin: 1% 16%;
- width: 72%; padding:10px;
+ margin: 1% 11%;
+ width: 80%; padding:10px;
}
.signup-form {
http://git-wip-us.apache.org/repos/asf/syncope/blob/421c0f8b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicDerivedAttributes.js
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicDerivedAttributes.js b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicDerivedAttributes.js
index d2a0187..6e4e3aa 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicDerivedAttributes.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicDerivedAttributes.js
@@ -26,27 +26,6 @@ angular.module('self')
scope: {
dynamicForm: "=form",
user: "="
- },
- controller: function ($scope) {
-
- $scope.addDerivedAttribute = function (item, model) {
- var derSchemaKey = item.key;
- console.log("ADDING DERIVED item: ", derSchemaKey);
- $scope.user.derAttrs[derSchemaKey] = {
- schema: derSchemaKey,
- values: [],
- readonly: false
- };
-
- };
-
- $scope.removeDerivedAttribute = function (item, model) {
- var derSchemaKey = item.key;
- console.log("REMOVING DERIVED item: ", derSchemaKey);
- delete $scope.user.derAttrs[derSchemaKey];
-
- };
-
}
};
});
http://git-wip-us.apache.org/repos/asf/syncope/blob/421c0f8b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicPlainAttributes.js
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicPlainAttributes.js b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicPlainAttributes.js
index 1a0a4c3..672f024 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicPlainAttributes.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicPlainAttributes.js
@@ -30,12 +30,12 @@ angular.module('self')
controller: function ($scope) {
$scope.addAttributeField = function (plainSchemaKey) {
- console.log("ADDING: ", plainSchemaKey + "_" + ($scope.dynamicForm.attributeTable[plainSchemaKey].fields.length));
+ console.log("Add PLAIN value: ", plainSchemaKey + "_" + ($scope.dynamicForm.attributeTable[plainSchemaKey].fields.length));
$scope.dynamicForm.attributeTable[plainSchemaKey].fields.push(plainSchemaKey + "_" + ($scope.dynamicForm.attributeTable[plainSchemaKey].fields.length));
};
$scope.removeAttributeField = function (plainSchemaKey, index) {
- console.log("REMOVING FROM: " + plainSchemaKey + " ATTRIBUTE INDEX: " + index);
+ console.log("Remove PLAIN value: " + plainSchemaKey + " attribute index: " + index);
$scope.dynamicForm.attributeTable[plainSchemaKey].fields.splice(index, 1);
// clean user model
$scope.user.plainAttrs[plainSchemaKey].values.splice(index, 1);
http://git-wip-us.apache.org/repos/asf/syncope/blob/421c0f8b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicVirtualAttributes.js
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicVirtualAttributes.js b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicVirtualAttributes.js
index 460d300..c1a44e5 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicVirtualAttributes.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicVirtualAttributes.js
@@ -30,12 +30,12 @@ angular.module('self')
controller: function ($scope) {
$scope.addVirtualAttributeField = function (virSchemaKey) {
- console.log("ADDING VIRTUAL: ", virSchemaKey + "_" + ($scope.dynamicForm.virtualAttributeTable[virSchemaKey].fields.length));
+ console.log("Add VIRTUAL value: ", virSchemaKey + "_" + ($scope.dynamicForm.virtualAttributeTable[virSchemaKey].fields.length));
$scope.dynamicForm.virtualAttributeTable[virSchemaKey].fields.push(virSchemaKey + "_" + ($scope.dynamicForm.virtualAttributeTable[virSchemaKey].fields.length));
};
$scope.removeVirtualAttributeField = function (virSchemaKey, index) {
- console.log("REMOVING FROM: " + virSchemaKey + " VIRTUAL ATTRIBUTE INDEX: " + index);
+ console.log("Remove VIRTUAL value: " + virSchemaKey + " Attribute index: " + index);
$scope.dynamicForm.virtualAttributeTable[virSchemaKey].fields.splice(index, 1);
// clean user model
$scope.user.virAttrs[virSchemaKey].values.splice(index, 1);
http://git-wip-us.apache.org/repos/asf/syncope/blob/421c0f8b/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 a92b9c2..7a3a3ec 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
@@ -17,16 +17,14 @@ specific language governing permissions and limitations
under the License.
-->
-<div id="attribute-derived" class="form-group" >
- <div>
- <dynamic-derived-attributes user="user" form="dynamicForm"></dynamic-derived-attributes>
- </div>
- <!-- <div style="color:#dd301b" ng-if="attribute.validated == false" class="row-fluid">
- <div class="col-md-5"></div>
- <div class="col-md-7">{{attribute.validationMessage| translate }}</div>
- </div>-->
- <!--</div>-->
+<div>
+ <dynamic-derived-attributes user="user" form="dynamicForm"></dynamic-derived-attributes>
</div>
+<!-- <div style="color:#dd301b" ng-if="attribute.validated == false" class="row-fluid">
+ <div class="col-md-5"></div>
+ <div class="col-md-7">{{attribute.validationMessage| translate }}</div>
+ </div>-->
+<!--</div>-->
<div class="form-group row">
<navigation-buttons ng-show="createMode" next="create.virtualSchemas" previous="create.plainSchemas"></navigation-buttons>
http://git-wip-us.apache.org/repos/asf/syncope/blob/421c0f8b/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 a81b3c3..cfd6011 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
@@ -20,7 +20,6 @@ under the License.
<div>
<dynamic-plain-attributes form="dynamicForm" user="user"></dynamic-plain-attributes>
</div>
-
<!-- <div style="color:#dd301b" ng-if="attribute.validated == false" class="row-fluid">
<div class="col-md-5"></div>
<div class="col-md-7">{{attribute.validationMessage| translate }}</div>
http://git-wip-us.apache.org/repos/asf/syncope/blob/421c0f8b/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 1d77c80..7a3fe66 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
@@ -17,17 +17,14 @@ specific language governing permissions and limitations
under the License.
-->
-<div id="attribute-virtual" class="form-group">
- <div>
- <dynamic-virtual-attributes form="dynamicForm" user="user"></dynamic-virtual-attributes>
- </div>
- <!-- <div style="color:#dd301b" ng-if="attribute.validated == false" class="row-fluid">
- <div class="col-md-5"></div>
- <div class="col-md-7">{{attribute.validationMessage| translate }}</div>
- </div>-->
- <!--</div>-->
+<div>
+ <dynamic-virtual-attributes form="dynamicForm" user="user"></dynamic-virtual-attributes>
</div>
-
+<!-- <div style="color:#dd301b" ng-if="attribute.validated == false" class="row-fluid">
+ <div class="col-md-5"></div>
+ <div class="col-md-7">{{attribute.validationMessage| translate }}</div>
+ </div>-->
+<!--</div>-->
<div class="form-group row">
<navigation-buttons ng-show="createMode" next="create.groups" previous="create.derivedSchemas"></navigation-buttons>
<navigation-buttons ng-show="!createMode" next="update.groups" previous="update.derivedSchemas"></navigation-buttons>