Skip to content

Commit

Permalink
Merge branch 'master' into feature/attribute-caching-passive
Browse files Browse the repository at this point in the history
  • Loading branch information
@semancik
semancik committed Oct 24, 2016
2 parents 51f4035 + f37aeac commit b81001e
Show file tree
Hide file tree
Showing 22 changed files with 657 additions and 509 deletions.
9 changes: 8 additions & 1 deletion ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html
View file
Expand Up @@ -19,7 +19,7 @@
<body>
<wicket:extend>

<div wicket:id="eventPanel">
<div wicket:id="eventPanel" class="row">

<div wicket:id="eventDetailsPanel" class="col-md-6">
<div class="box box-success">
Expand Down Expand Up @@ -99,6 +99,13 @@
<div wicket:id="deltaListPanel"></div>
</div>
</div>
<div class="row">
<div class="main-button-bar" style="padding-left: 15px;">
<span class="button-group">
<a class="btn btn-default" wicket:id="back"/>
</span>
</div>
</div>
</wicket:extend>
</body>
</html>
21 changes: 15 additions & 6 deletions ...n-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java
View file
Expand Up @@ -3,7 +3,10 @@
import java.util.ArrayList;
import java.util.List;

import com.evolveum.midpoint.web.component.AjaxButton;
import com.evolveum.midpoint.web.page.admin.PageAdminObjectDetails;
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
Expand Down Expand Up @@ -76,7 +79,7 @@ public class PageAuditLogDetails extends PageBase{
private static final String ID_PARAMETERS_PARAMETER = "parameter";
private static final String ID_PARAMETERS_MESSAGE = "message";


private static final String ID_BUTTON_BACK = "back";

private IModel<AuditEventRecordType> recordModel;

Expand All @@ -99,13 +102,9 @@ private void initLayout(){
add(eventPanel);
initEventPanel(eventPanel);
initDeltasPanel(eventPanel);
initLayoutBackButton();
}






private void initEventPanel(WebMarkupContainer eventPanel){

WebMarkupContainer eventDetailsPanel = new WebMarkupContainer(ID_EVENT_DETAILS_PANEL);
Expand Down Expand Up @@ -197,5 +196,15 @@ private void initDeltasPanel(WebMarkupContainer eventPanel){

}

protected void initLayoutBackButton() {
AjaxButton back = new AjaxButton(ID_BUTTON_BACK, createStringResource("PageBase.button.back")) {

@Override
public void onClick(AjaxRequestTarget target) {
redirectBack();
}

};
add(back);
}
}
37 changes: 1 addition & 36 deletions ...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogViewer.html
View file
Expand Up @@ -17,42 +17,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:extend>
<div class="box box-primary">
<form wicket:id="mainForm">
<div wicket:id="parametersPanel" class="box-body">
<div class="col-md-3">
<label class=".col-ms-1"><wicket:message key="PageAuditLogViewer.fromLabel" /></label>
<div class=".col-ms-3" wicket:id="fromField"/>
<label class=".col-ms-1"><wicket:message key="PageAuditLogViewer.toLabel" /></label>
<div class=".col-ms-3" wicket:id="toField" />
<label><wicket:message key="PageAuditLogViewer.targetNameLabel" /></label>
<div wicket:id="targetNameField" />
<label><wicket:message key="PageAuditLogViewer.targetOwnerNameLabel" /></label>
<div wicket:id="targetOwnerNameField" />
<label><wicket:message key="PageAuditLogViewer.initiatorNameLabel" /></label>
<div wicket:id="initiatorNameField"/>
</div>
<div class="col-md-4">
<label class=".col-ms-1"><wicket:message key="PageAuditLogViewer.eventTypeLabel" /></label>
<div class=".col-ms-3" wicket:id="eventTypeField" />
<label class=".col-ms-1"><wicket:message key="PageAuditLogViewer.eventStageLabel" /></label>
<div class=".col-ms-3" wicket:id="eventStageField" />
<label class=".col-ms-1"><wicket:message key="PageAuditLogViewer.outcomeLabel" /></label>
<div class=".col-ms-3" wicket:id="outcomeField" />
</div>
<div class="col-md-1"/>
<div class="col-md-4">
<label class=".col-ms-1"><wicket:message key="PageAuditLogViewer.channelLabel" /></label>
<div class=".col-ms-3" wicket:id="channelField" />

<label class=".col-ms-1"><wicket:message key="PageAuditLogViewer.hostIdentifierLabel" /></label>
<div class=".col-ms-3" wicket:id="hostIdentifierField" />
<div class=".col-ms-1"><a class="btn btn-primary" wicket:id="searchButton"/></div>
</div>
</div>
<div wicket:id="table"/>
</form>
</div>
<div wicket:id="auditLogViewerPanel" />
</wicket:extend>
</body>
</html>

0 comments on commit b81001e

Please sign in to comment.