diff --git a/src/admin/components/edition/collection-edition-form.vue b/src/admin/components/edition/collection-edition-form.vue index 550459a30..b1eb25caf 100644 --- a/src/admin/components/edition/collection-edition-form.vue +++ b/src/admin/components/edition/collection-edition-form.vue @@ -258,7 +258,7 @@ + :label="$i18n.get('label_allow_comments')"> - - - - - - -
- +
+ + +
+
+ +
+
+
+ + + + + {{ collectionName }} + +
+
+
+ + +
+
+ + * + +
+
+
+ + + + + {{ $i18n.get('publish_visibility') }} + + + + + + {{ $i18n.get('private_visibility') }} + +
+
+
+ + +
+
+ + +
+
+
+ + {{ $i18n.get('label_allow_comments') }} + +
+
+
+ +
- -
- - * - -
-
-
- - - - - {{ $i18n.get('publish_visibility') }} - - - - - - {{ $i18n.get('private_visibility') }} - -
-
- - -
- -
-
-
-

- {{ collectionName }} -

-
-
- @@ -436,10 +457,7 @@ {{ $i18n.get('metadata') }} - - - -
+ @@ -484,9 +502,7 @@ -
- -
+
+ class="button is-secondary">{{ isOnSequenceEdit ? $i18n.get('label_save_as_draft') : $i18n.get('label_return_to_draft') }}
- - - - - - {{ item.comment_status == 'open' ? $i18n.get('label_yes') : $i18n.get('label_no') }} - + -
-
- +
+ + +
+
+ +
+
+
+ + + + + {{ collectionName }} + +
+
+
+ + +
+
@@ -155,39 +161,32 @@
-
- + + +
- +
- {{ collectionName }} + + + + + + + {{ item.comment_status == 'open' ? $i18n.get('label_allowed') : $i18n.get('label_not_allowed') }}
-
- -
- -
-
- -
-
@@ -200,46 +199,17 @@ -
- -
-
- - {{ open ? $i18n.get('label_collapse_all') : $i18n.get('label_expand_all') }} - - - -
- - -
-

-

- + +
+

+

