From 7a5899a968acf3d8e903b5b717c0db86fc25ed11 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 18 Aug 2017 15:27:12 -0400 Subject: [PATCH 1/7] popover content audit for JT form --- .../job_templates/job-template.form.js | 37 +++++-------------- 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/awx/ui/client/src/templates/job_templates/job-template.form.js b/awx/ui/client/src/templates/job_templates/job-template.form.js index a25cfeccd8..b8092c37a2 100644 --- a/awx/ui/client/src/templates/job_templates/job-template.form.js +++ b/awx/ui/client/src/templates/job_templates/job-template.form.js @@ -51,11 +51,7 @@ function(NotificationsList, CompletedJobsList, i18n) { "default": 0, required: true, column: 1, - awPopOver: "

" + i18n.sprintf(i18n._("When this template is submitted as a job, setting the type to %s will execute the playbook, running tasks " + - " on the selected hosts."), "run") + "

" + - i18n.sprintf(i18n._("Setting the type to %s will not execute the playbook."), "check") + " " + - i18n.sprintf(i18n._("Instead, %s will check playbook " + - " syntax, test environment setup and report problems."), "ansible") + "

", + awPopOver: i18n._('For job templates, select run to execute the playbook. Select check to only check playbook syntax, test environment setup, and report problems without executing the playbook.'), dataTitle: i18n._('Job Type'), dataPlacement: 'right', dataContainer: "body", @@ -139,7 +135,7 @@ function(NotificationsList, CompletedJobsList, i18n) { field-is-disabled="!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)"> `, required: true, - awPopOver: "

" + i18n._("Select credentials that allow {{BRAND_NAME}} to access the nodes this job will be ran against. You can only select one credential of each type.

You must select either a machine (SSH) credential or \"Prompt on launch\". \"Prompt on launch\" requires you to select a machine credential at run time.

If you select credentials AND check the \"Prompt on launch\" box, you make the selected credentials the defaults that can be updated at run time.") + "

", + awPopOver: i18n._('Select credentials that allow Tower to access the nodes this job will be ran against. You can only select one credential of each type. For machine credentials (SSH), checking "Prompt on launch" without selecting credentials will require you to select a machine credential at run time. If you select credentials and check "Prompt on launch", the selected credential(s) become the defaults that can be updated at run time.'), dataTitle: i18n._('Credentials'), dataPlacement: 'right', dataContainer: "body", @@ -158,10 +154,7 @@ function(NotificationsList, CompletedJobsList, i18n) { spinner: true, 'class': "input-small", column: 1, - awPopOver: '

' + i18n.sprintf(i18n._('The number of parallel or simultaneous processes to use while executing the playbook. Inputting no value will use ' + - 'the default value from the %sansible configuration file%s.'), '' + - '', '') +'

', + awPopOver: i18n._('The number of parallel or simultaneous processes to use while executing the playbook. Value defaults to 0. Refer to the Ansible documentation for details about the configuration file.'), placeholder: 'DEFAULT', dataTitle: i18n._('Forks'), dataPlacement: 'right', @@ -172,10 +165,7 @@ function(NotificationsList, CompletedJobsList, i18n) { label: i18n._('Limit'), type: 'text', column: 1, - awPopOver: "

" + i18n.sprintf(i18n._("Provide a host pattern to further constrain the list of hosts that will be managed or affected by the playbook. " + - "Multiple patterns can be separated by %s %s or %s"), ";", ":", ",") + "

" + - i18n.sprintf(i18n._("For more information and examples see " + - "%sthe Patterns topic at docs.ansible.com%s."), "", "") + "

", + awPopOver: i18n._('Provide a host pattern to further constrain the list of hosts that will be managed or affected by the playbook. Multiple patterns are allowed. Refer to Ansible documentation for more information and examples on patterns.'), dataTitle: i18n._('Limit'), dataPlacement: 'right', dataContainer: "body", @@ -218,9 +208,7 @@ function(NotificationsList, CompletedJobsList, i18n) { 'elementClass': 'Form-textInput', ngOptions: 'tag.label for tag in job_tag_options track by tag.value', column: 2, - awPopOver: "

" + i18n._("Provide a comma separated list of tags.") + "

\n" + - "

" + i18n._("Tags are useful when you have a large playbook, and you want to run a specific part of a play or task.") + "

" + - "

" + i18n._("Consult the Ansible documentation for further details on the usage of tags.") + "

