Merge branch 'master' of https://github.com/Evolveum/midpoint

Evolveum · Oct 12, 2015 · 6920ae3 · 6920ae3
2 parents 0c7c670 + 4c84ada
commit 6920ae3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 12 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/input/UploadPanel.html
@@ -16,19 +16,16 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <div class="col-xs-4" style="padding: 0 0 0 0">
+    <div class="form-object-value-binary-box">
+        <input wicket:id="fileInput" type="file" class="form-object-value-binary-file-input"/>
         <span class="btn-group">
-            <a class="btn btn-default btn-xs" wicket:id="upload" wicket:message="title:UploadPanel.upload.tooltip">
+            <a class="btn btn-success btn-xs" wicket:id="upload" wicket:message="title:UploadPanel.upload.tooltip">
                 <i class="fa fa-upload"/>
             </a>
             <a class="btn btn-danger btn-xs" wicket:id="remove" wicket:message="title:UploadPanel.delete.tooltip">
                 <i class="fa fa-trash-o"/>
             </a>
         </span>
     </div>
-
-    <div class="col-xs-8">
-        <input wicket:id="fileInput" type="file"/>
-    </div>
 </wicket:panel>
 </html>
diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.html b/...admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismPropertyPanel.html
@@ -27,7 +27,7 @@
               wicket:message="title:prismPropertyPanel.hasPendingModification">*</span>
         <i wicket:id="help"/>
     </div>
-    <div class="col-md-6" wicket:id="values">
+    <div class="col-md-8" wicket:id="values">
         <div wicket:id="value"/>
     </div>
 </wicket:panel>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.html
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2010-2013 Evolveum
+  ~ Copyright (c) 2010-2015 Evolveum
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/prism/PrismValuePanel.java
@@ -422,16 +422,19 @@ public String createAssociationTooltip(){
                   return WebMiscUtil.createEnumPanel(ActivationStatusType.class, id, new PropertyModel<ActivationStatusType>(model, baseExpression), this);
               } else if(ActivationType.F_LOCKOUT_STATUS.equals(definition.getName())){
                   return WebMiscUtil.createEnumPanel(LockoutStatusType.class, id, new PropertyModel<LockoutStatusType>(model, baseExpression), this);
-              } else{
-
+              } else {
+              	// nothing to do
               }
 
               if (DOMUtil.XSD_DATETIME.equals(valueType)) {
                   panel = new DatePanel(id, new PropertyModel<XMLGregorianCalendar>(model, baseExpression));
+
               } else if (ProtectedStringType.COMPLEX_TYPE.equals(valueType)) {
                   panel = new PasswordPanel(id, new PropertyModel<String>(model, baseExpression + ".clearValue"));
+
               } else if (DOMUtil.XSD_BOOLEAN.equals(valueType)) {
                   panel = new TriStateComboPanel(id, new PropertyModel<Boolean>(model, baseExpression));
+
               } else if (SchemaConstants.T_POLY_STRING_TYPE.equals(valueType)) {
                   InputPanel inputPanel;
                   PrismPropertyDefinition def = property.getDefinition();
@@ -457,14 +460,16 @@ public Iterator<String> getIterator(String input) {
                       };
 
                   } else {
+
                       inputPanel = new TextPanel<>(id, new PropertyModel<String>(model, baseExpression + ".orig"), String.class);
                   }
 
                   if (ObjectType.F_NAME.equals(def.getName()) || UserType.F_FULL_NAME.equals(def.getName())) {
                       inputPanel.getBaseFormComponent().setRequired(true);
                   }
                   panel = inputPanel;
-              } else if(DOMUtil.XSD_BASE64BINARY.equals(valueType)){
+
+              } else if(DOMUtil.XSD_BASE64BINARY.equals(valueType)) {
                   panel = new UploadPanel(id){
 
                       @Override

diff --git a/gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less b/gui/admin-gui/src/main/webapp/less/midpoint/midpoint.less
@@ -245,4 +245,15 @@ div.multivalue-form {
 div.tree-table-header {
     margin: 10px 3px 3px;
     font-weight: bold;
-}
+}
+
+.form-object-value-binary-box {
+	width: 100%;
+	padding: 0px;
+}
+
+.form-object-value-binary-file-input {
+	width: 80%;
+	vertical-align: middle;
+	display: inline !important;
+}