few minor (mostly visual) improvements in Object Policies editor

Evolveum · Aug 14, 2014 · 3306e35 · 3306e35
1 parent ce41b84
commit 3306e35
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.html b/...ui/src/main/java/com/evolveum/midpoint/web/component/ObjectPolicyConfigurationEditor.html
@@ -24,12 +24,12 @@
     <wicket:container wicket:id="repeater">
         <div class="col-lg-4" wicket:id="textWrapper">
             <div class="input-group input-group-sm">
+                <input type="text" class="form-control input-sm" wicket:id="name" />
                 <span class="input-group-btn">
                     <button wicket:id="edit" class="btn btn-primary" type="button">
                         <wicket:message key="objectPolicyConfigurationEditor.button.edit" />
                     </button>
                 </span>
-                <input type="text" class="form-control input-sm" wicket:id="name" />
                 <span class="text-danger" wicket:id="feedback"/>
             </div>
         </div>

diff --git a/...java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyDialog.html b/...java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyDialog.html
@@ -28,7 +28,7 @@
                 <wicket:container wicket:id="repeater">
                     <div class="col-md-6" wicket:id="textWrapper">
                         <div class="input-group">
-                            <input type="text" class="form-control" wicket:id="property">
+                            <input type="text" class="form-control input-sm" wicket:id="property">
                             <span class="input-group-addon">
                                 <input type="checkbox" wicket:id="oidBound">
                             </span>

diff --git a/...java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyDialog.java b/...java/com/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyDialog.java
@@ -34,6 +34,7 @@
 import com.evolveum.midpoint.web.page.admin.configuration.dto.PropertyConstraintTypeDto;
 import com.evolveum.midpoint.web.util.WebMiscUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -105,7 +106,7 @@ protected ObjectPolicyDialogDto load() {
         showUnloadConfirmation(false);
         setCssClassName(ModalWindow.CSS_CLASS_GRAY);
         setCookieName(ObjectPolicyDialog.class.getSimpleName() + ((int) (Math.random() * 100)));
-        setInitialWidth(615);
+        setInitialWidth(625);
         setInitialHeight(400);
         setWidthUnit("px");
 
@@ -210,6 +211,7 @@ protected void onUpdate(AjaxRequestTarget target) {}
                 textWrapper.add(property);
 
                 CheckBox oidBound = new CheckBox(ID_OID_BOUND, new PropertyModel<Boolean>(item.getModel(), PropertyConstraintTypeDto.F_OID_BOUND));
+                oidBound.add(AttributeModifier.replace("title", createStringResource("ObjectPolicyDialog.label.oidBound.help")));
                 textWrapper.add(oidBound);
 
                 WebMarkupContainer buttonGroup = new WebMarkupContainer(ID_BUTTON_GROUP);

diff --git a/...om/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyDialog.properties b/...om/evolveum/midpoint/web/page/admin/configuration/component/ObjectPolicyDialog.properties
@@ -14,11 +14,12 @@
 # limitations under the License.
 #
 
-ObjectPolicyDialog.label=Create/Edit Object Policy
+ObjectPolicyDialog.label=Edit Object Policy
 ObjectPolicyDialog.type=Object type
 ObjectPolicyDialog.template=Object template
 ObjectPolicyDialog.propertyConstraint=Property constraint
 ObjectPolicyDialog.property.placeholder=Insert property path
 ObjectPolicyDialog.button.save=Save
 ObjectPolicyDialog.button.cancel=Cancel
+ObjectPolicyDialog.label.oidBound.help=Oid bound - The property value will be bound to OID. This property will be set to the value of OID and it cannot be changed.
 nullValid=Choose one