Skip to content

Commit

Permalink
Tasks list and Nodes list tables are improved with button menu column
Browse files Browse the repository at this point in the history
  • Loading branch information
@KaterynaHonchar
KaterynaHonchar committed Feb 1, 2017
1 parent 760b239 commit 8718ef2
Show file tree
Hide file tree
Showing 9 changed files with 174 additions and 131 deletions.
4 changes: 4 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
View file
Expand Up @@ -125,6 +125,10 @@ public class GuiStyleConstants {
public static final String CLASS_TEST_CONNECTION_MENU_ITEM = "fa fa-question";
public static final String CLASS_DELETE_MENU_ITEM = "fa fa-minus";
public static final String CLASS_EDIT_MENU_ITEM = "fa fa-edit";
public static final String CLASS_SUSPEND_MENU_ITEM = "fa fa-pause";
public static final String CLASS_RESUME_MENU_ITEM = "fa fa-check-square";
public static final String CLASS_STOP_MENU_ITEM = "fa fa-stop";
public static final String CLASS_START_MENU_ITEM = "fa fa-play";

public static final String CLASS_BUTTON_TOGGLE_OFF = "btn-default";
public static final String CLASS_BUTTON_TOGGLE_ON = "btn-info";
Expand Down
2 changes: 1 addition & 1 deletion ...dmin-gui/src/main/java/com/evolveum/midpoint/web/component/data/MenuMultiButtonPanel.html
View file
Expand Up @@ -16,7 +16,7 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<table>
<table style="min-width: 75px;">
<tr>
<td>
<span wicket:id="buttons"/>
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/java/com/evolveum/midpoint/web/component/data/column/InlineMenuButtonColumn.java
View file
Expand Up @@ -154,15 +154,15 @@ public boolean isButtonVisible(int id, IModel<T> model) {
if (model == null || model.getObject() == null){
return true;
}
if (id == InlineMenuItem.INLINE_MENU_ITEM_ID.ENABLE.getMenuItemId() &&
if (id == InlineMenuItem.FOCUS_LIST_INLINE_MENU_ITEM_ID.ENABLE.getMenuItemId() &&
model.getObject() instanceof SelectableBean &&
((SelectableBean) model.getObject()).getValue() instanceof FocusType){
FocusType focus = (FocusType)((SelectableBean) model.getObject()).getValue();
if (focus.getActivation() == null){
return false;
}
return ActivationStatusType.DISABLED.equals(focus.getActivation().getEffectiveStatus());
} else if (id == InlineMenuItem.INLINE_MENU_ITEM_ID.DISABLE.getMenuItemId() &&
} else if (id == InlineMenuItem.FOCUS_LIST_INLINE_MENU_ITEM_ID.DISABLE.getMenuItemId() &&
model.getObject() instanceof SelectableBean &&
((SelectableBean) model.getObject()).getValue() instanceof FocusType){
FocusType focus = (FocusType)((SelectableBean) model.getObject()).getValue();
Expand Down
2 changes: 0 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenu.java
View file
Expand Up @@ -125,7 +125,6 @@ public String getObject() {
}
}));

if (item.getEnabled() != null || item.getVisible() != null) {
menuItem.add(new VisibleEnableBehaviour() {

@Override
Expand All @@ -138,7 +137,6 @@ public boolean isVisible() {
return getBoolean(item.getVisible(), true);
}
});
}

WebMarkupContainer menuItemBody;
if (item.isMenuHeader() || item.isDivider()) {
Expand Down
31 changes: 28 additions & 3 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/menu/cog/InlineMenuItem.java
View file
Expand Up @@ -35,18 +35,43 @@ public class InlineMenuItem implements Serializable {
private String buttonIconCssClass;
private String buttonColorCssClass;

public static enum INLINE_MENU_ITEM_ID{
public static enum FOCUS_LIST_INLINE_MENU_ITEM_ID {
ENABLE(0), DISABLE(1), RECONCILE(2),
UNLOCK(3), DELETE(4), MERGE(5),
HEADER_ENABLE(0), HEADER_RECONCILE(1),
HEADER_DISABLE(2), TEST_CONNECTION(0),
HEADER_DISABLE(2);

private int menuItemId = -1;

private FOCUS_LIST_INLINE_MENU_ITEM_ID(final int id){menuItemId = id;}

public int getMenuItemId(){
return menuItemId;
}
public String toString(){return Integer.toString(menuItemId);}
}
public static enum RESOURCE_INLINE_MENU_ITEM_ID {
TEST_CONNECTION(0),
HEADER_TEST_CONNECTION(1),
EDIT_XML(1), HEADER_DELETE(0), DELETE_RESOURCE(2),
DELETE_SYNC_TOKEN(3), EDIT_USING_WIZARD(4);

private int menuItemId = -1;

private INLINE_MENU_ITEM_ID(final int id){menuItemId = id;}
private RESOURCE_INLINE_MENU_ITEM_ID(final int id){menuItemId = id;}

public int getMenuItemId(){
return menuItemId;
}
public String toString(){return Integer.toString(menuItemId);}
}
public static enum TASKS_INLINE_MENU_ITEM_ID {
SUSPEND(0), RESUME(1), RUN_NOW(2), DELETE(3), DELETE_CLOSED(4),
NODE_STOP_SCHEDULER(1), NODE_STOP_SCHEDULER_TASK(2), NODE_START(0), NODE_DELETE(3);

private int menuItemId = -1;

private TASKS_INLINE_MENU_ITEM_ID(final int id){menuItemId = id;}

public int getMenuItemId(){
return menuItemId;
Expand Down
12 changes: 6 additions & 6 deletions ...gui/src/main/java/com/evolveum/midpoint/web/component/util/FocusListInlineMenuHelper.java
View file
Expand Up @@ -100,8 +100,8 @@ public void onClick(AjaxRequestTarget target) {
updateActivationPerformed(target, true, rowDto.getValue());
}
}
}, isHeader ? InlineMenuItem.INLINE_MENU_ITEM_ID.HEADER_ENABLE.getMenuItemId()
: InlineMenuItem.INLINE_MENU_ITEM_ID.ENABLE.getMenuItemId(),
}, isHeader ? InlineMenuItem.FOCUS_LIST_INLINE_MENU_ITEM_ID.HEADER_ENABLE.getMenuItemId()
: InlineMenuItem.FOCUS_LIST_INLINE_MENU_ITEM_ID.ENABLE.getMenuItemId(),
GuiStyleConstants.CLASS_OBJECT_USER_ICON,
DoubleButtonColumn.BUTTON_COLOR_CLASS.SUCCESS.toString()));

Expand All @@ -120,8 +120,8 @@ public void onClick(AjaxRequestTarget target) {
updateActivationPerformed(target, false, rowDto.getValue());
}
}
}, isHeader ? InlineMenuItem.INLINE_MENU_ITEM_ID.HEADER_DISABLE.getMenuItemId()
: InlineMenuItem.INLINE_MENU_ITEM_ID.DISABLE.getMenuItemId(),
}, isHeader ? InlineMenuItem.FOCUS_LIST_INLINE_MENU_ITEM_ID.HEADER_DISABLE.getMenuItemId()
: InlineMenuItem.FOCUS_LIST_INLINE_MENU_ITEM_ID.DISABLE.getMenuItemId(),
GuiStyleConstants.CLASS_OBJECT_USER_ICON,
DoubleButtonColumn.BUTTON_COLOR_CLASS.DANGER.toString()));
menu.add(new InlineMenuItem(parentPage.createStringResource("FocusListInlineMenuHelper.menu.reconcile"),
Expand All @@ -137,8 +137,8 @@ public void onClick(AjaxRequestTarget target) {
reconcilePerformed(target, rowDto.getValue());
}
}
}, isHeader ? InlineMenuItem.INLINE_MENU_ITEM_ID.HEADER_RECONCILE.getMenuItemId()
: InlineMenuItem.INLINE_MENU_ITEM_ID.RECONCILE.getMenuItemId(),
}, isHeader ? InlineMenuItem.FOCUS_LIST_INLINE_MENU_ITEM_ID.HEADER_RECONCILE.getMenuItemId()
: InlineMenuItem.FOCUS_LIST_INLINE_MENU_ITEM_ID.RECONCILE.getMenuItemId(),
GuiStyleConstants.CLASS_RECONCILE_MENU_ITEM,
DoubleButtonColumn.BUTTON_COLOR_CLASS.INFO.toString()));

