From b4ba96a61fa4c6a8f9d639d5b20d7b6cbf0f20b0 Mon Sep 17 00:00:00 2001 From: Romain Courteaud <romain@nexedi.com> Date: Mon, 11 Dec 2017 13:37:17 +0000 Subject: [PATCH] [erp5_hal_json_style] Improve dialog confirmation message layout Display it on one line --- .../Base_viewCloneDocumentDialog.xml | 23 ++++++++++++++++++- .../your_warning.xml | 6 ++--- .../Base_viewDeleteDocumentDialog.xml | 23 ++++++++++++++++++- .../your_warning.xml | 6 ++--- 4 files changed, 50 insertions(+), 8 deletions(-) diff --git a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewCloneDocumentDialog.xml b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewCloneDocumentDialog.xml index 28ac27bbcc..72310401b7 100644 --- a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewCloneDocumentDialog.xml +++ b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewCloneDocumentDialog.xml @@ -62,6 +62,9 @@ <value> <list> <string>left</string> + <string>right</string> + <string>center</string> + <string>bottom</string> </list> </value> </item> @@ -70,7 +73,13 @@ <value> <dictionary> <item> - <key> <string>left</string> </key> + <key> <string>bottom</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>center</string> </key> <value> <list> <string>your_warning</string> @@ -79,6 +88,18 @@ </list> </value> </item> + <item> + <key> <string>left</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>right</string> </key> + <value> + <list/> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewCloneDocumentDialog/your_warning.xml b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewCloneDocumentDialog/your_warning.xml index ee0f4406ba..a4321edf63 100644 --- a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewCloneDocumentDialog/your_warning.xml +++ b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewCloneDocumentDialog/your_warning.xml @@ -205,11 +205,11 @@ </item> <item> <key> <string>css_class</string> </key> - <value> <string></string> </value> + <value> <string>invisible</string> </value> </item> <item> <key> <string>default</string> </key> - <value> <string></string> </value> + <value> <string>Do you want to clone this document?</string> </value> </item> <item> <key> <string>description</string> </key> @@ -257,7 +257,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Do you want to clone this document:</string> </value> + <value> <string>Confirmation message</string> </value> </item> <item> <key> <string>unicode</string> </key> diff --git a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewDeleteDocumentDialog.xml b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewDeleteDocumentDialog.xml index 47b59a4979..64e71e8e92 100644 --- a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewDeleteDocumentDialog.xml +++ b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewDeleteDocumentDialog.xml @@ -62,6 +62,9 @@ <value> <list> <string>left</string> + <string>right</string> + <string>center</string> + <string>bottom</string> </list> </value> </item> @@ -70,7 +73,13 @@ <value> <dictionary> <item> - <key> <string>left</string> </key> + <key> <string>bottom</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>center</string> </key> <value> <list> <string>your_warning</string> @@ -80,6 +89,18 @@ </list> </value> </item> + <item> + <key> <string>left</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>right</string> </key> + <value> + <list/> + </value> + </item> </dictionary> </value> </item> diff --git a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewDeleteDocumentDialog/your_warning.xml b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewDeleteDocumentDialog/your_warning.xml index ae73a1ec08..81649e667b 100644 --- a/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewDeleteDocumentDialog/your_warning.xml +++ b/bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/Base_viewDeleteDocumentDialog/your_warning.xml @@ -205,11 +205,11 @@ </item> <item> <key> <string>css_class</string> </key> - <value> <string></string> </value> + <value> <string>invisible</string> </value> </item> <item> <key> <string>default</string> </key> - <value> <string></string> </value> + <value> <string>Do you want to delete this document?</string> </value> </item> <item> <key> <string>description</string> </key> @@ -257,7 +257,7 @@ </item> <item> <key> <string>title</string> </key> - <value> <string>Do you want to Delete this document:</string> </value> + <value> <string>Confirmation message</string> </value> </item> <item> <key> <string>unicode</string> </key> -- 2.30.9