scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 14:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix wording and titles [SCI-10613][SCI-10789][SCI-10796]

Browse source
This commit is contained in:
Anton 2024-06-18 12:58:11 +02:00
parent df5a414bf5
commit af13131549
5 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/tailwind/modals.css
View file

@ -40,7 +40,7 @@
}
.modal .modal-dialog.modal-lg {
@apply w-[900px];
@apply max-w-[900px] w-full;
}
.modal.fade .modal-dialog {

4
app/javascript/vue/repositories/modals/import/mapping_step.vue
View file

@ -15,7 +15,7 @@
{{ this.i18n.t('repositories.import_records.steps.step2.subtitle') }}
</p>
<div class="flex gap-6 items-center my-6">
<div class="flex items-center gap-2">
<div class="flex items-center gap-2" :title="i18n.t('repositories.import_records.steps.step2.autoMappingTooltip')">
<div class="sci-checkbox-container">
<input type="checkbox" class="sci-checkbox" v-model="autoMapping" />
<span class="sci-checkbox-label"></span>
@ -44,7 +44,7 @@
<hr class="m-0 mt-6">
<div class="grid grid-cols-[3rem_auto_1.5rem_auto_5rem_auto] px-2">
<div v-for="(column, key) in columnLabels" class="flex items-center px-2 py-2">{{ column }}</div>
<div v-for="(column, key) in columnLabels" class="flex items-center px-2 py-2 font-bold">{{ column }}</div>
<template v-for="(item, index) in params.import_data.header" :key="item">
<MappingStepTableRow

10
app/javascript/vue/repositories/modals/import/mapping_step_table_row.vue
View file

@ -48,10 +48,12 @@
<div class="py-1 min-h-12 px-2 flex items-center" :class="{
'bg-sn-super-light-blue': selected
}">
<i v-if="differentMapingName" class="sn-icon sn-icon-info text-sn-science-blue"></i>
<i v-else-if="columnMapped" class="sn-icon sn-icon-check"></i>
<i v-else-if="matchNotFound" class="sn-icon sn-icon-close text-sn-alert-brittlebush"></i>
<i v-else class="sn-icon sn-icon-close text-sn-sleepy-grey"></i>
<i v-if="differentMapingName" :title="i18n.t('repositories.import_records.steps.step2.table.tableRow.importedColumnTitle')"
class="sn-icon sn-icon-info text-sn-science-blue"></i>
<i v-else-if="columnMapped" :title="i18n.t('repositories.import_records.steps.step2.table.tableRow.importedColumnTitle')" class="sn-icon sn-icon-check"></i>
<i v-else-if="matchNotFound" :title="i18n.t('repositories.import_records.steps.step2.table.tableRow.matchNotFoundColumnTitle')"
class="sn-icon sn-icon-close text-sn-alert-brittlebush"></i>
<i v-else :title="i18n.t('repositories.import_records.steps.step2.table.tableRow.doNotImportColumnTitle')" class="sn-icon sn-icon-close text-sn-sleepy-grey"></i>
</div>
<div class="py-1 min-h-12 px-2 flex items-center" :title="params.import_data.columns[index]" :class="{

8
app/javascript/vue/repositories/modals/import/upload_step.vue
View file

@ -1,10 +1,10 @@
<template>
<div ref="modal" class="modal" tabindex="-1" role="dialog">
<div class="modal-dialog flex" role="document" :class="{'!w-[900px]': showingInfo}">
<div v-if="showingInfo" class="w-[300px] h-full bg-sn-super-light-grey p-6 rounded-s text-sn-dark-grey">
<div v-if="showingInfo" class="w-[300px] shrink-0 h-full bg-sn-super-light-grey p-6 rounded-s text-sn-dark-grey">
<h3 class="my-0 mb-4">{{ this.i18n.t('repositories.import_records.info_sidebar.title') }}</h3>
<div v-for="i in 4" :key="i" class="flex gap-3 mb-4">
<span class="btn btn-secondary icon-btn !text-sn-black">
<span class="btn btn-secondary icon-btn !text-sn-black !pointer-events-none">
<i class="sn-icon"
:class="i18n.t(`repositories.import_records.info_sidebar.elements.element${i - 1}.icon`)"
></i>
@ -15,10 +15,10 @@
</div>
</div>
<div class="flex gap-3 mb-4 items-center">
<span class="btn btn-secondary icon-btn !text-sn-black">
<span class="btn btn-secondary icon-btn !text-sn-black !pointer-events-none">
<i class="sn-icon sn-icon-open"></i>
</span>
<a :href="i18n.t('repositories.import_records.info_sidebar.elements.element4.linkTo')" class="font-bold">
<a :href="i18n.t('repositories.import_records.info_sidebar.elements.element4.linkTo')" class="font-bold" target="_blank">
{{ i18n.t('repositories.import_records.info_sidebar.elements.element4.label') }}
</a>
</div>