Expand Down
10 changes: 5 additions & 5 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
View file
Expand Up @@ -194,8 +194,8 @@ public void onClick(AjaxRequestTarget target) {
SelectableBean<ResourceType> rowDto = getRowModel().getObject();
testResourcePerformed(target, rowDto.getValue());
}
}, isHeader ? InlineMenuItem.INLINE_MENU_ITEM_ID.HEADER_TEST_CONNECTION.getMenuItemId()
: InlineMenuItem.INLINE_MENU_ITEM_ID.TEST_CONNECTION.getMenuItemId(),
}, isHeader ? InlineMenuItem.RESOURCE_INLINE_MENU_ITEM_ID.HEADER_TEST_CONNECTION.getMenuItemId()
: InlineMenuItem.RESOURCE_INLINE_MENU_ITEM_ID.TEST_CONNECTION.getMenuItemId(),
GuiStyleConstants.CLASS_TEST_CONNECTION_MENU_ITEM,
DoubleButtonColumn.BUTTON_COLOR_CLASS.INFO.toString()));

Expand All @@ -212,8 +212,8 @@ public void onClick(AjaxRequestTarget target) {
deleteResourcePerformed(target, rowDto.getValue());
}
}
}, isHeader ? InlineMenuItem.INLINE_MENU_ITEM_ID.HEADER_DELETE.getMenuItemId()
: InlineMenuItem.INLINE_MENU_ITEM_ID.DELETE_RESOURCE.getMenuItemId(),
}, isHeader ? InlineMenuItem.RESOURCE_INLINE_MENU_ITEM_ID.HEADER_DELETE.getMenuItemId()
: InlineMenuItem.RESOURCE_INLINE_MENU_ITEM_ID.DELETE_RESOURCE.getMenuItemId(),
GuiStyleConstants.CLASS_DELETE_MENU_ITEM,
DoubleButtonColumn.BUTTON_COLOR_CLASS.DANGER.toString()));

Expand Down Expand Up @@ -252,7 +252,7 @@ public void onClick(AjaxRequestTarget target) {
SelectableBean<ResourceType> rowDto = getRowModel().getObject();
editAsXmlPerformed(rowDto.getValue());
}
}, InlineMenuItem.INLINE_MENU_ITEM_ID.EDIT_XML.getMenuItemId(),
}, InlineMenuItem.RESOURCE_INLINE_MENU_ITEM_ID.EDIT_XML.getMenuItemId(),
GuiStyleConstants.CLASS_EDIT_MENU_ITEM,
DoubleButtonColumn.BUTTON_COLOR_CLASS.INFO.toString()));

Expand Down

0 comments on commit 8718ef2

Please sign in to comment.