Issue #3415660 by govind.maloo: Arrows supporting Previous and Next buttons on webforms are not rendering as expected #1182

govindmaloo · 2023-12-18T16:31:22Z

https://www.drupal.org/project/civictheme/issues/3415660

Checklist before requesting a review

I have formatted the subject to include ticket number as [CS-123] Verb in past tense with dot at the end.
I have added a link to the issue tracker
I have provided information in Changed section about WHY something was done if this was not a normal implementation
I have performed a self-review of my code
I have commented my code, particularly in hard-to-understand areas
I have added tests that prove my fix is effective or that my feature works
I have run new and existing relevant tests locally with my changes, and they passed
I have provided screenshots, where applicable

Changed

Screenshots

govindmaloo · 2024-01-02T01:13:16Z

@AlexSkrypnyk I have tried multiple approaches but only this is working for me. Let me know if you have any other suggestions.

AlexSkrypnyk · 2024-01-23T09:27:16Z

@govindmaloo
Did you try to use the raw filter:

value: attributes.value|raw

AlexSkrypnyk · 2024-01-23T09:31:07Z

web/themes/contrib/civictheme/includes/form.inc

+  // Fix htmlentity in submit button text.
+  $element = $variables['element'];
+
+  if (isset($element['#type']) && $element['#type'] == 'submit' && !empty($variables['attributes']['value'])) {


what if this is type reset or just a button? the solution should take care of all possible cases

I have tried raw filter but didn't work.

And it should work for all button. I can review if you think this solution can work.

AlexSkrypnyk · 2024-01-23T09:34:48Z

web/themes/contrib/civictheme/templates/form/input--submit.html.twig

@@ -17,7 +18,7 @@
 {% set children %}
  {% include "@atoms/button/button.twig" with {
    type: type,
-    text: attributes.value,


does attributes.value contains HTML-converted text? can you try using raw filter?

AlexSkrypnyk · 2024-01-23T09:42:31Z

@govindmaloo
In order for this to pass QA, it needs to be tested on a real webform.

Could you please port the feedback webform from this PR #1163

Also, please port any required tests for that form.

Please do not include any CSS changes to the UI Kit - this is a purely preprocess issue and it should not require any style changes.

This should be added through Drupal attributes.

govindmaloo · 2024-02-05T18:19:15Z

@AlexSkrypnyk I have updated this branch on top of the latest develop and also added this PR to fix CI build
#1211

AlexSkrypnyk · 2024-02-06T23:43:42Z

web/themes/contrib/civictheme/templates/form/container.html.twig

@@ -7,6 +7,7 @@
 {% set classes = [
    'container',
    has_parent ? 'js-form-wrapper form-wrapper',
+    'ct-contianer',


there is no class ct-container. Also, this is misspelt

# Conflicts: # .docker/cli.dockerfile # .docker/cli.onlytheme.dockerfile # .docker/cli.sibling.dockerfile

AlexSkrypnyk · 2024-02-07T00:52:11Z

@govindmaloo
I have updated the head branch to point to develop and this branch now contains unrelated changes.

Could you please remove any unrelated changes and only leave what is necessary for this issue.

Thanks

govindmaloo · 2024-02-08T15:56:33Z

@AlexSkrypnyk Please review I have updated the branch and removed webform related changes.

govindmaloo changed the base branch from develop to feature/CIVIC-1493 December 18, 2023 16:31

github-actions bot assigned govindmaloo Dec 18, 2023

AlexSkrypnyk reviewed Jan 23, 2024

View reviewed changes

AlexSkrypnyk added the Question label Jan 23, 2024

AlexSkrypnyk changed the title ~~[CIVIC-1529] Fixed submit button text htmlentity issue.~~ Issue #3415660 by govind.maloo: Arrows supporting Previous and Next buttons not rendering as expected Jan 23, 2024

AlexSkrypnyk changed the title ~~Issue #3415660 by govind.maloo: Arrows supporting Previous and Next buttons not rendering as expected~~ Issue #3415660 by govind.maloo: Arrows supporting Previous and Next on webforms buttons not rendering as expected Jan 23, 2024

AlexSkrypnyk changed the title ~~Issue #3415660 by govind.maloo: Arrows supporting Previous and Next on webforms buttons not rendering as expected~~ Issue #3415660 by govind.maloo: Arrows supporting Previous and Next buttons on webforms are not rendering as expected Jan 23, 2024

AlexSkrypnyk added State: Requires more work Pull request was reviewed and reviver(s) asked to work further on the pull request and removed Question labels Jan 23, 2024

AlexSkrypnyk mentioned this pull request Jan 23, 2024

Issue #3415662 by govind.maloo: Webform conditional fields issues #1163

Open

8 tasks

govindmaloo and others added 6 commits February 5, 2024 22:30

[CIVIC-1493] Added webform related fixes.

6bc3afb

[CIVIC-1493] Updated webform templates and test.

fbbaeb1

Fixed indentation.

439eacb

Removed modifier_class from the container.

81d3df3

This should be added through Drupal attributes.

Reverted the change ro submit button's theme.

7a5292c

Fixed indentation.

e57f766

govindmaloo force-pushed the feature/CIVIC-1493 branch from 98b4ee3 to e57f766 Compare February 5, 2024 17:03

github-actions bot added the State: CONFLICT label Feb 5, 2024

govindmaloo added 2 commits February 5, 2024 22:36

[CIVIC-1493] Added webform related fixes.

1beef14

[CIVIC-1493] Updated webform templates and test.

7cd22b4

govindmaloo force-pushed the feature/CIVIC-1529 branch from 4ff911a to f011b67 Compare February 5, 2024 17:07

github-actions bot removed the State: CONFLICT label Feb 5, 2024

[CIVIC-1529] Fixed submit button arrow htmlentity.

397c11f

govindmaloo force-pushed the feature/CIVIC-1529 branch from f011b67 to 397c11f Compare February 5, 2024 17:11

govindmaloo added 2 commits February 5, 2024 23:14

Updated webform and related test.

501b1e8

Build fix.

abf2ee3

Updated tzdata package.

dcc1b72

Updated webform configuration.

1cfccc7

govindmaloo force-pushed the feature/CIVIC-1529 branch from 9b701e8 to 1cfccc7 Compare February 6, 2024 17:24

AlexSkrypnyk reviewed Feb 6, 2024

View reviewed changes

AlexSkrypnyk added 4 commits February 7, 2024 10:47

Merge branch 'develop' into feature/CIVIC-1529

6ece161

# Conflicts: # .docker/cli.dockerfile # .docker/cli.onlytheme.dockerfile # .docker/cli.sibling.dockerfile

Removed unnecessary class.

6fc6d4f

Merge branch 'develop' into feature/CIVIC-1493

1e6596d

Merge branch 'feature/CIVIC-1493' into feature/CIVIC-1529

89fb1c6

AlexSkrypnyk changed the base branch from feature/CIVIC-1493 to develop February 7, 2024 00:50

govindmaloo added 2 commits February 8, 2024 21:12

Merge branch 'develop' into feature/CIVIC-1529

c5ed680

Removed webform related fixes from this branch.

b2e3593

govindmaloo added State: Needs review Pull requests needs a review from assigned developers and removed State: Requires more work Pull request was reviewed and reviver(s) asked to work further on the pull request labels Feb 8, 2024

Merge branch 'develop' into feature/CIVIC-1529

b38be1c

AlexSkrypnyk merged commit e54be55 into develop Feb 15, 2024
12 checks passed

AlexSkrypnyk deleted the feature/CIVIC-1529 branch February 15, 2024 03:55

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue #3415660 by govind.maloo: Arrows supporting Previous and Next buttons on webforms are not rendering as expected #1182

Issue #3415660 by govind.maloo: Arrows supporting Previous and Next buttons on webforms are not rendering as expected #1182

govindmaloo commented Dec 18, 2023 •

edited by AlexSkrypnyk

govindmaloo commented Jan 2, 2024

AlexSkrypnyk commented Jan 23, 2024

AlexSkrypnyk Jan 23, 2024

govindmaloo Jan 23, 2024

AlexSkrypnyk Jan 23, 2024

AlexSkrypnyk commented Jan 23, 2024

govindmaloo commented Feb 5, 2024

AlexSkrypnyk Feb 6, 2024

AlexSkrypnyk commented Feb 7, 2024

govindmaloo commented Feb 8, 2024

Issue #3415660 by govind.maloo: Arrows supporting Previous and Next buttons on webforms are not rendering as expected #1182

Issue #3415660 by govind.maloo: Arrows supporting Previous and Next buttons on webforms are not rendering as expected #1182

Conversation

govindmaloo commented Dec 18, 2023 • edited by AlexSkrypnyk

Checklist before requesting a review

Changed

Screenshots

govindmaloo commented Jan 2, 2024

AlexSkrypnyk commented Jan 23, 2024

AlexSkrypnyk Jan 23, 2024

Choose a reason for hiding this comment

govindmaloo Jan 23, 2024

Choose a reason for hiding this comment

AlexSkrypnyk Jan 23, 2024

Choose a reason for hiding this comment

AlexSkrypnyk commented Jan 23, 2024

govindmaloo commented Feb 5, 2024

AlexSkrypnyk Feb 6, 2024

Choose a reason for hiding this comment

AlexSkrypnyk commented Feb 7, 2024

govindmaloo commented Feb 8, 2024

govindmaloo commented Dec 18, 2023 •

edited by AlexSkrypnyk