diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AjaxCompositedIconButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AjaxCompositedIconButton.java index c5934ff64eb..012f96a3525 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AjaxCompositedIconButton.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AjaxCompositedIconButton.java @@ -46,7 +46,17 @@ public AjaxCompositedIconButton(String id, CompositedIcon icon, IModel t this.title = title; this.icon =icon; + + add(AttributeAppender.append("class", new IModel() { + + private static final long serialVersionUID = 1L; + @Override + public String getObject() { + return " position-relative "; + } + })); + add(AttributeAppender.append("class", new IModel() { private static final long serialVersionUID = 1L; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultifunctionalButton.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultifunctionalButton.java index 4cb962631e5..f9e53388509 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultifunctionalButton.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/MultifunctionalButton.java @@ -86,8 +86,8 @@ public void onClick(AjaxRequestTarget target) { CompositedIconBuilder additionalButtonBuilder = new CompositedIconBuilder(); additionalButtonBuilder.setBasicIcon(WebComponentUtil.getIconCssClass(additionalButtonDisplayType), IconCssStyle.IN_ROW_STYLE) - .appendColorHtmlValue(WebComponentUtil.getIconColor(additionalButtonDisplayType)); -// .appendLayerIcon(GuiStyleConstants.CLASS_PLUS_CIRCLE, IconCssStyle.BOTTOM_RIGHT_STYLE, GuiStyleConstants.GREEN_COLOR); + .appendColorHtmlValue(WebComponentUtil.getIconColor(additionalButtonDisplayType)) + .appendLayerIcon(GuiStyleConstants.CLASS_PLUS_CIRCLE, IconCssStyle.BOTTOM_RIGHT_STYLE, GuiStyleConstants.GREEN_COLOR); AjaxCompositedIconButton additionalButton = new AjaxCompositedIconButton(buttonsPanel.newChildId(), additionalButtonBuilder.build(), Model.of(WebComponentUtil.getDisplayTypeTitle(additionalButtonDisplayType))) { @@ -106,9 +106,8 @@ public void onClick(AjaxRequestTarget target) { DisplayType defaultObjectButtonDisplayType = getDefaultObjectButtonDisplayType(); CompositedIconBuilder defaultObjectButtonBuilder = new CompositedIconBuilder(); defaultObjectButtonBuilder.setBasicIcon(WebComponentUtil.getIconCssClass(defaultObjectButtonDisplayType), IconCssStyle.IN_ROW_STYLE) - .appendColorHtmlValue(WebComponentUtil.getIconColor(defaultObjectButtonDisplayType)); - //TODO fix style for circle image -// .appendLayerIcon(GuiStyleConstants.CLASS_PLUS_CIRCLE, IconCssStyle.BOTTOM_RIGHT_STYLE, GuiStyleConstants.GREEN_COLOR); + .appendColorHtmlValue(WebComponentUtil.getIconColor(defaultObjectButtonDisplayType)) + .appendLayerIcon(GuiStyleConstants.CLASS_PLUS_CIRCLE, IconCssStyle.BOTTOM_RIGHT_STYLE, GuiStyleConstants.GREEN_COLOR); AjaxCompositedIconButton defaultButton = new AjaxCompositedIconButton(buttonsPanel.newChildId(), defaultObjectButtonBuilder.build(), diff --git a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less index 413c5824f5c..05e2e5f32e3 100644 --- a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less +++ b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less @@ -1460,4 +1460,8 @@ th.countLabel{ .buttons-panel-marging{ margin: 10px; +} + +.position-relative{ + position: relative; } \ No newline at end of file diff --git a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java index 67ab50f0632..8e42ca973b1 100644 --- a/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java +++ b/testing/story/src/test/java/com/evolveum/midpoint/testing/story/TestLdapDependency.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016-2017 Evolveum + * Copyright (c) 2016-2019 Evolveum * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ package com.evolveum.midpoint.testing.story; -import static com.evolveum.midpoint.test.IntegrationTestTools.display; import static org.testng.AssertJUnit.assertNotNull; import java.io.File; @@ -108,8 +107,6 @@ public class TestLdapDependency extends AbstractStoryTest { private static final String LDAP_OU_INTENT = "ou"; private static final String LDAP_OU_VIP_INTENT = "ou-vip"; - - private ResourceType resourceOpenDjType; private PrismObject resourceOpenDj; @@ -158,8 +155,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti // Resources - resourceOpenDj = importAndGetObjectFromFile(ResourceType.class, getResourceOpenDjFile(), RESOURCE_OPENDJ_OID, initTask, initResult); - resourceOpenDjType = resourceOpenDj.asObjectable(); + resourceOpenDj = importAndGetObjectFromFile(ResourceType.class, getResourceOpenDjFile(), RESOURCE_OPENDJ_OID, initTask, initResult); openDJController.setResource(resourceOpenDj); // Org @@ -174,7 +170,7 @@ public void initSystem(Task initTask, OperationResult initResult) throws Excepti @Test public void test000Sanity() throws Exception { final String TEST_NAME = "test000Sanity"; - TestUtil.displayTestTitle(this, TEST_NAME); + displayTestTitle(TEST_NAME); Task task = taskManager.createTaskInstance(TestTrafo.class.getName() + "." + TEST_NAME); OperationResult testResultOpenDj = modelService.testResource(RESOURCE_OPENDJ_OID, task); @@ -187,8 +183,8 @@ public void test000Sanity() throws Exception { @Test public void test100AddOrgIT() throws Exception { final String TEST_NAME = "test100AddOrgIT"; - TestUtil.displayTestTitle(this, TEST_NAME); - Task task = taskManager.createTaskInstance(TestLdapDependency.class.getName() + "." + TEST_NAME); + displayTestTitle(TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject orgBefore = createOrg(ORG_IT_NAME, ORG_TOP_OID); @@ -216,8 +212,8 @@ public void test100AddOrgIT() throws Exception { @Test public void test150AssignFunctionalRoleToITOrg() throws Exception { final String TEST_NAME = "test150AssignFunctionalRoleToITOrg"; - TestUtil.displayTestTitle(this, TEST_NAME); - Task task = taskManager.createTaskInstance(TestLdapDependency.class.getName() + "." + TEST_NAME); + displayTestTitle(TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject orgBefore = getOrg(ORG_IT_NAME); @@ -247,8 +243,8 @@ public void test150AssignFunctionalRoleToITOrg() throws Exception { @Test public void test170UnassignFunctionalRoleFromITOrg() throws Exception { final String TEST_NAME = "test170UnassignFunctionalRoleFromITOrg"; - TestUtil.displayTestTitle(this, TEST_NAME); - Task task = taskManager.createTaskInstance(TestLdapDependency.class.getName() + "." + TEST_NAME); + displayTestTitle(TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject orgBefore = getOrg(ORG_IT_NAME); @@ -279,8 +275,8 @@ public void test170UnassignFunctionalRoleFromITOrg() throws Exception { @Test public void test200AddOrgHR() throws Exception { final String TEST_NAME = "test200AddOrgHR"; - TestUtil.displayTestTitle(this, TEST_NAME); - Task task = taskManager.createTaskInstance(TestLdapDependency.class.getName() + "." + TEST_NAME); + displayTestTitle(TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject orgBefore = createOrg(ORG_HR_NAME, ORG_TOP_OID); @@ -308,8 +304,8 @@ public void test200AddOrgHR() throws Exception { @Test public void test250AssignFunctionalAndVipRoleToHROrg() throws Exception { final String TEST_NAME = "test250AssignFunctionalAndVipRoleToHROrg"; - TestUtil.displayTestTitle(this, TEST_NAME); - Task task = taskManager.createTaskInstance(TestLdapDependency.class.getName() + "." + TEST_NAME); + displayTestTitle(TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject orgBefore = getOrg(ORG_HR_NAME); @@ -342,8 +338,8 @@ public void test250AssignFunctionalAndVipRoleToHROrg() throws Exception { @Test public void test270UnassignVipRoleFromHROrg() throws Exception { final String TEST_NAME = "test270UnassignVipRoleFromHROrg"; - TestUtil.displayTestTitle(this, TEST_NAME); - Task task = taskManager.createTaskInstance(TestLdapDependency.class.getName() + "." + TEST_NAME); + displayTestTitle(TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject orgBefore = getOrg(ORG_HR_NAME); @@ -376,8 +372,8 @@ public void test270UnassignVipRoleFromHROrg() throws Exception { @Test public void test280AssignVipAndSuperVipRoleToHROrg() throws Exception { final String TEST_NAME = "test280AssignVipAndSuperVipRoleToHROrg"; - TestUtil.displayTestTitle(this, TEST_NAME); - Task task = taskManager.createTaskInstance(TestLdapDependency.class.getName() + "." + TEST_NAME); + displayTestTitle(TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject orgBefore = getOrg(ORG_HR_NAME); @@ -411,8 +407,8 @@ public void test280AssignVipAndSuperVipRoleToHROrg() throws Exception { @Test public void test290UnassignVipRoleFromHROrg() throws Exception { final String TEST_NAME = "test290UnassignVipRoleFromHROrg"; - TestUtil.displayTestTitle(this, TEST_NAME); - Task task = taskManager.createTaskInstance(TestLdapDependency.class.getName() + "." + TEST_NAME); + displayTestTitle(TEST_NAME); + Task task = createTask(TEST_NAME); OperationResult result = task.getResult(); PrismObject orgBefore = getOrg(ORG_HR_NAME);