", + awPopOver: i18n._('Tags are useful when you have a large playbook, and you want to run a specific part of a play or task. Use commas to separate multiple tags. Refer to Ansible Tower documentation for details on the usage of tags.'), dataTitle: i18n._("Job Tags"), dataPlacement: "right", dataContainer: "body", @@ -237,9 +225,7 @@ function(NotificationsList, CompletedJobsList, i18n) { 'elementClass': 'Form-textInput', ngOptions: 'tag.label for tag in skip_tag_options track by tag.value', column: 2, - awPopOver: "

" + i18n._("Provide a comma separated list of tags.") + "

\n" + - "

" + i18n._("Skip tags are useful when you have a large playbook, and you want to skip specific parts of a play or task.") + "

" + - "

" + i18n._("Consult the Ansible documentation for further details on the usage of tags.") + "

", + awPopOver: i18n._('Skip tags are useful when you have a large playbook, and you want to skip specific parts of a play or task. Use commas to separate multiple tags. Refer to Ansible Tower documentation for details on the usage of tags.'), dataTitle: i18n._("Skip Tags"), dataPlacement: "right", dataContainer: "body", @@ -282,9 +268,9 @@ function(NotificationsList, CompletedJobsList, i18n) { label: i18n._('Enable Privilege Escalation'), type: 'checkbox', column: 2, - awPopOver: "

" + i18n.sprintf(i18n._("If enabled, run this playbook as an administrator. This is the equivalent of passing the %s option to the %s command."), '--become', 'ansible-playbook') + "

", + awPopOver: i18n._('If enabled, run this playbook as an administrator.'), dataPlacement: 'right', - dataTitle: i18n._('Become Privilege Escalation'), + dataTitle: i18n._('Enable Privilege Escalation'), dataContainer: "body", labelClass: 'stack-inline', ngDisabled: '!(job_template_obj.summary_fields.user_capabilities.edit || canAddJobTemplate)' @@ -363,12 +349,7 @@ function(NotificationsList, CompletedJobsList, i18n) { rows: 6, "default": "---", column: 2, - awPopOver: "

" + i18n.sprintf(i18n._("Pass extra command line variables to the playbook. This is the %s or %s command line parameter " + - "for %s. Provide key/value pairs using either YAML or JSON."), '-e', '--extra-vars', 'ansible-playbook') + "

" + - "JSON:
\n" + - "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + - "YAML:
\n" + - "
---
somevar: somevalue
password: magic
\n", + awPopOver: i18n._('Pass extra command line variables to the playbook. Provide key/value pairs using either YAML or JSON. Refer to the Ansible Tower documentation for example syntax.'), dataTitle: i18n._('Extra Variables'), dataPlacement: 'right', dataContainer: "body", From 50852e406adfc1aca760d7c1108b655d57958307 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 18 Aug 2017 15:44:10 -0400 Subject: [PATCH 2/7] popover content for notification templates form --- .../notificationTemplates.form.js | 31 ++++++------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/awx/ui/client/src/notifications/notificationTemplates.form.js b/awx/ui/client/src/notifications/notificationTemplates.form.js index 0e15356be5..3f4e01ed55 100644 --- a/awx/ui/client/src/notifications/notificationTemplates.form.js +++ b/awx/ui/client/src/notifications/notificationTemplates.form.js @@ -97,8 +97,7 @@ export default ['i18n', function(i18n) { label: i18n._('Recipient List'), type: 'textarea', rows: 3, - awPopOver: '

' + i18n._('Type an option on each line.') + '

'+ - '

' + i18n._('For example:') + '
alias1@email.com
\n alias2@email.com
\n', + awPopOver: i18n._('Enter one email address per line to create a recipient list for this type of notification.'), dataTitle: i18n._('Recipient List'), dataPlacement: 'right', dataContainer: "body", @@ -140,8 +139,7 @@ export default ['i18n', function(i18n) { label: i18n._('Destination Channels'), type: 'textarea', rows: 3, - awPopOver: '

