scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-01-06 15:40:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into features/new-datatable

Browse source
This commit is contained in:
Martin Artnik 2024-01-10 16:31:53 +01:00
commit 21b3c2a65f
8 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Gemfile.lock
View file

@ -442,7 +442,7 @@ GEM
net-smtp (0.3.3)
net-protocol
newrelic_rpm (9.2.2)
nio4r (2.5.9)
nio4r (2.7.0)
nokogiri (1.14.5)
mini_portile2 (~> 2.8.0)
racc (~> 1.4)
@ -505,7 +505,7 @@ GEM
pry (>= 0.10.4)
psych (3.3.4)
public_suffix (5.0.1)
puma (6.3.1)
puma (6.4.2)
nio4r (~> 2.0)
raabro (1.4.0)
racc (1.7.1)

2
VERSION
View file

@ -1 +1 @@
1.29.5.1
1.29.6

2
app/assets/javascripts/shareable_links/handson_table_wraping.js
View file

@ -10,7 +10,7 @@
if ($(table).parent().hasClass('table-wrapper')) return;
$(table).wrap(`
<div class="table-wrapper" style="overflow: auto; width: ${$($(rtf)[0]).parent().width()}px"></div>
<div class="table-wrapper w-full" style="overflow: auto;"></div>
`);
}
}

3
app/assets/javascripts/shared/inline_editing.js
View file

@ -148,9 +148,6 @@ let inlineEditing = (function() {
$(editBlocks).click();
}
})
.on('blur', `${editBlocks} textarea, ${editBlocks} input`, function(e) {
saveAllEditFields();
})
.on('click', editBlocks, function(e) {
// 'A' mean that, if we click on <a></a> element we will not go in edit mode
var container = $(this);

6
app/views/layouts/shareable_links.html.erb
View file

@ -30,11 +30,11 @@
</head>
<body id="sci-shareable-links" data-datetime-picker-format="YYYY-MM-DD">
<div class="flex shareable-links">
<div class="sticky top-0 w-80 h-screen px-6 py-6 flex flex-col
border-0 border-r border-solid border-sn-sleepy-grey">
<div class="sticky top-0 h-screen px-6 py-6 flex flex-col
border-0 border-r border-solid border-sn-sleepy-grey w-[15vw]">
<%= render "shareable_links/my_modules/left_navigation" %>
</div>
<div class="flex flex-col flex-1 min-h-screen p-4 bg-sn-super-light-grey">
<div class="flex flex-col flex-1 min-h-screen p-4 bg-sn-super-light-grey w-[85vw]">
<%= yield %>
</div>
</div>

2
app/views/shareable_links/my_module_protocol_show.html.erb
View file

@ -46,7 +46,7 @@
<div class="task-notes">
<div class="task-notes-content">
<% if @my_module.description.present? %>
<div class="rtf-view overflow-auto w-full max-w-[54rem]">
<div class="rtf-view overflow-auto w-full">
<%= smart_annotation_text(@my_module.shareable_tinymce_render(:description)) %>
</div>
<% else %>

2
app/views/shareable_links/my_modules/_protocol.html.erb
View file

@ -42,7 +42,7 @@
<div>
<div id="protocol-description-container" >
<% if protocol.description.present? %>
<div class="rtf-view overflow-auto w-full max-w-[54rem]">
<div class="rtf-view overflow-auto w-full">
<%= smart_annotation_text(protocol.shareable_tinymce_render(:description)) %>
</div>
<% else %>

2
app/views/shareable_links/my_modules/step_elements/_text.html.erb
View file

@ -8,7 +8,7 @@
</div>
<% end %>
<% if element.text.present? %>
<div class="rtf-view rounded min-h-[2.25rem] mb-4 relative group/text_container content__text-body overflow-auto w-full max-w-[54rem]">
<div class="rtf-view rounded min-h-[2.25rem] mb-4 relative group/text_container content__text-body overflow-auto w-full">
<%= smart_annotation_text(element.shareable_tinymce_render(:text)) %>
</div>
<% else %>