scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-06 03:46:39 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix CSS for protocol versioning modal [SCI-8194] (#5197)

Browse source
This commit is contained in:
ajugo 2023-03-27 13:28:00 +02:00 • committed by GitHub
parent b9b785c122
commit 26879f200d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 84 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
app/assets/stylesheets/protocols/index.scss
View file

@ -209,15 +209,40 @@
flex-wrap: wrap; flex-wrap: wrap;
padding: 1em 0; padding: 1em 0;
.protocol-actions { .protocol-version-metadata {
display: flex; display: flex;
margin-left: auto; flex-wrap: nowrap;
min-height: 36px; width: 100%;
.protocol-link {
@include font-button;
flex-shrink: 0;
}
.protocol-actions {
display: flex;
margin-left: auto;
min-height: 36px;
}
.edit-buttons {
margin-top: .25em;
.btn {
margin-left: .5em;
}
}
.protocol-metadata {
@include font-small;
margin-left: 16px;
}
} }
&:not(:hover) { &:not(:hover) {
.save-as-draft { .save-as-draft {
display: none; opacity: 0;
pointer-events: none;
} }
} }
@ -250,16 +275,6 @@
width: 100%; width: 100%;
} }
.edit-buttons {
display: flex;
justify-content: end;
margin-top: .25em;
.btn {
margin-left: .5em;
}
}
.protocol-comment-container { .protocol-comment-container {
&[data-edit-mode="0"] { &[data-edit-mode="0"] {
.edit-buttons { .edit-buttons {
@ -268,12 +283,6 @@
} }
} }
} }
.protocol-metadata {
@include font-small;
margin-left: 16px;
max-width: 220px;
}
} }
.protocol-version-link { .protocol-version-link {

104
app/views/protocols/index/_protocol_versions_modal.html.erb
View file

@ -11,37 +11,39 @@
<% if @protocol.initial_draft? || @protocol.draft.present? %> <% if @protocol.initial_draft? || @protocol.draft.present? %>
<% draft = @protocol.initial_draft? ? @protocol : @protocol.draft %> <% draft = @protocol.initial_draft? ? @protocol : @protocol.draft %>
<div class="protocol-version-row"> <div class="protocol-version-row">
<div class="protocol-link"> <div class="protocol-version-metadata">
<%= link_to protocol_path(draft) do %> <div class="protocol-link">
<% if draft.previous_version %> <%= link_to protocol_path(draft) do %>
<%= t('protocols.index.versions.draft_html', parent_version: draft.previous_version.version_number) %> <% if draft.previous_version %>
<%= t('protocols.index.versions.draft_html', parent_version: draft.previous_version.version_number) %>
<% else %>
<%= t('protocols.index.versions.first_draft_html') %>
<% end %>
<% end %>
</div>
<div class="protocol-metadata">
<% if draft.last_modified_by.present? %>
<%= t('protocols.index.versions.draft_full_modification_info',
modified_on: draft.updated_at.present? ? l(draft.updated_at, format: :full_date) : '',
modified_by: draft.last_modified_by&.full_name) %>
<% else %> <% else %>
<%= t('protocols.index.versions.first_draft_html') %> <%= t('protocols.index.versions.draft_update_modification_info',
modified_on: draft.updated_at.present? ? l(draft.updated_at, format: :full_date) : '') %>
<%end%>
</div>
<div class="protocol-actions">
<% if can_publish_protocol_in_repository?(draft) %>
<%= button_to publish_protocol_path(draft), class: "btn btn-light publish-draft" do %>
<%= image_tag 'icon_small/publish.svg' %>
<%= t('protocols.index.versions.publish') %>
<% end %>
<% end %> <% end %>
<% end %> <% if can_delete_protocol_draft_in_repository?(draft) %>
</div> <div data-url="<%= destroy_draft_protocol_path(draft) %>" class="btn btn-light delete-draft">
<div class="protocol-metadata"> <i class="fas fa-trash"></i>
<% if draft.last_modified_by.present? %> </div>
<%= t('protocols.index.versions.draft_full_modification_info',
modified_on: draft.updated_at.present? ? l(draft.updated_at, format: :full_date) : '',
modified_by: draft.last_modified_by&.full_name) %>
<% else %>
<%= t('protocols.index.versions.draft_update_modification_info',
modified_on: draft.updated_at.present? ? l(draft.updated_at, format: :full_date) : '') %>
<%end%>
</div>
<div class="protocol-actions">
<% if can_publish_protocol_in_repository?(draft) %>
<%= button_to publish_protocol_path(draft), class: "btn btn-light publish-draft" do %>
<%= image_tag 'icon_small/publish.svg' %>
<%= t('protocols.index.versions.publish') %>
<% end %> <% end %>
<% end %> </div>
<% if can_delete_protocol_draft_in_repository?(draft) %>
<div data-url="<%= destroy_draft_protocol_path(draft) %>" class="btn btn-light delete-draft">
<i class="fas fa-trash"></i>
</div>
<% end %>
</div> </div>
<div class="protocol-version-comment"> <div class="protocol-version-comment">
<% if can_manage_protocol_draft_in_repository?(draft) %> <% if can_manage_protocol_draft_in_repository?(draft) %>
@ -71,29 +73,31 @@
<% end %> <% end %>
<% @published_versions.each do |protocol_version| %> <% @published_versions.each do |protocol_version| %>
<div class="protocol-version-row"> <div class="protocol-version-row">
<div class="protocol-link"> <div class="protocol-version-metadata">
<%= link_to protocol_path(protocol_version) do %> <div class="protocol-link">
<b><%= t('protocols.index.versions.revision', version: protocol_version.version_number) %></b> <%= link_to protocol_path(protocol_version) do %>
<% end %> <b><%= t('protocols.index.versions.revision', version: protocol_version.version_number) %></b>
</div>
<div class="protocol-metadata">
<%= t('protocols.index.versions.revision_publishing_info',
published_on: protocol_version.published_on.present? ? l(protocol_version.published_on, format: :full_date) : '',
published_by: protocol_version.published_by&.full_name) %>
</div>
<div class="protocol-actions">
<% if can_save_protocol_version_as_draft?(@protocol) %>
<%= button_to save_as_draft_protocol_path(protocol_version),
class: "btn btn-light icon-btn save-as-draft",
title: t('protocols.index.versions.save_as_draft'),
disabled: @protocol.draft.present?,
data: {
placement: :left,
toggle: :tooltip
} do %>
<i class="fas fa-clone"></i>
<% end %> <% end %>
<% end %> </div>
<div class="protocol-metadata">
<%= t('protocols.index.versions.revision_publishing_info',
published_on: protocol_version.published_on.present? ? l(protocol_version.published_on, format: :full_date) : '',
published_by: protocol_version.published_by&.full_name) %>
</div>
<div class="protocol-actions">
<% if can_save_protocol_version_as_draft?(@protocol) %>
<%= button_to save_as_draft_protocol_path(protocol_version),
class: "btn btn-light icon-btn save-as-draft",
title: t('protocols.index.versions.save_as_draft'),
disabled: @protocol.draft.present?,
data: {
placement: :left,
toggle: :tooltip
} do %>
<i class="fas fa-clone"></i>
<% end %>
<% end %>
</div>
</div> </div>
<div class="protocol-version-comment"> <div class="protocol-version-comment">
<%= protocol_version.version_comment %> <%= protocol_version.version_comment %>

2
config/locales/en.yml
View file

@ -2671,7 +2671,7 @@ en:
publish_modal: publish_modal:
title: "Publish version %{version} of the protocol template" title: "Publish version %{version} of the protocol template"
name: "Protocol template name" name: "Protocol template name"
comment: "Revision comment" comment: "Revision notes"
comment_placeholder: "What's new in this version?" comment_placeholder: "What's new in this version?"
publish: "Publish" publish: "Publish"
new_protocol_modal: new_protocol_modal: