Skip to content

Commit

Permalink
system config panel, two columns for cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@1azyman
1azyman committed Dec 6, 2017
1 parent 2438a06 commit be3fb9e
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 41 deletions.
56 changes: 23 additions & 33 deletions .../java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.html
View file
Expand Up @@ -39,40 +39,30 @@ <h3 style="margin-left: 20px;">
<h3 style="margin-left: 20px">
<wicket:message key="SystemConfigPanel.cleanupPolicy"/>
</h3>
<div class="form-group">
<div wicket:id="auditRecordsCleanupAge"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
</div>
<div class="form-group">
<div wicket:id="auditRecordsCleanupRecords"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
</div>
<div class="form-group">
<div wicket:id="closedTasksCleanupAge"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
</div>
<div class="form-group">
<div wicket:id="certificationCampaignsCleanupAge"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
</div>
<div class="form-group">
<div wicket:id="certificationCampaignsCleanupRecords"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
</div>
<div class="form-group">
<div wicket:id="reportsCleanupAge"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
</div>
<div class="form-group">
<div wicket:id="resultsCleanupAge"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
</div>
<div class="form-group">
<div wicket:id="resultsCleanupRecords"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
<div class="container-fluid">
<div class="col-md-6">
<div class="form-group" wicket:id="auditRecordsCleanupAge"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
<div class="form-group" wicket:id="auditRecordsCleanupRecords"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
<div class="form-group" wicket:id="closedTasksCleanupAge"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
<div class="form-group" wicket:id="certificationCampaignsCleanupAge"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
</div>
<div class="col-md-6">
<div class="form-group" wicket:id="certificationCampaignsCleanupRecords"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
<div class="form-group" wicket:id="reportsCleanupAge"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
<div class="form-group" wicket:id="resultsCleanupAge"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
<div class="form-group" wicket:id="resultsCleanupRecords"
wicket:message="placeholder:SystemConfigPanel.cleanupPolicy.placeholder"/>
</div>
</div>

<h3>
<h3 style="margin-left: 20px;">
<wicket:message key="SystemConfigPanel.title.deploymentInformation"/>
</h3>
<div class="form-group" wicket:id="deploymentInfoContainer">
Expand Down Expand Up @@ -101,7 +91,7 @@ <h3>

<hr style="margin-right: 20px;">
</div>
<h3>
<h3 style="margin-left: 20px;">
<wicket:message key="SystemConfigPanel.title.misc"/>
</h3>

