diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index cd1d779266cd3980aa3fcf281906dd9b624ae1b3..9ec915acd00b8d66111cdf7da1e56e5bfeb04737 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -4866,6 +4866,12 @@ <entry> <key>Testing</key> </entry> + <entry> + <key>Save settings</key> + </entry> + <entry> + <key>Test email</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> <sqlModels> diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod index 5e0010607c73fa7785f1ff77d2fb7ae1918534bf..541e271bab2cd6f8412a44e614c0086cf03c035f 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -74,6 +74,10 @@ <key>NONE</key> <value>keine</value> </entry> + <entry> + <key>Recipient status</key> + <value>Empfängerstatus</value> + </entry> <entry> <key>LOW</key> <value>gering</value> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index bc01304f1d2921701a47ee0374cca9fdb0107c37..27d3974f75c4010a650e63802f5f7ff4b585ce01 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -4915,6 +4915,12 @@ <entry> <key>Testing</key> </entry> + <entry> + <key>Save settings</key> + </entry> + <entry> + <key>Test email</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/neonContext/BulkMail/BulkMail.aod b/neonContext/BulkMail/BulkMail.aod index ae4fd6a6791f4b9330470b0107eb1069f9c818f9..b6e2ea9a7a328a517cbb068c11196aec2e4d4826 100644 --- a/neonContext/BulkMail/BulkMail.aod +++ b/neonContext/BulkMail/BulkMail.aod @@ -29,5 +29,9 @@ <name>6b057fb0-94ac-4bca-88b2-c97fdfcf9d6e</name> <view>BulkMailContent_view</view> </neonViewReference> + <neonViewReference> + <name>fb5bc6ed-d3c9-45ef-a0c7-17b190e3ce74</name> + <view>BulkMailMainPreview_view</view> + </neonViewReference> </references> </neonContext> diff --git a/neonView/BulkMailMainPreview_view/BulkMailMainPreview_view.aod b/neonView/BulkMailMainPreview_view/BulkMailMainPreview_view.aod new file mode 100644 index 0000000000000000000000000000000000000000..27aab06baf390b03d2bb4a685c0cfe31b604f13a --- /dev/null +++ b/neonView/BulkMailMainPreview_view/BulkMailMainPreview_view.aod @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="UTF-8"?> +<neonView xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.1.2" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/neonView/1.1.2"> + <name>BulkMailMainPreview_view</name> + <majorModelMode>DISTRIBUTED</majorModelMode> + <layout> + <headerFooterLayout> + <name>layout</name> + <footer>e8f0200f-3447-4196-8aba-f2966e83689a</footer> + </headerFooterLayout> + </layout> + <children> + <neonViewReference> + <name>2a1f719c-1838-4f30-8fb7-27cd7bbf16ee</name> + <entityField>#ENTITY</entityField> + <view>BulkMailPreview_view</view> + </neonViewReference> + <neonViewReference> + <name>e8f0200f-3447-4196-8aba-f2966e83689a</name> + <entityField>RecipientStatusChart</entityField> + <view>BulkMailStatusChart_view</view> + </neonViewReference> + </children> +</neonView> diff --git a/neonView/BulkMailMain_view/BulkMailMain_view.aod b/neonView/BulkMailMain_view/BulkMailMain_view.aod index 0f6a248d7ebcb16708fb96898fab4572dfd5fcc3..d5529d583077bcfee3707cf20cca98d2b8928d40 100644 --- a/neonView/BulkMailMain_view/BulkMailMain_view.aod +++ b/neonView/BulkMailMain_view/BulkMailMain_view.aod @@ -5,15 +5,10 @@ <layout> <masterSlaveLayout> <name>layout</name> - <master>9f5528f7-230e-42e5-8831-66bdee9a9588</master> + <master>3f7fc7d4-7cda-428c-8acb-364addc5239c</master> </masterSlaveLayout> </layout> <children> - <neonViewReference> - <name>9f5528f7-230e-42e5-8831-66bdee9a9588</name> - <entityField>#ENTITY</entityField> - <view>BulkMailPreview_view</view> - </neonViewReference> <neonViewReference> <name>8be4ed02-1c54-41d0-9bba-3b785346a550</name> <entityField>Recipients</entityField> @@ -29,5 +24,10 @@ <entityField>LogHistories</entityField> <view>LogHistoryFilter_view</view> </neonViewReference> + <neonViewReference> + <name>3f7fc7d4-7cda-428c-8acb-364addc5239c</name> + <entityField>#ENTITY</entityField> + <view>BulkMailMainPreview_view</view> + </neonViewReference> </children> </neonView> diff --git a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod index a253dad73d0189accb53314fdaf9a03ff7d204bb..a9bdee7f245a104ebe54b6a5fd5d47fbaa9f6189 100644 --- a/neonView/BulkMailPreview_view/BulkMailPreview_view.aod +++ b/neonView/BulkMailPreview_view/BulkMailPreview_view.aod @@ -6,7 +6,6 @@ <headerFooterLayout> <name>layout</name> <header>Card</header> - <footer>6def3a7a-c9a0-4f2d-a36f-e53a631d8261</footer> </headerFooterLayout> </layout> <children> @@ -65,10 +64,5 @@ </entityFieldLink> </fields> </genericViewTemplate> - <neonViewReference> - <name>6def3a7a-c9a0-4f2d-a36f-e53a631d8261</name> - <entityField>RecipientStatusChart</entityField> - <view>BulkMailStatusChart_view</view> - </neonViewReference> </children> </neonView>