From 691fe233a6413674760bf42f6dcbdf1242f0ea77 Mon Sep 17 00:00:00 2001 From: Viliam Repan Date: Wed, 21 May 2014 16:20:06 +0200 Subject: [PATCH 1/3] report configuration html/css fixes. --- .../evolveum/midpoint/web/component/AceEditor.java | 14 +++++++++++++- .../web/page/admin/reports/PageReport.html | 9 ++++----- .../web/page/admin/reports/PageReport.java | 2 ++ .../web/page/admin/reports/PageReport.properties | 2 ++ .../src/main/webapp/js/midpoint/ace-editor.js | 6 +++--- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AceEditor.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AceEditor.java index a9abe1d4477..246606ee488 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AceEditor.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/AceEditor.java @@ -26,6 +26,7 @@ public class AceEditor extends TextArea { private IModel readonly = new Model(false); + private int minSize = 200; public AceEditor(String id, IModel model) { super(id, model); @@ -37,11 +38,22 @@ public void renderHead(IHeaderResponse response) { super.renderHead(response); StringBuilder sb = new StringBuilder(); - sb.append("initEditor('").append(getMarkupId()).append("',").append(readonly.getObject()).append(");"); + sb.append("initEditor('").append(getMarkupId()); + sb.append("',").append(readonly.getObject()); + sb.append(",").append(minSize); + sb.append(");"); response.render(OnDomReadyHeaderItem.forScript(sb.toString())); } + public int getMinSize() { + return minSize; + } + + public void setMinSize(int minSize) { + this.minSize = minSize; + } + public void setReadonly(boolean readonly) { this.readonly.setObject(readonly); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.html index 7f731b9e0a5..dad64b82c5d 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.html +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.html @@ -28,19 +28,18 @@
-
- -
-
+
+

-
+
+

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java index ae29bc807fa..1d5b1d76385 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.java @@ -118,10 +118,12 @@ private void initLayout() { AceEditor templateEditor = new AceEditor(ID_TEMPLATE_EDITOR, new Base64Model( new PrismPropertyModel<>(model, ReportType.F_TEMPLATE))); + templateEditor.setMinSize(450); mainForm.add(templateEditor); AceEditor templateStyleEditor = new AceEditor(ID_TEMPLATE_STYLE_EDITOR, new Base64Model( new PrismPropertyModel<>(model, ReportType.F_TEMPLATE_STYLE))); + templateStyleEditor.setMinSize(450); mainForm.add(templateStyleEditor); // List tabs = new ArrayList(); diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.properties b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.properties index f95a90be830..616ad3af845 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.properties +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReport.properties @@ -14,3 +14,5 @@ # limitations under the License. # page.title=Report configuration +PageReport.jasperTemplate=Jasper template +PageReport.jasperTemplateStyle=Jasper template style \ No newline at end of file diff --git a/gui/admin-gui/src/main/webapp/js/midpoint/ace-editor.js b/gui/admin-gui/src/main/webapp/js/midpoint/ace-editor.js index 959b62e1f72..66a47ebf2b1 100644 --- a/gui/admin-gui/src/main/webapp/js/midpoint/ace-editor.js +++ b/gui/admin-gui/src/main/webapp/js/midpoint/ace-editor.js @@ -18,7 +18,7 @@ var ACE_EDITOR_POSTFIX = "_editor"; var DISABLED_CLASS = "disabled"; $.aceEditors = {}; -function initEditor(textAreaId, readonly) { +function initEditor(textAreaId, readonly, minSize) { var jqTextArea = '#' + textAreaId; var editorId = textAreaId + ACE_EDITOR_POSTFIX; var jqEditor = '#' + editorId; @@ -52,8 +52,8 @@ function initEditor(textAreaId, readonly) { $(document).ready(function () { //38 + 1 + 21 is menu outer height var newHeight = $(document).innerHeight() - $('div.mainContainer').outerHeight(true) - 60; - if (newHeight < 200) { - newHeight = 200; + if (newHeight < minSize) { + newHeight = minSize; } $('#' + editorId).height(newHeight.toString() + "px"); From 8208334737007868c3e3beeead402a7a7d31a4b4 Mon Sep 17 00:00:00 2001 From: Viliam Repan Date: Wed, 21 May 2014 16:55:09 +0200 Subject: [PATCH 2/3] ugly fix for MID-1631 --- .../web/page/admin/configuration/PageAccounts.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java index 85f7e3ae7a7..e1c343eae3a 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java @@ -530,10 +530,15 @@ protected boolean handleObject(PrismObject object, OperationResult parentResult) } private Writer createWriter(String fileName) throws IOException { - //todo improve!!!! + //todo improve!!!!!!! MidpointConfiguration config = getMidpointConfiguration(); - File file = new File(config.getMidpointHome() + "/export/" + fileName); + File exportFolder = new File(config.getMidpointHome() + "/export/"); + if (!exportFolder.exists() || !exportFolder.isDirectory()) { + exportFolder.mkdir(); + } + + File file = new File(exportFolder, fileName); file.createNewFile(); return new OutputStreamWriter(new FileOutputStream(file), "utf-8"); From 026c90d1d86a52f828f04ee274c8279f2857e3ff Mon Sep 17 00:00:00 2001 From: Viliam Repan Date: Wed, 21 May 2014 17:01:59 +0200 Subject: [PATCH 3/3] ugly fix improvement for MID-1631 --- .../page/admin/configuration/PageAccounts.java | 15 ++++++++++----- .../admin/configuration/PageAccounts.properties | 3 ++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java index e1c343eae3a..70650838051 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.java @@ -534,12 +534,17 @@ private Writer createWriter(String fileName) throws IOException { MidpointConfiguration config = getMidpointConfiguration(); File exportFolder = new File(config.getMidpointHome() + "/export/"); - if (!exportFolder.exists() || !exportFolder.isDirectory()) { - exportFolder.mkdir(); - } - File file = new File(exportFolder, fileName); - file.createNewFile(); + try { + if (!exportFolder.exists() || !exportFolder.isDirectory()) { + exportFolder.mkdir(); + } + + file.createNewFile(); + } catch (Exception ex) { + error(getString("PageAccounts.exportFileDoesntExist", file.getAbsolutePath())); + throw ex; + } return new OutputStreamWriter(new FileOutputStream(file), "utf-8"); } diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.properties b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.properties index 4ec66309095..01a01f9b95b 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.properties +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/configuration/PageAccounts.properties @@ -36,4 +36,5 @@ PageAccounts.accounts.synchronizationSituation=Situation PageAccounts.accounts.synchronizationTimestamp=Timestamp PageAccounts.accounts.description=Description PageAccounts.exportException=Error occurred during export, reason {0} -PageAccounts.button.clearExportFolder=Clear export folder \ No newline at end of file +PageAccounts.button.clearExportFolder=Clear export folder +PageAccounts.exportFileDoesntExist=Couldn't create file {0} \ No newline at end of file