From 0899db14b4f04274367e19385470443d84e4b33f Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Sun, 5 Aug 2018 22:22:51 -0300 Subject: [PATCH] Adds log files links to processes list and popup. --- package-lock.json | 5 ++ src/admin/components/lists/processes-list.vue | 50 +++++++++++++++---- .../components/other/processes-popup.vue | 22 ++++++-- src/admin/pages/lists/items-page.vue | 35 +++++++------ src/admin/tainacan-admin-i18n.php | 3 ++ src/theme-helper/view-mode-table.vue | 11 ---- 6 files changed, 85 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3a8cb3dcf..9fec7408b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8580,6 +8580,11 @@ "vue-style-loader": "4.1.1" } }, + "vue-masonry-css": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/vue-masonry-css/-/vue-masonry-css-1.0.2.tgz", + "integrity": "sha512-iiFW4laFhlsh3E5rrymX4SEvtFM8WknDFH0O09lqjqNaUO2iyVqRWT/6Js/pSKv38q4iLD0aoTmmnPanufJReQ==" + }, "vue-resize": { "version": "0.4.4", "resolved": "https://registry.npmjs.org/vue-resize/-/vue-resize-0.4.4.tgz", diff --git a/src/admin/components/lists/processes-list.vue b/src/admin/components/lists/processes-list.vue index 15fd0af6e..520fb1589 100644 --- a/src/admin/components/lists/processes-list.vue +++ b/src/admin/components/lists/processes-list.vue @@ -2,7 +2,7 @@
- +
- + + + + --> + + diff --git a/src/admin/components/other/processes-popup.vue b/src/admin/components/other/processes-popup.vue index 335c677d5..8215e12c7 100644 --- a/src/admin/components/other/processes-popup.vue +++ b/src/admin/components/other/processes-popup.vue @@ -43,8 +43,9 @@ class="mdi mdi-18px" :class="{ 'mdi-menu-down': processesColapses[index], 'mdi-menu-right': !processesColapses[index] }" /> -

{{ bgProcess.name ? bgProcess.name : $i18n.get('label_unamed_process') }}

- {{ (bgProcesses[0].progress_value && bgProcesses[0].progress_value >= 0) ? '(' + bgProcesses[0].progress_value + '%)' : '' }} +

{{ bgProcess.name ? bgProcess.name : $i18n.get('label_unamed_process') }} + {{ (bgProcesses[0].progress_value && bgProcesses[0].progress_value >= 0) ? '(' + bgProcesses[0].progress_value + '%)' : '' }} +

