From 84b1eca6c87910b671b21810db3cdbb7b4499d56 Mon Sep 17 00:00:00 2001 From: vdumas Date: Wed, 12 Apr 2023 14:16:13 +0200 Subject: [PATCH] =?UTF-8?q?N=C2=B06159=20-=20Enhancement=20on=20mail=20not?= =?UTF-8?q?ification=20screen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/action.class.inc.php | 92 ++++++++++++++----- .../components/input/_input-set.scss | 2 +- css/backoffice/datamodel/_action.scss | 89 ++++++++++++++++++ css/backoffice/datamodel/_all.scss | 3 +- dictionaries/en.dictionary.itop.core.php | 71 +++++++------- dictionaries/fr.dictionary.itop.core.php | 70 +++++++------- 6 files changed, 234 insertions(+), 93 deletions(-) create mode 100644 css/backoffice/datamodel/_action.scss diff --git a/core/action.class.inc.php b/core/action.class.inc.php index 2540dcd19..603061da3 100644 --- a/core/action.class.inc.php +++ b/core/action.class.inc.php @@ -47,18 +47,33 @@ abstract class Action extends cmdbAbstractObject "key_type" => "autoincrement", "name_attcode" => "name", "complementary_name_attcode" => array('finalclass', 'description'), - "state_attcode" => "", + "state_attcode" => "status", "reconc_keys" => array('name'), "db_table" => "priv_action", "db_key_field" => "id", "db_finalclass_field" => "realclass", - 'style' => new ormStyle(null, null, null, null, null, '../images/icons/icons8-in-transit.svg'), + "style" => new ormStyle("ibo-dm-class--Action", "ibo-dm-class-alt--Action", "var(--ibo-dm-class--Action--main-color)", "var(--ibo-dm-class--Action--complementary-color)", null, '../images/icons/icons8-in-transit.svg'), ); MetaModel::Init_Params($aParams); //MetaModel::Init_InheritAttributes(); - MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values"=>null, "sql"=>"name", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values"=>null, "sql"=>"description", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values" => new ValueSetEnum(array('test' => 'Being tested', 'enabled' => 'In production', 'disabled' => 'Inactive')), "sql" => "status", "default_value" => "test", "is_null_allowed" => false, "depends_on" => array()))); + MetaModel::Init_AddAttribute(new AttributeString("name", array("allowed_values" => null, "sql" => "name", "default_value" => null, "is_null_allowed" => false, "depends_on" => array()))); + MetaModel::Init_AddAttribute(new AttributeString("description", array("allowed_values" => null, "sql" => "description", "default_value" => null, "is_null_allowed" => true, "depends_on" => array()))); +// MetaModel::Init_AddAttribute(new AttributeEnum("status", array("allowed_values" => new ValueSetEnum(array('test' => 'Being tested', 'enabled' => 'In production', 'disabled' => 'Inactive')), "sql" => "status", "default_value" => "test", "is_null_allowed" => false, "depends_on" => array()))); + + MetaModel::Init_AddAttribute(new AttributeEnum("status", array( + "allowed_values" => new ValueSetEnum(array('test' => 'Being tested', 'enabled' => 'In production', 'disabled' => 'Inactive')), + "styled_values" => [ + 'test' => new ormStyle('ibo-dm-enum--Action-status-test', 'ibo-dm-enum-alt--Action-status-test', 'var(--ibo-dm-enum--Action-status-test--main-color)', 'var(--ibo-dm-enum--Action-status-test--complementary-color)', null, null), + 'enabled' => new ormStyle('ibo-dm-enum--Action-status-enabled', 'ibo-dm-enum-alt--Action-status-enabled', 'var(--ibo-dm-enum--Action-status-enabled--main-color)', 'var(--ibo-dm-enum--Action-status-enabled--complementary-color)', 'fas fa-check', null), + 'disabled' => new ormStyle('ibo-dm-enum--Action-status-disabled', 'ibo-dm-enum-alt--Action-status-disabled', 'var(--ibo-dm-enum--Action-status-disabled--main-color)', 'var(--ibo-dm-enum--Action-status-disabled--complementary-color)', null, null), + ], + "display_style" => 'list', + "sql" => "status", + "default_value" => "test", + "is_null_allowed" => false, + "depends_on" => array(), + ))); + MetaModel::Init_AddAttribute(new AttributeLinkedSetIndirect("trigger_list", array("linked_class" => "lnkTriggerAction", "ext_key_to_me" => "action_id", "ext_key_to_remote" => "trigger_id", "allowed_values" => null, "count_min" => 0, "count_max" => 0, "depends_on" => array(), "display_style" => 'property'))); @@ -170,13 +185,13 @@ abstract class ActionNotification extends Action { $aParams = array ( - "category" => "grant_by_profile,core/cmdb", - "key_type" => "autoincrement", - "name_attcode" => "name", - "state_attcode" => "", - "reconc_keys" => array('name'), - "db_table" => "priv_action_notification", - "db_key_field" => "id", + "category" => "grant_by_profile,core/cmdb", + "key_type" => "autoincrement", + "name_attcode" => "name", + "state_attcode" => "", + "reconc_keys" => array('name'), + "db_table" => "priv_action_notification", + "db_key_field" => "id", "db_finalclass_field" => "", ); MetaModel::Init_Params($aParams); @@ -232,27 +247,56 @@ class ActionEmail extends ActionNotification MetaModel::Init_Params($aParams); MetaModel::Init_InheritAttributes(); - MetaModel::Init_AddAttribute(new AttributeEmailAddress("test_recipient", array("allowed_values"=>null, "sql"=>"test_recipient", "default_value"=>"", "is_null_allowed"=>true, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeEmailAddress("test_recipient", array("allowed_values" => null, "sql" => "test_recipient", "default_value" => "", "is_null_allowed" => true, "depends_on" => array()))); - MetaModel::Init_AddAttribute(new AttributeString("from", array("allowed_values"=>null, "sql"=>"from", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeString("from_label", array("allowed_values"=>null, "sql"=>"from_label", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeString("reply_to", array("allowed_values"=>null, "sql"=>"reply_to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeString("reply_to_label", array("allowed_values"=>null, "sql"=>"reply_to_label", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeOQL("to", array("allowed_values"=>null, "sql"=>"to", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeOQL("cc", array("allowed_values"=>null, "sql"=>"cc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeOQL("bcc", array("allowed_values"=>null, "sql"=>"bcc", "default_value"=>null, "is_null_allowed"=>true, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeTemplateString("subject", array("allowed_values"=>null, "sql"=>"subject", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeTemplateHTML("body", array("allowed_values"=>null, "sql"=>"body", "default_value"=>null, "is_null_allowed"=>false, "depends_on"=>array()))); - MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("allowed_values"=>new ValueSetEnum('low,normal,high'), "sql"=>"importance", "default_value"=>'normal', "is_null_allowed"=>false, "depends_on"=>array()))); + MetaModel::Init_AddAttribute(new AttributeString("from", array("allowed_values" => null, "sql" => "from", "default_value" => null, "is_null_allowed" => false, "depends_on" => array()))); + MetaModel::Init_AddAttribute(new AttributeString("from_label", array("allowed_values" => null, "sql" => "from_label", "default_value" => null, "is_null_allowed" => true, "depends_on" => array()))); + MetaModel::Init_AddAttribute(new AttributeString("reply_to", array("allowed_values" => null, "sql" => "reply_to", "default_value" => null, "is_null_allowed" => true, "depends_on" => array()))); + MetaModel::Init_AddAttribute(new AttributeString("reply_to_label", array("allowed_values" => null, "sql" => "reply_to_label", "default_value" => null, "is_null_allowed" => true, "depends_on" => array()))); + MetaModel::Init_AddAttribute(new AttributeOQL("to", array("allowed_values" => null, "sql" => "to", "default_value" => null, "is_null_allowed" => true, "depends_on" => array()))); + MetaModel::Init_AddAttribute(new AttributeOQL("cc", array("allowed_values" => null, "sql" => "cc", "default_value" => null, "is_null_allowed" => true, "depends_on" => array()))); + MetaModel::Init_AddAttribute(new AttributeOQL("bcc", array("allowed_values" => null, "sql" => "bcc", "default_value" => null, "is_null_allowed" => true, "depends_on" => array()))); + MetaModel::Init_AddAttribute(new AttributeTemplateString("subject", array("allowed_values" => null, "sql" => "subject", "default_value" => null, "is_null_allowed" => false, "depends_on" => array()))); + MetaModel::Init_AddAttribute(new AttributeTemplateHTML("body", array("allowed_values" => null, "sql" => "body", "default_value" => null, "is_null_allowed" => false, "depends_on" => array()))); + MetaModel::Init_AddAttribute(new AttributeEnum("importance", array("allowed_values" => new ValueSetEnum('low,normal,high'), "sql" => "importance", "default_value" => 'normal', "is_null_allowed" => false, "depends_on" => array()))); // Display lists // - Attributes to be displayed for the complete details MetaModel::Init_SetZListItems('details', array('name', 'description', 'status', 'test_recipient', 'from', 'from_label', 'reply_to', 'reply_to_label', 'to', 'cc', 'bcc', 'subject', 'body', 'importance', 'trigger_list')); + + MetaModel::Init_SetZListItems('details', array( + 'col:col1' => array( + 'fieldset:ActionEmail:main' => array( + 0 => 'name', + 1 => 'description', + 2 => 'status', + 3 => 'subject', + 4 => 'body', + 5 => 'importance', + ), + 'fieldset:ActionEmail:trigger' => array( + 0 => 'trigger_list', + ), + ), + 'col:col2' => array( + 'fieldset:ActionEmail:recipients' => array( + 0 => 'from', + 1 => 'from_label', + 2 => 'reply_to', + 3 => 'reply_to_label', + 4 => 'test_recipient', + 5 => 'to', + 6 => 'cc', + 7 => 'bcc', + ), + ), + )); + // - Attributes to be displayed for a list MetaModel::Init_SetZListItems('list', array('name', 'status', 'to', 'subject')); // Search criteria // - Criteria of the std search form - MetaModel::Init_SetZListItems('standard_search', array('name','description', 'status', 'subject')); + MetaModel::Init_SetZListItems('standard_search', array('name', 'description', 'status', 'subject')); // - Criteria of the advanced search form // MetaModel::Init_SetZListItems('advanced_search', array('name')); } diff --git a/css/backoffice/components/input/_input-set.scss b/css/backoffice/components/input/_input-set.scss index e57b48601..d6cf21db0 100644 --- a/css/backoffice/components/input/_input-set.scss +++ b/css/backoffice/components/input/_input-set.scss @@ -19,7 +19,7 @@ $ibo-input-set--item--siblings-spacing: 3px !default; $ibo-input-set--item--margin-y: 1px !default; $ibo-input-set--item--padding-x: 6px !default; $ibo-input-set--item--padding-y: $ibo-spacing-200 !default; -$ibo-input-set--item--max-width: 120px !default; +$ibo-input-set--item--max-width: 360px !default; $ibo-input-set--item--background-color: $ibo-color-white-100 !default; $ibo-input-set--item--border: none !default; $ibo-input-set--item--border-radius: $ibo-border-radius-300 !default; diff --git a/css/backoffice/datamodel/_action.scss b/css/backoffice/datamodel/_action.scss new file mode 100644 index 000000000..429a7567a --- /dev/null +++ b/css/backoffice/datamodel/_action.scss @@ -0,0 +1,89 @@ +/* + * @copyright Copyright (C) 2010-2023 Combodo SARL + * @license http://opensource.org/licenses/AGPL-3.0 + */ + +// Class itself +$ibo-dm-class--Action--main-color: $ibo-color-blue-grey-600 !default; +$ibo-dm-class--Action--complementary-color: $ibo-color-white-100 !default; + +:root { + --ibo-dm-class--Action--main-color: #{$ibo-dm-class--Action--main-color}; + --ibo-dm-class--Action--complementary-color: #{$ibo-dm-class--Action--complementary-color}; +} + +.ibo-dm-class--Action { + --ibo-main-color: #{$ibo-dm-class--Action--main-color}; + --ibo-main-color--100: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-class--Action--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)}; + --ibo-main-color--900: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-class--Action--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)}; + --ibo-complementary-color: #{$ibo-dm-class--Action--complementary-color}; +} + +.ibo-dm-class-alt--Action { + --ibo-main-color: #{$ibo-dm-class--Action--complementary-color}; + --ibo-complementary-color: #{$ibo-dm-class--Action--main-color}; +} + +// State attribute, "enabled" value +$ibo-dm-enum--Action-status-enabled--main-color: $ibo-lifecycle-active-state-primary-color !default; +$ibo-dm-enum--Action-status-enabled--complementary-color: $ibo-lifecycle-active-state-secondary-color !default; + +:root { + --ibo-dm-enum--Action-status-enabled--main-color: #{$ibo-dm-enum--Action-status-enabled--main-color}; + --ibo-dm-enum--Action-status-enabled--complementary-color: #{$ibo-dm-enum--Action-status-enabled--complementary-color}; +} + +.ibo-dm-enum--Action-status-enabled { + --ibo-main-color: #{$ibo-dm-enum--Action-status-enabled--main-color}; + --ibo-main-color--100: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--Action-status-enabled--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)}; + --ibo-main-color--900: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--Action-status-enabled--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)}; + --ibo-complementary-color: #{$ibo-dm-enum--Action-status-enabled--complementary-color}; +} + +.ibo-dm-enum-alt--Action-status-enabled { + --ibo-main-color: #{$ibo-dm-enum--Action-status-enabled--complementary-color}; + --ibo-complementary-color: #{$ibo-dm-enum--Action-status-enabled--main-color}; +} + +// State attribute, "disabled" value +$ibo-dm-enum--Action-status-disabled--main-color: $ibo-lifecycle-frozen-state-primary-color !default; +$ibo-dm-enum--Action-status-disabled--complementary-color: $ibo-lifecycle-frozen-state-secondary-color !default; + +:root { + --ibo-dm-enum--Action-status-disabled--main-color: #{$ibo-dm-enum--Action-status-disabled--main-color}; + --ibo-dm-enum--Action-status-disabled--complementary-color: #{$ibo-dm-enum--Action-status-disabled--complementary-color}; +} + +.ibo-dm-enum--Action-status-disabled { + --ibo-main-color: #{$ibo-dm-enum--Action-status-disabled--main-color}; + --ibo-main-color--100: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--Action-status-disabled--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)}; + --ibo-main-color--900: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--Action-status-disabled--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)}; + --ibo-complementary-color: #{$ibo-dm-enum--Action-status-disabled--complementary-color}; +} + +.ibo-dm-enum-alt--Action-status-disabled { + --ibo-main-color: #{$ibo-dm-enum--Action-status-disabled--complementary-color}; + --ibo-complementary-color: #{$ibo-dm-enum--Action-status-disabled--main-color}; +} + + +// State attribute, "test" value +$ibo-dm-enum--Action-status-test--main-color: $ibo-lifecycle-inactive-state-primary-color !default; +$ibo-dm-enum--Action-status-test--complementary-color: $ibo-lifecycle-inactive-state-secondary-color !default; + +:root { + --ibo-dm-enum--Action-status-test--main-color: #{$ibo-dm-enum--Action-status-test--main-color}; + --ibo-dm-enum--Action-status-test--complementary-color: #{$ibo-dm-enum--Action-status-test--complementary-color}; +} + +.ibo-dm-enum--Action-status-test { + --ibo-main-color: #{$ibo-dm-enum--Action-status-test--main-color}; + --ibo-main-color--100: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--Action-status-test--main-color, $ibo-color-base-lightness-100), $ibo-color-base-opacity-for-lightness-100)}; + --ibo-main-color--900: #{ibo-adjust-alpha(ibo-adjust-lightness($ibo-dm-enum--Action-status-test--main-color, $ibo-color-base-lightness-900), $ibo-color-base-opacity-for-lightness-900)}; + --ibo-complementary-color: #{$ibo-dm-enum--Action-status-test--complementary-color}; +} + +.ibo-dm-enum-alt--Action-status-test { + --ibo-main-color: #{$ibo-dm-enum--Action-status-test--complementary-color}; + --ibo-complementary-color: #{$ibo-dm-enum--Action-status-test--main-color}; +} diff --git a/css/backoffice/datamodel/_all.scss b/css/backoffice/datamodel/_all.scss index de5764f10..4601f9b05 100644 --- a/css/backoffice/datamodel/_all.scss +++ b/css/backoffice/datamodel/_all.scss @@ -9,4 +9,5 @@ /* to see what the compiler generates for XML DM classes. */ /**************************************************************************************************************************/ -@import "user"; \ No newline at end of file +@import "user"; +@import "action"; \ No newline at end of file diff --git a/dictionaries/en.dictionary.itop.core.php b/dictionaries/en.dictionary.itop.core.php index 421e00130..b4c473a8d 100644 --- a/dictionaries/en.dictionary.itop.core.php +++ b/dictionaries/en.dictionary.itop.core.php @@ -207,7 +207,7 @@ Operators:
'Core:AttributeTag' => 'Tags', 'Core:AttributeTag+' => '', - + 'Core:Context=REST/JSON' => 'REST', 'Core:Context=Synchro' => 'Synchro', 'Core:Context=Setup' => 'Setup', @@ -519,40 +519,43 @@ Dict::Add('EN US', 'English', 'English', array( // Dict::Add('EN US', 'English', 'English', array( - 'Class:ActionEmail' => 'Email notification', - 'Class:ActionEmail+' => '', - 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one', - 'Class:ActionEmail/Attribute:status/Value:test+' => 'Only the Test recipient is notified', - 'Class:ActionEmail/Attribute:status/Value:enabled+' => 'All To, Cc and Bcc emails are notified', - 'Class:ActionEmail/Attribute:status/Value:disabled+' => 'The email notification will not be sent', - 'Class:ActionEmail/Attribute:test_recipient' => 'Test recipient', - 'Class:ActionEmail/Attribute:test_recipient+' => 'Destination email used when notification is being tested', - 'Class:ActionEmail/Attribute:from' => 'From (email)', - 'Class:ActionEmail/Attribute:from+' => 'Sender email address will be sent into the email header', - 'Class:ActionEmail/Attribute:from_label' => 'From (label)', - 'Class:ActionEmail/Attribute:from_label+' => 'Sender display name will be sent into the email header', - 'Class:ActionEmail/Attribute:reply_to' => 'Reply to (email)', - 'Class:ActionEmail/Attribute:reply_to+' => 'Reply to email address Will be sent into the email header', - 'Class:ActionEmail/Attribute:reply_to_label' => 'Reply to (label)', - 'Class:ActionEmail/Attribute:reply_to_label+' => 'Reply to display name will be sent into the email header', - 'Class:ActionEmail/Attribute:to' => 'To', - 'Class:ActionEmail/Attribute:to+' => 'Destination of the email', - 'Class:ActionEmail/Attribute:cc' => 'Cc', - 'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy', - 'Class:ActionEmail/Attribute:bcc' => 'Bcc', - 'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy', - 'Class:ActionEmail/Attribute:subject' => 'Subject', - 'Class:ActionEmail/Attribute:subject+' => 'Title of the email', - 'Class:ActionEmail/Attribute:body' => 'Body', - 'Class:ActionEmail/Attribute:body+' => 'Contents of the email', - 'Class:ActionEmail/Attribute:importance' => 'importance', - 'Class:ActionEmail/Attribute:importance+' => 'Importance flag', - 'Class:ActionEmail/Attribute:importance/Value:low' => 'low', - 'Class:ActionEmail/Attribute:importance/Value:low+' => '', - 'Class:ActionEmail/Attribute:importance/Value:normal' => 'normal', + 'Class:ActionEmail' => 'Email notification', + 'Class:ActionEmail+' => '', + 'Class:ActionEmail/Attribute:status+' => 'This status drives who will be notified: just the Test recipient, all (To, cc and Bcc) or no-one', + 'Class:ActionEmail/Attribute:status/Value:test+' => 'Only the Test recipient is notified', + 'Class:ActionEmail/Attribute:status/Value:enabled+' => 'All To, Cc and Bcc emails are notified', + 'Class:ActionEmail/Attribute:status/Value:disabled+' => 'The email notification will not be sent', + 'Class:ActionEmail/Attribute:test_recipient' => 'Test recipient', + 'Class:ActionEmail/Attribute:test_recipient+' => 'Destination email used when notification is being tested', + 'Class:ActionEmail/Attribute:from' => 'From (email)', + 'Class:ActionEmail/Attribute:from+' => 'Sender email address will be sent into the email header', + 'Class:ActionEmail/Attribute:from_label' => 'From (label)', + 'Class:ActionEmail/Attribute:from_label+' => 'Sender display name will be sent into the email header', + 'Class:ActionEmail/Attribute:reply_to' => 'Reply to (email)', + 'Class:ActionEmail/Attribute:reply_to+' => 'Reply to email address will be sent into the email header', + 'Class:ActionEmail/Attribute:reply_to_label' => 'Reply to (label)', + 'Class:ActionEmail/Attribute:reply_to_label+' => 'Reply to display name will be sent into the email header', + 'Class:ActionEmail/Attribute:to' => 'To', + 'Class:ActionEmail/Attribute:to+' => 'Destination of the email', + 'Class:ActionEmail/Attribute:cc' => 'Cc', + 'Class:ActionEmail/Attribute:cc+' => 'Carbon Copy', + 'Class:ActionEmail/Attribute:bcc' => 'Bcc', + 'Class:ActionEmail/Attribute:bcc+' => 'Blind Carbon Copy', + 'Class:ActionEmail/Attribute:subject' => 'Subject', + 'Class:ActionEmail/Attribute:subject+' => 'Title of the email', + 'Class:ActionEmail/Attribute:body' => 'Body', + 'Class:ActionEmail/Attribute:body+' => 'Contents of the email', + 'Class:ActionEmail/Attribute:importance' => 'importance', + 'Class:ActionEmail/Attribute:importance+' => 'Importance flag', + 'Class:ActionEmail/Attribute:importance/Value:low' => 'Low', + 'Class:ActionEmail/Attribute:importance/Value:low+' => '', + 'Class:ActionEmail/Attribute:importance/Value:normal' => 'Normal', 'Class:ActionEmail/Attribute:importance/Value:normal+' => '', - 'Class:ActionEmail/Attribute:importance/Value:high' => 'high', - 'Class:ActionEmail/Attribute:importance/Value:high+' => '', + 'Class:ActionEmail/Attribute:importance/Value:high' => 'High', + 'Class:ActionEmail/Attribute:importance/Value:high+' => '', + 'ActionEmail:main' => 'Message', + 'ActionEmail:trigger' => 'Triggers', + 'ActionEmail:recipients' => 'Contacts', )); // diff --git a/dictionaries/fr.dictionary.itop.core.php b/dictionaries/fr.dictionary.itop.core.php index 46e145b3e..bdb7120e8 100644 --- a/dictionaries/fr.dictionary.itop.core.php +++ b/dictionaries/fr.dictionary.itop.core.php @@ -516,40 +516,44 @@ Dict::Add('FR FR', 'French', 'Français', array( // Dict::Add('FR FR', 'French', 'Français', array( - 'Class:ActionEmail' => 'Notification par mél', - 'Class:ActionEmail+' => '', - 'Class:ActionEmail/Attribute:status+' => 'Cet état définit qui va être notifié: le \'Destinataire de test\', tous les destinataires (A, Copie and Copie Cachée) ou personne', - 'Class:ActionEmail/Attribute:status/Value:test+' => 'Seul le destinataire de test est notifié ', - 'Class:ActionEmail/Attribute:status/Value:enabled+' => 'Tous les destinataires (A, Copie and Copie Cachée) sont notifiés', - 'Class:ActionEmail/Attribute:status/Value:disabled+' => 'La notification n\'est pas envoyée', - 'Class:ActionEmail/Attribute:test_recipient' => 'Destinataire de test', - 'Class:ActionEmail/Attribute:test_recipient+' => '', - 'Class:ActionEmail/Attribute:from' => 'De (mél)', - 'Class:ActionEmail/Attribute:from+' => 'Adresse mél qui sera affichés en expéditeur de la notification', - 'Class:ActionEmail/Attribute:from_label' => 'De (libellé)', - 'Class:ActionEmail/Attribute:from_label+' => 'Le nom de l\'expéditeur sera inclus dans l\'entête du mél', - 'Class:ActionEmail/Attribute:reply_to' => 'Répondre à (mél)', - 'Class:ActionEmail/Attribute:reply_to+' => 'Adresse mèl qui sera affichée dans le répondre à de la notification', - 'Class:ActionEmail/Attribute:reply_to_label' => 'Répondre à (libellé)', - 'Class:ActionEmail/Attribute:reply_to_label+' => 'Le nom du destinataire en cas de réponse sera inclus dans l\'entête du mél.', - 'Class:ActionEmail/Attribute:to' => 'A', - 'Class:ActionEmail/Attribute:to+' => '', - 'Class:ActionEmail/Attribute:cc' => 'Copie', - 'Class:ActionEmail/Attribute:cc+' => '', - 'Class:ActionEmail/Attribute:bcc' => 'Copie Cachée', - 'Class:ActionEmail/Attribute:bcc+' => '', - 'Class:ActionEmail/Attribute:subject' => 'Sujet', - 'Class:ActionEmail/Attribute:subject+' => '', - 'Class:ActionEmail/Attribute:body' => 'Message', - 'Class:ActionEmail/Attribute:body+' => '', - 'Class:ActionEmail/Attribute:importance' => 'Importance', - 'Class:ActionEmail/Attribute:importance+' => '', - 'Class:ActionEmail/Attribute:importance/Value:low' => 'Basse', - 'Class:ActionEmail/Attribute:importance/Value:low+' => '', - 'Class:ActionEmail/Attribute:importance/Value:normal' => 'Normale', + 'Class:ActionEmail' => 'Notification par mél', + 'Class:ActionEmail+' => '', + 'Class:ActionEmail/Attribute:status+' => 'Cet état définit qui va être notifié: le \'Destinataire de test\', tous les destinataires (A, Copie and Copie Cachée) ou personne', + 'Class:ActionEmail/Attribute:status/Value:test+' => 'Seul le destinataire de test est notifié ', + 'Class:ActionEmail/Attribute:status/Value:enabled+' => 'Tous les destinataires (A, Copie and Copie Cachée) sont notifiés', + 'Class:ActionEmail/Attribute:status/Value:disabled+' => 'La notification n\'est pas envoyée', + 'Class:ActionEmail/Attribute:test_recipient' => 'Destinataire de test', + 'Class:ActionEmail/Attribute:test_recipient+' => '', + 'Class:ActionEmail/Attribute:from' => 'De (mél)', + 'Class:ActionEmail/Attribute:from+' => 'Adresse mél qui sera affichés en expéditeur de la notification', + 'Class:ActionEmail/Attribute:from_label' => 'De (libellé)', + 'Class:ActionEmail/Attribute:from_label+' => 'Le nom de l\'expéditeur sera inclus dans l\'entête du mél', + 'Class:ActionEmail/Attribute:reply_to' => 'Répondre à (mél)', + 'Class:ActionEmail/Attribute:reply_to+' => 'Adresse mèl qui sera affichée dans le répondre à de la notification', + 'Class:ActionEmail/Attribute:reply_to_label' => 'Répondre à (libellé)', + 'Class:ActionEmail/Attribute:reply_to_label+' => 'Le nom du destinataire en cas de réponse sera inclus dans l\'entête du mél.', + 'Class:ActionEmail/Attribute:to' => 'A', + 'Class:ActionEmail/Attribute:to+' => '', + 'Class:ActionEmail/Attribute:cc' => 'Copie', + 'Class:ActionEmail/Attribute:cc+' => '', + 'Class:ActionEmail/Attribute:bcc' => 'Copie Cachée', + 'Class:ActionEmail/Attribute:bcc+' => '', + 'Class:ActionEmail/Attribute:subject' => 'Sujet', + 'Class:ActionEmail/Attribute:subject+' => '', + 'Class:ActionEmail/Attribute:body' => 'Message', + 'Class:ActionEmail/Attribute:body+' => '', + 'Class:ActionEmail/Attribute:importance' => 'Importance', + 'Class:ActionEmail/Attribute:importance+' => '', + 'Class:ActionEmail/Attribute:importance/Value:low' => 'Basse', + 'Class:ActionEmail/Attribute:importance/Value:low+' => '', + 'Class:ActionEmail/Attribute:importance/Value:normal' => 'Normale', 'Class:ActionEmail/Attribute:importance/Value:normal+' => '', - 'Class:ActionEmail/Attribute:importance/Value:high' => 'Haute', - 'Class:ActionEmail/Attribute:importance/Value:high+' => '', + 'Class:ActionEmail/Attribute:importance/Value:high' => 'Haute', + 'Class:ActionEmail/Attribute:importance/Value:high+' => '', + 'ActionEmail:main' => 'Message', + 'ActionEmail:trigger' => 'Conditions de déclenchement', + 'ActionEmail:recipients' => 'Contacts', + )); //