@@ -270,10 +240,6 @@ -
- -
-
{{ $i18n.get('activities') }} -
- -
-
@@ -314,19 +276,38 @@ class="button is-secondary" style="margin-right: auto;" :to="{ path: $routerHelper.getNewItemPath(collectionId)}"> - {{ $i18n.get('label_create_another_item') }} + + {{ $i18n.get('label_create_another_item') }} - {{ $i18n.getFrom('items','edit_item') }} + + + + {{ $i18n.getFrom('items','edit_item') }} + - {{ $i18n.get('label_item_page_on_website') }} + + + + {{ $i18n.get('label_item_page_on_website') }}
@@ -356,7 +337,6 @@ collectionId: Number, itemId: Number, isLoading: false, - isLoadingMetadatumMappers: false, open: true, collectionName: '', thumbPlaceholderPath: tainacan_plugin.base_url + '/admin/images/placeholder_square.png', @@ -378,11 +358,6 @@ attachmentsList() { return this.getAttachments().filter((attachment) => attachment.id != this.item.document); }, - metadatum_mappers: { - get() { - return this.getMetadatumMappers(); - } - }, }, methods: { ...mapActions('item', [ @@ -399,12 +374,6 @@ 'getMetadata', 'getAttachments' ]), - ...mapGetters('metadata', [ - 'getMetadatumMappers' - ]), - ...mapActions('metadata', [ - 'fetchMetadatumMappers', - ]), loadMetadata() { // Obtains Item Metadatum this.fetchMetadata(this.itemId).then(() => { @@ -433,15 +402,6 @@ // Puts loading on Item Loading this.isLoading = true; - this.isLoadingMetadatumMappers = true; - this.fetchMetadatumMappers() - .then(() => { - this.isLoadingMetadatumMappers = false; - }) - .catch(() => { - this.isLoadingMetadatumMappers = false; - }); - // Obtains Item this.fetchItem({ itemId: this.itemId, @@ -535,6 +495,8 @@ .tainacan-form > .columns { margin-bottom: 70px; + margin-left: $page-side-padding; + margin-right: $page-side-padding; } .column.is-5 { @@ -549,8 +511,13 @@ padding-left: 0; padding-right: $page-side-padding; - .field { - padding: 10px 0 14px 30px; + .columns .column { + padding: 1rem $page-side-padding 0 24px; + } + + .field { + padding: 10px 0 14px 0px; + margin-left: -3px; } @media screen and (max-width: 769px) { @@ -558,12 +525,10 @@ width: 100%; } } - .collapse .collapse-content { - margin-left: 30px; - } .b-tabs { overflow: hidden !important; + margin-top: -15px; } } @@ -571,6 +536,7 @@ .field { border-bottom: 1px solid $gray2; padding: 10px 25px; + margin-left: 0px !important; .label { font-size: 14px; @@ -584,6 +550,16 @@ } } } + + @media screen and (min-width: 1367px){ + column-count: 2; + column-gap: $page-side-padding; + + .field { + break-inside: avoid; + } + } + } .section-label { @@ -596,22 +572,11 @@ } } - .collapse-all { - font-size: 12px; - display: inline-flex; - align-items: center; - - .icon { - vertical-align: bottom; - } - } - .section-box { - background-color: white; - padding: 26px; - margin-top: 16px; - margin-bottom: 38px; + padding: 0 $page-side-padding 0 0; + margin-top: 18px; + margin-bottom: 32px; ul { display: flex; @@ -713,6 +678,16 @@ margin-right: auto; } } + + .sequence-button { + background-color: transparent; + color: $turquoise5; + border: none; + + .icon { + margin-right: 5px !important; + } + } } diff --git a/src/admin/scss/_tabs.scss b/src/admin/scss/_tabs.scss index f8fb53e1f..27793b9e2 100644 --- a/src/admin/scss/_tabs.scss +++ b/src/admin/scss/_tabs.scss @@ -6,6 +6,7 @@ a { font-size: 0.8125rem; color: black !important; + padding: 0.5rem 1.45rem; border-bottom: 4px solid transparent; transition: border-bottom-color ease 0.3s; cursor: pointer !important; @@ -19,4 +20,13 @@ border-bottom-color: $turquoise5; color: black !important; } + .icon:first-child { + margin-right: 0.2rem; + margin-left: -3px; + } +} +.b-tabs { + .tab-content { + padding: 0.75rem 1.5rem; + } } \ No newline at end of file diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php index 89ebdd2e6..8aeaefe2a 100644 --- a/src/admin/tainacan-admin-i18n.php +++ b/src/admin/tainacan-admin-i18n.php @@ -225,7 +225,8 @@ return apply_filters( 'tainacan-admin-i18n', [ 'label_empty_header_image' => __( 'Empty Header Image', 'tainacan' ), 'label_enable_cover_page' => __( 'Enable Cover Page', 'tainacan' ), 'label_cover_page' => __( 'Cover Page', 'tainacan' ), - 'label_comment_status' => __( 'Allow Comments', 'tainacan' ), + 'label_allow_comments' => __( 'Allow comments', 'tainacan' ), + 'label_comments' => __( 'Comments', 'tainacan' ), 'label_default_displayed_metadata' => __( 'Default Displayed Metadata', 'tainacan' ), 'label_display' => __( 'Display on Listing', 'tainacan' ), 'label_display_default' => __( 'Display by default', 'tainacan' ), @@ -426,6 +427,9 @@ return apply_filters( 'tainacan-admin-i18n', [ 'label_number_of_copies' => __( 'Number of copies', 'tainacan' ), 'label_return_to_list' => __( 'Return to list', 'tainacan' ), 'label_expose_only_displayed_metadata' => __( 'Expose only displayed metadata', 'tainacan' ), + 'label_allowed' => __( 'Allowed', 'tainacan' ), + 'label_not_allowed' => __( 'Not allowed', 'tainacan' ), + // Instructions. More complex sentences to guide user and placeholders 'instruction_delete_selected_collections' => __( 'Delete selected collections', 'tainacan' ), 'instruction_delete_selected_items' => __( 'Delete selected items', 'tainacan' ),