syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From giacom...@apache.org
Subject syncope git commit: [SYNCOPE-913] Add and remove buttons now are on the same line of multivalue input
Date Tue, 02 Aug 2016 09:50:58 GMT
Repository: syncope
Updated Branches:
  refs/heads/master 5c90dd82c -> 277c8bcb6


[SYNCOPE-913] Add and remove buttons now are on the same line of multivalue input


Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/277c8bcb
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/277c8bcb
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/277c8bcb

Branch: refs/heads/master
Commit: 277c8bcb6aa13f63e39ddeca7dd4476ad09b86f9
Parents: 5c90dd8
Author: giacomolm <giacomolm@hotmail.it>
Authored: Tue Aug 2 11:50:03 2016 +0200
Committer: giacomolm <giacomolm@hotmail.it>
Committed: Tue Aug 2 11:50:43 2016 +0200

----------------------------------------------------------------------
 .../META-INF/resources/app/css/editUser.css     | 34 +++++++++++++++++++-
 .../app/views/dynamicPlainAttribute.html        |  6 ++--
 .../app/views/dynamicPlainAttributes.html       | 20 ++++++------
 3 files changed, 45 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/syncope/blob/277c8bcb/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 16bb79c..d1b90b8 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
@@ -74,7 +74,7 @@ under the License.
 }
 
 .minus{
-  margin-bottom: 2%;
+
 }
 
 .fileButton{
@@ -283,3 +283,35 @@ under the License.
   to      { -webkit-transform: translateX(0); }
 }
 
+.multivalue>button{
+  float: right
+}
+.schema-type #date{
+  margin-top: 35px;
+}
+
+.multivalue input{
+  width: calc(100% - 70px);
+  margin-top: 10px
+}
+
+.multivalue button{
+  margin-top: 2px
+}
+
+.multivalue #datetime{
+  margin-top: 0px
+}
+
+#datetime input{
+  width: 100%;
+  margin-top: 0px
+}
+#timepicker input{
+  width: 50px;
+  margin-top: 0px
+}
+
+.multivalue #timepicker {
+    margin-top: -35px;
+}

http://git-wip-us.apache.org/repos/asf/syncope/blob/277c8bcb/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
index d278730..5195a30 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
@@ -17,7 +17,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<div ng-switch="schema.type" >
+<div ng-switch="schema.type" class="schema-type">
   <input ng-switch-when="String" class="form-control" type="text"
          ng-model="user.plainAttrs[schema.key].values[index]"
          ng-required="{{schema.mandatoryCondition}}" validate="true"
@@ -48,9 +48,7 @@ under the License.
              is-open="status.opened" datepicker-options="dateOptions"
              ng-required="{{schema.mandatoryCondition}}" close-text="Close"
              ng-init="initAttribute(schema, index)"/>
-    </span>
-    <span>
-      <button type="button" class="btn btn-default" style="margin-top:35px;" ng-click="open($event)"
>
+      <button type="button" class="btn btn-default" ng-click="open($event)" >
         <i class="glyphicon glyphicon-calendar"></i>
       </button>
     </span>

http://git-wip-us.apache.org/repos/asf/syncope/blob/277c8bcb/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttributes.html
----------------------------------------------------------------------
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttributes.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttributes.html
index b203fb1..9d3ea20 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttributes.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttributes.html
@@ -17,27 +17,27 @@ specific language governing permissions and limitations
 under the License.
 -->
 <div id="attribute" class="form-group" ng-repeat="plainSchema in dynamicForm.plainSchemas">
-  <label for="plainSchema.key">{{plainSchema.key | translate}} <span ng-if="plainSchema.mandatoryCondition
=== 'true'">*</span></label>
+  <label for="plainSchema.key">{{plainSchema.key| translate}} <span ng-if="plainSchema.mandatoryCondition
=== 'true'">*</span></label>
   <div ng-if="!plainSchema.multivalue">
     <dynamic-plain-attribute schema="plainSchema" user="user" index="0"></dynamic-plain-attribute>
-    <validation-message name="{{plainSchema.key | translate}}"/>
+    <validation-message name="{{plainSchema.key| translate}}"/>
   </div>
 
   <div ng-if="plainSchema.multivalue">
     <div ng-repeat="field in dynamicForm.attributeTable[plainSchema.key].fields track
by $index" 
          ng-model='dynamicForm.attributeTable[plainSchema.key].fields[$index]'>
-      <dynamic-plain-attribute schema="plainSchema" user="user" index="$index"></dynamic-plain-attribute>
-      <span>
+      <div class="multivalue">
+        <button class="btn btn-default btn-sm" type="button" ng-click="addAttributeField(plainSchema.key)">
+          <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-click="removeAttributeField(plainSchema.key, $index)">
           <i class="glyphicon glyphicon-minus" title="Remove value"></i>
         </button>
-      </span>
+        <dynamic-plain-attribute schema="plainSchema" user="user" index="$index"></dynamic-plain-attribute>
+      </div>
+
     </div>
-    <span>
-      <button class="btn btn-default btn-sm" type="button" ng-click="addAttributeField(plainSchema.key)">
-        <i class="glyphicon glyphicon-plus" title="Add value"></i>
-      </button>
-    </span>
+
   </div>
 </div>


Mime
View raw message