Skip to content

Commit

Permalink
resource pages - rework..
Browse files Browse the repository at this point in the history
  • Loading branch information
@katkav
katkav committed Jan 13, 2016
1 parent d9ad79b commit 3a53c24
Show file tree
Hide file tree
Showing 16 changed files with 2,374 additions and 1,299 deletions.
36 changes: 36 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBox.html
View file
@@ -0,0 +1,36 @@
<!--
~ Copyright (c) 2010-2016 Evolveum
~
~ Licensed under the Apache License, Version 2.0 (the "License");
~ you may not use this file except in compliance with the License.
~ You may obtain a copy of the License at
~
~ http://www.apache.org/licenses/LICENSE-2.0
~
~ Unless required by applicable law or agreed to in writing, software
~ distributed under the License is distributed on an "AS IS" BASIS,
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->

<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>

<div class="col-md-3 col-sm-6 col-xs-12">
<div class="info-box">
<span class="info-box-icon bg-aqua" wicket:id="backgroundColor">
<i wicket:id="imageId"></i>
</span>

<div class="info-box-content">
<span class="info-box-text" wicket:id="description"></span>
</div>

</div>

</div>

</wicket:panel>
</html>
66 changes: 66 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/box/InfoBox.java
View file
@@ -0,0 +1,66 @@
package com.evolveum.midpoint.web.component.box;

import java.util.List;

import org.apache.wicket.AttributeModifier;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.RepeatingView;

