partial fix for MID-3668

Evolveum · Jan 16, 2017 · c35539b · c35539b
1 parent 47f5f6a
commit c35539b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 11 deletions.
diff --git a/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html b/.../src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentCatalogPanel.html
@@ -19,24 +19,28 @@
       xmlns:wicket="http://wicket.apache.org">
 <body>
 <wicket:panel>
-    <div class="row">
-        <div wicket:id="headerPanel" class="row box-header">
-            <select class="col-md-2 input-sm" style="margin-left: 15px;" wicket:id="viewTypeSelect"/>
+    <div class="row" wicket:id="headerPanel">
+        <div class="col-md-2">
+            <select class="form-control input-sm col-md-2" wicket:id="viewTypeSelect"/>
+        </div>
+
+        <form class="col-md-8 search-form" wicket:id="searchForm">
+            <div wicket:id="search"/>
+        </form>
 
-            <form class="col-md-8 search-form" wicket:id="searchForm">
-                <div wicket:id="search"/>
-            </form>
-            <a wicket:id="cartButton" class="col-md-1" style="font-size: 24px">
-                <i class="fa fa-shopping-cart" style="width: 50%;"></i>
-            <span wicket:id="itemsCount" class="badge bg-red"
-                  style="font-size: 10px; position: absolute; top: -1px; right: 50%;"></span>
+        <div class="col-md-1">
+            <a wicket:id="cartButton">
+                <i class="fa fa-shopping-cart fa-2x"></i>
+                <span wicket:id="itemsCount" class="badge bg-red" style="position: absolute; top: -1px; left: 30px;"></span>
             </a>
         </div>
     </div>
+
     <div wicket:id="catalogItemsPanelContainer" class="row">
         <div wicket:id="treePanelContainer">
             <div wicket:id="treePanel"/>
         </div>
+
         <div wicket:id="catalogItemsPanelContainer">
             <div wicket:id="catalogItemsPanel"/>
         </div>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageRequestRole.java
@@ -90,7 +90,8 @@ private void initLayout() {
         Form mainForm = new org.apache.wicket.markup.html.form.Form(ID_MAIN_FORM);
         add(mainForm);
 
-        MultipleAssignmentSelectorPanel<UserType, UserType, RoleType> panel = new MultipleAssignmentSelectorPanel<>(ID_MAIN_PANEL, assignmentsModel,
+        MultipleAssignmentSelectorPanel<UserType, UserType, RoleType> panel =
+                new MultipleAssignmentSelectorPanel<>(ID_MAIN_PANEL, assignmentsModel,
                 user, UserType.class, RoleType.class, this);
         mainForm.add(panel);