diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 0da85faf6dd0f753f0d8a6174c472ec3e09d6d8e..e7ce9299f36d086a657ad281cc25f36c4f410872 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -18842,7 +18842,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="0" />
+ <auditMode v="1" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
@@ -18860,8 +18860,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>${WEBLINK_SCORE}</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
@@ -18890,6 +18897,12 @@
<documentation></documentation>
<title></title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>DATE_NEW</name>
@@ -18944,8 +18957,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>URL</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>USER_EDIT</name>
@@ -18972,8 +18992,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Placeholder</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>WORKFLOWPROCESSDEFINITION_KEY</name>
@@ -18986,8 +19013,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Workflow</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ISREDIRECT</name>
@@ -19000,8 +19034,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Redirect</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>WORKFLOWSIGNAL_NAME</name>
@@ -19014,8 +19055,15 @@
<isUnique v="false" />
<index v="false" />
<documentation></documentation>
- <title></title>
+ <title>Signal</title>
<description></description>
+ <customProperties>
+ <customBooleanProperty>
+ <name>log</name>
+ <global v="false" />
+ <property v="true" />
+ </customBooleanProperty>
+ </customProperties>
</entityFieldDb>
<entityFieldDb>
<name>ACTION_TYPE</name>
diff --git a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
index 421e4597dd6cb4fdfca1e48ca16a787c809585b8..70f7df7f4ad5bf2715a2454845ee7abdbc065921 100644
--- a/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
+++ b/entity/BulkMailRecipient_entity/BulkMailRecipient_entity.aod
@@ -154,6 +154,7 @@
<entityActionGroup>
<name>testRunActions</name>
<title>Test Run Actions</title>
+ <iconId>VAADIN:PAPERPLANE_O</iconId>
<stateProcess>%aditoprj%/entity/BulkMailRecipient_entity/entityfields/testrunactions/stateProcess.js</stateProcess>
<children>
<entityActionField>
diff --git a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
index 68c3c1099f025c5435770d12262c0624b1e2d767..63924735b1974f4ff7dfebb2bc68e60d6a548c57 100644
--- a/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
+++ b/entity/BulkMailTesting_entity/BulkMailTesting_entity.aod
@@ -53,7 +53,7 @@
<name>testMail</name>
<title>Test email</title>
<onActionProcess>%aditoprj%/entity/BulkMailTesting_entity/entityfields/testmail/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CLIPBOARD_CHECK</iconId>
+ <iconId>VAADIN:PAPERPLANE_O</iconId>
</entityActionField>
<entityProvider>
<name>#PROVIDER_AGGREGATES</name>
diff --git a/entity/BulkMail_entity/BulkMail_entity.aod b/entity/BulkMail_entity/BulkMail_entity.aod
index 733499d5e6440d8fd26c4721ec19ff966bf7336f..7d370947a623fbbc3218d72e73046c7451c00865 100644
--- a/entity/BulkMail_entity/BulkMail_entity.aod
+++ b/entity/BulkMail_entity/BulkMail_entity.aod
@@ -161,6 +161,7 @@
<entityParameter>
<name>tablenames_param</name>
<valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
+ <documentation>%aditoprj%/entity/BulkMail_entity/entityfields/loghistories/children/tablenames_param/documentation.adoc</documentation>
</entityParameter>
</children>
</entityConsumer>
@@ -532,6 +533,36 @@
<fieldName>#PROVIDER</fieldName>
</dependency>
</entityConsumer>
+ <entityField>
+ <name>ISOLANGUAGE</name>
+ <title>Language</title>
+ <consumer>Languages</consumer>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/isolanguage/valueProcess.js</valueProcess>
+ <displayValueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess>
+ </entityField>
+ <entityField>
+ <name>dateLastEdit</name>
+ <title>Edited on</title>
+ <contentType>DATE</contentType>
+ </entityField>
+ <entityField>
+ <name>userLastEdit</name>
+ <title>Editor</title>
+ <contentType>TEXT</contentType>
+ <groupable v="true" />
+ </entityField>
+ <entityField>
+ <name>BULKMAIL_OBJECTTYPE</name>
+ <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmail_objecttype/valueProcess.js</valueProcess>
+ </entityField>
+ <entityConsumer>
+ <name>Languages</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>Language_entity</entityName>
+ <fieldName>ISO3Name</fieldName>
+ </dependency>
+ </entityConsumer>
<entityActionGroup>
<name>observeActionoGroup</name>
<children>
@@ -571,12 +602,6 @@
<stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/stateProcess.js</stateProcess>
<tooltipProcess>%aditoprj%/entity/BulkMail_entity/entityfields/sendmail/tooltipProcess.js</tooltipProcess>
</entityActionField>
- <entityActionField>
- <name>testMail</name>
- <title>Test email</title>
- <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:CLIPBOARD_CHECK</iconId>
- </entityActionField>
<entityActionField>
<name>downloadTemplate</name>
<title>Download template</title>
@@ -604,6 +629,12 @@
<iconId>VAADIN:TOOLS</iconId>
<stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/newmosaicotemplate/stateProcess.js</stateProcess>
</entityActionField>
+ <entityActionField>
+ <name>testMail</name>
+ <title>Test email</title>
+ <onActionProcess>%aditoprj%/entity/BulkMail_entity/entityfields/testmail/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:PAPERPLANE_O</iconId>
+ </entityActionField>
<entityActionField>
<name>openAdminView</name>
<title>Open admin view</title>
@@ -611,36 +642,6 @@
<iconId>VAADIN:CURLY_BRACKETS</iconId>
<stateProcess>%aditoprj%/entity/BulkMail_entity/entityfields/openadminview/stateProcess.js</stateProcess>
</entityActionField>
- <entityField>
- <name>ISOLANGUAGE</name>
- <title>Language</title>
- <consumer>Languages</consumer>
- <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/isolanguage/valueProcess.js</valueProcess>
- <displayValueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/isolanguage/displayValueProcess.js</displayValueProcess>
- </entityField>
- <entityField>
- <name>dateLastEdit</name>
- <title>Edited on</title>
- <contentType>DATE</contentType>
- </entityField>
- <entityField>
- <name>userLastEdit</name>
- <title>Editor</title>
- <contentType>TEXT</contentType>
- <groupable v="true" />
- </entityField>
- <entityField>
- <name>BULKMAIL_OBJECTTYPE</name>
- <valueProcess>%aditoprj%/entity/BulkMail_entity/entityfields/bulkmail_objecttype/valueProcess.js</valueProcess>
- </entityField>
- <entityConsumer>
- <name>Languages</name>
- <dependency>
- <name>dependency</name>
- <entityName>Language_entity</entityName>
- <fieldName>ISO3Name</fieldName>
- </dependency>
- </entityConsumer>
<entityField>
<name>CAMPAIGN_ID</name>
<title>Campaign</title>
diff --git a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
index 8d752e3755b7dc4c2433777c54b289f5c57100a6..3fe8c57bec141b26cb1c10f0269ef400fa01e46c 100644
--- a/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
+++ b/entity/CampaignParticipant_entity/CampaignParticipant_entity.aod
@@ -171,7 +171,7 @@
<title>Update campaign step</title>
<onActionProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/onActionProcess.js</onActionProcess>
<isObjectAction v="false" />
- <iconId>NEON:GROUP_APPOINTMENT</iconId>
+ <iconId>VAADIN:FILE_TREE_SUB</iconId>
<state>AUTO</state>
<stateProcess>%aditoprj%/entity/CampaignParticipant_entity/entityfields/filterviewactiongroup/children/setsteptoparticipantselection/stateProcess.js</stateProcess>
<tooltip>Update campaign step</tooltip>
diff --git a/entity/CampaignStep_entity/CampaignStep_entity.aod b/entity/CampaignStep_entity/CampaignStep_entity.aod
index bbf180554c656100f88929c9f66e3bcae35d0b9d..e7053a5c96711f36b039d5b36996431848d4f7bd 100644
--- a/entity/CampaignStep_entity/CampaignStep_entity.aod
+++ b/entity/CampaignStep_entity/CampaignStep_entity.aod
@@ -344,7 +344,7 @@
<name>newCampaignStep</name>
<title>New step</title>
<onActionProcess>%aditoprj%/entity/CampaignStep_entity/entityfields/newcampaignstep/onActionProcess.js</onActionProcess>
- <iconId>NEON:GROUP_APPOINTMENT</iconId>
+ <iconId>VAADIN:FILE_TREE_SUB</iconId>
</entityActionField>
<entityParameter>
<name>predecessorstepId_param</name>
diff --git a/entity/Campaign_entity/Campaign_entity.aod b/entity/Campaign_entity/Campaign_entity.aod
index f35660d768204ecac37a730a700fc63dc880eab0..74cdbb1d533ef85d299420270bff5924b8a018a6 100644
--- a/entity/Campaign_entity/Campaign_entity.aod
+++ b/entity/Campaign_entity/Campaign_entity.aod
@@ -353,7 +353,7 @@
<name>newCampaignStep</name>
<title>New step</title>
<onActionProcess>%aditoprj%/entity/Campaign_entity/entityfields/newcampaignstep/onActionProcess.js</onActionProcess>
- <iconId>NEON:GROUP_APPOINTMENT</iconId>
+ <iconId>VAADIN:FILE_TREE_SUB</iconId>
</entityActionField>
<entityConsumer>
<name>CampaignAnalysisConsumer</name>
diff --git a/entity/MailLog_entity/MailLog_entity.aod b/entity/MailLog_entity/MailLog_entity.aod
index d11a302c48876f498a97e30720bbbe741e33095f..125056661935e1fdbfbcea4038d9d3997b1897e1 100644
--- a/entity/MailLog_entity/MailLog_entity.aod
+++ b/entity/MailLog_entity/MailLog_entity.aod
@@ -103,6 +103,7 @@
<isMenuAction v="true" />
<isObjectAction v="true" />
<selectionType>MULTI</selectionType>
+ <iconId>VAADIN:DOWNLOAD</iconId>
<tooltipProcess>%aditoprj%/entity/MailLog_entity/entityfields/recipientactions/children/downloademl/tooltipProcess.js</tooltipProcess>
</entityActionField>
</children>
diff --git a/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod b/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod
index 2c49610b8c55425f97cbd86bba7e78f36ee03d6e..c383fde4ead08761a0ef434c3febd2abee411964 100644
--- a/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod
+++ b/entity/MosaicoTemplate_entity/MosaicoTemplate_entity.aod
@@ -97,31 +97,6 @@
</entityParameter>
</children>
</entityConsumer>
- <entityActionField>
- <name>OpenInMosaico</name>
- <title>Open in mosaico</title>
- <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openinmosaico/onActionProcess.js</onActionProcess>
- <iconId>NEON:WRENCH</iconId>
- <tooltipProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openinmosaico/tooltipProcess.js</tooltipProcess>
- </entityActionField>
- <entityActionField>
- <name>CopyTemplate</name>
- <title>Copy template</title>
- <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/copytemplate/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:COPY</iconId>
- </entityActionField>
- <entityActionField>
- <name>newBulkMail</name>
- <title>Write bulk mail</title>
- <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/newbulkmail/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:AT</iconId>
- </entityActionField>
- <entityActionField>
- <name>newDocumentTemplate</name>
- <title>New document template</title>
- <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/newdocumenttemplate/onActionProcess.js</onActionProcess>
- <iconId>VAADIN:FILE_FONT</iconId>
- </entityActionField>
<entityParameter>
<name>CopyMosaicoTemplateIdParam</name>
<expose v="true" />
@@ -165,6 +140,31 @@
<mandatory v="true" />
<displayValueProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/category/displayValueProcess.js</displayValueProcess>
</entityField>
+ <entityActionField>
+ <name>newBulkMail</name>
+ <title>Write bulk mail</title>
+ <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/newbulkmail/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:AT</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>newDocumentTemplate</name>
+ <title>New document template</title>
+ <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/newdocumenttemplate/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:FILE_FONT</iconId>
+ </entityActionField>
+ <entityActionField>
+ <name>OpenInMosaico</name>
+ <title>Open in mosaico</title>
+ <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openinmosaico/onActionProcess.js</onActionProcess>
+ <iconId>NEON:WRENCH</iconId>
+ <tooltipProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openinmosaico/tooltipProcess.js</tooltipProcess>
+ </entityActionField>
+ <entityActionField>
+ <name>CopyTemplate</name>
+ <title>Copy template</title>
+ <onActionProcess>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/copytemplate/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:COPY</iconId>
+ </entityActionField>
<entityActionField>
<name>openAdminView</name>
<documentation>%aditoprj%/entity/MosaicoTemplate_entity/entityfields/openadminview/documentation.adoc</documentation>
diff --git a/entity/Weblink_entity/Weblink_entity.aod b/entity/Weblink_entity/Weblink_entity.aod
index ba40c32758c338e9b683a319b8a4e7aa3b00a991..b36de13a6fc0d53ac2be9c9025b68a17e54a0451 100644
--- a/entity/Weblink_entity/Weblink_entity.aod
+++ b/entity/Weblink_entity/Weblink_entity.aod
@@ -206,6 +206,28 @@
<title>Last Click</title>
<contentType>DATE</contentType>
</entityField>
+ <entityActionField>
+ <name>openAdminView</name>
+ <title>Open admin view</title>
+ <onActionProcess>%aditoprj%/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js</onActionProcess>
+ <iconId>VAADIN:CURLY_BRACKETS</iconId>
+ <stateProcess>%aditoprj%/entity/Weblink_entity/entityfields/openadminview/stateProcess.js</stateProcess>
+ </entityActionField>
+ <entityConsumer>
+ <name>LogHistories</name>
+ <dependency>
+ <name>dependency</name>
+ <entityName>LogHistory_entity</entityName>
+ <fieldName>LogHistoryProvider</fieldName>
+ </dependency>
+ <children>
+ <entityParameter>
+ <name>tablenames_param</name>
+ <valueProcess>%aditoprj%/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js</valueProcess>
+ <documentation>%aditoprj%/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/documentation.adoc</documentation>
+ </entityParameter>
+ </children>
+ </entityConsumer>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -304,6 +326,10 @@
<expression>%aditoprj%/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/datelastclick.value/expression.js</expression>
<isFilterable v="true" />
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>ACTION_TYPE.displayValue</name>
+ <expression>%aditoprj%/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/action_type.displayvalue/expression.js</expression>
+ </dbRecordFieldMapping>
</recordFieldMappings>
<linkInformation>
<linkInformation>
diff --git a/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js b/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..4e5484c53bfd9839d54f6b49a8fa1e5ee6bdc81b
--- /dev/null
+++ b/entity/Weblink_entity/entityfields/loghistories/children/tablenames_param/valueProcess.js
@@ -0,0 +1,9 @@
+import("system.vars");
+import("system.result");
+import("Context_lib");
+
+var res = [];
+res.push({id: vars.get("$field.WEBLINKID"), tableNames: ["WEBLINK"]});
+
+res = JSON.stringify(res);//currently only strings can be passed as param
+result.object(res);
\ No newline at end of file
diff --git a/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js b/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..b5f5e2e14661caad5c0c4eed47e503e2f5f4b2ba
--- /dev/null
+++ b/entity/Weblink_entity/entityfields/openadminview/onActionProcess.js
@@ -0,0 +1,11 @@
+import("system.vars");
+import("Context_lib");
+
+
+
+AdminViewUtils.open("WEBLINKID", [
+ ["DATE_NEW", vars.get("$field.DATE_NEW"), "DATE"],
+ ["DATE_EDIT", vars.get("$field.DATE_EDIT"), "DATE"],
+ ["USER_NEW", vars.get("$field.USER_NEW")],
+ ["USER_EDIT", vars.get("$field.USER_EDIT")]
+]);
\ No newline at end of file
diff --git a/entity/Weblink_entity/entityfields/openadminview/stateProcess.js b/entity/Weblink_entity/entityfields/openadminview/stateProcess.js
new file mode 100644
index 0000000000000000000000000000000000000000..38f2298db7304b4d44a15fbad7f720558c02da99
--- /dev/null
+++ b/entity/Weblink_entity/entityfields/openadminview/stateProcess.js
@@ -0,0 +1,4 @@
+import("Context_lib");
+import("system.result");
+
+result.string(AdminViewUtils.getActionState());
\ No newline at end of file
diff --git a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/action_type.displayvalue/expression.js b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/action_type.displayvalue/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..5f4573dc27b744862ef193913294c1d4f4607ff7
--- /dev/null
+++ b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/action_type.displayvalue/expression.js
@@ -0,0 +1,5 @@
+import("system.result");
+import("Keyword_lib");
+import("KeywordRegistry_basic");
+
+result.string(KeywordUtils.getResolvedTitleSqlPart($KeywordRegistry.weblinkActionType(), "WEBLINK.ACTION_TYPE"));
\ No newline at end of file
diff --git a/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlstchange.value/expression.js b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlstchange.value/expression.js
new file mode 100644
index 0000000000000000000000000000000000000000..6efa7822f9266fa11c60814281afd569b55d8be7
--- /dev/null
+++ b/entity/Weblink_entity/recordcontainers/db/recordfieldmappings/userlstchange.value/expression.js
@@ -0,0 +1,6 @@
+import("system.result");
+import("Sql_lib");
+
+var cond = SqlMaskingUtils.prototype.isNull("WEBLINK.USER_EDIT", "WEBLINK.USER_NEW");
+
+result.string(cond);
\ No newline at end of file
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 270cb8e30ae20e9b77e1476561e4732c5298e16c..e31f2b8927ac7342e34ad502f2817bd77e1da1b8 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -3479,6 +3479,10 @@
<key>Public Hand</key>
<value>Öffentliche Hand</value>
</entry>
+ <entry>
+ <key>Cost overview</key>
+ <value>Kostenübersicht</value>
+ </entry>
<entry>
<key>Create and open in editor</key>
<value>Erstellen und im Editor öffnen</value>
diff --git a/neonContext/WeblinkClick/WeblinkClick.aod b/neonContext/WeblinkClick/WeblinkClick.aod
index 06f55183587ce936ca90e2d452ecaf69070be639..a371f4c0fbd3d58ebe9e4beea7757f34a115725c 100644
--- a/neonContext/WeblinkClick/WeblinkClick.aod
+++ b/neonContext/WeblinkClick/WeblinkClick.aod
@@ -2,7 +2,6 @@
<neonContext xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.1" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonContext/1.1.1">
<name>WeblinkClick</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
- <filterView>WeblinkClickFilter_view</filterView>
<entity>WeblinkClick_entity</entity>
<references>
<neonViewReference>
diff --git a/neonView/BulkMailMain_view/BulkMailMain_view.aod b/neonView/BulkMailMain_view/BulkMailMain_view.aod
index f61ce7711775bb207d6550a34a03ae62b373f096..9c304416151c5c105193aef06b1545744836e178 100644
--- a/neonView/BulkMailMain_view/BulkMailMain_view.aod
+++ b/neonView/BulkMailMain_view/BulkMailMain_view.aod
@@ -29,11 +29,6 @@
<entityField>BulkMailTestRecipients</entityField>
<view>BulkMailTestRecipientFilter_view</view>
</neonViewReference>
- <neonViewReference>
- <name>9e1e1137-f0a8-45d5-8b91-6e36411be6f1</name>
- <entityField>Activities</entityField>
- <view>ActivityFilter_view</view>
- </neonViewReference>
<neonViewReference>
<name>cd8c44c9-209b-464c-a2e0-ce15720ab22e</name>
<entityField>MailLogs</entityField>
@@ -44,6 +39,11 @@
<entityField>Clicks</entityField>
<view>WeblinkClickFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>9e1e1137-f0a8-45d5-8b91-6e36411be6f1</name>
+ <entityField>Activities</entityField>
+ <view>ActivityFilter_view</view>
+ </neonViewReference>
<neonViewReference>
<name>49eb2dd2-0df9-4b58-bdae-f941200be8d9</name>
<entityField>LogHistories</entityField>
diff --git a/neonView/CampaignCostChart_view/CampaignCostChart_view.aod b/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
index b1b48e8a6a46f1d87accd01025ec8c81aa27eb6b..bd65911bca3075419355f7988ba99644f1b2abaa 100644
--- a/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
+++ b/neonView/CampaignCostChart_view/CampaignCostChart_view.aod
@@ -23,9 +23,11 @@
</neonDashletConfiguration>
</dashletConfigurations>
<layout>
- <boxLayout>
+ <drawerLayout>
<name>layout</name>
- </boxLayout>
+ <layoutCaption>Cost overview</layoutCaption>
+ <fixedDrawer v="true" />
+ </drawerLayout>
</layout>
<children>
<singleDataChartViewTemplate>
diff --git a/neonView/CampaignOverview_view/CampaignOverview_view.aod b/neonView/CampaignOverview_view/CampaignOverview_view.aod
index 8d48635c048e2ba5b327d5004610dc1ce02071ac..0e5711ecc2975192a5c3e4aa5666ec311f8179ae 100644
--- a/neonView/CampaignOverview_view/CampaignOverview_view.aod
+++ b/neonView/CampaignOverview_view/CampaignOverview_view.aod
@@ -7,7 +7,6 @@
<layout>
<boxLayout>
<name>layout</name>
- <direction>VERTICAL</direction>
</boxLayout>
</layout>
<children>
diff --git a/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod b/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod
index 10f2275e319aaa7c582324be30523367a902ecee..1c601dc689a85710bb9a4a2b7aed117bcea5b512 100644
--- a/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod
+++ b/neonView/CampaignParticipantChart_view/CampaignParticipantChart_view.aod
@@ -3,9 +3,11 @@
<name>CampaignParticipantChart_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <boxLayout>
+ <drawerLayout>
<name>layout</name>
- </boxLayout>
+ <layoutCaption>Participants</layoutCaption>
+ <fixedDrawer v="true" />
+ </drawerLayout>
</layout>
<children>
<multiDataChartViewTemplate>
diff --git a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
index fa93cc7f4c3a663c0b6efe7fc2185538b0a2d365..8318e45e12104638b95893faeb52066466e4b14d 100644
--- a/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
+++ b/neonView/CampaignStepsGantt_view/CampaignStepsGantt_view.aod
@@ -3,9 +3,11 @@
<name>CampaignStepsGantt_view</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<layout>
- <noneLayout>
+ <drawerLayout>
<name>layout</name>
- </noneLayout>
+ <layoutCaption>Stufen</layoutCaption>
+ <fixedDrawer v="true" />
+ </drawerLayout>
</layout>
<children>
<ganttViewTemplate>
diff --git a/neonView/WeblinkMain_view/WeblinkMain_view.aod b/neonView/WeblinkMain_view/WeblinkMain_view.aod
index d768584685d2a8d1d45a3c704c78100ae8174e1a..ba9e2d634fe194c11e2c52a5ed847d5dc1e47425 100644
--- a/neonView/WeblinkMain_view/WeblinkMain_view.aod
+++ b/neonView/WeblinkMain_view/WeblinkMain_view.aod
@@ -24,5 +24,10 @@
<entityField>Clicks</entityField>
<view>WeblinkClickFilter_view</view>
</neonViewReference>
+ <neonViewReference>
+ <name>ae528068-30ba-45b2-a052-a33cc9d76635</name>
+ <entityField>LogHistories</entityField>
+ <view>LogHistoryFilter_view</view>
+ </neonViewReference>
</children>
</neonView>