38
config/locales/en.yml
View file

@ -2197,30 +2197,31 @@ en:
list_row: "Row %{row}"
list_error: "%{key}: %{val}"
import_records:
update_inventory: 'Update inventory'
update_inventory: 'Import items'
steps:
step1:
id: 'step1'
icon: 'sn-icon-open'
label: 'Step 1'
title: 'Update inventory'
subtitle: 'To add or edit items, export the inventory and reimport edited inventory.'
title: 'Import items'
subtitle: 'Inventory import allows for adding new items or updating existing data. Ensure the imported file contains column header names. For easy import, export the full inventory with existing items or only the inventory columns template.'
helpText: 'Help'
exportTitle: 'Export'
exportFullInvBtnText: 'Export full inventory'
exportEmptyInvBtnText: 'Export empty inventory'
exportFullInvBtnText: 'Export all items'
exportEmptyInvBtnText: 'Download inventory template'
importTitle: 'Import'
importBtnText: 'Import'
cancelBtnText: 'Cancel'
dragAndDropSupportingText: '.XLSX, .XLS or .CSV file'
dragAndDropSupportingText: '.xlsx, .xls, .csv or .txt file'
step2:
id: 'step2'
icon: 'sn-icon-open'
label: 'Step 2'
title: 'Mapping data'
subtitle: 'Match your imported columns with the columns in the SciNote inventory.'
subtitle: 'Match your imported file columns with the existing columns in the inventory to finalize the item import.'
selectNamePropertyError: 'Select Name attribute field to import your items.'
autoMappingText: 'Auto-mapping'
autoMappingTooltip: 'When auto-mapping is selected, SciNote automatically connects columns with matching names. When not selected, manual mapping of each column is required.'
updateEmptyCellsText: 'Update empty cells'
onlyAddNewItemsText: 'Only add new items'
importedFileText: 'Imported file:'
@ -2246,12 +2247,9 @@ en:
placeholders:
matchNotFound: 'Match not found'
doNotImport: 'Do not import'
defaultColumnTitle: 'Default column. Mapped as identifier.'
matchNotFoundColumnTitle: 'Match not found.'
userDefinedColumnTitle: 'Column name does not match. Column will be imported as '
matchNotFoundColumnTitle: 'Column match not found.'
importedColumnTitle: 'Column will be imported.'
doNotImportColumnTitle: 'Column will not import.'
importAsNewColumn: 'Import as new column'
doNotImportColumnTitle: 'Column will not be imported.'
newColumnType:
text: 'Text'
list: 'Dropdown'
@ -2279,7 +2277,7 @@ en:
duplicated_items: 'Duplicated'
invalid_items: 'Invalid'
archived_items: 'Archived'
code: 'Code'
code: 'Item ID'
name: 'Name'
status: 'Status'
cancel: 'Cancel import'
@ -2300,28 +2298,28 @@ en:
download_report: 'Download success report'
close: 'Close'
info_sidebar:
title: 'Guide for updating the inventory'
title: 'Item import guide'
elements:
element0:
id: 'el0'
icon: 'sn-icon-export'
label: 'Export inventory'
subtext: "Before making edits, we advise you to export the latest inventory information. If you're only adding new items, consider exporting empty inventory."
subtext: "Before making changes, we advise you to first export the current inventory item information. If you're only adding in new items, exporting the inventory template is recommended."
element1:
id: 'el1'
icon: 'sn-icon-edit'
label: 'Edit your data'
subtext: 'Make sure to include header names in first row, followed by item data.'
subtext: 'Structure your import data”. And the text updated to: “Make sure to include header names in the first row of the import file, followed by item data.'
element2:
id: 'el2'
icon: 'sn-icon-import'
label: 'Import new or update items'
subtext: 'Upload your data using .xlsx, .csv or .txt files.'
label: 'Upload your file'
subtext: 'Upload your data using .xlsx, .csv, or .txt files to import new items or update existing item data.'
element3:
id: 'el3'
icon: 'sn-icon-tables'
label: 'Merge your data'
subtext: 'Complete the process by merging the columns you want to update.'
label: 'Map and finalize your data'
subtext: 'Complete the item import process by mapping uploaded file data with the columns you want to update in the inventory.'
element4:
id: 'el4'
icon: 'sn-icon-open'