+ + + @@ -77,6 +83,14 @@ {{ $i18n.get('label_queued_on') + ' ' + getDate(bgProcess.queued_on) }}
{{ $i18n.get('label_last_processed_on') + ' ' + getDate(bgProcess.processed_last) }} +
+ {{ $i18n.get('label_log_file') }} + {{ $i18n.get('label_error_log_file') }} @@ -231,7 +245,7 @@ export default { .popup-list { background-color: white; color: black; - overflow-y: scroll; + overflow-y: auto; overflow-x: hidden; max-height: 222px; animation-name: expand; diff --git a/src/admin/pages/lists/items-page.vue b/src/admin/pages/lists/items-page.vue index 55219e03f..970b23a07 100644 --- a/src/admin/pages/lists/items-page.vue +++ b/src/admin/pages/lists/items-page.vue @@ -948,22 +948,25 @@ let creationDateMetadatumDisplay = prefsFetchOnlyObject != undefined ? (prefsFetchOnlyObject['1'] != null) : true; let authorNameMetadatumDisplay = prefsFetchOnlyObject != undefined ? (prefsFetchOnlyObject['2'] != null) : true; - metadata.push({ - name: this.$i18n.get('label_creation_date'), - metadatum: 'row_creation', - metadata_type: undefined, - slug: 'creation_date', - id: undefined, - display: creationDateMetadatumDisplay - }); - metadata.push({ - name: this.$i18n.get('label_created_by'), - metadatum: 'row_author', - metadata_type: undefined, - slug: 'author_name', - id: undefined, - display: authorNameMetadatumDisplay - }); + if (!this.isOnTheme) { + + metadata.push({ + name: this.$i18n.get('label_creation_date'), + metadatum: 'row_creation', + metadata_type: undefined, + slug: 'creation_date', + id: undefined, + display: creationDateMetadatumDisplay + }); + metadata.push({ + name: this.$i18n.get('label_created_by'), + metadatum: 'row_author', + metadata_type: undefined, + slug: 'author_name', + id: undefined, + display: authorNameMetadatumDisplay + }); + } this.$eventBusSearch.addFetchOnly({ '0': (thumbnailMetadatumDisplay ? 'thumbnail' : null), diff --git a/src/admin/tainacan-admin-i18n.php b/src/admin/tainacan-admin-i18n.php index 88c982a93..2e32c7174 100644 --- a/src/admin/tainacan-admin-i18n.php +++ b/src/admin/tainacan-admin-i18n.php @@ -271,12 +271,15 @@ return apply_filters( 'tainacan-admin-i18n', [ 'label_last_processed_on' => __( 'Last processed on:', 'tainacan' ), 'label_progress' => __( 'Progress', 'tainacan' ), 'label_process_completed' => __( 'Process completed', 'tainacan' ), + 'label_process_failed' => __( 'Process failed', 'tainacan' ), 'label_max_options_to_show' => __( 'Max options to show', 'tainacan' ), 'label_unamed_process' => __( 'Unamed process', 'tainacan' ), 'label_import_collection' => __( 'Import collection', 'tainacan' ), 'label_semantic_uri' => __( 'Semantic Uri', 'tainacan' ), 'label_view_collection' => __( 'View collection', 'tainacan' ), 'label_view_more' => __( 'View more', 'tainacan' ), + 'label_log_file' => __( 'Log file', 'tainacan' ), + 'label_error_log_file' => __( 'Error Log file', 'tainacan' ), // Instructions. More complex sentences to guide user and placeholders 'instruction_delete_selected_collections' => __( 'Delete selected collections', 'tainacan' ), diff --git a/src/theme-helper/view-mode-table.vue b/src/theme-helper/view-mode-table.vue index 562861a7e..beaeea5a2 100644 --- a/src/theme-helper/view-mode-table.vue +++ b/src/theme-helper/view-mode-table.vue @@ -76,17 +76,6 @@ class="table-thumb" :src="item[column.slug].thumb ? item[column.slug].thumb : thumbPlaceholderPath"> -

- {{ item[column.slug] }} -

-
-   + + -
{{ $i18n.get('label_name') }}
@@ -59,6 +59,10 @@
{{ $i18n.get('label_last_processed_on') }}
 +
{{ $i18n.get('label_log_file') }}
+
{{ $i18n.get('label_status') }}
@@ -71,13 +75,13 @@ :key="index" v-for="(bgProcess, index) of processes"> - 		- + :aria-label="$i18n.get('label_progress') + ': ' + bgProcess.progress_label ? bgProcess.progress_label + (bgProcess.progress_value ? ' (' + bgProcess.progress_value + '%)' : '') : $i18n.get('label_no_details_of_process')">

- {{ bgProcess.progress_label ? bgProcess.progress_label : $i18n.get('label_no_details_of_process') }}

+ {{ bgProcess.progress_label ? bgProcess.progress_label + (bgProcess.progress_value ? ' (' + bgProcess.progress_value + '%)' : '') : $i18n.get('label_no_details_of_process') }}

 {{ getDate(bgProcess.last_processed_on) }}

 +

+ {{ $i18n.get('label_log_file') }} + | + {{ $i18n.get('label_error_log_file') }} +

+ 		+ + +