You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/12/20 10:24:21 UTC
[2/2] syncope git commit: [SYNCOPE-982] Mail body (both as TEXT and
HTML) now accessible
[SYNCOPE-982] Mail body (both as TEXT and HTML) now accessible
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/18ac4512
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/18ac4512
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/18ac4512
Branch: refs/heads/master
Commit: 18ac4512cbda7a1b58a185fc866887ff753d7932
Parents: 4a68915
Author: Francesco Chicchiricc� <il...@apache.org>
Authored: Tue Dec 20 11:19:27 2016 +0100
Committer: Francesco Chicchiricc� <il...@apache.org>
Committed: Tue Dec 20 11:19:38 2016 +0100
----------------------------------------------------------------------
.../MailTemplateDirectoryPanel.java | 20 +++++------
.../notifications/NotificationTasks.java | 12 +++++++
.../console/panels/ConnObjectDetails.java | 6 +---
.../client/console/panels/ConnObjects.java | 2 +-
.../client/console/panels/MultilevelPanel.java | 2 +-
.../policies/AccountPolicyDirectoryPanel.java | 4 +--
.../policies/PasswordPolicyDirectoryPanel.java | 4 +--
.../console/policies/PolicyDirectoryPanel.java | 2 +-
.../policies/PullPolicyDirectoryPanel.java | 2 +-
.../reports/ReportTemplateDirectoryPanel.java | 28 +++++++--------
.../client/console/tasks/ExecMessage.java | 3 +-
.../console/tasks/ExecutionsDirectoryPanel.java | 6 ++--
.../console/tasks/NotificationMailBody.java | 33 +++++++++++++++++
.../tasks/NotificationMailBodyDetails.java | 37 ++++++++++++++++++++
.../tasks/NotificationTaskDirectoryPanel.java | 27 +++++++++++++-
.../console/tasks/TaskDirectoryPanel.java | 2 +-
.../console/tasks/TaskExecutionDetails.java | 2 +-
.../wicket/markup/html/form/ActionLink.java | 4 +--
.../markup/html/form/ActionLinksPanel.java | 22 ++++++------
.../client/console/approvals/Approval.html | 23 ++++++------
.../console/approvals/ApprovalDetails.html | 9 ++---
.../ReportDirectoryPanel_pt_BR.properties | 2 +-
.../client/console/tasks/CrontabPanel.html | 31 ++++++++--------
.../client/console/tasks/ExecMessage.html | 15 ++++----
.../console/tasks/NotificationMailBody.html | 26 ++++++++++++++
.../tasks/NotificationMailBodyDetails.html | 23 ++++++++++++
.../NotificationTaskDirectoryPanel.properties | 3 +-
...NotificationTaskDirectoryPanel_it.properties | 3 +-
...ificationTaskDirectoryPanel_pt_BR.properties | 3 +-
...NotificationTaskDirectoryPanel_ru.properties | 3 +-
.../client/console/tasks/PushTaskFilters.html | 13 +++----
.../tasks/SchedTaskWizardBuilder$Schedule.html | 9 ++---
.../markup/html/form/ActionLinksPanel.html | 12 +++----
.../fit/console/NotificationsITCase.java | 6 ++--
34 files changed, 266 insertions(+), 133 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
index 9f5f8a3..e3c3f0a 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/MailTemplateDirectoryPanel.java
@@ -96,8 +96,8 @@ public class MailTemplateDirectoryPanel
@Override
public WizardModalPanel<MailTemplateTO> build(
final String id, final int index, final AjaxWizard.Mode mode) {
- return new TemplateModal<MailTemplateTO, MailTemplateFormat>(
- modal, restClient, new MailTemplateTO(), pageReference);
+
+ return new TemplateModal<>(modal, restClient, new MailTemplateTO(), pageReference);
}
}, true);
@@ -128,19 +128,19 @@ public class MailTemplateDirectoryPanel
@Override
public void onClick(final AjaxRequestTarget target, final MailTemplateTO ignore) {
- TemplateContentModal.TemplateContent<MailTemplateFormat> content
- = new TemplateContentModal.TemplateContent<MailTemplateFormat>(
+ TemplateContentModal.TemplateContent<MailTemplateFormat> content =
+ new TemplateContentModal.TemplateContent<>(
model.getObject().getKey(), MailTemplateFormat.HTML);
content.setContent(
restClient.readTemplateFormat(model.getObject().getKey(), MailTemplateFormat.HTML));
utilityModal.header(new ResourceModel("mail.template.html", "HTML Content"));
- utilityModal.setContent(new TemplateContentModal<MailTemplateTO, MailTemplateFormat>(
+ utilityModal.setContent(new TemplateContentModal<>(
utilityModal, restClient, content, pageRef));
utilityModal.show(true);
target.add(utilityModal);
}
- }, ActionLink.ActionType.HTML_EDIT, StandardEntitlement.MAIL_TEMPLATE_UPDATE);
+ }, ActionLink.ActionType.HTML, StandardEntitlement.MAIL_TEMPLATE_UPDATE);
panel.add(new ActionLink<MailTemplateTO>() {
@@ -148,20 +148,20 @@ public class MailTemplateDirectoryPanel
@Override
public void onClick(final AjaxRequestTarget target, final MailTemplateTO ignore) {
- TemplateContentModal.TemplateContent<MailTemplateFormat> content
- = new TemplateContentModal.TemplateContent<MailTemplateFormat>(
+ TemplateContentModal.TemplateContent<MailTemplateFormat> content =
+ new TemplateContentModal.TemplateContent<>(
model.getObject().getKey(), MailTemplateFormat.TEXT);
content.setContent(
restClient.readTemplateFormat(model.getObject().getKey(), MailTemplateFormat.TEXT));
utilityModal.setFormModel(content);
utilityModal.header(new ResourceModel("mail.template.text", "TEXT Content"));
- utilityModal.setContent(new TemplateContentModal<MailTemplateTO, MailTemplateFormat>(
+ utilityModal.setContent(new TemplateContentModal<>(
utilityModal, restClient, content, pageRef));
utilityModal.show(true);
target.add(utilityModal);
}
- }, ActionLink.ActionType.TEXT_EDIT, StandardEntitlement.MAIL_TEMPLATE_UPDATE);
+ }, ActionLink.ActionType.TEXT, StandardEntitlement.MAIL_TEMPLATE_UPDATE);
panel.add(new ActionLink<MailTemplateTO>() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationTasks.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationTasks.java b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationTasks.java
index 588b07f..9a01fe8 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationTasks.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationTasks.java
@@ -21,11 +21,13 @@ package org.apache.syncope.client.console.notifications;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.client.console.panels.ModalPanel;
import org.apache.syncope.client.console.panels.MultilevelPanel;
+import org.apache.syncope.client.console.tasks.NotificationMailBodyDetails;
import org.apache.syncope.client.console.tasks.NotificationTaskDirectoryPanel;
import org.apache.syncope.client.console.tasks.TaskExecutionDetails;
import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.common.lib.to.NotificationTaskTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
+import org.apache.syncope.common.lib.types.MailTemplateFormat;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.panel.Panel;
@@ -71,6 +73,16 @@ public class NotificationTasks extends Panel implements ModalPanel {
new StringResourceModel("task.view", this, new Model<>(Pair.of(null, taskTO))).getObject(),
new TaskExecutionDetails<>(null, taskTO, pageReference), target);
}
+
+ @Override
+ protected void viewMailBody(
+ final MailTemplateFormat format, final String content, final AjaxRequestTarget target) {
+
+ mlp.next(
+ new StringResourceModel("content", this).setParameters(format.name()).getObject(),
+ new NotificationMailBodyDetails(content), target);
+ }
+
});
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectDetails.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectDetails.java
index df55d0b..51b91a9 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectDetails.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectDetails.java
@@ -19,18 +19,14 @@
package org.apache.syncope.client.console.panels;
import org.apache.commons.lang3.tuple.Pair;
-import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.client.console.wizards.any.ConnObjectPanel;
import org.apache.syncope.common.lib.to.ConnObjectTO;
-import org.apache.wicket.PageReference;
public class ConnObjectDetails extends MultilevelPanel.SecondLevel {
private static final long serialVersionUID = -6532127408741991806L;
- public ConnObjectDetails(
- final BaseModal<?> baseModal, final ConnObjectTO connObjectTO, final PageReference pageRef) {
-
+ public ConnObjectDetails(final ConnObjectTO connObjectTO) {
super();
MultilevelPanel mlp = new MultilevelPanel("details");
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
index cd29d21..af491e7 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjects.java
@@ -131,7 +131,7 @@ public class ConnObjects extends Panel implements ModalPanel {
connObjects.next(
new StringResourceModel("connObject.view", this, new Model<>(connObjectTO)).getObject(),
- new ConnObjectDetails(baseModal, connObjectTO, pageRef),
+ new ConnObjectDetails(connObjectTO),
target);
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/panels/MultilevelPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/panels/MultilevelPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/panels/MultilevelPanel.java
index 19d2689..4f0029c 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/panels/MultilevelPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/panels/MultilevelPanel.java
@@ -103,7 +103,7 @@ public class MultilevelPanel extends Panel implements IHeaderContributor {
}
/**
- * Ad panel with id <tt>first</tt>
+ * Add panel with id <tt>first</tt>
*
* @param panel panel to be used into the first level.
* @return the current MultilevelPanel instance.
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
index 0eb17ef..0c5c1c2 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/AccountPolicyDirectoryPanel.java
@@ -45,7 +45,7 @@ public class AccountPolicyDirectoryPanel extends PolicyDirectoryPanel<AccountPol
public AccountPolicyDirectoryPanel(final String id, final PageReference pageRef) {
super(id, PolicyType.ACCOUNT, pageRef);
- this.addNewItemPanelBuilder(new PolicyModalPanelBuilder<AccountPolicyTO>(
+ this.addNewItemPanelBuilder(new PolicyModalPanelBuilder<>(
new AccountPolicyTO(), modal, pageRef), true);
MetaDataRoleAuthorizationStrategy.authorize(addAjaxLink, RENDER, StandardEntitlement.POLICY_CREATE);
@@ -73,7 +73,7 @@ public class AccountPolicyDirectoryPanel extends PolicyDirectoryPanel<AccountPol
@Override
public void onClick(final AjaxRequestTarget target, final AccountPolicyTO ignore) {
- target.add(ruleCompositionModal.setContent(new PolicyRuleDirectoryPanel<AccountPolicyTO>(
+ target.add(ruleCompositionModal.setContent(new PolicyRuleDirectoryPanel<>(
ruleCompositionModal, model.getObject().getKey(), PolicyType.ACCOUNT, pageRef)));
ruleCompositionModal.header(new StringResourceModel(
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
index 6bf607a..2d911b6 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PasswordPolicyDirectoryPanel.java
@@ -45,7 +45,7 @@ public class PasswordPolicyDirectoryPanel extends PolicyDirectoryPanel<PasswordP
super(id, PolicyType.PASSWORD, pageRef);
this.addNewItemPanelBuilder(
- new PolicyModalPanelBuilder<PasswordPolicyTO>(new PasswordPolicyTO(), modal, pageRef), true);
+ new PolicyModalPanelBuilder<>(new PasswordPolicyTO(), modal, pageRef), true);
MetaDataRoleAuthorizationStrategy.authorize(addAjaxLink, RENDER, StandardEntitlement.POLICY_CREATE);
initResultTable();
@@ -69,7 +69,7 @@ public class PasswordPolicyDirectoryPanel extends PolicyDirectoryPanel<PasswordP
@Override
public void onClick(final AjaxRequestTarget target, final PasswordPolicyTO ignore) {
- target.add(ruleCompositionModal.setContent(new PolicyRuleDirectoryPanel<PasswordPolicyTO>(
+ target.add(ruleCompositionModal.setContent(new PolicyRuleDirectoryPanel<>(
ruleCompositionModal, model.getObject().getKey(), PolicyType.PASSWORD, pageRef)));
ruleCompositionModal.header(new StringResourceModel(
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
index b20bb05..e528168 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PolicyDirectoryPanel.java
@@ -80,7 +80,7 @@ public abstract class PolicyDirectoryPanel<T extends AbstractPolicyTO>
};
- protected final BaseModal<T> policySpecModal = new BaseModal<T>("outer");
+ protected final BaseModal<T> policySpecModal = new BaseModal<>("outer");
private final PolicyType policyType;
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyDirectoryPanel.java
index 1a615e5..1f3442b 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/policies/PullPolicyDirectoryPanel.java
@@ -45,7 +45,7 @@ public class PullPolicyDirectoryPanel extends PolicyDirectoryPanel<PullPolicyTO>
defaultItem.setSpecification(new PullPolicySpec());
this.addNewItemPanelBuilder(
- new PolicyModalPanelBuilder<PullPolicyTO>(defaultItem, modal, pageRef), true);
+ new PolicyModalPanelBuilder<>(defaultItem, modal, pageRef), true);
MetaDataRoleAuthorizationStrategy.authorize(addAjaxLink, RENDER, StandardEntitlement.POLICY_CREATE);
initResultTable();
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
index d3602ee..7621b11 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportTemplateDirectoryPanel.java
@@ -98,8 +98,8 @@ public class ReportTemplateDirectoryPanel
@Override
public WizardModalPanel<ReportTemplateTO> build(
final String id, final int index, final AjaxWizard.Mode mode) {
- return new TemplateModal<ReportTemplateTO, ReportTemplateFormat>(
- modal, restClient, new ReportTemplateTO(), pageReference);
+
+ return new TemplateModal<>(modal, restClient, new ReportTemplateTO(), pageReference);
}
}, true);
@@ -130,14 +130,14 @@ public class ReportTemplateDirectoryPanel
@Override
public void onClick(final AjaxRequestTarget target, final ReportTemplateTO ignore) {
- TemplateContentModal.TemplateContent<ReportTemplateFormat> content
- = new TemplateContentModal.TemplateContent<ReportTemplateFormat>(
+ TemplateContentModal.TemplateContent<ReportTemplateFormat> content =
+ new TemplateContentModal.TemplateContent<>(
model.getObject().getKey(), ReportTemplateFormat.FO);
content.setContent(
restClient.readTemplateFormat(model.getObject().getKey(), ReportTemplateFormat.FO));
utilityModal.header(new ResourceModel("report.template.fo", "FO Content"));
- utilityModal.setContent(new TemplateContentModal<ReportTemplateTO, ReportTemplateFormat>(
+ utilityModal.setContent(new TemplateContentModal<>(
utilityModal, restClient, content, pageRef));
utilityModal.show(true);
target.add(utilityModal);
@@ -150,19 +150,18 @@ public class ReportTemplateDirectoryPanel
@Override
public void onClick(final AjaxRequestTarget target, final ReportTemplateTO ignore) {
- TemplateContentModal.TemplateContent<ReportTemplateFormat> content
- = new TemplateContentModal.TemplateContent<ReportTemplateFormat>(
+ TemplateContentModal.TemplateContent<ReportTemplateFormat> content =
+ new TemplateContentModal.TemplateContent<>(
model.getObject().getKey(), ReportTemplateFormat.HTML);
content.setContent(
restClient.readTemplateFormat(model.getObject().getKey(), ReportTemplateFormat.HTML));
utilityModal.header(new ResourceModel("report.template.html", "HTML Content"));
- utilityModal.setContent(new TemplateContentModal<ReportTemplateTO, ReportTemplateFormat>(
- utilityModal, restClient, content, pageRef));
+ utilityModal.setContent(new TemplateContentModal<>(utilityModal, restClient, content, pageRef));
utilityModal.show(true);
target.add(utilityModal);
}
- }, ActionLink.ActionType.HTML_EDIT, StandardEntitlement.MAIL_TEMPLATE_UPDATE);
+ }, ActionLink.ActionType.HTML, StandardEntitlement.MAIL_TEMPLATE_UPDATE);
panel.add(new ActionLink<ReportTemplateTO>() {
@@ -170,20 +169,19 @@ public class ReportTemplateDirectoryPanel
@Override
public void onClick(final AjaxRequestTarget target, final ReportTemplateTO ignore) {
- TemplateContentModal.TemplateContent<ReportTemplateFormat> content
- = new TemplateContentModal.TemplateContent<ReportTemplateFormat>(
+ TemplateContentModal.TemplateContent<ReportTemplateFormat> content =
+ new TemplateContentModal.TemplateContent<>(
model.getObject().getKey(), ReportTemplateFormat.CSV);
content.setContent(
restClient.readTemplateFormat(model.getObject().getKey(), ReportTemplateFormat.CSV));
utilityModal.setFormModel(content);
utilityModal.header(new ResourceModel("report.template.text", "TEXT Content"));
- utilityModal.setContent(new TemplateContentModal<ReportTemplateTO, ReportTemplateFormat>(
- utilityModal, restClient, content, pageRef));
+ utilityModal.setContent(new TemplateContentModal<>(utilityModal, restClient, content, pageRef));
utilityModal.show(true);
target.add(utilityModal);
}
- }, ActionLink.ActionType.TEXT_EDIT, StandardEntitlement.MAIL_TEMPLATE_UPDATE);
+ }, ActionLink.ActionType.TEXT, StandardEntitlement.MAIL_TEMPLATE_UPDATE);
panel.add(new ActionLink<ReportTemplateTO>() {
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecMessage.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecMessage.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecMessage.java
index 9c30ce9..293e051 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecMessage.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecMessage.java
@@ -28,7 +28,6 @@ public class ExecMessage extends MultilevelPanel.SecondLevel {
public ExecMessage(final String message) {
super();
- final Label dialogContent = new Label("message", new Model<>(message));
- add(dialogContent.setOutputMarkupId(true));
+ add(new Label("message", Model.of(message)).setOutputMarkupId(true));
}
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
index 44e4dd7..1e39479 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
@@ -94,7 +94,7 @@ public abstract class ExecutionsDirectoryPanel
resultTableBuilder.setMultiLevelPanel(baseModal, multiLevelPanelRef);
}
- protected abstract void next(final String title, final SecondLevel secondLevel, final AjaxRequestTarget target);
+ protected abstract void next(String title, SecondLevel secondLevel, AjaxRequestTarget target);
@Override
protected List<IColumn<ExecTO, String>> getColumns() {
@@ -116,9 +116,7 @@ public abstract class ExecutionsDirectoryPanel
public ActionLinksPanel<ExecTO> getActions(final String componentId, final IModel<ExecTO> model) {
final ExecTO taskExecutionTO = model.getObject();
- final ActionLinksPanel.Builder<ExecTO> panel = ActionLinksPanel.builder();
-
- panel.
+ final ActionLinksPanel.Builder<ExecTO> panel = ActionLinksPanel.<ExecTO>builder().
add(new ActionLink<ExecTO>() {
private static final long serialVersionUID = -3722207913631435501L;
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationMailBody.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationMailBody.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationMailBody.java
new file mode 100644
index 0000000..bd4a6b6
--- /dev/null
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationMailBody.java
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.syncope.client.console.tasks;
+
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.Model;
+
+public class NotificationMailBody extends Panel {
+
+ private static final long serialVersionUID = 3163146190501510888L;
+
+ public NotificationMailBody(final String id, final String body) {
+ super(id);
+ add(new Label("body", Model.of(body)).setOutputMarkupId(true));
+ }
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationMailBodyDetails.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationMailBodyDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationMailBodyDetails.java
new file mode 100644
index 0000000..0d2af81
--- /dev/null
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationMailBodyDetails.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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 org.apache.syncope.client.console.tasks;
+
+import org.apache.syncope.client.console.panels.MultilevelPanel;
+
+/**
+ * Notification e-mail body (for a given {@link org.apache.syncope.common.lib.to.NotificationTaskTO}.
+ */
+public class NotificationMailBodyDetails extends MultilevelPanel.SecondLevel {
+
+ private static final long serialVersionUID = -4110576026663173545L;
+
+ public NotificationMailBodyDetails(final String body) {
+ super();
+
+ MultilevelPanel mlp = new MultilevelPanel("body");
+ mlp.setFirstLevel(new NotificationMailBody(MultilevelPanel.FIRST_LEVEL_ID, body));
+ add(mlp);
+ }
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
index 615e512..3aeff11 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.java
@@ -34,6 +34,7 @@ import org.apache.syncope.client.console.panels.MultilevelPanel;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.ActionColumn;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.CollectionPropertyColumn;
import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.DatePropertyColumn;
+import org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.KeyPropertyColumn;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink.ActionType;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLinksPanel;
@@ -42,6 +43,7 @@ import org.apache.syncope.common.lib.types.TaskType;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.to.NotificationTaskTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
+import org.apache.syncope.common.lib.types.MailTemplateFormat;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
@@ -75,14 +77,19 @@ public abstract class NotificationTaskDirectoryPanel
initResultTable();
}
+ protected abstract void viewMailBody(MailTemplateFormat format, String content, AjaxRequestTarget target);
+
@Override
protected List<IColumn<NotificationTaskTO, String>> getColumns() {
final List<IColumn<NotificationTaskTO, String>> columns = new ArrayList<>();
- columns.add(new PropertyColumn<NotificationTaskTO, String>(
+ columns.add(new KeyPropertyColumn<NotificationTaskTO>(
new StringResourceModel("key", this, null), "key", "key"));
columns.add(new PropertyColumn<NotificationTaskTO, String>(
+ new StringResourceModel("sender", this, null), "sender", "sender"));
+
+ columns.add(new PropertyColumn<NotificationTaskTO, String>(
new StringResourceModel("subject", this, null), "subject", "subject"));
columns.add(new CollectionPropertyColumn<NotificationTaskTO>(
@@ -123,6 +130,24 @@ public abstract class NotificationTaskDirectoryPanel
@Override
public void onClick(final AjaxRequestTarget target, final NotificationTaskTO modelObject) {
+ viewMailBody(MailTemplateFormat.TEXT, taskTO.getTextBody(), target);
+ }
+ }, ActionLink.ActionType.TEXT, StandardEntitlement.TASK_READ).
+ add(new ActionLink<NotificationTaskTO>() {
+
+ private static final long serialVersionUID = -3722207913631435501L;
+
+ @Override
+ public void onClick(final AjaxRequestTarget target, final NotificationTaskTO modelObject) {
+ viewMailBody(MailTemplateFormat.HTML, taskTO.getHtmlBody(), target);
+ }
+ }, ActionLink.ActionType.HTML, StandardEntitlement.TASK_READ).
+ add(new ActionLink<NotificationTaskTO>() {
+
+ private static final long serialVersionUID = -3722207913631435501L;
+
+ @Override
+ public void onClick(final AjaxRequestTarget target, final NotificationTaskTO modelObject) {
try {
restClient.startExecution(taskTO.getKey(), new Date());
SyncopeConsoleSession.get().info(getString(Constants.OPERATION_SUCCEEDED));
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java
index 41ae2ff..39036e5 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskDirectoryPanel.java
@@ -64,7 +64,7 @@ public abstract class TaskDirectoryPanel<T extends AbstractTaskTO>
resultTableBuilder.setMultiLevelPanel(baseModal, multiLevelPanelRef);
}
- protected abstract void viewTask(final T taskTO, final AjaxRequestTarget target);
+ protected abstract void viewTask(T taskTO, AjaxRequestTarget target);
protected abstract class TasksProvider<T extends AbstractTaskTO> extends DirectoryDataProvider<T> {
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java
index eb2254f..263eca3 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/tasks/TaskExecutionDetails.java
@@ -26,7 +26,7 @@ import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
/**
- * Modal window with Task form (to stop and start execution).
+ * Task executions.
*
* @param <T> actual type of task
*/
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
index f772eec..78e7292 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
@@ -50,8 +50,8 @@ public abstract class ActionLink<T extends Serializable> implements Serializable
EDIT("read"),
TYPE_EXTENSIONS("read"),
FO_EDIT("read"),
- HTML_EDIT("read"),
- TEXT_EDIT("read"),
+ HTML("read"),
+ TEXT("read"),
COMPOSE("update"),
LAYOUT_EDIT("read"),
RESET("update"),
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java
----------------------------------------------------------------------
diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java
index e02b24b..93025a3 100644
--- a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java
+++ b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.java
@@ -65,8 +65,8 @@ public final class ActionLinksPanel<T extends Serializable> extends Panel {
super.add(new Fragment("panelEdit", "emptyFragment", this));
super.add(new Fragment("panelTypeExtensions", "emptyFragment", this));
super.add(new Fragment("panelFoEdit", "emptyFragment", this));
- super.add(new Fragment("panelHtmlEdit", "emptyFragment", this));
- super.add(new Fragment("panelTextEdit", "emptyFragment", this));
+ super.add(new Fragment("panelHtml", "emptyFragment", this));
+ super.add(new Fragment("panelText", "emptyFragment", this));
super.add(new Fragment("panelCompose", "emptyFragment", this));
super.add(new Fragment("panelLayoutEdit", "emptyFragment", this));
super.add(new Fragment("panelReset", "emptyFragment", this));
@@ -414,10 +414,10 @@ public final class ActionLinksPanel<T extends Serializable> extends Panel {
}.setVisible(link.isEnabled(model.getObject())));
break;
- case HTML_EDIT:
- fragment = new Fragment("panelHtmlEdit", "fragmentHtmlEdit", this);
+ case HTML:
+ fragment = new Fragment("panelHtml", "fragmentHtml", this);
- fragment.addOrReplace(new IndicatingAjaxLink<Void>("htmlEditLink") {
+ fragment.addOrReplace(new IndicatingAjaxLink<Void>("htmlLink") {
private static final long serialVersionUID = -7978723352517770644L;
@@ -434,10 +434,10 @@ public final class ActionLinksPanel<T extends Serializable> extends Panel {
}.setVisible(link.isEnabled(model.getObject())));
break;
- case TEXT_EDIT:
- fragment = new Fragment("panelTextEdit", "fragmentTextEdit", this);
+ case TEXT:
+ fragment = new Fragment("panelText", "fragmentText", this);
- fragment.addOrReplace(new IndicatingAjaxLink<Void>("textEditLink") {
+ fragment.addOrReplace(new IndicatingAjaxLink<Void>("textLink") {
private static final long serialVersionUID = -7978723352517770644L;
@@ -1192,11 +1192,11 @@ public final class ActionLinksPanel<T extends Serializable> extends Panel {
super.addOrReplace(new Fragment("panelFoEdit", "emptyFragment", this));
break;
- case HTML_EDIT:
- super.addOrReplace(new Fragment("panelHtmlEdit", "emptyFragment", this));
+ case HTML:
+ super.addOrReplace(new Fragment("panelHtml", "emptyFragment", this));
break;
- case TEXT_EDIT:
+ case TEXT:
super.addOrReplace(new Fragment("panelTestEdit", "emptyFragment", this));
break;
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/approvals/Approval.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/approvals/Approval.html b/client/console/src/main/resources/org/apache/syncope/client/console/approvals/Approval.html
index 5231287..64805b9 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/approvals/Approval.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/approvals/Approval.html
@@ -17,18 +17,15 @@ specific language governing permissions and limitations
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <head><title></title></head>
- <body>
- <wicket:panel>
- <div wicket:id="propView">
- <span wicket:id="value">[value]</span>
- </div>
+ <wicket:panel>
+ <div wicket:id="propView">
+ <span wicket:id="value">[value]</span>
+ </div>
- <div style="margin: 20px 0">
- <a href="#" alt="user details" class="btn btn-primary btn-circle btn-lg" wicket:id="userDetails" wicket:message="title:userDetails">
- <i class="glyphicon glyphicon-eye-open"></i>
- </a>
- </div>
- </wicket:panel>
- </body>
+ <div style="margin: 20px 0">
+ <a href="#" alt="user details" class="btn btn-primary btn-circle btn-lg" wicket:id="userDetails" wicket:message="title:userDetails">
+ <i class="glyphicon glyphicon-eye-open"></i>
+ </a>
+ </div>
+ </wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/approvals/ApprovalDetails.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/approvals/ApprovalDetails.html b/client/console/src/main/resources/org/apache/syncope/client/console/approvals/ApprovalDetails.html
index fc22ba2..1de2361 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/approvals/ApprovalDetails.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/approvals/ApprovalDetails.html
@@ -17,10 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <head><title></title></head>
- <body>
- <wicket:panel>
- <span wicket:id="wizard"/>
- </wicket:panel>
- </body>
+ <wicket:panel>
+ <span wicket:id="wizard"/>
+ </wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_pt_BR.properties
index bda2b2e..0e0dc0a 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/reports/ReportDirectoryPanel_pt_BR.properties
@@ -15,7 +15,7 @@
# specific language governing permissions and limitations
# under the License.
profile=Profilo
-executions=Esecuzioni
+executions=Execu\u00e7\u00e3o
title=Reports
name=Report
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/tasks/CrontabPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/CrontabPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/CrontabPanel.html
index 241141d..abb6be9 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/CrontabPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/CrontabPanel.html
@@ -17,21 +17,18 @@ specific language governing permissions and limitations
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <head><title></title></head>
- <body>
- <wicket:panel>
- <label for="cron"><wicket:message key="cron"/></label>
- <div id="schedule" class="form-group">
- <span wicket:id="seconds"/>
- <span wicket:id="minutes"/>
- <span wicket:id="hours"/>
- <span wicket:id="daysOfMonth"/>
- <span wicket:id="months"/>
- <span wicket:id="daysOfWeek"/>
- </div>
- <div id="templates" class="form-group">
- <span wicket:id="cronTemplateChooser"/>
- </div>
- </wicket:panel>
- </body>
+ <wicket:panel>
+ <label for="cron"><wicket:message key="cron"/></label>
+ <div id="schedule" class="form-group">
+ <span wicket:id="seconds"/>
+ <span wicket:id="minutes"/>
+ <span wicket:id="hours"/>
+ <span wicket:id="daysOfMonth"/>
+ <span wicket:id="months"/>
+ <span wicket:id="daysOfWeek"/>
+ </div>
+ <div id="templates" class="form-group">
+ <span wicket:id="cronTemplateChooser"/>
+ </div>
+ </wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/tasks/ExecMessage.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/ExecMessage.html b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/ExecMessage.html
index eb79456..1a513d6 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/ExecMessage.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/ExecMessage.html
@@ -17,14 +17,11 @@ specific language governing permissions and limitations
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <head><title></title></head>
- <body>
- <wicket:panel>
- <div id="dialog">
- <pre wicket:id="message">
+ <wicket:panel>
+ <div id="dialog">
+ <pre wicket:id="message">
[Task execution's message to show]
- </pre>
- </div>
- </wicket:panel>
- </body>
+ </pre>
+ </div>
+ </wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationMailBody.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationMailBody.html b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationMailBody.html
new file mode 100644
index 0000000..3d60c98
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationMailBody.html
@@ -0,0 +1,26 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:panel>
+ <div id="dialog">
+ <pre wicket:id="body">
+ </pre>
+ </div>
+ </wicket:panel>
+</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationMailBodyDetails.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationMailBodyDetails.html b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationMailBodyDetails.html
new file mode 100644
index 0000000..f1118bf
--- /dev/null
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationMailBodyDetails.html
@@ -0,0 +1,23 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you 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.
+-->
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:panel>
+ <span wicket:id="body"></span>
+ </wicket:panel>
+</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.properties
index 3fa8a2c..868ff4f 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel.properties
@@ -14,4 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-task.view=Notifications with subject '${right.subject}'
+task.view=Executions
+content={0} Content
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_it.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_it.properties b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_it.properties
index 03249fb..7a1958e 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_it.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_it.properties
@@ -14,4 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-task.view=Notifica con oggetto '${right.subject}'
+task.view=Esecuzioni
+content=Contenuto {0}
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_pt_BR.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_pt_BR.properties b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_pt_BR.properties
index 3fa8a2c..ee845b7 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_pt_BR.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_pt_BR.properties
@@ -14,4 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-task.view=Notifications with subject '${right.subject}'
+task.view=Execu\u00e7\u00e3o
+content=Conte\u00fado {0}
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_ru.properties
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_ru.properties b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_ru.properties
index 916473a..438046b 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_ru.properties
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/NotificationTaskDirectoryPanel_ru.properties
@@ -14,4 +14,5 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-task.view=\u0423\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u044f \u0441 \u0442\u0435\u043c\u043e\u0439 '${right.subject}'
+task.view=\u0417\u0430\u043f\u0443\u0441\u043a\u0438 \u0437\u0430\u0434\u0430\u0447\u0438
+content=\u0421\u043e\u0434\u0435\u0440\u0436\u0438\u043c\u043e\u0435 {0}
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PushTaskFilters.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PushTaskFilters.html b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PushTaskFilters.html
index cd8993b..2208e47 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PushTaskFilters.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PushTaskFilters.html
@@ -17,12 +17,9 @@ specific language governing permissions and limitations
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <head><title></title></head>
- <body>
- <wicket:panel>
- <span wicket:id="filters">
- <div wicket:id="filters"/>
- </span>
- </wicket:panel>
- </body>
+ <wicket:panel>
+ <span wicket:id="filters">
+ <div wicket:id="filters"/>
+ </span>
+ </wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder$Schedule.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder$Schedule.html b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder$Schedule.html
index 99e853e..dad9871 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder$Schedule.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/SchedTaskWizardBuilder$Schedule.html
@@ -17,10 +17,7 @@ specific language governing permissions and limitations
under the License.
-->
<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
- <head><title></title></head>
- <body>
- <wicket:panel>
- <span wicket:id="schedule"/>
- </wicket:panel>
- </body>
+ <wicket:panel>
+ <span wicket:id="schedule"/>
+ </wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html
----------------------------------------------------------------------
diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html
index 9903f98..2106460 100644
--- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html
+++ b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionLinksPanel.html
@@ -48,8 +48,8 @@ under the License.
<span wicket:id="panelTemplate">[plus]</span>
<span wicket:id="panelTypeExtensions">[plus]</span>
<span wicket:id="panelFoEdit">[plus]</span>
- <span wicket:id="panelHtmlEdit">[plus]</span>
- <span wicket:id="panelTextEdit">[plus]</span>
+ <span wicket:id="panelHtml">[plus]</span>
+ <span wicket:id="panelText">[plus]</span>
<span wicket:id="panelCompose">[plus]</span>
<span wicket:id="panelLayoutEdit">[plus]</span>
<span wicket:id="panelExport">[plus]</span>
@@ -154,12 +154,12 @@ under the License.
<a href="#" wicket:id="foEditLink" class="btn"><i id="actionLink" class="fa fa-file-pdf-o" alt="fo edit icon" title="FO Edit"></i></a>
</wicket:fragment>
- <wicket:fragment wicket:id="fragmentHtmlEdit">
- <a href="#" wicket:id="htmlEditLink" class="btn"><i id="actionLink" class="fa fa-file-code-o" alt="html edit icon" title="HTML Edit"></i></a>
+ <wicket:fragment wicket:id="fragmentHtml">
+ <a href="#" wicket:id="htmlLink" class="btn"><i id="actionLink" class="fa fa-file-code-o" alt="html icon" title="HTML"></i></a>
</wicket:fragment>
- <wicket:fragment wicket:id="fragmentTextEdit">
- <a href="#" wicket:id="textEditLink" class="btn"><i id="actionLink" class="fa fa-file-text-o" alt="text edit icon" title="TEXT Edit"></i></a>
+ <wicket:fragment wicket:id="fragmentText">
+ <a href="#" wicket:id="textLink" class="btn"><i id="actionLink" class="fa fa-file-text-o" alt="text icon" title="TEXT"></i></a>
</wicket:fragment>
<wicket:fragment wicket:id="fragmentCompose">
http://git-wip-us.apache.org/repos/asf/syncope/blob/18ac4512/fit/core-reference/src/test/java/org/apache/syncope/fit/console/NotificationsITCase.java
----------------------------------------------------------------------
diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/NotificationsITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/NotificationsITCase.java
index 487a0c6..9e8a931 100644
--- a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/NotificationsITCase.java
+++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/NotificationsITCase.java
@@ -154,7 +154,7 @@ public class NotificationsITCase extends AbstractConsoleITCase {
+ "content:tasks:firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:"
+ "groupForm:checkgroup:dataTable", "Notification for SYNCOPE-81");
- TESTER.clickLink(result.getPageRelativePath() + ":cells:8:cell:panelExecute:executeLink");
+ TESTER.clickLink(result.getPageRelativePath() + ":cells:9:cell:panelExecute:executeLink");
TESTER.assertInfoMessages("Operation executed successfully");
TESTER.cleanupFeedbackMessages();
@@ -171,10 +171,10 @@ public class NotificationsITCase extends AbstractConsoleITCase {
+ "content:tasks:firstLevelContainer:first:container:content:searchContainer:resultTable:tablePanel:"
+ "groupForm:checkgroup:dataTable", "Notification for SYNCOPE-81");
- TESTER.clickLink(result.getPageRelativePath() + ":cells:8:cell:panelView:viewLink");
+ TESTER.clickLink(result.getPageRelativePath() + ":cells:9:cell:panelView:viewLink");
TESTER.assertLabel("body:content:tabbedPanel:panel:outerObjectsRepeater:3:outer:form:content:tasks:"
- + "secondLevelContainer:title", "Notifications with subject 'Notification for SYNCOPE-81'");
+ + "secondLevelContainer:title", "Executions");
TESTER.clickLink("body:content:tabbedPanel:panel:outerObjectsRepeater:3:outer:form:content:tasks:"
+ "secondLevelContainer:back");