Expand Down
18 changes: 10 additions & 8 deletions .../java/com/evolveum/midpoint/web/page/admin/configuration/component/SystemConfigPanel.java
View file
Expand Up @@ -72,6 +72,8 @@ public class SystemConfigPanel extends BasePanel<SystemConfigurationDto> {
private static final String ID_LABEL_SIZE = "col-md-4";
private static final String ID_INPUT_SIZE = "col-md-4";

private static final String CLEANUP_SIZE = "col-md-6";


public SystemConfigPanel(String id, IModel<SystemConfigurationDto> model) {
super(id, model);
Expand Down Expand Up @@ -103,42 +105,42 @@ protected void initLayout() {
TextFormGroup auditRecordsAgeField = new TextFormGroup(ID_AUDIT_RECORDS_CLEANUP_AGE,
new PropertyModel<>(getModel(), SystemConfigurationDto.F_AUDIT_CLEANUP_AGE),
createStringResource("SystemConfigPanel.cleanupPolicy.auditRecords"),
DURATION_TOOLTIP_KEY, true, ID_LABEL_SIZE, ID_INPUT_SIZE, false, false);
DURATION_TOOLTIP_KEY, true, CLEANUP_SIZE, CLEANUP_SIZE, false, false);
add(auditRecordsAgeField);
TextFormGroup auditRecordsRecordsField = new TextFormGroup(ID_AUDIT_RECORDS_CLEANUP_RECORDS,
new PropertyModel<>(getModel(), SystemConfigurationDto.F_AUDIT_CLEANUP_RECORDS),
createStringResource("SystemConfigPanel.cleanupPolicy.auditRecords.records"),
null, true, ID_LABEL_SIZE, ID_INPUT_SIZE, false, false);
null, true, CLEANUP_SIZE, CLEANUP_SIZE, false, false);
add(auditRecordsRecordsField);
TextFormGroup closedTasksAgeField = new TextFormGroup(ID_CLOSED_TASKS_CLEANUP_AGE,
new PropertyModel<>(getModel(), SystemConfigurationDto.F_TASK_CLEANUP_AGE),
createStringResource("SystemConfigPanel.cleanupPolicy.closedTasks"),
DURATION_TOOLTIP_KEY, true, ID_LABEL_SIZE, ID_INPUT_SIZE, false, false);
DURATION_TOOLTIP_KEY, true, CLEANUP_SIZE, CLEANUP_SIZE, false, false);
add(closedTasksAgeField);
TextFormGroup campaignsAgeField = new TextFormGroup(ID_CERTIFICATION_CAMPAIGNS_CLEANUP_AGE,
new PropertyModel<>(getModel(), SystemConfigurationDto.F_CAMPAIGN_CLEANUP_AGE),
createStringResource("SystemConfigPanel.cleanupPolicy.certificationCampaigns"),
DURATION_TOOLTIP_KEY, true, ID_LABEL_SIZE, ID_INPUT_SIZE, false, false);
DURATION_TOOLTIP_KEY, true, CLEANUP_SIZE, CLEANUP_SIZE, false, false);
add(campaignsAgeField);
TextFormGroup campaignsRecordsField = new TextFormGroup(ID_CERTIFICATION_CAMPAIGNS_CLEANUP_RECORDS,
new PropertyModel<>(getModel(), SystemConfigurationDto.F_CAMPAIGN_CLEANUP_RECORDS),
createStringResource("SystemConfigPanel.cleanupPolicy.certificationCampaigns.records"),
null, true, ID_LABEL_SIZE, ID_INPUT_SIZE, false, false);
null, true, CLEANUP_SIZE, CLEANUP_SIZE, false, false);
add(campaignsRecordsField);
TextFormGroup reportsAgeField = new TextFormGroup(ID_REPORTS_CLEANUP_AGE,
new PropertyModel<>(getModel(), SystemConfigurationDto.F_REPORT_CLEANUP_AGE),
createStringResource("SystemConfigPanel.cleanupPolicy.reports"),
DURATION_TOOLTIP_KEY, true, ID_LABEL_SIZE, ID_INPUT_SIZE, false, false);
DURATION_TOOLTIP_KEY, true, CLEANUP_SIZE, CLEANUP_SIZE, false, false);
add(reportsAgeField);
TextFormGroup resultsAgeField = new TextFormGroup(ID_RESULTS_CLEANUP_AGE,
new PropertyModel<>(getModel(), SystemConfigurationDto.F_RESULT_CLEANUP_AGE),
createStringResource("SystemConfigPanel.cleanupPolicy.results"),
DURATION_TOOLTIP_KEY, true, ID_LABEL_SIZE, ID_INPUT_SIZE, false, false);
DURATION_TOOLTIP_KEY, true, CLEANUP_SIZE, CLEANUP_SIZE, false, false);
add(resultsAgeField);
TextFormGroup resultsRecordsField = new TextFormGroup(ID_RESULTS_CLEANUP_RECORDS,
new PropertyModel<>(getModel(), SystemConfigurationDto.F_RESULT_CLEANUP_RECORDS),
createStringResource("SystemConfigPanel.cleanupPolicy.results.records"),
null, true, ID_LABEL_SIZE, ID_INPUT_SIZE, false, false);
null, true, CLEANUP_SIZE, CLEANUP_SIZE, false, false);
add(resultsRecordsField);

TextFormGroup deploymentInfoName = new TextFormGroup(ID_DEPLOYMENT_INFO_NAME, new PropertyModel<String>(getModel(), "deploymentInformation.name"), createStringResource("SystemConfigPanel.deploymentInformation.name"), ID_LABEL_SIZE, ID_INPUT_SIZE, false);
Expand Down

0 comments on commit be3fb9e

Please sign in to comment.