improving org tree page - added inline menu for tree panel..

Evolveum · Apr 16, 2016 · 33ac352 · 33ac352
1 parent 08a5724
commit 33ac352
Show file tree

Hide file tree

Showing 6 changed files with 198 additions and 226 deletions.
diff --git a/...i/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgSummaryPanel.java b/...i/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgSummaryPanel.java
@@ -46,7 +46,7 @@ protected QName getTitlePropertyName() {
 
 	@Override
 	protected String getIconCssClass() {
-		return GuiStyleConstants.CLASS_OBJECT_SERVICE_ICON;
+		return GuiStyleConstants.CLASS_OBJECT_ORG_ICON;
 	}
 
 	@Override

diff --git a/...i/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java b/...i/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/OrgTreeProvider.java
@@ -33,6 +33,7 @@
 import com.evolveum.midpoint.util.logging.LoggingUtils;
 import com.evolveum.midpoint.util.logging.Trace;
 import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.page.admin.users.PageOrgTree;
 import com.evolveum.midpoint.web.page.admin.users.PageUsers;
 import com.evolveum.midpoint.web.page.admin.users.dto.OrgTreeDto;
@@ -132,9 +133,15 @@ private OrgTreeDto createDto(OrgTreeDto parent, PrismObject<OrgType> unit) {
         String identifier = unit.getPropertyRealValue(OrgType.F_IDENTIFIER, String.class);
 
         //todo relation [lazyman]
-        return new OrgTreeDto(parent, unit);
+        OrgTreeDto orgDto = new OrgTreeDto(parent, unit);
+        orgDto.getMenuItems().addAll(createInlineMenuItems());
+        return orgDto;
     }
 
+    protected List<InlineMenuItem> createInlineMenuItems(){
+    	return null;
+    }
+
     @Override
     public Iterator<? extends OrgTreeDto> getRoots() {
         OperationResult result = null;

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.html
@@ -16,7 +16,7 @@
   ~ limitations under the License.
   -->
 <wicket:panel xmlns:wicket="http://wicket.apache.org">
-    <div wicket:id="confirmDeletePopup" />
+<!--     <div wicket:id="confirmDeletePopup" /> -->
     <div wicket:id="movePopup" />
     <div wicket:id="addDeletePopup" />
 
@@ -64,7 +64,7 @@
                         <div class="tree-table-header">
                                 <wicket:message key="TreeTablePanel.managers"/>
                             </div>
-                            <div class="col-md-6" wicket:id="managerTable">
+                            <div class="col-md-12" wicket:id="managerTable">
                             <div class="pull-right">
                             	<div wicket:id="editManager" class="fa fa-edit"></div>
                             	<div wicket:id="removeManager" class="fa fa-trash-o"></div>