' + i18n._('Type an option on each line. The pound symbol (#) is not required.') + '

'+ - '

' + i18n._('For example:') + '
engineering
\n #support
\n', + awPopOver: i18n._('Enter one Slack channel per line. The pound symbol (#) is not required.'), dataTitle: i18n._('Destination Channels'), dataPlacement: 'right', dataContainer: "body", @@ -157,8 +155,7 @@ export default ['i18n', function(i18n) { label: i18n._('Destination Channels'), type: 'textarea', rows: 3, - awPopOver: '

' + i18n._('Type an option on each line. The pound symbol (#) is not required.') + '

'+ - '

' + i18n._('For example:') + '
engineering
\n #support
\n', + awPopOver: i18n._('Enter one HipChat channel per line. The pound symbol (#) is not required.'), dataTitle: i18n._('Destination Channels'), dataPlacement: 'right', dataContainer: "body", @@ -198,8 +195,7 @@ export default ['i18n', function(i18n) { label: i18n._('Source Phone Number'), dataTitle: i18n._('Source Phone Number'), type: 'text', - awPopOver: '

' + i18n._('Number associated with the "Messaging Service" in Twilio.') + '

'+ - '

' + i18n.sprintf(i18n._('This must be of the form %s.'), '+18005550199') + '

', + awPopOver: i18n._('Enter the number associated with the "Messaging Service" in Twilio in the format +18005550199.'), awRequiredWhen: { reqExpression: "twilio_required", init: "false" @@ -213,8 +209,7 @@ export default ['i18n', function(i18n) { dataTitle: i18n._('Destination SMS Number'), type: 'textarea', rows: 3, - awPopOver: '

' + i18n._('Type an option on each line.') + '

'+ - '

' + i18n._('For example:') + '
+12125552368
\n+19105556162
\n', + awPopOver: i18n._('Enter one phone number per line to specify where to route SMS messages.'), dataPlacement: 'right', dataContainer: "body", awRequiredWhen: { @@ -297,8 +292,7 @@ export default ['i18n', function(i18n) { dataTitle: i18n._('Notification Color'), type: 'select', ngOptions: 'color for color in hipchatColors track by color', - awPopOver: '

' + i18n.sprintf(i18n._('Color can be one of %s.'), 'yellow, green, red, ' + - 'purple, gray, random') + '\n', + awPopOver: i18n._('Specify a notification color. Acceptable colors are: yellow, green, red purple, gray or random.'), awRequiredWhen: { reqExpression: "hipchat_required", init: "false" @@ -336,13 +330,7 @@ export default ['i18n', function(i18n) { reqExpression: "webhook_required", init: "false" }, - awPopOver: '

' + i18n._('Specify HTTP Headers in JSON format') + '

' + - '

' + i18n._('For example:') + '

\n' +
-                           '{\n' +
-                           '  "X-Auth-Token": "828jf0",\n' +
-                           '  "X-Ansible": "Is great!"\n' +
-                           '}\n' +
-                           '

', + awPopOver: i18n._('Specify HTTP Headers in JSON format. Refer to the Ansible Tower documentation for example syntax.'), dataPlacement: 'right', ngShow: "notification_type.value == 'webhook' ", subForm: 'typeSubForm', @@ -374,9 +362,8 @@ export default ['i18n', function(i18n) { label: i18n._('Destination Channels or Users'), type: 'textarea', rows: 3, - awPopOver: '

' + i18n._('Type an option on each line. The pound symbol (#) is not required.') + '

'+ - '

' + i18n._('For example:') + '
' + i18n.sprintf(i18n._('%s or %s'), '#support', 'support') + '
\n ' + i18n.sprintf(i18n._('%s or %s'), '@username', 'username') + '
\n', - dataTitle: i18n._('Destination Channels'), + awPopOver: i18n._('Enter one IRC channel or username per line. The pound symbol (#) for channels, and the at (@) symbol for users, are not required.'), + dataTitle: i18n._('Destination Channels or Users'), dataPlacement: 'right', dataContainer: "body", awRequiredWhen: { From 22afd8b0449d85cd2f60ef342a515221df096378 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 18 Aug 2017 15:48:34 -0400 Subject: [PATCH 3/7] tooltip content for inventory scripts form --- awx/ui/client/src/inventory-scripts/inventory-scripts.form.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js index 644f4ecdee..f7f1b581d5 100644 --- a/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js +++ b/awx/ui/client/src/inventory-scripts/inventory-scripts.form.js @@ -59,8 +59,7 @@ export default ['i18n', function(i18n) { ngDisabled: '!(inventory_script_obj.summary_fields.user_capabilities.edit || canAdd)', ngTrim: false, rows: 10, - awPopOver: "

" + i18n._("Drag and drop your custom inventory script file here or create one in the field to import your custom inventory.") + " " + - "

" + i18n.sprintf(i18n._("Script must begin with a hashbang sequence: i.e.... %s"), "#!/usr/bin/env python") + "

", + awPopOver: i18n._('Drag and drop your custom inventory script file here or create one in the field to import your custom inventory. Refer to the Ansible Tower documentation for example syntax.'), dataTitle: i18n._('Custom Script'), dataPlacement: 'right', dataContainer: "body" From a589bc4562b561ee49513ba73de61c61aaee7e4d Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 18 Aug 2017 15:58:22 -0400 Subject: [PATCH 4/7] tooltip content audit for inventory form --- .../inventories/standard-inventory/inventory.form.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js b/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js index fa4ed8d106..0562137f9e 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js +++ b/awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js @@ -82,7 +82,7 @@ function(i18n, InventoryCompletedJobsList) { instance_groups: { label: i18n._('Instance Groups'), type: 'custom', - awPopOver: "

" + i18n._("Select the Instance Groups for this Inventory to run on.") + "

", + awPopOver: i18n._('Select the Instance Groups for this Inventory to run on. Refer to the Ansible Tower documentation for more detail.'), dataTitle: i18n._('Instance Groups'), dataPlacement: 'right', dataContainer: 'body', @@ -95,14 +95,8 @@ function(i18n, InventoryCompletedJobsList) { class: 'Form-formGroup--fullWidth', rows: 6, "default": "---", - awPopOver: "

" + i18n._("Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two.") + "

" + - "JSON:
\n" + - "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + - "YAML:
\n" + - "
---
somevar: somevalue
password: magic
\n" + - '

' + i18n.sprintf(i18n._('View JSON examples at %s'), 'www.json.org') + '

' + - '

' + i18n.sprintf(i18n._('View YAML examples at %s'), 'docs.ansible.com') + '

', - dataTitle: i18n._('Inventory Variables'), + awPopOver: i18n._('Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax.'), + dataTitle: i18n._('Variables'), dataPlacement: 'right', dataContainer: 'body', ngDisabled: '!(inventory_obj.summary_fields.user_capabilities.edit || canAdd)' // TODO: get working From e5efbcf42f97fe40428c9dba49a5fd4801b45fbb Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 18 Aug 2017 16:05:48 -0400 Subject: [PATCH 5/7] tooltip content audit for workflows form --- awx/ui/client/src/templates/workflows.form.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/awx/ui/client/src/templates/workflows.form.js b/awx/ui/client/src/templates/workflows.form.js index b03b7bef47..106d011cb6 100644 --- a/awx/ui/client/src/templates/workflows.form.js +++ b/awx/ui/client/src/templates/workflows.form.js @@ -77,12 +77,7 @@ export default ['NotificationsList', 'i18n', function(NotificationsList, i18n) { rows: 6, "default": "---", column: 2, - awPopOver: "

" + i18n.sprintf(i18n._("Pass extra command line variables to the playbook. This is the %s or %s command line parameter " + - "for %s. Provide key/value pairs using either YAML or JSON."), "-e", "--extra-vars", "ansible-playbook") + "

" + - "JSON:
\n" + - "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + - "YAML:
\n" + - "
---
somevar: somevalue
password: magic
\n", + awPopOver:i18n._('Pass extra command line variables to the playbook. This is the -e or --extra-vars command line parameter for ansible-playbook. Provide key/value pairs using either YAML or JSON. Refer to the Ansible Tower documentaton for example syntax.'), dataTitle: i18n._('Extra Variables'), dataPlacement: 'right', dataContainer: "body", From b281b563e0cdfa521208f84343771a2d22776e4e Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 18 Aug 2017 16:18:44 -0400 Subject: [PATCH 6/7] tooltip content audit for survey maker --- .../shared/question-definition.form.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/awx/ui/client/src/templates/survey-maker/shared/question-definition.form.js b/awx/ui/client/src/templates/survey-maker/shared/question-definition.form.js index 764bbf439d..f63df7978c 100644 --- a/awx/ui/client/src/templates/survey-maker/shared/question-definition.form.js +++ b/awx/ui/client/src/templates/survey-maker/shared/question-definition.form.js @@ -42,8 +42,7 @@ export default ['i18n', function(i18n){ realName: 'variable', type: 'custom', control:''+ '
'+ '
Please enter an answer variable name.
'+ @@ -62,7 +61,10 @@ export default ['i18n', function(i18n){ defaultText: i18n._('Choose an answer type'), ngOptions: 'answer_types.name for answer_types in answer_types track by answer_types.type', required: true, - + awPopOver: i18n._('Choose an answer type or format you want as the prompt for the user. Refer to the Ansible Tower Documentation for more additional information about each option.'), + dataTitle: i18n._('Answer Type'), + dataPlacement: 'right', + dataContainer: "body", column: 2, ngChange: 'typeChange()', class: 'Form-formGroup--singleColumn' @@ -76,12 +78,6 @@ export default ['i18n', function(i18n){ ngRequired: "type.type=== 'multiselect' || type.type=== 'multiplechoice' " , ngShow: 'type.type=== "multiselect" || type.type=== "multiplechoice" ', - awPopOver: '

Type an option on each line.

'+ - '

For example the following input:

Apple
\n Banana
\n Cherry

would be displayed as:

\n'+ - '
  1. Apple
  2. Banana
  3. Cherry
', - dataTitle: i18n._('Multiple Choice Options'), - dataPlacement: 'right', - dataContainer: "body", column: 2, class: 'Form-formGroup--singleColumn' }, From 7d7b9175233d2bc204918d8e41c629f48ebc8c94 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Fri, 18 Aug 2017 16:29:51 -0400 Subject: [PATCH 7/7] tooltip content audit for sources form --- .../related/sources/sources.form.js | 39 +++++-------------- tower-license | 1 + 2 files changed, 10 insertions(+), 30 deletions(-) create mode 160000 tower-license diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js index d091289d18..9205be3ca7 100644 --- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js +++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/sources.form.js @@ -263,16 +263,9 @@ return { parseTypeName: 'envParseType', dataTitle: i18n._("Source Variables"), dataPlacement: 'right', - awPopOver: "

" + i18n._("Override variables found in openstack.yml and used by the inventory update script. For an example variable configuration ") + - "" + - i18n._("view openstack.yml in the Ansible github repo.") + "

" + - "

" + i18n._("Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.") + "

" + - i18n._("JSON:") + "
\n" + - "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + - i18n._("YAML:") + "
\n" + - "
---
somevar: somevalue
password: magic
\n" + - "

" + i18n._("View JSON examples at ") + 'www.json.org

' + - "

" + i18n._("View YAML examples at ") + 'docs.ansible.com

', + awPopOver: i18n._(`Override variables found in openstack.yml and used by the inventory update script. For an example variable configuration + + view openstack.yml in the Ansible github repo. Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax.`), dataContainer: 'body', subForm: 'sourceSubForm' }, @@ -287,16 +280,9 @@ return { parseTypeName: 'envParseType', dataTitle: i18n._("Source Variables"), dataPlacement: 'right', - awPopOver: "

" + i18n._("Override variables found in openstack.yml and used by the inventory update script. For an example variable configuration ") + - "" + - i18n._("view openstack.yml in the Ansible github repo.") + "

" + - "

" + i18n._("Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.") + "

" + - i18n._("JSON:") + "
\n" + - "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + - i18n._("YAML:") + "
\n" + - "
---
somevar: somevalue
password: magic
\n" + - "

" + i18n._("View JSON examples at ") + 'www.json.org

' + - "

" + i18n._("View YAML examples at ") + 'docs.ansible.com

', + awPopOver: i18n._(`Override variables found in cloudforms.ini and used by the inventory update script. For an example variable configuration + + view cloudforms.ini in the Ansible github repo. Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax.`), dataContainer: 'body', subForm: 'sourceSubForm' }, @@ -311,16 +297,9 @@ return { parseTypeName: 'envParseType', dataTitle: i18n._("Source Variables"), dataPlacement: 'right', - awPopOver: "

" + i18n._("Override variables found in openstack.yml and used by the inventory update script. For an example variable configuration ") + - "" + - i18n._("view openstack.yml in the Ansible github repo.") + "

" + - "

" + i18n._("Enter variables using either JSON or YAML syntax. Use the radio button to toggle between the two.") + "

" + - i18n._("JSON:") + "
\n" + - "
{
 \"somevar\": \"somevalue\",
 \"password\": \"magic\"
}
\n" + - i18n._("YAML:") + "
\n" + - "
---
somevar: somevalue
password: magic
\n" + - "

" + i18n._("View JSON examples at ") + 'www.json.org

' + - "

" + i18n._("View YAML examples at ") + 'docs.ansible.com

', + awPopOver: i18n._(`Override variables found in foreman.ini and used by the inventory update script. For an example variable configuration + + view foreman.ini in the Ansible github repo. Enter inventory variables using either JSON or YAML syntax. Use the radio button to toggle between the two. Refer to the Ansible Tower documentation for example syntax.`), dataContainer: 'body', subForm: 'sourceSubForm' }, diff --git a/tower-license b/tower-license new file mode 160000 index 0000000000..4b872af7df --- /dev/null +++ b/tower-license @@ -0,0 +1 @@ +Subproject commit 4b872af7dfba5cb3677170159ca098f92b52f57a