From e3aee8e1901482279e75f0f0e441138bc7d2c8de Mon Sep 17 00:00:00 2001 From: Tobias Feldmann <t.feldmann@adito.de> Date: Fri, 14 Dec 2018 10:12:23 +0100 Subject: [PATCH] small fixes --- .../_____LANGUAGE_EXTRA.aod | 111 +++++++++++++++++ .../_____LANGUAGE_de/_____LANGUAGE_de.aod | 112 ++++++++++++++++++ .../_____LANGUAGE_en/_____LANGUAGE_en.aod | 111 +++++++++++++++++ neonView/OrgAttr_view/OrgAttr_view.aod | 4 +- .../SalesprojectPreview_view.aod | 5 +- 5 files changed, 339 insertions(+), 4 deletions(-) diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod index f0b76ea105..77ab27a5df 100644 --- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod +++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod @@ -1143,6 +1143,117 @@ <entry> <key>Price Politics</key> </entry> + <entry> + <key>Further informations</key> + </entry> + <entry> + <key>Ab hier voerst ignorieren! Fehlende Funktionalität</key> + </entry> + <entry> + <key>Historie</key> + </entry> + <entry> + <key>asdf</key> + </entry> + <entry> + <key>Offene Vertriebsprojekte</key> + </entry> + <entry> + <key>Kontakt</key> + </entry> + <entry> + <key>Vertriebsprojekte</key> + </entry> + <entry> + <key>Social</key> + </entry> + <entry> + <key>Kontakte</key> + </entry> + <entry> + <key>Vertrieb</key> + </entry> + <entry> + <key>Produkt</key> + </entry> + <entry> + <key>Vertrag</key> + </entry> + <entry> + <key>Dataset</key> + </entry> + <entry> + <key>ADITO FB Feed</key> + </entry> + <entry> + <key>Vertriebsprojekt</key> + </entry> + <entry> + <key>Neues von ADITO</key> + </entry> + <entry> + <key>Detail</key> + </entry> + <entry> + <key>Facebook Feed</key> + </entry> + <entry> + <key>Group1</key> + </entry> + <entry> + <key>Group2</key> + </entry> + <entry> + <key>Details</key> + </entry> + <entry> + <key>Historien</key> + </entry> + <entry> + <key>Meine Historien</key> + </entry> + <entry> + <key>Verträge</key> + </entry> + <entry> + <key>Prices</key> + </entry> + <entry> + <key>Twitter</key> + </entry> + <entry> + <key>Firmen</key> + </entry> + <entry> + <key>Connections</key> + </entry> + <entry> + <key>Object</key> + </entry> + <entry> + <key>Kontaktmanagement</key> + </entry> + <entry> + <key>Angebote</key> + </entry> + <entry> + <key>Produkte</key> + </entry> + <entry> + <key>Attributes</key> + </entry> + <entry> + <key>Facebook</key> + </entry> + <entry> + <key>Twitter Timeline</key> + </entry> + <entry> + <key>Versendete Angebote</key> + </entry> + <entry> + <key>weitere Informationen</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 68e686b8d9..83aeb9ab78 100644 --- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod +++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod @@ -1428,6 +1428,118 @@ <entry> <key>Price Politics</key> </entry> + <entry> + <key>Further informations</key> + <value>Weitere Informationen</value> + </entry> + <entry> + <key>Ab hier voerst ignorieren! Fehlende Funktionalität</key> + </entry> + <entry> + <key>Historie</key> + </entry> + <entry> + <key>asdf</key> + </entry> + <entry> + <key>Offene Vertriebsprojekte</key> + </entry> + <entry> + <key>Kontakt</key> + </entry> + <entry> + <key>Vertriebsprojekte</key> + </entry> + <entry> + <key>Social</key> + </entry> + <entry> + <key>Kontakte</key> + </entry> + <entry> + <key>Vertrieb</key> + </entry> + <entry> + <key>Produkt</key> + </entry> + <entry> + <key>Vertrag</key> + </entry> + <entry> + <key>Dataset</key> + </entry> + <entry> + <key>ADITO FB Feed</key> + </entry> + <entry> + <key>Vertriebsprojekt</key> + </entry> + <entry> + <key>Neues von ADITO</key> + </entry> + <entry> + <key>Detail</key> + </entry> + <entry> + <key>Facebook Feed</key> + </entry> + <entry> + <key>Group1</key> + </entry> + <entry> + <key>Group2</key> + </entry> + <entry> + <key>Details</key> + </entry> + <entry> + <key>Historien</key> + </entry> + <entry> + <key>Meine Historien</key> + </entry> + <entry> + <key>Verträge</key> + </entry> + <entry> + <key>Prices</key> + </entry> + <entry> + <key>Twitter</key> + </entry> + <entry> + <key>Firmen</key> + </entry> + <entry> + <key>Connections</key> + </entry> + <entry> + <key>Object</key> + </entry> + <entry> + <key>Kontaktmanagement</key> + </entry> + <entry> + <key>Angebote</key> + </entry> + <entry> + <key>Produkte</key> + </entry> + <entry> + <key>Attributes</key> + </entry> + <entry> + <key>Facebook</key> + </entry> + <entry> + <key>Twitter Timeline</key> + </entry> + <entry> + <key>Versendete Angebote</key> + </entry> + <entry> + <key>weitere Informationen</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod index 7f66dfd832..9ccbd8aed0 100644 --- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod +++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod @@ -1158,6 +1158,117 @@ <entry> <key>Price Politics</key> </entry> + <entry> + <key>Further informations</key> + </entry> + <entry> + <key>Ab hier voerst ignorieren! Fehlende Funktionalität</key> + </entry> + <entry> + <key>Historie</key> + </entry> + <entry> + <key>asdf</key> + </entry> + <entry> + <key>Offene Vertriebsprojekte</key> + </entry> + <entry> + <key>Kontakt</key> + </entry> + <entry> + <key>Vertriebsprojekte</key> + </entry> + <entry> + <key>Social</key> + </entry> + <entry> + <key>Kontakte</key> + </entry> + <entry> + <key>Vertrieb</key> + </entry> + <entry> + <key>Produkt</key> + </entry> + <entry> + <key>Vertrag</key> + </entry> + <entry> + <key>Dataset</key> + </entry> + <entry> + <key>ADITO FB Feed</key> + </entry> + <entry> + <key>Vertriebsprojekt</key> + </entry> + <entry> + <key>Neues von ADITO</key> + </entry> + <entry> + <key>Detail</key> + </entry> + <entry> + <key>Facebook Feed</key> + </entry> + <entry> + <key>Group1</key> + </entry> + <entry> + <key>Group2</key> + </entry> + <entry> + <key>Details</key> + </entry> + <entry> + <key>Historien</key> + </entry> + <entry> + <key>Meine Historien</key> + </entry> + <entry> + <key>Verträge</key> + </entry> + <entry> + <key>Prices</key> + </entry> + <entry> + <key>Twitter</key> + </entry> + <entry> + <key>Firmen</key> + </entry> + <entry> + <key>Connections</key> + </entry> + <entry> + <key>Object</key> + </entry> + <entry> + <key>Kontaktmanagement</key> + </entry> + <entry> + <key>Angebote</key> + </entry> + <entry> + <key>Produkte</key> + </entry> + <entry> + <key>Attributes</key> + </entry> + <entry> + <key>Facebook</key> + </entry> + <entry> + <key>Twitter Timeline</key> + </entry> + <entry> + <key>Versendete Angebote</key> + </entry> + <entry> + <key>weitere Informationen</key> + </entry> </keyValueMap> <font name="Dialog" style="0" size="11" /> </language> diff --git a/neonView/OrgAttr_view/OrgAttr_view.aod b/neonView/OrgAttr_view/OrgAttr_view.aod index f33fad0fa6..59140ae9a1 100644 --- a/neonView/OrgAttr_view/OrgAttr_view.aod +++ b/neonView/OrgAttr_view/OrgAttr_view.aod @@ -5,9 +5,9 @@ TODO: diese Felder werden später als Attribute implementiert</description> <majorModelMode>DISTRIBUTED</majorModelMode> <layout> - <boxLayout> + <noneLayout> <name>layout</name> - </boxLayout> + </noneLayout> </layout> <children> <genericViewTemplate> diff --git a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod index 08c290b887..f59d42bff4 100644 --- a/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod +++ b/neonView/SalesprojectPreview_view/SalesprojectPreview_view.aod @@ -16,7 +16,8 @@ </cardViewTemplate> <genericViewTemplate> <name>SalesprojectInfo_template</name> - <drawerCaption></drawerCaption> + <showDrawer v="true" /> + <drawerCaption>Details</drawerCaption> <entityField>#ENTITY</entityField> <fields> <entityFieldLink> @@ -56,7 +57,7 @@ <genericViewTemplate> <name>SalesprojectDescription_template</name> <showDrawer v="true" /> - <drawerCaption>Information</drawerCaption> + <drawerCaption>Further informations</drawerCaption> <entityField>#ENTITY</entityField> <fields> <entityFieldLink> -- GitLab