From 67d86ce26fac46ba7afdfc05e5ff10b6b5485591 Mon Sep 17 00:00:00 2001 From: Radovan Semancik Date: Thu, 15 Feb 2018 18:13:10 +0100 Subject: [PATCH] Audit log CSS fix (MID-4300) --- .../admin/reports/PageAuditLogDetails.html | 38 +++++++++---------- .../admin/reports/PageAuditLogDetails.java | 17 ++++++++- .../component/AuditLogViewerPanel.java | 19 +++++++++- .../resources/static/less/midpoint-theme.less | 9 +++++ 4 files changed, 62 insertions(+), 21 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html index 208e91f519e..f6183536c7e 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.html @@ -25,84 +25,84 @@
- + - - + - + - - - + - - + - + - - + - + - + - + - + - + - + - +
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java index 7866a70543c..a8024b970a7 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageAuditLogDetails.java @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2010-2018 Evolveum + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.evolveum.midpoint.web.page.admin.reports; import java.util.*; @@ -54,10 +69,10 @@ label = "PageAuditLogViewer.auth.auditLogViewer.label", description = "PageAuditLogViewer.auth.auditLogViewer.description")}) public class PageAuditLogDetails extends PageBase { + private static final long serialVersionUID = 1L; private static final Trace LOGGER = TraceManager.getTrace(PageAuditLogDetails.class); - private static final long serialVersionUID = 1L; private static final String ID_EVENT_PANEL = "eventPanel"; private static final String ID_DELTA_LIST_PANEL = "deltaListPanel"; diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java index 0b22e3c2a66..61a73db3a29 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/component/AuditLogViewerPanel.java @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2010-2018 Evolveum + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.evolveum.midpoint.web.page.admin.reports.component; import static java.util.stream.Collectors.toList; @@ -82,6 +97,7 @@ */ public class AuditLogViewerPanel extends BasePanel { private static final long serialVersionUID = 1L; + private static final String ID_PARAMETERS_PANEL = "parametersPanel"; private static final String ID_TABLE = "table"; private static final String ID_FROM = "fromField"; @@ -503,8 +519,9 @@ protected List> initColumns() { @Override protected IModel createLinkModel(final IModel rowModel){ return new AbstractReadOnlyModel() { + private static final long serialVersionUID = 1L; - @Override + @Override public String getObject() { XMLGregorianCalendar time = rowModel.getObject().getTimestamp(); return WebComponentUtil.formatDate(time); diff --git a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less index e7da6fe235d..647cde47593 100644 --- a/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less +++ b/gui/admin-gui/src/main/resources/static/less/midpoint-theme.less @@ -1273,4 +1273,13 @@ dd.stacktrace::before { .box-content { padding: 15px; } +} + +// Tables where the first column is the name of the property/attribute +// (e.g. audit log item details) +// see MID-4300 + +td.prop-name { + min-width: 90px; + font-weight: bold; } \ No newline at end of file