From bb5941e5d8998ba142be014c35bdb964f4fd86c5 Mon Sep 17 00:00:00 2001 From: Benjamin FAURE Date: Tue, 8 Mar 2022 10:56:20 +0100 Subject: [PATCH] Added toggleable guidance/comments section --- .../stylesheets/blocks/_question_form.scss | 35 +++++++++++++++++++ app/javascript/src/answers/edit.js | 9 +++++ app/views/phases/_edit_plan_answers.html.erb | 16 +++++++-- config/initializers/_dmproadmap.rb | 4 +++ 4 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 app/assets/stylesheets/blocks/_question_form.scss diff --git a/app/assets/stylesheets/blocks/_question_form.scss b/app/assets/stylesheets/blocks/_question_form.scss new file mode 100644 index 0000000000..301e5861e4 --- /dev/null +++ b/app/assets/stylesheets/blocks/_question_form.scss @@ -0,0 +1,35 @@ +.question-body { + display: flex; + padding: 15px 0; + .question-section { + flex: 8; + position: relative; + .toggle-guidance-section { + position: absolute; + top: 0; + right: 0; + background-color: $color-grey-darker; + color: $color-white; + padding: 10px 5px; + cursor: pointer; + + text-orientation: mixed; + writing-mode: vertical-rl; + &.disabled { + background-color: $color-muted; + cursor: not-allowed; + } + } + .question-form { + padding-right: 50px; + padding-top: 10px; + } + } + + .guidance-section { + flex: 4; + border-left: 5px solid $color-grey-darker; + padding-left: 5px; + } + +} \ No newline at end of file diff --git a/app/javascript/src/answers/edit.js b/app/javascript/src/answers/edit.js index a0fd8d589a..766ccc9386 100644 --- a/app/javascript/src/answers/edit.js +++ b/app/javascript/src/answers/edit.js @@ -185,4 +185,13 @@ $(() => { } datePicker(); + + // Clicking the 'Comments & Guidance' div should toggle the guidance & comments section + $(document).on('click', '.toggle-guidance-section', (e) => { + const target = $(e.currentTarget); + target.parents('.question-body').find('.guidance-section').toggle(); + target.find('span.fa-chevron-right, span.fa-chevron-left') + .toggleClass('fa-chevron-right') + .toggleClass('fa-chevron-left'); + }); }); diff --git a/app/views/phases/_edit_plan_answers.html.erb b/app/views/phases/_edit_plan_answers.html.erb index ae13124610..9c4467840c 100644 --- a/app/views/phases/_edit_plan_answers.html.erb +++ b/app/views/phases/_edit_plan_answers.html.erb @@ -65,9 +65,18 @@ answer = Answer.new({ plan: plan, question: question }) end %> -
-
+
+
+ <% + guidance_comments_opened = Rails.configuration.x.application.guidance_comments_opened + %> + <% if Rails.configuration.x.application.guidance_comments_toggleable %> +
+ + <%= _('Comments & Guidance') %> +
+ <% end %>
" class="answer-locking"> @@ -87,7 +96,8 @@
-
+ <% style = guidance_comments_opened ? '' : 'display: none' %> +
<%= render partial: '/phases/guidances_notes', locals: { plan: plan, diff --git a/config/initializers/_dmproadmap.rb b/config/initializers/_dmproadmap.rb index 06c664419a..fa04bf6f9e 100644 --- a/config/initializers/_dmproadmap.rb +++ b/config/initializers/_dmproadmap.rb @@ -122,6 +122,10 @@ class Application < Rails::Application config.x.application.require_contributor_name = false config.x.application.require_contributor_email = false + # Defines if Guidances/Comments in toggleable & if it's opened by default + config.x.application.guidance_comments_toggleable = true + config.x.application.guidance_comments_opened = true + # ------------------- # # SHIBBOLETH SETTINGS # # ------------------- #