scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-26 01:35:34 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6300 from aignatov-bio/ai-sci-9382-results-bug-fixes

Browse source 
Bug fixes [SCI-9382][SCI-9392][SCI-9395][SCI-9396]
This commit is contained in:
Martin Artnik 2023-09-27 12:41:34 +02:00 committed by GitHub
commit 923006dc38
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/assets/stylesheets/shared/assets.scss
View file

@ -181,6 +181,7 @@
display: flex;
height: calc(100% - 4em);
justify-content: center;
margin: unset;
width: 100%;
}

2
app/assets/stylesheets/shared/content/text.scss
View file

@ -12,6 +12,8 @@
}
.view-text-element {
overflow-x: auto;
pointer-events: initial;
a {
pointer-events: initial;
}

33
app/javascript/vue/shared/content/attachments/thumbnail.vue
View file

@ -42,9 +42,33 @@
<div class="absolute bottom-16 text-sn-grey">
{{ attachment.attributes.file_size_formatted }}
</div>
<div class="absolute bottom-4 min-w-[194px] justify-between flex">
<div class="absolute bottom-4 w-[184px] grid grid-cols-[repeat(4,_2.5rem)] justify-between">
<a class="btn btn-light icon-btn thumbnail-action-btn"
v-if="this.attachment.attributes.wopi && this.attachment.attributes.urls.edit_asset"
:href="attachment.attributes.urls.edit_asset"
id="wopi_file_edit_button"
:class="attachment.attributes.wopi_context.edit_supported ? '' : 'disabled'"
>
<i class="sn-icon sn-icon-edit"></i>
</a>
<a class="btn btn-light icon-btn thumbnail-action-btn ove-edit-button"
v-else-if="attachment.attributes.asset_type == 'gene_sequence' && attachment.attributes.urls.open_vector_editor_edit"
@click="openOVEditor(attachment.attributes.urls.open_vector_editor_edit)"
>
<i class="sn-icon sn-icon-edit"></i>
</a>
<a class="btn btn-light icon-btn thumbnail-action-btn marvinjs-edit-button"
v-else-if="attachment.attributes.asset_type == 'marvinjs' && attachment.attributes.urls.marvin_js_start_edit"
:data-sketch-id="attachment.id"
:data-update-url="attachment.attributes.urls.marvin_js"
:data-sketch-start-edit-url="attachment.attributes.urls.marvin_js_start_edit"
:data-sketch-name="attachment.attributes.metadata.name"
:data-sketch-description="attachment.attributes.metadata.description"
>
<i class="sn-icon sn-icon-edit"></i>
</a>
<a class="btn btn-light icon-btn thumbnail-action-btn image-edit-button"
v-if="attachment.attributes.urls.edit_asset"
v-else-if="attachment.attributes.image_editable && attachment.attributes.urls.edit_asset"
:title="i18n.t('attachments.thumbnail.buttons.edit')"
:data-image-id="attachment.id"
:data-image-name="attachment.attributes.file_name"
@ -140,6 +164,11 @@
.on('load', (event) => ActiveStoragePreviews.showPreview(event))
}))
}
},
methods: {
openOVEditor(url) {
window.showIFrameModal(url);
}
}
}
</script>

10
config/locales/en.yml
View file

@ -1281,7 +1281,7 @@ en:
text: 'Text'
checklist: 'Checklist'
attachment: 'File'
add_file: 'File from your PC'
add_file: 'From your PC'
checklist_item: 'Add new'
well_plate_options:
32_x_48: '1536 (32 x 48)'
@ -3153,7 +3153,7 @@ en:
text: 'Text'
checklist: 'Checklist'
attachment: 'File'
add_file: 'File from your PC'
add_file: 'From your PC'
checklist_item: 'Add new'
well_plate_options:
32_x_48: '1536 (32 x 48)'
@ -3384,7 +3384,7 @@ en:
wopi_supported_table_formats_title: 'Only .xlsx, .xlsm, .xlsb, .ods file formats are supported for editing in Excel Online.'
wopi_supported_presentation_formats_title: 'Only .pptx, ppsx, .odp file formats are supported for editing in PowerPoint Online.'
create_wopi_file:
button_text: 'MS Office file'
button_text: 'New MS Office file'
li_text: "Office file"
modal_title: 'Create new Microsoft Office Online document'
text_field_label: 'Document name'
@ -3813,8 +3813,8 @@ en:
To: 'To'
marvinjs:
new_sketch: "New Chemical Drawing"
new_button: "Create Chemical Drawing"
new_sketch: "New chemical drawing"
new_button: "New chemical drawing"
new_li_button: "Chemical drawing"
structure_placeholder: "Click here to enter Chemical Drawing name"
modal_name_title: "Chemical Drawing name:"