added title to user icons on Users list page

Evolveum · Jun 22, 2016 · 9e34b56 · 9e34b56
1 parent e063c98
commit 9e34b56
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 3 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
@@ -70,6 +70,7 @@ public class GuiStyleConstants {
 	public static final String CLASS_OBJECT_CERT_CAMPAIGN_ICON = "fa fa-gavel";
 	public static final String CLASS_OBJECT_CERT_CAMPAIGN_ICON_COLORED = CLASS_OBJECT_CERT_CAMPAIGN_ICON + " object-task-color";		// TODO
 
+	public static final String CLASS_ICON_STYLE = "icon-style-";  //some icon styles start with this string
 	public static final String CLASS_ICON_STYLE_NORMAL = "icon-style-normal";
 	public static final String CLASS_ICON_STYLE_DISABLED = "icon-style-disabled";
 	public static final String CLASS_ICON_STYLE_ARCHIVED = "icon-style-archived";

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/column/ColumnUtils.java
@@ -200,7 +200,30 @@ public String getObject() {
 					}
 				};
 			}
-		};
+
+            @Override
+            protected IModel<String> createTitleModel(final IModel<SelectableBean<T>> rowModel) {
+
+                return new AbstractReadOnlyModel<String>() {
+
+                    @Override
+                    public String getObject() {
+                        T user = rowModel.getObject().getValue();
+                        String iconClass = WebComponentUtil.createUserIcon(user.asPrismContainer());
+                        String compareStringValue = GuiStyleConstants.CLASS_OBJECT_USER_ICON + " " + GuiStyleConstants.CLASS_ICON_STYLE;
+                        String titleValue = "";
+                        if (iconClass != null &&
+                                iconClass.startsWith(compareStringValue) &&
+                                iconClass.length() > compareStringValue.length()){
+                            titleValue = iconClass.substring(compareStringValue.length());
+                        }
+                        return createStringResource("ColumnUtils.getUserIconColumn.createTitleModel." + titleValue) == null ?
+                                "" : createStringResource("ColumnUtils.getUserIconColumn.createTitleModel." + titleValue).getString();
+                    }
+                };
+            }
+
+        };
 	}
 
 	public static <T extends ObjectType> IColumn<SelectableBean<T>, String> getShadowIconColumn(){

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -3215,4 +3215,17 @@ LockoutStatusPanel.unlockButtonLabel=Unlock
 LockoutStatusPanel.changesSaving=(will be applied after Save button click)
 operation.com.evolveum.midpoint.web.page.admin.server.PageTaskEdit.saveTask=Save task (GUI)
 operation.com.evolveum.midpoint.web.page.admin.users.PageUsers.unlockUsers=Unlock user
-operation.com.evolveum.midpoint.web.page.admin.workflow.PageProcessInstances.stopProcessInstance=Stop process instance
+operation.com.evolveum.midpoint.web.page.admin.workflow.PageProcessInstances.stopProcessInstance=Stop process instance
+
+#values for icon title on Users list page. The name of the property key
+#is generated in the following way:
+# ColumnUtils.getUserIconColumn.createTitleModel. + GuiStyleConstants.CLASS_ICON_STYLE_NORMAL = ColumnUtils.getUserIconColumn.createTitleModel.normal
+ColumnUtils.getUserIconColumn.createTitleModel.normal=normal
+ColumnUtils.getUserIconColumn.createTitleModel.disabled=disabled
+ColumnUtils.getUserIconColumn.createTitleModel.archived=archived
+ColumnUtils.getUserIconColumn.createTitleModel.privileged=privileged
+ColumnUtils.getUserIconColumn.createTitleModel.end-user=end-user
+ColumnUtils.getUserIconColumn.createTitleModel.manager=manager
+ColumnUtils.getUserIconColumn.createTitleModel.broken=broken
+ColumnUtils.getUserIconColumn.createTitleModel.up=up
+ColumnUtils.getUserIconColumn.createTitleModel.down=down
diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties b/gui/admin-gui/src/main/resources/localization/Midpoint_en.properties
@@ -3167,4 +3167,17 @@ LockoutStatusPanel.unlockButtonLabel=Unlock
 LockoutStatusPanel.changesSaving=(changes will be applied after Save button click)
 operation.com.evolveum.midpoint.web.page.admin.server.PageTaskEdit.saveTask=Save task (GUI)
 operation.com.evolveum.midpoint.web.page.admin.users.PageUsers.unlockUsers=Unlock user
-operation.com.evolveum.midpoint.web.page.admin.workflow.PageProcessInstances.stopProcessInstance=Stop process instance
+operation.com.evolveum.midpoint.web.page.admin.workflow.PageProcessInstances.stopProcessInstance=Stop process instance
+
+#values for icon title on Users list page. The name of the property key
+#is generated in the following way:
+# ColumnUtils.getUserIconColumn.createTitleModel. + GuiStyleConstants.CLASS_ICON_STYLE_NORMAL = ColumnUtils.getUserIconColumn.createTitleModel.normal
+ColumnUtils.getUserIconColumn.createTitleModel.normal=normal
+ColumnUtils.getUserIconColumn.createTitleModel.disabled=disabled
+ColumnUtils.getUserIconColumn.createTitleModel.archived=archived
+ColumnUtils.getUserIconColumn.createTitleModel.privileged=privileged
+ColumnUtils.getUserIconColumn.createTitleModel.end-user=end-user
+ColumnUtils.getUserIconColumn.createTitleModel.manager=manager
+ColumnUtils.getUserIconColumn.createTitleModel.broken=broken
+ColumnUtils.getUserIconColumn.createTitleModel.up=up
+ColumnUtils.getUserIconColumn.createTitleModel.down=down