scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2111 from aignatov-bio/ai-sci-3943-fix-marvinjs-in-search

Browse source 
Fix MarvinJS representation in global search [SCI-3943]
This commit is contained in:
aignatov-bio 2019-10-04 09:16:34 +02:00 committed by GitHub
parent 09e6545f30 675d5eb088
commit c2c8343c57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/stylesheets/themes/main_navigation.scss
View file

@ -144,6 +144,16 @@
#search-container {
padding-left: 45px;
.mce-i-marvinjs {
position: relative;
&::before {
display: inline-block;
left: 0;
top: 10px;
}
}
}
/** Search */

4
app/views/search/results/_assets.html.erb
View file

@ -1,7 +1,7 @@
<% @asset_results.each do |asset| %>
<h5>
<% if asset.image? %>
<span class="fas fa-paperclip"></span>
<% if asset.blob.metadata["asset_type"] == 'marvinjs' %>
<span class="mce-i-marvinjs"></span>
<% else %>
<% if wopi_file?(asset) %>
<%= file_extension_icon(asset) %>

9
app/views/search/results/partials/_asset_text.html.erb
View file

@ -1,6 +1,9 @@
<% query ||= nil %>
<% asset_read_allowed = false %>
<% text = query.present? ? highlight(asset.file_name, query.strip.split(/\s+/)) : asset.file_name %>
<%
query ||= nil
asset_read_allowed = false
file_name = asset.blob.metadata["asset_type"] ? asset.blob.metadata["name"] : asset.file_name
text = query.present? ? highlight(file_name, query.strip.split(/\s+/)) : file_name
%>
<% if asset.step %>
<% protocol = asset.step.protocol %>