Skip to content

Collapse and expand questions when editing questionnaire#6099

Merged
tramuntanal merged 23 commits intodevelopfrom
Platoniq-feature/collapse-questions
May 15, 2020
Merged

Collapse and expand questions when editing questionnaire#6099
tramuntanal merged 23 commits intodevelopfrom
Platoniq-feature/collapse-questions

Conversation

@tramuntanal
Copy link
Copy Markdown
Contributor

🎩 What? Why?

This PR supersedes #5945 to resolve merge conflicts. It does not modifies the functionality.

📌 Related Issues

Copy link
Copy Markdown
Contributor

@Leusev Leusev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good for me

@tramuntanal tramuntanal merged commit 204758a into develop May 15, 2020
@tramuntanal tramuntanal deleted the Platoniq-feature/collapse-questions branch May 15, 2020 09:46
ace pushed a commit to aspgems/decidim that referenced this pull request May 19, 2020
* develop:
  Collapse and expand questions when editing questionnaire (decidim#6099)
  Projects budget votes and selected styles (decidim#5950)
  Fix avatar deformation in CSS (decidim#5990)
  Use organization time zone when decidim-api is used (decidim#6088)
microstudi pushed a commit to Platoniq/decidim that referenced this pull request Jul 8, 2020
* Make questions in questionnaire collapsible to improve UX

* Spec for collapsible questions

* Make new questions collapsible

* Spec for new questions to be collapsible

* Dynamic title for questions card-title

* Collapse all and expand all buttons in questionnaire edit

* Expand questions in spec

* Move collapsible question event binding to separate js

* Add specs for collapse all and expand all buttons

* Update changelog

* Fix erb lint

* Update changelog

* Add collapsible_questions.js to admin js manifest

* Fix conflicts

* Document LiveTextUpdate component

* Fix lint errors

* Add expand_all_questions to matrix-related specs

Co-authored-by: Vera Rojman <vrojman@protonmail.com>
# Conflicts:
#	decidim-forms/app/assets/javascripts/decidim/forms/admin/forms.js.es6
#	decidim-forms/app/assets/javascripts/decidim/forms/admin/live_text_update.component.js.es6
#	decidim-forms/app/helpers/decidim/forms/admin/application_helper.rb
#	decidim-forms/lib/decidim/forms/test/shared_examples/manage_questionnaires.rb
@microstudi microstudi mentioned this pull request Jul 23, 2020
13 tasks
microstudi pushed a commit to Platoniq/decidim that referenced this pull request Jul 23, 2020
* Make questions in questionnaire collapsible to improve UX

* Spec for collapsible questions

* Make new questions collapsible

* Spec for new questions to be collapsible

* Dynamic title for questions card-title

* Collapse all and expand all buttons in questionnaire edit

* Expand questions in spec

* Move collapsible question event binding to separate js

* Add specs for collapse all and expand all buttons

* Update changelog

* Fix erb lint

* Update changelog

* Add collapsible_questions.js to admin js manifest

* Fix conflicts

* Document LiveTextUpdate component

* Fix lint errors

* Add expand_all_questions to matrix-related specs

Co-authored-by: Vera Rojman <vrojman@protonmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants