Skip to content

Commit

Permalink
MID-6271 resource details panel fixed
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed May 18, 2022
1 parent 1f1e0b3 commit 19cdca0
Show file tree
Hide file tree
Showing 5 changed files with 90 additions and 100 deletions.
1 change: 1 addition & 0 deletions gui/admin-gui/src/frontend/scss/midpoint-theme.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,7 @@ th.cog, td.cog {
height: 75px;
padding-top: 10px;
white-space: normal;
margin: 0 !important;
}

// Feedback messages
Expand Down
16 changes: 6 additions & 10 deletions ...com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceDetailsTabPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,25 +8,21 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div class="row mt-1 mb-3">
<div class="col-12 col-md-4">
<div class="row my-3 gap-2 gap-xl-0">
<div class="col-lg-12 col-xl-4">
<div class="info-box-resource" wicket:id="lastStatus"/>
</div>
<div class="col-12 col-md-4">
<div class="col-lg-12 col-xl-4">
<div class="info-box-resource" wicket:id="sourceTarget"/>
</div>
<div class="col-12 col-md-4">
<div class="col-lg-12 col-xl-4">
<div class="info-box-resource" wicket:id="schemaStatus"/>
</div>
</div>

<div class="row">
<div wicket:id="capabilities"/>
</div>
<div wicket:id="capabilities"/>

<div class="row">
<div wicket:id="resourceConfig"/>
</div>
<div class="card-outline card-success" wicket:id="resourceConfig"/>
</wicket:panel>
</html>

Expand Down
1 change: 0 additions & 1 deletion ...com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceDetailsTabPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@ public void onClick(AjaxRequestTarget target) {

BoxedTablePanel<ResourceConfigurationDto> resourceConfig = new BoxedTablePanel("resourceConfig",
resourceConfigProvider, tableColumns);
resourceConfig.setAdditionalBoxCssClasses("box-success");
add(resourceConfig);

}
Expand Down
156 changes: 77 additions & 79 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesPanel.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,85 +9,83 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div class="box box-primary">
<div class="box-header">
<h3 class="box-title">Capabilities</h3>
</div>
<div class="box-body">
<a class="btn btn-app" wicket:id="activation">
<i class="fa fa-lock"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="activationLockoutStatus">
<i class="fa fa-lock"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="activationStatus">
<i class="fa fa-lock"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="activationValidity">
<i class="fa fa-lock"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="credentials">
<i class="fa fa-key"></i>
<span wicket:id="label" />
</a>
<div class="card-header">
<h3 class="card-title">Capabilities</h3>
</div>
<div class="card-body d-flex flex-wrap gap-2">
<a class="btn btn-app btn-resource-capability" wicket:id="activation">
<i class="fa fa-lock"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="activationLockoutStatus">
<i class="fa fa-lock"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="activationStatus">
<i class="fa fa-lock"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="activationValidity">
<i class="fa fa-lock"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="credentials">
<i class="fa fa-key"></i>
<span wicket:id="label" />
</a>

<a class="btn btn-app" wicket:id="password">
<i class="fa fa-key"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="liveSync">
<i class="fa fa-sync-alt"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="testConnection">
<i class="fa fa-question"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="script">
<i class="fa fa-code"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="auxiliaryObjectClasses">
<i class="fa fa-wrench"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="create">
<i class="fa fa-plus"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="update">
<i class="fa fa-edit"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="addRemoveAttributeValues">
<i class="fa fa-edit"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="delete">
<i class="fa fa-minus"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="read">
<i class="fa fa-book"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="countObjects">
<i class="fa fa-edit"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="pagedSearch">
<i class="fa fa-code"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app" wicket:id="runAs">
<i class="fa fa-child"></i>
<span wicket:id="label" />
</a>
</div>
</div>
<a class="btn btn-app btn-resource-capability" wicket:id="password">
<i class="fa fa-key"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="liveSync">
<i class="fa fa-sync-alt"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="testConnection">
<i class="fa fa-question"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="script">
<i class="fa fa-code"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="auxiliaryObjectClasses">
<i class="fa fa-wrench"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="create">
<i class="fa fa-plus"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="update">
<i class="fa fa-edit"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="addRemoveAttributeValues">
<i class="fa fa-edit"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="delete">
<i class="fa fa-minus"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="read">
<i class="fa fa-book"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="countObjects">
<i class="fa fa-edit"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="pagedSearch">
<i class="fa fa-code"></i>
<span wicket:id="label" />
</a>
<a class="btn btn-app btn-resource-capability" wicket:id="runAs">
<i class="fa fa-child"></i>
<span wicket:id="label" />
</a>
</div>
</wicket:panel>
</html>
16 changes: 6 additions & 10 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/CapabilitiesPanel.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
*/
package com.evolveum.midpoint.web.page.admin.resources;

import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.PropertyModel;
Expand Down Expand Up @@ -36,6 +36,7 @@ public class CapabilitiesPanel extends BasePanel<CapabilitiesDto> {
private static final String ID_READ = "read";
private static final String ID_CONNECTOR_SCRIPT = "script";
private static final String ID_RUN_AS = "runAs";
private static final String ID_LABEL = "label";

private static final long serialVersionUID = 1L;

Expand All @@ -46,6 +47,7 @@ public CapabilitiesPanel(String id, IModel<CapabilitiesDto> model) {
}

private void initLayout() {
add(AttributeAppender.append("class", "card card-outline card-primary"));

createCapabilityButton(ID_ACTIVATION);
createCapabilityButton(ID_CREDENTIALS);
Expand All @@ -65,26 +67,20 @@ private void initLayout() {
createCapabilityButton(ID_ACTIVATION_LOCKOUT_STATUS);
createCapabilityButton(ID_COUNT_OBJECTS);
createCapabilityButton(ID_RUN_AS);

}

private void createCapabilityButton(String id) {
AjaxLink<Boolean> button = new AjaxLink<Boolean>(id, new PropertyModel<>(getModel(), id)) {
AjaxLink<Boolean> button = new AjaxLink<>(id, new PropertyModel<>(getModel(), id)) {

@Override
public void onClick(AjaxRequestTarget target) {
// TODO:
}

};

button.add(new AttributeModifier("class",
button.getModelObject() ? "btn btn-app btn-resource-capability bg-light-blue"
: "btn btn-app btn-resource-capability bg-gray text-light-blue"));

button.add(new Label("label", new ResourceModel("CapabilitiesType." + id)));
button.add(AttributeAppender.append("class", () -> button.getModelObject() ? "bg-light-blue" : "bg-gray text-light-blue"));
button.add(new Label(ID_LABEL, new ResourceModel("CapabilitiesType." + id)));

add(button);
}

}

0 comments on commit 19cdca0

Please sign in to comment.