Skip to content

Commit

Permalink
Resource content styles. And cleanup. Lots of cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Apr 27, 2016
1 parent 768dc46 commit 3dc1a2c
Show file tree
Hide file tree
Showing 20 changed files with 349 additions and 386 deletions.
5 changes: 5 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/GuiStyleConstants.java
View file
Expand Up @@ -48,6 +48,11 @@ public class GuiStyleConstants {
public static final String CLASS_OBJECT_RESOURCE_BOX_CSS_CLASSES = "object-resource-box";
public static final String CLASS_OBJECT_RESOURCE_BOX_THIN_CSS_CLASSES = "object-resource-box-thin";

public static final String CLASS_OBJECT_SHADOW_ICON = "fa fa-eye";
public static final String CLASS_OBJECT_SHADOW_ICON_COLORED = CLASS_OBJECT_RESOURCE_ICON + " object-shadow-color";
public static final String CLASS_OBJECT_SHADOW_BOX_CSS_CLASSES = "object-shadow-box";
public static final String CLASS_OBJECT_SHADOW_BOX_THIN_CSS_CLASSES = "object-shadow-box-thin";

public static final String CLASS_OBJECT_TASK_ICON = "fa fa-tasks";
public static final String CLASS_OBJECT_TASK_ICON_COLORED = CLASS_OBJECT_TASK_ICON + " object-task-color";
public static final String CLASS_OBJECT_TASK_BOX_CSS_CLASSES = "object-task-box";
Expand Down
14 changes: 10 additions & 4 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
View file
Expand Up @@ -85,6 +85,8 @@ public abstract class ObjectListPanel<T extends ObjectType> extends BasePanel<T>

private TableId tableId;

private String addutionalBoxCssClasses;

public Class<T> getType() {
return type;
}
Expand Down Expand Up @@ -235,8 +237,8 @@ protected WebMarkupContainer createHeader(String headerId) {
}

@Override
protected String getBoxCssClasses() {
return ObjectListPanel.this.getBoxCssClasses();
public String getAdditionalBoxCssClasses() {
return ObjectListPanel.this.getAdditionalBoxCssClasses();
}

@Override
Expand All @@ -258,8 +260,12 @@ protected WebMarkupContainer createButtonToolbar(String id) {
return table;
}

protected String getBoxCssClasses() {
return null;
public String getAdditionalBoxCssClasses() {
return addutionalBoxCssClasses;
}

public void setAdditionalBoxCssClasses(String boxCssClasses) {
this.addutionalBoxCssClasses = boxCssClasses;
}

/**
Expand Down
27 changes: 21 additions & 6 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
View file
Expand Up @@ -22,6 +22,7 @@
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider;
Expand Down Expand Up @@ -62,6 +63,7 @@ public class BoxedTablePanel<T> extends BasePanel<T> implements Table {

private UserProfileStorage.TableId tableId;
private boolean showPaging;
private String additionalBoxCssClasses = null;

public BoxedTablePanel(String id, ISortableDataProvider provider, List<IColumn<T, String>> columns) {
this(id, provider, columns, null, Integer.MAX_VALUE);
Expand All @@ -82,10 +84,19 @@ public BoxedTablePanel(String id, ISortableDataProvider provider, List<IColumn<T

private void initLayout(List<IColumn<T, String>> columns, ISortableDataProvider provider, int pageSize) {
WebMarkupContainer box = new WebMarkupContainer(ID_BOX);
String boxCssClasses = getBoxCssClasses();
if (boxCssClasses != null) {
box.add(new AttributeModifier("class", boxCssClasses));
}
box.add(new AttributeAppender("class", new AbstractReadOnlyModel<String>() {
private static final long serialVersionUID = 1L;

@Override
public String getObject() {
String boxCssClasses = getAdditionalBoxCssClasses();
if (boxCssClasses == null) {
return "";
} else {
return " " + boxCssClasses;
}
}
}));
add(box);

WebMarkupContainer tableContainer = new WebMarkupContainer(ID_TABLE_CONTAINER);
Expand All @@ -110,8 +121,12 @@ protected Item<T> newRowItem(String id, int index, IModel<T> rowModel) {
box.add(createFooter(ID_FOOTER));
}

protected String getBoxCssClasses() {
return null;
public String getAdditionalBoxCssClasses() {
return additionalBoxCssClasses;
}

public void setAdditionalBoxCssClasses(String boxCssClasses) {
this.additionalBoxCssClasses = boxCssClasses;
}

// TODO better name?
Expand Down
8 changes: 2 additions & 6 deletions ...src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertDefinitions.java
View file
Expand Up @@ -86,6 +86,7 @@ private void initLayout() {
add(mainForm);

MainObjectListPanel<AccessCertificationDefinitionType> mainPanel = new MainObjectListPanel<AccessCertificationDefinitionType>(ID_TABLE, AccessCertificationDefinitionType.class, TableId.PAGE_CERT_DEFINITIONS_PANEL, null, this) {
private static final long serialVersionUID = 1L;

@Override
protected IColumn<SelectableBean<AccessCertificationDefinitionType>, String> createCheckboxColumn() {
Expand All @@ -111,13 +112,8 @@ protected List<InlineMenuItem> createInlineMenu() {
protected void newObjectPerformed(AjaxRequestTarget target) {
setResponsePage(PageCertDefinition.class);
}

@Override
protected String getBoxCssClasses() {
return GuiStyleConstants.CLASS_BOX + " " + GuiStyleConstants.CLASS_OBJECT_CERT_DEF_BOX_CSS_CLASSES;
}

};
mainPanel.setAdditionalBoxCssClasses(GuiStyleConstants.CLASS_OBJECT_CERT_DEF_BOX_CSS_CLASSES);
mainForm.add(mainPanel);
}

Expand Down
11 changes: 5 additions & 6 deletions ...admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResources.java
View file
Expand Up @@ -152,6 +152,7 @@ private void initLayout() {

MainObjectListPanel<ResourceType> resourceListPanel = new MainObjectListPanel<ResourceType>(ID_TABLE,
ResourceType.class, TableId.TABLE_RESOURCES, options, this) {
private static final long serialVersionUID = 1L;

@Override
protected List<InlineMenuItem> createInlineMenu() {
Expand All @@ -174,23 +175,21 @@ protected void newObjectPerformed(AjaxRequestTarget target) {
setResponsePage(PageResourceWizard.class);

}

@Override
protected String getBoxCssClasses() {
return GuiStyleConstants.CLASS_BOX + " " + GuiStyleConstants.CLASS_OBJECT_RESOURCE_BOX_CSS_CLASSES;
}
};
resourceListPanel.setOutputMarkupId(true);
resourceListPanel.setAdditionalBoxCssClasses(GuiStyleConstants.CLASS_OBJECT_RESOURCE_BOX_CSS_CLASSES);
mainForm.add(resourceListPanel);

BoxedTablePanel connectorHosts = new BoxedTablePanel(ID_CONNECTOR_TABLE,
new ObjectDataProvider(PageResources.this, ConnectorHostType.class),
initConnectorHostsColumns(), UserProfileStorage.TableId.PAGE_RESOURCES_CONNECTOR_HOSTS,
(int) getItemsPerPage(UserProfileStorage.TableId.PAGE_RESOURCES_CONNECTOR_HOSTS)) {

private static final long serialVersionUID = 1L;

@Override
protected WebMarkupContainer createHeader(String headerId) {
return new SearchFormPanel(headerId, chSearchModel) {
private static final long serialVersionUID = 1L;

@Override
protected void searchPerformed(ObjectQuery query, AjaxRequestTarget target) {
Expand Down
37 changes: 17 additions & 20 deletions ...sources/ResourceContentResourcePanel.html → ...admin/resources/ResourceContentPanel.html
View file
Expand Up @@ -17,29 +17,26 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>

<div class="row">
<div class="form-group">
<label><wicket:message key="ResourceContentResourcePanel.realSearch" /></label>
<label wicket:id="objectClass" />

</div>
</div>
<div class="table-responsive" wicket:id="table" />
<div wicket:id="label" />
<div class="table-responsive" wicket:id="table" />
<div wicket:id="label" />

<div class="box">
<div class="form-group">
<div class=btn-group>
<div wicket:id="import" />
<div class="box object-task-box">
<div class="box-header with-border">
<h3 class="box-title"><wicket:message key="pageResource.synchronizationTasks"/></h3>
</div>
<div class=btn-group>
<div wicket:id="reconciliation" />
<div class="box-body">
<div class="form-group">
<div class=btn-group>
<div wicket:id="import" />
</div>
<div class=btn-group>
<div wicket:id="reconciliation" />
</div>
<div class=btn-group>
<div wicket:id="liveSync" />
</div>
</div>
</div>
<div class=btn-group>
<div wicket:id="liveSync" />
</div>
</div>
</div>

</wicket:panel>
Expand Down

0 comments on commit 3dc1a2c

Please sign in to comment.