Skip to content

Commit

Permalink
Merge branch 'master' of github.com:Evolveum/midpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
@mederly
mederly committed Oct 19, 2015
2 parents abf473b + ceef365 commit f59e6f4
Show file tree
Hide file tree
Showing 65 changed files with 3,990 additions and 748 deletions.
8 changes: 8 additions & 0 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/BoxedTablePanel.java
View file
Expand Up @@ -116,6 +116,14 @@ public void setShowPaging(boolean show) {
}
}

public WebMarkupContainer getHeader() {
return (WebMarkupContainer) get(ID_HEADER);
}

public WebMarkupContainer getFooter() {
return (WebMarkupContainer) get(ID_FOOTER);
}

protected WebMarkupContainer createHeader(String headerId) {
WebMarkupContainer header = new WebMarkupContainer(headerId);
header.setVisible(false);
Expand Down
13 changes: 10 additions & 3 deletions gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
View file
Expand Up @@ -79,12 +79,18 @@
<!-- BOOTSTRAP RESOURCES END -->
</wicket:remove>

<link href="css/admin-lte/fonts.css" type="text/css" rel="stylesheet"/>

<wicket:link>
<link href="../../../../../webjars/adminlte/2.3.0/bootstrap/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="../../../../../webjars/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css" />
<link href="../../../../../webjars/ionicons/2.0.1/css/ionicons.min.css" rel="stylesheet" type="text/css" />
<link href="../../../../../webjars/adminlte/2.3.0/plugins/datatables/dataTables.bootstrap.css" rel="stylesheet" type="text/css" />
<link href="../../../../../webjars/adminlte/2.3.0/dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css" />
</wicket:link>

<link href="css/admin-lte/AdminLTE.min.css" rel="stylesheet" type="text/css" />

<wicket:link>
<link href="../../../../../webjars/adminlte/2.3.0/dist/css/skins/skin-blue-light.min.css" rel="stylesheet" type="text/css" />

<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
Expand All @@ -95,11 +101,12 @@
<![endif]-->
</wicket:link>

<!-- OBSOLETE START -->
<link type="text/css" rel="stylesheet" href="css/silk.css"/>
<link type="text/css" rel="stylesheet" href="css/flag.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap-select/bootstrap-multiselect.css"/>
<link rel="stylesheet" type="text/css" href="css/bootstrap-select/bootstrap-select.css"/>

<!-- OBSOLETE START -->
<link type="text/css" rel="stylesheet" href="css/silk.css"/>
<link type="text/css" rel="stylesheet" href="wro/all.css"/>
<link type="text/css" rel="stylesheet" href="wro/midpoint.css"/>
<!-- OBSOLETE END -->
Expand Down
150 changes: 81 additions & 69 deletions ...ui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.html
View file
Expand Up @@ -21,77 +21,89 @@
<form wicket:id="mainForm" class="clearfix form-horizontal">
<div class="row">
<div class="col-md-6">
<h2><wicket:message key="PageCertCampaign.basic"/></h2>
<table class="table table-condensed table-striped">
<tr>
<td><wicket:message key="PageCertCampaign.name"/></td>
<td style="padding-left: 20px;"><div wicket:id="campaignName" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.description"/></td>
<td style="padding-left: 20px;"><div wicket:id="campaignDescription" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.owner"/></td>
<td style="padding-left: 20px;"><div wicket:id="campaignOwner" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.time"/></td>
<td style="padding-left: 20px;"><div wicket:id="campaignTime"/></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.numberOfStages"/></td>
<td style="padding-left: 20px;"><div wicket:id="campaignNumberOfStages" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.currentState"/></td>
<td style="padding-left: 20px;"><div wicket:id="campaignCurrentState" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.stageTime"/></td>
<td style="padding-left: 20px;"><div wicket:id="stageTime"/></td>
</tr>
</table>
<div class="box box-success">
<div class="box-header with-border">
<h3 class="box-title"><wicket:message key="PageCertCampaign.basic"/></h3>
</div>
<div class="box-body no-padding">
<table class="table table-striped">
<tr>
<td><wicket:message key="PageCertCampaign.name"/></td>
<td><div wicket:id="campaignName" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.description"/></td>
<td><div wicket:id="campaignDescription" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.owner"/></td>
<td><div wicket:id="campaignOwner" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.time"/></td>
<td><div wicket:id="campaignTime"/></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.numberOfStages"/></td>
<td><div wicket:id="campaignNumberOfStages" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.currentState"/></td>
<td><div wicket:id="campaignCurrentState" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.stageTime"/></td>
<td><div wicket:id="stageTime"/></td>
</tr>
</table>
</div>
</div>
</div>
<div class="col-md-6">
<h2><wicket:message key="PageCertCampaign.statistics"/></h2>
<table class="table table-condensed table-striped">
<tr>
<th><wicket:message key="PageCertCampaign.statistics.response" /></th>
<th><wicket:message key="PageCertCampaign.statistics.items" /></th>
<th><wicket:message key="PageCertCampaign.statistics.remedied" /></th>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.statistics.accept" /></td>
<td><span wicket:id="statAccept" /></td>
<td/>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.statistics.revoke" /></td>
<td><span wicket:id="statRevoke" /></td>
<td><span wicket:id="statRevokeRemedied" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.statistics.reduce" /></td>
<td><span wicket:id="statReduce" /></td>
<td><span wicket:id="statReduceRemedied" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.statistics.delegate" /></td>
<td><span wicket:id="statDelegate" /></td>
<td/>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.statistics.noDecision" /></td>
<td><span wicket:id="statNoDecision" /></td>
<td/>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.statistics.noResponse" /></td>
<td><span wicket:id="statNoResponse" /></td>
<td/>
</tr>
</table>
<div class="box box-danger">
<div class="box-header with-border">
<h3 class="box-title"><wicket:message key="PageCertCampaign.statistics"/></h3>
</div>
<div class="box-body no-padding">
<table class="table table-striped">
<tr>
<th><wicket:message key="PageCertCampaign.statistics.response" /></th>
<th><wicket:message key="PageCertCampaign.statistics.items" /></th>
<th><wicket:message key="PageCertCampaign.statistics.remedied" /></th>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.statistics.accept" /></td>
<td><span wicket:id="statAccept" /></td>
<td/>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.statistics.revoke" /></td>
<td><span wicket:id="statRevoke" /></td>
<td><span wicket:id="statRevokeRemedied" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.statistics.reduce" /></td>
<td><span wicket:id="statReduce" /></td>
<td><span wicket:id="statReduceRemedied" /></td>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.statistics.delegate" /></td>
<td><span wicket:id="statDelegate" /></td>
<td/>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.statistics.noDecision" /></td>
<td><span wicket:id="statNoDecision" /></td>
<td/>
</tr>
<tr>
<td><wicket:message key="PageCertCampaign.statistics.noResponse" /></td>
<td><span wicket:id="statNoResponse" /></td>
<td/>
</tr>
</table>
</div>
</div>
</div>
</div>
<div wicket:id="decisionsTable"/>
Expand Down
14 changes: 8 additions & 6 deletions ...ui/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaign.java
View file
Expand Up @@ -28,7 +28,8 @@
import com.evolveum.midpoint.web.application.PageDescriptor;
import com.evolveum.midpoint.web.component.AjaxButton;
import com.evolveum.midpoint.web.component.AjaxSubmitButton;
import com.evolveum.midpoint.web.component.data.TablePanel;
import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
import com.evolveum.midpoint.web.component.data.Table;
import com.evolveum.midpoint.web.component.data.column.DoubleButtonColumn.BUTTON_COLOR_CLASS;
import com.evolveum.midpoint.web.component.data.column.MultiButtonColumn;
import com.evolveum.midpoint.web.component.util.LoadableModel;
Expand All @@ -44,6 +45,7 @@
import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationCampaignType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationCasesStatisticsType;
import com.evolveum.midpoint.xml.ns._public.common.common_3.AccessCertificationResponseType;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
Expand Down Expand Up @@ -83,7 +85,7 @@
/**
* @author mederly
*/
@PageDescriptor(url = "/admin/certificationCampaign",
@PageDescriptor(url = "/admin/certification/campaign",
action = {
@AuthorizationAction(actionUri = PageAdminCertification.AUTH_CERTIFICATION_ALL,
label = PageAdminCertification.AUTH_CERTIFICATION_ALL_LABEL,
Expand Down Expand Up @@ -251,7 +253,7 @@ private void initTableLayout(Form mainForm) {
CertCaseDtoProvider provider = new CertCaseDtoProvider(PageCertCampaign.this);
provider.setQuery(createCaseQuery());
provider.setCampaignOid(getCampaignOid());
TablePanel table = new TablePanel<>(ID_DECISIONS_TABLE, provider, initColumns());
BoxedTablePanel table = new BoxedTablePanel<>(ID_DECISIONS_TABLE, provider, initColumns());
table.setShowPaging(true);
table.setOutputMarkupId(true);
mainForm.add(table);
Expand Down Expand Up @@ -479,7 +481,7 @@ private void executeCampaignStateOperation(AjaxRequestTarget target, String acti
statModel.reset();
campaignModel.reset();
target.add(get(createComponentPath(ID_MAIN_FORM)));
target.add(getDecisionsTable()); // ???
target.add((Component) getDecisionsTable()); // ???
target.add(getFeedbackPanel());
}

Expand All @@ -489,8 +491,8 @@ private ObjectQuery createCaseQuery() {
return query;
}

private TablePanel getDecisionsTable() {
return (TablePanel) get(createComponentPath(ID_MAIN_FORM, ID_DECISIONS_TABLE));
private Table getDecisionsTable() {
return (Table) get(createComponentPath(ID_MAIN_FORM, ID_DECISIONS_TABLE));
}

private String getCampaignOid() {
Expand Down
23 changes: 12 additions & 11 deletions ...i/src/main/java/com/evolveum/midpoint/web/page/admin/certification/PageCertCampaigns.html
View file
Expand Up @@ -16,19 +16,20 @@
-->

<html xmlns="http://www.w3.org/1999/xhtml"
xmlns:wicket="http://wicket.apache.org">
xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:extend>
<wicket:extend>

<div wicket:id="confirmCloseStagePopup" />
<div wicket:id="confirmDeleteMultipleCampaignsPopup" />
<div wicket:id="confirmDeleteCampaignPopup" />
<div wicket:id="confirmCloseCampaignPopup" />
<div wicket:id="confirmCloseMultipleCampaignsPopup" />
<form wicket:id="mainForm" class="clearfix form-horizontal">
<div wicket:id="campaignsTable" />
</form>
<div wicket:id="confirmCloseStagePopup"/>
<div wicket:id="confirmDeleteMultipleCampaignsPopup"/>
<div wicket:id="confirmDeleteCampaignPopup"/>
<div wicket:id="confirmCloseCampaignPopup"/>
<div wicket:id="confirmCloseMultipleCampaignsPopup"/>

</wicket:extend>
<form wicket:id="mainForm" class="form-inline">
<div wicket:id="campaignsTable"/>
</form>

</wicket:extend>
</body>
</html>

0 comments on commit f59e6f4

Please sign in to comment.