public class InfoBox extends Panel{


private static final long serialVersionUID = 1L;
private static final String BACKGROUND_COLOR = "backgroundColor";
private static final String IMAGE_ID = "imageId";
private static final String DESCRIPTION = "description";

public InfoBox(String id, String background, String image, List<String> values) {
super(id);

initLayout(background, image, values);
}

private void initLayout(String backgroundColor, String imageId, List<String> values){


WebMarkupContainer background = new WebMarkupContainer(BACKGROUND_COLOR);
background.add(new AttributeModifier("class", "info-box-icon " + backgroundColor));
add(background);


WebMarkupContainer image = new WebMarkupContainer(IMAGE_ID);
image.add(new AttributeModifier("class", "fa " + imageId));
background.add(image);

RepeatingView description = new RepeatingView(DESCRIPTION);

for (String value : values){
description.add(new Label(description.newChildId(), value));
}

add(description);

}

/**
*
* <div class="col-md-3 col-sm-6 col-xs-12">
<div class="info-box">
<span class="info-box-icon bg-aqua" wicket:id="backgroundColor">
<i class="fa fa-star-o" wicket:id="imageId"/>
</span>
<div class="info-box-content">
<span class="info-box-text" wicket:id="description" />
</div>
</div>
</div>
*
*/


}
4 changes: 2 additions & 2 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/message/OpResult.java
View file
Expand Up @@ -52,7 +52,7 @@ public class OpResult implements Serializable {
private int count;
private String xml;

public static OpResult getOpResult(PageBase page, OperationResult result) throws SchemaException, RuntimeException {
public static OpResult getOpResult(PageBase page, OperationResult result){
OpResult opResult = new OpResult();
Validate.notNull(result, "Operation result must not be null.");
Validate.notNull(result.getStatus(), "Operation result status must not be null.");
Expand Down Expand Up @@ -109,7 +109,7 @@ public static OpResult getOpResult(PageBase page, OperationResult result) throws
String m = "Can't create xml: " + ex;
// error(m);
opResult.xml = "<?xml version='1.0'?><message>" + StringEscapeUtils.escapeXml(m) + "</message>";
throw ex;
// throw ex;
}
return opResult;
}
Expand Down
1 change: 1 addition & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageBase.java
View file
Expand Up @@ -56,6 +56,7 @@
import com.evolveum.midpoint.web.page.admin.reports.PageReports;
import com.evolveum.midpoint.web.page.admin.resources.PageImportResource;
import com.evolveum.midpoint.web.page.admin.resources.PageResource;
import com.evolveum.midpoint.web.page.admin.resources.PageResourceOld;
import com.evolveum.midpoint.web.page.admin.resources.PageResourceWizard;
import com.evolveum.midpoint.web.page.admin.resources.PageResources;
import com.evolveum.midpoint.web.page.admin.roles.PageRole;
Expand Down
55 changes: 55 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.java
View file
Expand Up @@ -29,10 +29,13 @@
import com.evolveum.midpoint.web.component.message.OpResult;
import com.evolveum.midpoint.web.component.message.TempFeedback;
import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
import com.evolveum.midpoint.web.page.admin.resources.PageResources;
import com.evolveum.midpoint.web.security.MidPointApplication;
import com.evolveum.midpoint.web.security.MidPointAuthWebSession;
import com.evolveum.midpoint.web.security.SecurityUtils;
import com.evolveum.midpoint.web.session.SessionStorage;
import com.evolveum.midpoint.web.util.WebMiscUtil;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.Validate;
import org.apache.wicket.*;
Expand Down Expand Up @@ -371,6 +374,7 @@ public static StringResourceModel createStringResourceStatic(Component component
return createStringResourceStatic(component, resourceKey);
}

@Deprecated
public void showResult(OperationResult result) {
if (result == null) {
return;
Expand All @@ -383,7 +387,57 @@ public void showResult(OperationResult result) {
error(opResult);
}
}

public void showResultInSession(OperationResult result, String errorMessageKey, boolean showInSession) {
showResult(result, errorMessageKey, true);
}

public void showResult(OperationResult result, String errorMessageKey) {
showResult(result, errorMessageKey, false);
}

private void showResult(OperationResult result, String errorMessageKey, boolean showInSession) {
Validate.notNull(result, "Operation result must not be null.");
Validate.notNull(result.getStatus(), "Operation result status must not be null.");

OpResult opResult = OpResult.getOpResult((PageBase) getPage(), result);
switch (opResult.getStatus()) {
case FATAL_ERROR:
case PARTIAL_ERROR:
if (showInSession) {
getSession().error(getString("pageAdminResources.message.cantLoadResource"));
} else {
error(opResult);
}
break;
case IN_PROGRESS:
case NOT_APPLICABLE:
if (showInSession) {
getSession().info(opResult);
} else {
info(opResult);
}
break;
case SUCCESS:
if (showInSession) {
getSession().success(opResult);
} else {
success(opResult);
}
break;
case UNKNOWN:
case WARNING:
default:
if (showInSession) {
getSession().warn(opResult);
} else {
warn(opResult);
}
}

}

@Deprecated
public void showResultInSession(OperationResult result) {
if (result == null) {
return;
Expand All @@ -398,6 +452,7 @@ public void showResultInSession(OperationResult result) {
}
}

@Deprecated
private void showResult(OpResult opResult, boolean showInSession) {
Validate.notNull(opResult, "Operation result must not be null.");
Validate.notNull(opResult.getStatus(), "Operation result status must not be null.");
Expand Down
1 change: 1 addition & 0 deletions .../src/main/java/com/evolveum/midpoint/web/page/admin/certification/CertDecisionHelper.java
View file
Expand Up @@ -25,6 +25,7 @@
import com.evolveum.midpoint.web.page.admin.certification.handlers.CertGuiHandler;
import com.evolveum.midpoint.web.page.admin.certification.handlers.CertGuiHandlerRegistry;
import com.evolveum.midpoint.web.page.admin.resources.PageResource;
import com.evolveum.midpoint.web.page.admin.resources.PageResourceOld;
import com.evolveum.midpoint.web.page.admin.roles.PageRole;
import com.evolveum.midpoint.web.page.admin.users.PageOrgUnit;
import com.evolveum.midpoint.web.page.admin.users.PageUser;
Expand Down

0 comments on commit 3a53c24

Please sign in to comment.