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 2016/08/02 10:16:28 UTC
syncope git commit: [SYNCOPE-913] Virtual attributes now have add and
remove buttons inline
Repository: syncope
Updated Branches:
refs/heads/master 277c8bcb6 -> c633d95d1
[SYNCOPE-913] Virtual attributes now have add and remove buttons inline
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c633d95d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c633d95d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c633d95d
Branch: refs/heads/master
Commit: c633d95d160f6a3e3c2f2d13091ecaa342f85150
Parents: 277c8bc
Author: giacomolm <gi...@hotmail.it>
Authored: Tue Aug 2 12:16:01 2016 +0200
Committer: giacomolm <gi...@hotmail.it>
Committed: Tue Aug 2 12:16:01 2016 +0200
----------------------------------------------------------------------
.../META-INF/resources/app/css/editUser.css | 7 ++++++-
.../app/views/dynamicVirtualAttributes.html | 19 +++++++++----------
2 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/c633d95d/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 d1b90b8..7617856 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
@@ -295,6 +295,10 @@ under the License.
margin-top: 10px
}
+.multivalue input:disabled{
+ width: 100%;
+}
+
.multivalue button{
margin-top: 2px
}
@@ -312,6 +316,7 @@ under the License.
margin-top: 0px
}
+
.multivalue #timepicker {
- margin-top: -35px;
+ margin-top: -35px;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/c633d95d/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicVirtualAttributes.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicVirtualAttributes.html b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicVirtualAttributes.html
index 01006ac..cd4750f 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicVirtualAttributes.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicVirtualAttributes.html
@@ -20,18 +20,17 @@ under the License.
<label for="virtualSchema.key">{{virtualSchema.key}}</label>
<!--all virtual schemas are multivalue-->
<div ng-repeat="field in dynamicForm.virtualAttributeTable[virtualSchema.key].fields track by $index"
- ng-model='dynamicForm.virtualAttributeTable[virtualSchema.key].fields[$index]'>
- <dynamic-virtual-attribute schema="virtualSchema" user="user" index="$index"></dynamic-virtual-attribute>
- <span>
- <button class="btn btn-default btn-sm minus" ng-if="$index > 0" type="button"
+ ng-model='dynamicForm.virtualAttributeTable[virtualSchema.key].fields[$index]'>
+ <div class="multivalue">
+ <button class="btn btn-default btn-sm" type="button" ng-click="addVirtualAttributeField(virtualSchema.key)"
+ ng-show="!virtualSchema.readonly">
+ <i class="glyphicon glyphicon-plus" title="Add value"></i>
+ </button>
+ <button class="btn btn-default btn-sm minus" ng-if="$index > 0" type="button" ng-show="!virtualSchema.readonly"
ng-click="removeVirtualAttributeField(virtualSchema.key, $index)">
<i class="glyphicon glyphicon-minus" title="Remove value"></i>
</button>
- </span>
+ <dynamic-virtual-attribute schema="virtualSchema" user="user" index="$index"></dynamic-virtual-attribute>
+ </div>
</div>
- <span>
- <button class="btn btn-default btn-sm" type="button" ng-click="addVirtualAttributeField(virtualSchema.key)">
- <i class="glyphicon glyphicon-plus" title="Add value"></i>
- </button>
- </span>
</div>