From 84477cad43a5a971297e918b881b9e34e7604dd5 Mon Sep 17 00:00:00 2001 From: Anton Date: Tue, 10 Oct 2023 14:22:48 +0200 Subject: [PATCH] Update css for shared protocol [SCI-9476] --- .../shareable_links/my_module_results_show.js | 10 +++ .../stylesheets/my_modules/protocol.scss | 11 ---- app/assets/stylesheets/shared/assets.scss | 3 - .../stylesheets/shared/content/checklist.scss | 18 ----- .../my_module_protocol_show.html.erb | 6 +- .../my_module_results_show.html.erb | 23 ++++--- .../my_modules/_attachments.html.erb | 1 + .../my_modules/_comments_list.html.erb | 2 +- .../my_modules/_header_actions.html.erb | 12 ++-- .../my_modules/_protocol.html.erb | 64 +++++++++--------- .../_result_comments_sidebar.html.erb | 26 ++++++++ .../shareable_links/my_modules/_step.html.erb | 18 +++-- ...ml.erb => _step_comments_sidebar.html.erb} | 0 .../my_modules/results/_comments.html.erb | 14 ---- .../results/_comments_list.html.erb | 18 ----- .../my_modules/results/_result.html.erb | 65 ++++++++++--------- .../step_attachments/_context_menu.html.erb | 5 +- .../step_attachments/_thumbnail.html.erb | 47 +++++++++----- .../step_elements/_checklist.html.erb | 8 +-- .../step_elements/_checklist_item.html.erb | 12 ++-- .../my_modules/step_elements/_table.html.erb | 9 +-- .../my_modules/step_elements/_text.html.erb | 13 ++-- 22 files changed, 186 insertions(+), 199 deletions(-) create mode 100644 app/views/shareable_links/my_modules/_result_comments_sidebar.html.erb rename app/views/shareable_links/my_modules/{_comments_sidebar.html.erb => _step_comments_sidebar.html.erb} (100%) delete mode 100644 app/views/shareable_links/my_modules/results/_comments.html.erb delete mode 100644 app/views/shareable_links/my_modules/results/_comments_list.html.erb diff --git a/app/assets/javascripts/shareable_links/my_module_results_show.js b/app/assets/javascripts/shareable_links/my_module_results_show.js index a17af4da5..52394fa67 100644 --- a/app/assets/javascripts/shareable_links/my_module_results_show.js +++ b/app/assets/javascripts/shareable_links/my_module_results_show.js @@ -31,6 +31,15 @@ }); } + function initResultComments() { + $(document).on('click', '.shareable-link-open-comments-sidebar', function(e) { + e.preventDefault(); + $('.comments-sidebar').removeClass('open'); + + $($(this).data('objectTarget')).addClass('open'); + }); + } + function initResultsExpandCollapse() { $(document).on('click', '#results-collapse-btn', function() { $('.result .panel-collapse').collapse('hide'); @@ -44,6 +53,7 @@ function initMyModuleResultsShow() { initAttachments(); initResultsExpandCollapse(); + initResultComments(); $('.hot-table-container').each(function() { initializeHandsonTable($(this)); diff --git a/app/assets/stylesheets/my_modules/protocol.scss b/app/assets/stylesheets/my_modules/protocol.scss index b6b7d3817..11d83d2a2 100644 --- a/app/assets/stylesheets/my_modules/protocol.scss +++ b/app/assets/stylesheets/my_modules/protocol.scss @@ -103,14 +103,3 @@ color: var(--sn-grey); } } - -@media screen and (max-width: 1395px) { - .task-section-header { - height: 7.44rem; - } - - .protocol-buttons-group { - flex-wrap: wrap; - margin: 1rem; - } -} diff --git a/app/assets/stylesheets/shared/assets.scss b/app/assets/stylesheets/shared/assets.scss index 3e58a4b5b..947746b12 100644 --- a/app/assets/stylesheets/shared/assets.scss +++ b/app/assets/stylesheets/shared/assets.scss @@ -288,9 +288,6 @@ .dropdown-menu { @include font-button; - min-width: 200px; - padding: .5em 0; - z-index: 102; .divider-label { @include font-small; diff --git a/app/assets/stylesheets/shared/content/checklist.scss b/app/assets/stylesheets/shared/content/checklist.scss index 65eddae49..5317f14ec 100644 --- a/app/assets/stylesheets/shared/content/checklist.scss +++ b/app/assets/stylesheets/shared/content/checklist.scss @@ -2,16 +2,6 @@ // scss-lint:disable NestingDepth .step-checklist-items { - .sci-inline-edit { - margin-top: 5px; - - .sci-inline-edit__content { - margin-bottom: 7px; - margin-left: 0; - margin-right: .5em; - } - } - .step-checklist-item { padding-left: 5px; } @@ -59,14 +49,6 @@ .step-checklist-item-ghost { border: 1px solid $brand-primary; } - - .sci-checkbox-container { - margin: 11px 0; - - &.disabled { - pointer-events: none; - } - } } .step-checklist-container { diff --git a/app/views/shareable_links/my_module_protocol_show.html.erb b/app/views/shareable_links/my_module_protocol_show.html.erb index 1ad7bba3c..bf04088e7 100644 --- a/app/views/shareable_links/my_module_protocol_show.html.erb +++ b/app/views/shareable_links/my_module_protocol_show.html.erb @@ -7,7 +7,7 @@ -
+
<%= render partial: 'shareable_links/my_modules/header_actions' %> @@ -27,10 +27,6 @@ <%= @my_module.code %>
- -
- <%= render partial: 'shareable_links/my_modules/task_flow_button', locals: { my_module: @my_module } if @my_module.my_module_status_flow %> -
> <%= render partial: 'shareable_links/my_modules/my_module_details' %> diff --git a/app/views/shareable_links/my_module_results_show.html.erb b/app/views/shareable_links/my_module_results_show.html.erb index 2d9d24ddb..62b198e4e 100644 --- a/app/views/shareable_links/my_module_results_show.html.erb +++ b/app/views/shareable_links/my_module_results_show.html.erb @@ -6,24 +6,22 @@
-
-
+
+
<%= render partial: 'shareable_links/my_modules/header_actions' %> -
-
-
- -
  • <%= link_to t('general.sort_new.atoz'), shared_protocol_results_path(@shareable_link.uuid, page: params[:page], order: 'atoz'), class: (@results_order == 'atoz' ? 'selected' : '') %>
    • @@ -38,6 +36,7 @@
    <% @results.each do |result| %> <%= render partial: "shareable_links/my_modules/results/result", locals: { result: result, gallery: @gallery } %> + <%= render partial: "shareable_links/my_modules/result_comments_sidebar", locals: { result: result } %> <% end %>
    diff --git a/app/views/shareable_links/my_modules/_attachments.html.erb b/app/views/shareable_links/my_modules/_attachments.html.erb index 1c92812d0..c0a53be34 100644 --- a/app/views/shareable_links/my_modules/_attachments.html.erb +++ b/app/views/shareable_links/my_modules/_attachments.html.erb @@ -1,4 +1,5 @@
    +

    <%= t('protocols.steps.files', count: attachments.length) %>

    diff --git a/app/views/shareable_links/my_modules/_comments_list.html.erb b/app/views/shareable_links/my_modules/_comments_list.html.erb index 38245a948..a0088289a 100644 --- a/app/views/shareable_links/my_modules/_comments_list.html.erb +++ b/app/views/shareable_links/my_modules/_comments_list.html.erb @@ -1,5 +1,5 @@ <% user= nil %> -<% step.comments.order(created_at: :asc).each do |comment| %> +<% oject.comments.order(created_at: :asc).each do |comment| %>
    <% unless user == comment.user%>
    diff --git a/app/views/shareable_links/my_modules/_header_actions.html.erb b/app/views/shareable_links/my_modules/_header_actions.html.erb index 8012606a4..56a6beb77 100644 --- a/app/views/shareable_links/my_modules/_header_actions.html.erb +++ b/app/views/shareable_links/my_modules/_header_actions.html.erb @@ -1,12 +1,12 @@ -
    -
    - " +
    +
    + " href="<%= shared_protocol_url(@shareable_link.uuid) %>" title="<%= t("nav2.modules.steps") %>" > <%= t("nav2.modules.steps") %> - " + " href="<%= shared_protocol_results_path(@shareable_link.uuid) %>" title="<%= t("nav2.modules.results") %>" > @@ -16,5 +16,9 @@ <%= @my_module.archived_branch? ? @my_module.results.size : @active_results_size %> <% end %> +
    + <%= render partial: 'shareable_links/my_modules/task_flow_button', locals: { my_module: @my_module } if @my_module.my_module_status_flow %> +
    +
    diff --git a/app/views/shareable_links/my_modules/_protocol.html.erb b/app/views/shareable_links/my_modules/_protocol.html.erb index 8274a6fac..05e33f702 100644 --- a/app/views/shareable_links/my_modules/_protocol.html.erb +++ b/app/views/shareable_links/my_modules/_protocol.html.erb @@ -19,49 +19,47 @@ <% end %>
    +
    + <% if protocol.steps.length > 0 %> + + + <% end %> +
    -
    -
    -
    - - <%= protocol.name %> - -
    - -
    -
    - <% if protocol.description.present? %> -
    - <%= smart_annotation_text(protocol.shareable_tinymce_render(:description)) %> -
    - <% else %> -
    - <%= t("protocols.no_text_placeholder") %> -
    - <% end %> -
    -
    +
    +
    +
    + + <%= protocol.name %> +
    +
    -
    - <% if protocol.steps.length > 0 %> -
    - - +
    + <% if protocol.description.present? %> +
    + <%= smart_annotation_text(protocol.shareable_tinymce_render(:description)) %> +
    + <% else %> +
    + <%= t("protocols.no_text_placeholder") %>
    <% end %> +
    +
    +
    +
    +
    <% protocol.steps.sort_by(&:position).each do |step| %>
    <%= render partial: "shareable_links/my_modules/step", locals: { step: step } %> - <%= render partial: "shareable_links/my_modules/comments_sidebar", locals: { step: step } %> + <%= render partial: "shareable_links/my_modules/step_comments_sidebar", locals: { step: step } %>
    <% end %>
    diff --git a/app/views/shareable_links/my_modules/_result_comments_sidebar.html.erb b/app/views/shareable_links/my_modules/_result_comments_sidebar.html.erb new file mode 100644 index 000000000..a82bd486f --- /dev/null +++ b/app/views/shareable_links/my_modules/_result_comments_sidebar.html.erb @@ -0,0 +1,26 @@ +
    +
    +
    +
    + <%= "#{result.name}" %> +
    +
    + +
    +
    +
    + <% if result.comments.present? %> +
    + <%= render partial: "shareable_links/my_modules/comments_list", locals: { object: result } %> +
    + <% else %> +
    + <%= image_tag 'comments/placeholder.svg', class: 'no-comments-image' %> +

    <%= t('comments.empty_state.title') %>

    +

    <%= t('comments.empty_state.description') %>

    +
    + <% end %> +
    +
    +
    +
    diff --git a/app/views/shareable_links/my_modules/_step.html.erb b/app/views/shareable_links/my_modules/_step.html.erb index c8812adbb..a93b51b13 100644 --- a/app/views/shareable_links/my_modules/_step.html.erb +++ b/app/views/shareable_links/my_modules/_step.html.erb @@ -1,26 +1,26 @@ -
    +
    -
    -
    +
    -
    +
    - <%= step.position + 1 %> . + <%= step.position + 1 %>.
    -
    +
    <%= render partial: "shareable_links/my_modules/inline_view", locals: { text: step.name, smart_annotation_enabled: false } %> + <%= t('protocols.steps.timestamp_iso_html', date: step.created_at.iso8601, user: step.user.full_name) %>
    @@ -41,10 +41,7 @@
    -
    -
    - <%= t('protocols.steps.timestamp_iso_html', date: step.created_at.iso8601, user: step.user.full_name) %> -
    +
    <% step.step_orderable_elements.sort_by(&:position).each do |element| %> <% if element.orderable_type == 'StepText' %> <%= render partial: "shareable_links/my_modules/step_elements/text", locals: { element: element.orderable } %> @@ -59,4 +56,5 @@ <% end %>
    +
    diff --git a/app/views/shareable_links/my_modules/_comments_sidebar.html.erb b/app/views/shareable_links/my_modules/_step_comments_sidebar.html.erb similarity index 100% rename from app/views/shareable_links/my_modules/_comments_sidebar.html.erb rename to app/views/shareable_links/my_modules/_step_comments_sidebar.html.erb diff --git a/app/views/shareable_links/my_modules/results/_comments.html.erb b/app/views/shareable_links/my_modules/results/_comments.html.erb deleted file mode 100644 index 674e6be61..000000000 --- a/app/views/shareable_links/my_modules/results/_comments.html.erb +++ /dev/null @@ -1,14 +0,0 @@ -
    -
    -

    - <%=t('my_modules.results.comments_tab') %> - (<%= comments.count %>) -

    -
    -
    -
    -
    - <%= render partial: "shareable_links/my_modules/results/comments_list", locals: { comments: comments } %> -
    -
    -
    diff --git a/app/views/shareable_links/my_modules/results/_comments_list.html.erb b/app/views/shareable_links/my_modules/results/_comments_list.html.erb deleted file mode 100644 index dbd59eb23..000000000 --- a/app/views/shareable_links/my_modules/results/_comments_list.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -<% comments.order(created_at: :asc).each do |comment| %> -
    -
    - - <%= image_tag user_avatar_absolute_url(comment.user, :icon_small, true), class: 'user-avatar' %> - -
    -
    -
    <%= comment.user.full_name %>
    -
    -
    <%= l(comment.created_at, format: :full) %>
    -
    -
    -
    <%= smart_annotation_text(comment.message) %>
    -
    -
    -
    -<% end %> diff --git a/app/views/shareable_links/my_modules/results/_result.html.erb b/app/views/shareable_links/my_modules/results/_result.html.erb index a0aa82c11..32a78c7e9 100644 --- a/app/views/shareable_links/my_modules/results/_result.html.erb +++ b/app/views/shareable_links/my_modules/results/_result.html.erb @@ -1,37 +1,40 @@ -
    -
    -
    -
    -
    - +
    +
    +
    + - <%= result.name %> | - <%= t('my_modules.results.published_on_iso_html', timestamp: result.created_at.iso8601, user: h(result.user.full_name)) %> -
    -
    -
    -
    -
    - <% result.result_orderable_elements.sort_by(&:position).each do |element| %> - <% if element.orderable_type == 'ResultText' %> - <%= render partial: "shareable_links/my_modules/step_elements/text", locals: { element: element.orderable } %> - <% elsif element.orderable_type == 'ResultTable'%> - <%= render partial: "shareable_links/my_modules/step_elements/table", locals: { element: element.orderable.table } %> - <% end %> - <% end %> - <% if result.result_assets.present? %> - <%= render partial: "shareable_links/my_modules/attachments", locals: { attachments: result.assets, step: result } %> - <% end %> -
    -
    -
    -
    - <%= render partial: "shareable_links/my_modules/results/comments", locals: { comments: result.comments } %> -
    -
    +
    + <%= result.name %> + <%= t('my_modules.results.published_on_iso_html', timestamp: result.created_at.iso8601, user: h(result.user.full_name)) %> +
    +
    + + + + <%= result.comments.count %> + +
    +
    + <% result.result_orderable_elements.sort_by(&:position).each do |element| %> + <% if element.orderable_type == 'ResultText' %> + <%= render partial: "shareable_links/my_modules/step_elements/text", locals: { element: element.orderable } %> + <% elsif element.orderable_type == 'ResultTable'%> + <%= render partial: "shareable_links/my_modules/step_elements/table", locals: { element: element.orderable.table } %> + <% end %> + <% end %> + <% if result.result_assets.present? %> + <%= render partial: "shareable_links/my_modules/attachments", locals: { attachments: result.assets, step: result } %> + <% end %> +
    diff --git a/app/views/shareable_links/my_modules/step_attachments/_context_menu.html.erb b/app/views/shareable_links/my_modules/step_attachments/_context_menu.html.erb index 5c54e0ada..e97a2783c 100644 --- a/app/views/shareable_links/my_modules/step_attachments/_context_menu.html.erb +++ b/app/views/shareable_links/my_modules/step_attachments/_context_menu.html.erb @@ -3,10 +3,9 @@ -
      +
      • - <%= link_to shared_protocol_asset_download_path(@shareable_link.uuid, asset), data: { turbolinks: false } do %> - + <%= link_to shared_protocol_asset_download_path(@shareable_link.uuid, asset), data: { turbolinks: false }, class: "!px-3 !py-2.5 hover:!bg-sn-super-light-blue !text-sn-blue" do %> <%= t('Download') %> <% end %>
        • diff --git a/app/views/shareable_links/my_modules/step_attachments/_thumbnail.html.erb b/app/views/shareable_links/my_modules/step_attachments/_thumbnail.html.erb index 1370e6d1a..fc5d1cb4c 100644 --- a/app/views/shareable_links/my_modules/step_attachments/_thumbnail.html.erb +++ b/app/views/shareable_links/my_modules/step_attachments/_thumbnail.html.erb @@ -1,18 +1,17 @@ -
        +
        <%= link_to '#', - class: "shareable-file-preview-link", - id: "modal_link#{asset.id}", - data: { - no_turbolink: true, - id: asset.id - } do %> + class: "file-preview-link group-hover:hidden", + id: "modal_link#{asset.id}", + data: { + no_turbolink: true, + id: asset.id + } do %>
        <% if asset.previewable? && asset.medium_preview&.image&.attached? %> <%= image_tag asset.medium_preview.url(expires_in: Constants::URL_SHORT_EXPIRE_TIME.minutes), - class: 'asset-preview-image', - style: 'opacity: 0' %> + class: 'rounded-sm' %> <% else %> - +
        <% end %>
        <%= asset.render_file_name %>
        -
        - <%= t('assets.placeholder.modified_label') %> <%= asset.updated_at.iso8601 if asset.updated_at %>
        + <% end %> +
        + + <%= asset.render_file_name %> + +
        <%= number_to_human_size(asset.file_size) %>
        - <% end %> - <% if defined?(show_context) && show_context %> - <%= render partial: "shareable_links/my_modules/step_attachments/context_menu", locals: { asset: asset } %> - <% end %> +
        + <%= link_to shared_protocol_asset_download_path(@shareable_link.uuid, asset), class: "btn btn-light icon-btn thumbnail-action-btn",data: { turbolinks: false } do %> + + <% end %> +
        + <% if defined?(show_context) && show_context %> + <%= render partial: "shareable_links/my_modules/step_attachments/context_menu", locals: { asset: asset } %> + <% end %> +
        +
        diff --git a/app/views/shareable_links/my_modules/step_elements/_checklist.html.erb b/app/views/shareable_links/my_modules/step_elements/_checklist.html.erb index c5e817745..15b440858 100644 --- a/app/views/shareable_links/my_modules/step_elements/_checklist.html.erb +++ b/app/views/shareable_links/my_modules/step_elements/_checklist.html.erb @@ -1,7 +1,7 @@ -
        -
        -
        -
        +
        +
        +
        +
        <%= render partial: "shareable_links/my_modules/inline_view", locals: { text: element.name, smart_annotation_enabled: true } %>
        diff --git a/app/views/shareable_links/my_modules/step_elements/_checklist_item.html.erb b/app/views/shareable_links/my_modules/step_elements/_checklist_item.html.erb index 5cf2877ee..f17cee6d2 100644 --- a/app/views/shareable_links/my_modules/step_elements/_checklist_item.html.erb +++ b/app/views/shareable_links/my_modules/step_elements/_checklist_item.html.erb @@ -1,14 +1,14 @@ -
        -
        -
        -
        -
        +
        +
        +
        +
        +
        />
        -
        +
        <%= render partial: "shareable_links/my_modules/inline_view", locals: { text: checklist_item.text, smart_annotation_enabled: true } %>
        diff --git a/app/views/shareable_links/my_modules/step_elements/_table.html.erb b/app/views/shareable_links/my_modules/step_elements/_table.html.erb index 2d4382be7..2ca34f819 100644 --- a/app/views/shareable_links/my_modules/step_elements/_table.html.erb +++ b/app/views/shareable_links/my_modules/step_elements/_table.html.erb @@ -1,12 +1,13 @@ -
        -
        +
        +
        +
        <% if element.name.present? %> -
        +
        <%= render partial: "shareable_links/my_modules/inline_view", locals: { text: element.name, smart_annotation_enabled: false } %>
        <% end %>
        -
        +
        diff --git a/app/views/shareable_links/my_modules/step_elements/_text.html.erb b/app/views/shareable_links/my_modules/step_elements/_text.html.erb index 41b76cfb3..3a1f5abe0 100644 --- a/app/views/shareable_links/my_modules/step_elements/_text.html.erb +++ b/app/views/shareable_links/my_modules/step_elements/_text.html.erb @@ -1,13 +1,14 @@ -
        +
        +
        <% if element.name.present? %> -
        -
        - <%= render partial: "shareable_links/my_modules/inline_view", locals: { text: element.name, smart_annotation_enabled: false } %> -
        +
        +
        + <%= render partial: "shareable_links/my_modules/inline_view", locals: { text: element.name, smart_annotation_enabled: false } %> +
        <% end %> <% if element.text.present? %> -
        +
        <%= smart_annotation_text(element.shareable_tinymce_render(:text)) %>
        <% else %>