Skip to content

Commit

Permalink
Resource content styles (in progress)
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Apr 27, 2016
1 parent f6311a0 commit 40c54c4
Show file tree
Hide file tree
Showing 6 changed files with 78 additions and 66 deletions.
46 changes: 32 additions & 14 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageResource.java
View file
Expand Up @@ -30,6 +30,7 @@
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.string.StringValue;

import com.evolveum.midpoint.gui.api.component.tabs.PanelTab;
import com.evolveum.midpoint.gui.api.model.LoadableModel;
import com.evolveum.midpoint.gui.api.page.PageBase;
import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
Expand Down Expand Up @@ -84,7 +85,6 @@
@AuthorizationAction(actionUri = PageAdminResources.AUTH_RESOURCE_ALL, label = PageAdminResources.AUTH_RESOURCE_ALL_LABEL, description = PageAdminResources.AUTH_RESOURCE_ALL_DESCRIPTION),
@AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_RESOURCE_URL, label = "PageResource.auth.resource.label", description = "PageResource.auth.resource.description") })
public class PageResource extends PageAdminResources {

private static final long serialVersionUID = 1L;

private static final Trace LOGGER = TraceManager.getTrace(PageResource.class);
Expand Down Expand Up @@ -124,6 +124,7 @@ public PageResource(PageParameters parameters) {

private void initialize() {
resourceModel = new LoadableModel<PrismObject<ResourceType>>() {
private static final long serialVersionUID = 1L;

@Override
protected PrismObject<ResourceType> load() {
Expand Down Expand Up @@ -164,44 +165,56 @@ private void initLayout() {

List<ITab> tabs = new ArrayList<ITab>();

tabs.add(new AbstractTab(createStringResource("PageResource.tab.details")) {
tabs.add(new PanelTab(createStringResource("PageResource.tab.details")) {
private static final long serialVersionUID = 1L;

@Override
public WebMarkupContainer getPanel(String panelId) {
public WebMarkupContainer createPanel(String panelId) {
return new ResourceDetailsTabPanel(panelId, resourceModel, PageResource.this);
}
});

tabs.add(new AbstractTab(createStringResource("PageResource.tab.content.tasks")) {
tabs.add(new PanelTab(createStringResource("PageResource.tab.content.tasks")) {
private static final long serialVersionUID = 1L;

@Override
public WebMarkupContainer getPanel(String panelId) {
public WebMarkupContainer createPanel(String panelId) {
return new ResourceTasksPanel(panelId, true, resourceModel, PageResource.this);
}
});

tabs.add(new AbstractTab(createStringResource("PageResource.tab.content.account")) {
tabs.add(new PanelTab(createStringResource("PageResource.tab.content.account")) {
private static final long serialVersionUID = 1L;

@Override
public WebMarkupContainer getPanel(String panelId) {
public WebMarkupContainer createPanel(String panelId) {
return new ResourceContentTabPanel(panelId, ShadowKindType.ACCOUNT, resourceModel, PageResource.this);
}
});

tabs.add(new AbstractTab(createStringResource("PageResource.tab.content.entitlement")) {
tabs.add(new PanelTab(createStringResource("PageResource.tab.content.entitlement")) {
private static final long serialVersionUID = 1L;

@Override
public WebMarkupContainer getPanel(String panelId) {
public WebMarkupContainer createPanel(String panelId) {
return new ResourceContentTabPanel(panelId, ShadowKindType.ENTITLEMENT, resourceModel, PageResource.this);
}
});

tabs.add(new AbstractTab(createStringResource("PageResource.tab.content.generic")) {
tabs.add(new PanelTab(createStringResource("PageResource.tab.content.generic")) {
private static final long serialVersionUID = 1L;

@Override
public WebMarkupContainer getPanel(String panelId) {
public WebMarkupContainer createPanel(String panelId) {
return new ResourceContentTabPanel(panelId, ShadowKindType.GENERIC, resourceModel, PageResource.this);
}
});

tabs.add(new AbstractTab(createStringResource("PageResource.tab.content.others")) {
tabs.add(new PanelTab(createStringResource("PageResource.tab.content.others")) {
private static final long serialVersionUID = 1L;

@Override
public WebMarkupContainer getPanel(String panelId) {
public WebMarkupContainer createPanel(String panelId) {
return new ResourceContentTabPanel(panelId, null, resourceModel, PageResource.this);
}
});
Expand All @@ -211,7 +224,8 @@ public WebMarkupContainer getPanel(String panelId) {
add(resourceTabs);

AjaxButton test = new AjaxButton(BUTTON_TEST_CONNECTION_ID, createStringResource("pageResource.button.test")) {

private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
testConnectionPerformed(target);
Expand All @@ -221,6 +235,7 @@ public void onClick(AjaxRequestTarget target) {

AjaxButton refreshSchema = new AjaxButton(BUTTON_REFRESH_SCHEMA_ID,
createStringResource("pageResource.button.refreshSchema")) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
Expand All @@ -229,6 +244,7 @@ public void onClick(AjaxRequestTarget target) {
};
add(refreshSchema);
AjaxButton editXml = new AjaxButton(BUTTON_EDIT_XML_ID, createStringResource("pageResource.button.editXml")) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
Expand All @@ -240,6 +256,7 @@ public void onClick(AjaxRequestTarget target) {
};
add(editXml);
AjaxButton wizard = new AjaxButton(BUTTON_WIZARD_ID, createStringResource("pageResource.button.wizard")) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
Expand All @@ -251,6 +268,7 @@ public void onClick(AjaxRequestTarget target) {
add(wizard);

AjaxButton back = new AjaxButton(ID_BUTTON_BACK, createStringResource("pageResource.button.back")) {
private static final long serialVersionUID = 1L;

@Override
public void onClick(AjaxRequestTarget target) {
Expand Down
20 changes: 12 additions & 8 deletions ...ui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
View file
Expand Up @@ -115,14 +115,10 @@

/**
* Implementation classes : ResourceContentResourcePanel, ResourceContentRepositoryPanel
* @author katka
* @author katkav
*
*/
public abstract class ResourceContentPanel extends Panel {

/**
*
*/
private static final long serialVersionUID = 1L;

private static final Trace LOGGER = TraceManager.getTrace(ResourceContentPanel.class);
Expand Down Expand Up @@ -202,8 +198,8 @@ private void initLayout() {
// }
// };

MainObjectListPanel<ShadowType> shadowListPanel = new MainObjectListPanel<ShadowType>(ID_TABLE, ShadowType.class, null, pageBase) {

MainObjectListPanel<ShadowType> shadowListPanel = new MainObjectListPanel<ShadowType>(ID_TABLE, ShadowType.class, null, pageBase) {
private static final long serialVersionUID = 1L;

@Override
protected List<InlineMenuItem> createInlineMenu() {
Expand Down Expand Up @@ -263,6 +259,8 @@ protected ObjectQuery createContentQuery() {
};
shadowListPanel.setOutputMarkupId(true);
shadowListPanel.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
return createQuery() != null;
Expand All @@ -274,6 +272,8 @@ public boolean isVisible() {
add(label);
label.setOutputMarkupId(true);
label.add(new VisibleEnableBehaviour() {
private static final long serialVersionUID = 1L;

@Override
public boolean isVisible() {
return createQuery() == null;
Expand Down Expand Up @@ -311,6 +311,7 @@ public boolean isVisible() {
private ObjectDataProvider2<SelectableBean<ShadowType>, ShadowType> initProvider(){
ObjectDataProvider2<SelectableBean<ShadowType>, ShadowType> provider = new ObjectDataProvider2<SelectableBean<ShadowType>, ShadowType>(
this, ShadowType.class) {
private static final long serialVersionUID = 1L;

@Override
public SelectableBean<ShadowType> createDataObjectWrapper(ShadowType obj) {
Expand Down Expand Up @@ -489,6 +490,7 @@ public void populateItem(Item<ICellPopulator<SelectableBean<ShadowType>>> cellIt
columns.addAll((Collection) ColumnUtils.createColumns(columnDefs));
column = new LinkColumn<SelectableBean<ShadowType>>(createStringResource("pageContentAccounts.owner"),
true) {
private static final long serialVersionUID = 1L;

@Override
protected IModel createLinkModel(final IModel<SelectableBean<ShadowType>> rowModel) {
Expand Down Expand Up @@ -517,11 +519,13 @@ public void onClick(AjaxRequestTarget target, IModel<SelectableBean<ShadowType>>
};
columns.add(column);

columns.add(new LinkColumn<SelectableBean<ShadowType>>(createStringResource("PageAccounts.accounts.result")){
columns.add(new LinkColumn<SelectableBean<ShadowType>>(createStringResource("PageAccounts.accounts.result")) {
private static final long serialVersionUID = 1L;

@Override
protected IModel<String> createLinkModel(final IModel<SelectableBean<ShadowType>> rowModel){
return new AbstractReadOnlyModel<String>() {
private static final long serialVersionUID = 1L;

@Override
public String getObject() {
Expand Down
2 changes: 0 additions & 2 deletions ...n/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.html
View file
Expand Up @@ -17,8 +17,6 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>



<div class="table-responsive" wicket:id="table" />
<div wicket:id="label" />
Expand Down
7 changes: 1 addition & 6 deletions ...n/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentRepositoryPanel.java
View file
Expand Up @@ -30,11 +30,7 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowType;

public class ResourceContentRepositoryPanel extends ResourceContentPanel{

/**
*
*/
public class ResourceContentRepositoryPanel extends ResourceContentPanel {
private static final long serialVersionUID = 1L;

public ResourceContentRepositoryPanel(String id, IModel<PrismObject<ResourceType>> resourceModel,
Expand All @@ -47,7 +43,6 @@ protected void initCustomLayout() {

}


@Override
protected SelectorOptions<GetOperationOptions> addAdditionalOptions() {
return new SelectorOptions<GetOperationOptions>(GetOperationOptions.createNoFetch());
Expand Down
68 changes: 32 additions & 36 deletions ...src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.html
View file
Expand Up @@ -17,45 +17,41 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>


<div class="clearfix">
<div class="box">
<div class="form-inline search-form">
<!-- <row class="form-inline pull-right search-form"> -->
<div class="form-group col-md-4">
<label wicket:id="intentLabel"></label>
<span wicket:id="intent" />
</div>
<div class="form-group col-md-4">
<label wicket:id="objectClassLabel"></label>
<span wicket:id="objectClass" />
</div>


<div class="form-group col-md-4">
<label><wicket:message key="ResourceContentTabPanel.searchType" /></label>
<a class="btn btn-default" wicket:id="repositorySearch">
<label><wicket:message key="ResourceContentTabPanel.searchType.repository" /></label>
</a>
<a class="btn btn-default" wicket:id="resourceSearch">
<label><wicket:message key="ResourceContentTabPanel.searchType.resource" /></label>
</a>
<div class="container">
<div class="row">
<div class="form-horizontal">

<div class="form-group">
<label class="col-md-2" wicket:id="intentLabel"></label>
<div class="col-md-3" wicket:id="intent" />
</div>
<div class="form-group">
<label class="col-md-2" wicket:id="objectClassLabel"></label>
<div class="col-md-3" wicket:id="objectClass" />
</div>


<div class="form-group">
<label class="col-md-2"><wicket:message key="ResourceContentTabPanel.searchType" /></label>
<div class="btn-group col-md-3">
<a class="btn btn-default" wicket:id="repositorySearch">
<label><wicket:message key="ResourceContentTabPanel.searchType.repository" /></label>
</a>
<a class="btn btn-default" wicket:id="resourceSearch">
<label><wicket:message key="ResourceContentTabPanel.searchType.resource" /></label>
</a>
</div>
</div>

</div>
</div>

<div class="row">
<form wicket:id="mainForm">
<div wicket:id="table" />
</form>
</div>


</div>
</div>

</div>

<form wicket:id="mainForm">
<div wicket:id="table" />

</form>



</wicket:panel>
</html>
1 change: 1 addition & 0 deletions ...src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentTabPanel.java
View file
Expand Up @@ -50,6 +50,7 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.ShadowKindType;

public class ResourceContentTabPanel extends Panel {
private static final long serialVersionUID = 1L;

private static final Trace LOGGER = TraceManager.getTrace(ResourceContentTabPanel.class);

Expand Down

0 comments on commit 40c54c4

Please sign in to comment.