MID-1724 - fixed subissue 8. - bad styles of checkboxes on some place…

…s in UI causes them to look wrong.
Evolveum · Mar 13, 2014 · 584509d · 584509d
1 parent bba2696
commit 584509d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 8 deletions.
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.html b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResourceEdit.html
@@ -25,7 +25,7 @@
 
                 <div class="col-lg-8">
                     <label class="col-lg-2 checkbox-inline">
-                        <input type="checkbox" class="form-control" wicket:id="edit" />
+                        <input type="checkbox" wicket:id="edit" />
                         <wicket:message key="pageResourceEdit.edit"/>
                     </label>
                 </div>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/roles/PageRole.html
@@ -24,7 +24,7 @@
 
             <div class="col-lg-8">
                     <label class="col-lg-2 checkbox-inline">
-                        <input type="checkbox" class="form-control" wicket:id="edit" />
+                        <input type="checkbox" wicket:id="edit" />
                         <wicket:message key="pageRole.edit"/>
                     </label>
             </div>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskAdd.html
@@ -37,15 +37,15 @@ <h3><wicket:message key="pageTask.basic"/></h3>
                     </tr>
                     <tr>
                         <td><wicket:message key="pageTask.runUntilNodeDown"/></td>
-                        <td><input class="form-control input-sm" type="checkbox" wicket:id="runUntilNodeDown"/></td>
+                        <td><input class="input-sm" type="checkbox" wicket:id="runUntilNodeDown"/></td>
                     </tr>
                 </table>
 
                 <h3><wicket:message key="pageTask.advancedOption"/></h3>
                 <table class="table table-condensed table-striped">
                     <tr>
                         <td><wicket:message key="pageTask.createSuspended"/></td>
-                        <td><input class="form-control input-sm" type="checkbox" wicket:id="createSuspended"/></td>
+                        <td><input class="input-sm" type="checkbox" wicket:id="createSuspended"/></td>
                     </tr>
                     <tr>
                         <td><wicket:message key="pageTask.threadStop"/></td>
@@ -65,7 +65,7 @@ <h3><wicket:message key="pageTask.scheduleTitle"/><br />
                     <tbody>
                     <tr>
                         <td><wicket:message key="pageTask.recurring"/></td>
-                        <td><input class="form-control input-sm" type="checkbox" wicket:id="recurring"/></td>
+                        <td><input class="input-sm" type="checkbox" wicket:id="recurring"/></td>
                     </tr>
                     </tbody>
                     <tbody wicket:id="container">
@@ -74,7 +74,7 @@ <h3><wicket:message key="pageTask.scheduleTitle"/><br />
                             <wicket:message key="pageTask.bound"/>
                             <i wicket:id="boundHelp" wicket:message="title:pageTask.boundHelp"/>
                         </td>
-                        <td><input class="form-control input-sm" type="checkbox" wicket:id="bound"/></td>
+                        <td><input class="input-sm" type="checkbox" wicket:id="bound"/></td>
                     </tr>
                     <tr wicket:id="intervalContainer">
                         <td><wicket:message key="pageTask.scheduleInterval"/></td>
@@ -125,6 +125,7 @@ <h3><wicket:message key="pageTask.scheduleTitle"/><br />
         <div class="main-button-bar">
             <span class="button-group">
                 <a class="btn btn-default" wicket:id="backButton" />
+
             </span>
             <a class="btn btn-primary" wicket:id="saveButton"/>
         </div>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageTaskEdit.html
@@ -85,7 +85,7 @@ <h2><wicket:message key="pageTaskEdit.scheduleTitle"/><br />
                         <tr>
                             <td><wicket:message key="pageTaskEdit.recurring"/></td>
                             <td>
-                                <input type="checkbox" class="form-control input-sm" wicket:id="recurring"/>
+                                <input type="checkbox" class="input-sm" wicket:id="recurring"/>
                                 <span wicket:id="suspendReqRecurring" class="text-warning"><wicket:message key="pageTaskEdit.suspendReq"/></span>
                             </td>
                         </tr>
@@ -97,7 +97,7 @@ <h2><wicket:message key="pageTaskEdit.scheduleTitle"/><br />
                                 <i wicket:id="boundHelp" wicket:message="title:pageTaskEdit.boundHelp"/>
                             </td>
                             <td>
-                                <input type="checkbox" class="form-control input-sm" wicket:id="bound"/>
+                                <input type="checkbox" class="input-sm" wicket:id="bound"/>
                                 <span wicket:id="suspendReqBound" class="text-warning"><wicket:message key="pageTaskEdit.suspendReq"/></span>
                             </td>
                         </tr>

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgUnitBrowser.java
@@ -283,6 +283,7 @@ protected void rowSelected(AjaxRequestTarget target, IModel<OrgTableDto> row, Op
 
     }
 
+    //TODO - continue here - make sure that this query is not overwritten by query from createQueryFromSelected()
     private ObjectQuery createQuery(){
         OrgUnitSearchDto dto = searchModel.getObject();
         ObjectQuery query = null;