tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/gutenberg-faceted-search

This commit is contained in:
Mateus Machado Luna 2020-02-26 18:57:00 -03:00
parent e500b6a4ff 662e8b9414
commit 4038ca5bea
50 changed files with 392 additions and 502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package-lock.json generated
View File

@ -1964,9 +1964,9 @@
}
},
"buefy": {
"version": "0.8.10",
"resolved": "https://registry.npmjs.org/buefy/-/buefy-0.8.10.tgz",
"integrity": "sha512-Lw/UP3Ku7o+oqam9TIoRMG5SrytGQwXWAoxAtqt6Wb9eSsMEqp/5o+jZnz8oteR06YWgjdSIfOv2YeEdjEkQCg==",
"version": "0.8.11",
"resolved": "https://registry.npmjs.org/buefy/-/buefy-0.8.11.tgz",
"integrity": "sha512-+LcnrK4b3UKRXm1aalDfXvp5be7EJKJzLtRAhptnaHpCGySPDjm7MCvyIHnV02qjUMgwOF1UWp0xkkWc8suQOQ==",
"requires": {
"bulma": "0.7.5"
}

2
package.json
View File

@ -8,7 +8,7 @@
},
"dependencies": {
"axios": "^0.19.0",
"buefy": "^0.8.10",
"buefy": "^0.8.11",
"bulma": "^0.7.5",
"css-vars-ponyfill": "^2.1.2",
"mdi": "^2.2.43",

54
src/classes/repositories/class-tainacan-metadata.php
View File

@ -41,6 +41,7 @@ class Metadata extends Repository {
add_filter( 'pre_delete_post', array( &$this, 'force_delete_core_metadata' ), 10, 3 );
add_action('tainacan-insert-tainacan-taxonomy', [$this, 'hook_taxonomies_saved_as_private']);
add_action('tainacan-insert-tainacan-taxonomy', [$this, 'hook_taxonomies_saved_not_allow_insert_new_terms']);
}
@ -1081,7 +1082,7 @@ class Metadata extends Repository {
FROM
$wpdb->terms t INNER JOIN $wpdb->term_taxonomy tt ON t.term_id = tt.term_id
LEFT JOIN (
SELECT DISTINCT term_taxonomy_id FROM $wpdb->term_relationships
SELECT DISTINCT term_taxonomy_id FROM $wpdb->term_relationships
INNER JOIN ($items_query) as posts ON $wpdb->term_relationships.object_id = posts.ID
) as tr ON tt.term_taxonomy_id = tr.term_taxonomy_id
WHERE tt.taxonomy = %s ORDER BY t.name ASC", $taxonomy_slug
@ -1496,13 +1497,13 @@ class Metadata extends Repository {
$taxonomy_id = $taxonomy->get_id();
$args = [
'metadata_type' => 'Tainacan\Metadata_Types\Taxonomy',
'metadata_type' => 'Tainacan\Metadata_Types\Taxonomy',
'meta_query' => [
[
'key' => '_option_taxonomy_id',
'key' => '_option_taxonomy_id',
'value' => $taxonomy_id
]
],
],
'post_status' => $stati
];
$metadata = $this->fetch($args, 'OBJECT');
@ -1521,4 +1522,49 @@ class Metadata extends Repository {
}
}
/**
* When a taxonomy is saved disabling allow_insert. All related metadata should set allow_new_terms to 'no'
*
* @param \Tainacan\Entities\Taxonomy $taxonomy
* @return void
*/
public function hook_taxonomies_saved_not_allow_insert_new_terms($taxonomy) {
if ( $taxonomy instanceof Entities\Taxonomy && 'no' === $taxonomy->get_allow_insert() ) {
$taxonomy_id = $taxonomy->get_id();
$args = [
'metadata_type' => 'Tainacan\Metadata_Types\Taxonomy',
'meta_query' => [
[
'key' => '_option_taxonomy_id',
'value' => $taxonomy_id
],
[
'key' => '_option_allow_new_terms',
'value' => 'yes'
]
],
'post_status' => 'any',
];
$metadata = $this->fetch($args, 'OBJECT');
foreach ($metadata as $meta) {
$options = $meta->get_metadata_type_options();
$options['allow_new_terms'] = 'no';
$meta->set_metadata_type_options( $options );
if ( $meta->validate() ) {
$this->insert($meta);
}
}
}
}
}

4
src/views/admin/components/edition/collection-edition-form.vue
View File

@ -1009,8 +1009,8 @@ export default {
}
.selected-cover-page {
border: 1px solid var(--tainacan-gray2);
padding: 8px;
font-size: .75em;
padding: 3px 8px;
font-size: .875em;
.span { vertical-align: middle;}
.selected-cover-page-control {

1
src/views/admin/components/edition/term-edition-form.vue
View File

@ -148,6 +148,7 @@
:placeholder="$i18n.get('instruction_parent_term')"
:data="parentTerms"
field="name"
clearable
v-model="parentTermName"
@select="onSelectParentTerm($event)"
:loading="isFetchingParentTerms"

5
src/views/admin/components/filter-types/autocomplete/Autocomplete.vue
View File

@ -11,6 +11,7 @@
@input="search"
field="label"
@select="onSelect"
clearable
:placeholder="(metadatumType === 'Tainacan\\Metadata_Types\\Relationship') ? $i18n.get('info_type_to_search_items') : $i18n.get('info_type_to_search_metadata')">
<template slot-scope="props">
<div class="media">
@ -22,7 +23,9 @@
width="24"
:src="props.option.img">
</div>
<div class="media-content">
<div
:style="{ width: props.option.img ? '' : '100%'}"
class="media-content">
<span class="ellipsed-text">{{ props.option.label }}</span>
<span
v-if="props.option.total_items != undefined"

4
src/views/admin/components/filter-types/date-interval/DateInterval.vue
View File

@ -4,7 +4,6 @@
:aria-labelledby="'filter-label-id-' + filter.id"
:placeholder="$i18n.get('label_selectbox_init')"
v-model="dateInit"
size="is-small"
@focus="isTouched = true"
@input="validadeValues()"
editable
@ -26,12 +25,11 @@
style="font-size: 0.75em; margin-bottom: 0.125em;"
class="has-text-centered is-marginless">
{{ $i18n.get('label_until') }}
</p>
</p>
<b-datepicker
:aria-labelledby="'filter-label-id-' + filter.id"
:placeholder="$i18n.get('label_selectbox_init')"
v-model="dateEnd"
size="is-small"
@input="validadeValues()"
@focus="isTouched = true"
editable

1
src/views/admin/components/filter-types/date/Date.vue
View File

@ -77,7 +77,6 @@
:trap-focus="false"
:date-formatter="(date) => dateFormatter(date)"
:date-parser="(date) => dateParser(date)"
size="is-small"
icon="calendar-today"
:years-range="[-200, 50]"
:day-names="[

5
src/views/admin/components/filter-types/numeric/Numeric.vue
View File

@ -175,11 +175,10 @@
flex-grow: 2;
.dropdown-trigger button {
padding: 0 0.5em !important;
height: auto !important;
font-size: 1em !important;
i:not(.tainacan-icon-arrowdown) {
margin-top: -3px;
font-size: 1.25em;
font-style: normal;
color: var(--tainacan-info-color);

13
src/views/admin/components/filter-types/tainacan-filter-item.vue
View File

@ -194,13 +194,14 @@
.b-checkbox.checkbox {
font-weight: normal;
font-size: 1em;
font-size: 1em !important;
margin-right: 2px;
}
.datepicker {
.dropdown-menu {
left: -18px;
right: 0;
}
@media screen and (min-width: 768px) {
@ -210,19 +211,17 @@
max-width: 165px !important;
}
.pagination .pagination-list .control {
width: 77px !important;
width: 50% !important;
.select {
min-width: 100% !important;
select {
padding-left: 1px !important;
font-size: 0.875em !important;
height: 24px !important;
min-width: 100% !important;
min-width: 100% !important;
}
&:not(.is-loading)::after {
margin-top: -10px !important;
font-size: 1em;
}
}
}

3
src/views/admin/components/lists/filters-list.vue
View File

@ -872,12 +872,13 @@ export default {
margin-left: 0.5em;
}
.controls {
font-size: 0.875em;
position: absolute;
right: 5px;
top: 10px;
.switch {
position: relative;
bottom: 3px;
bottom: 2px;
}
.icon {
bottom: 1px;

3
src/views/admin/components/lists/metadata-list.vue
View File

@ -1117,12 +1117,13 @@ export default {
margin-left: 0.5em;
}
.controls {
font-size: 0.875em;
position: absolute;
right: 5px;
top: 10px;
.switch {
position: relative;
bottom: 3px;
bottom: 1px;
}
.icon {
bottom: 1px;

37
src/views/admin/components/lists/terms-list.vue
View File

@ -59,23 +59,18 @@
</b-dropdown>
</b-field>
<div class="search-area is-hidden-mobile">
<div class="control has-icons-right is-small is-clearfix">
<input
class="input is-small"
:placeholder="$i18n.get('instruction_search')"
type="search"
:aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('terms')"
autocomplete="on"
v-model="searchQuery"
@keyup.enter="searchTerms(0)"
:disabled="isEditingTerm">
<span
@click="searchTerms(0)"
class="icon is-right"
:class="{ 'has-text-gray3': isEditingTerm }">
<i class="tainacan-icon tainacan-icon-search" />
</span>
</div>
<b-input
:placeholder="$i18n.get('instruction_search')"
size="is-small"
type="search"
:aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('terms')"
autocomplete="on"
v-model="searchQuery"
icon-right="magnify"
icon-right-clickable
@icon-right-click="searchTerms(0)"
@keyup.enter.native="searchTerms(0)"
:disabled="isEditingTerm"/>
</div>
</div>
<div class="columns">
@ -528,14 +523,6 @@ export default {
}
.control {
width: 100%;
.icon {
pointer-events: all;
cursor: pointer;
color: var(--tainacan-blue5);
height: 27px;
font-size: 1.125em !important;
height: auto !important;
}
}
a {
margin-left: 12px;

14
src/views/admin/components/metadata-types/compound/class-tainacan-compound.php
View File

@ -19,20 +19,6 @@ class Compound extends Metadata_Type {
$this->set_component('tainacan-compound');
}
/**
* @param $itemMetadata \Tainacan\Entities\Item_Metadata_Entity The instace of the entity itemMetadata
* @return string
*/
public function render( $itemMetadata ){
return '<tainacan-text
id="tainacan-text-' . $itemMetadata->get_item()->WP_Post->post_name . '"
metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'"
item_id="'.$itemMetadata->get_item()->get_id().'"
value=\''.json_encode( $itemMetadata->get_value() ).'\'
name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-text>';
}
/**
* generate the metadata for this metadatum type
*/

14
src/views/admin/components/metadata-types/core-description/class-tainacan-core-description.php
View File

@ -23,20 +23,6 @@ class Core_Description extends Metadata_Type {
$this->set_description( __('The "Core Description" is a compulsory metadata automatically created for all collections by default. This is the main description displayed in items lists and where the basic research tools will do their searches.', 'tainacan') );
}
/**
* @param $itemMetadata \Tainacan\Entities\Item_Metadata_Entity The instace of the entity itemMetadata
* @return string
*/
public function render( $itemMetadata ){
return '<tainacan-textarea
id="tainacan-textarea-' . $itemMetadata->get_item()->WP_Post->post_name . '"
metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'"
item_id="'.$itemMetadata->get_item()->get_id().'"
value=\''.json_encode( $itemMetadata->get_value() ).'\'
name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-textarea>';
}
/**
* generate the metadata for this metadatum type
*/

14
src/views/admin/components/metadata-types/core-title/class-tainacan-core-title.php
View File

@ -23,20 +23,6 @@ class Core_Title extends Metadata_Type {
$this->set_description( __('The "Core Title" is a compulsory metadata automatically created for all collections by default. It is the main metadatum of the item and where the basic research tools will do their searches.', 'tainacan') );
}
/**
* @param $itemMetadata \Tainacan\Entities\Item_Metadata_Entity The instace of the entity itemMetadata
* @return string
*/
public function render( $itemMetadata ){
return '<tainacan-text
id="tainacan-text-' . $itemMetadata->get_item()->WP_Post->post_name . '"
metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'"
item_id="'.$itemMetadata->get_item()->get_id().'"
value=\''.json_encode( $itemMetadata->get_value() ).'\'
name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-text>';
}
/**
* generate the metadata for this metadatum type
*/

13
src/views/admin/components/metadata-types/date/class-tainacan-date.php
View File

@ -27,19 +27,6 @@ class Date extends Metadata_Type {
');
}
/**
* @param $itemMetadata \Tainacan\Entities\Item_Metadata_Entity The instace of the entity itemMetadata
* @return string
*/
public function render( $itemMetadata ){
return '<tainacan-date metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'"
item_id="'.$itemMetadata->get_item()->get_id().'"
value=\''.json_encode( $itemMetadata->get_value() ).'\'
name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-date>';
}
public function validate( Item_Metadata_Entity $item_metadata) {
$value = $item_metadata->get_value();
$format = 'Y-m-d';

2
src/views/admin/components/metadata-types/metadata-type/class-tainacan-metadata-type.php
View File

@ -89,8 +89,6 @@ abstract class Metadata_Type {
* @var string
*/
private $preview_template;
abstract function render( $itemMetadata );
public function __construct(){

13
src/views/admin/components/metadata-types/numeric/class-tainacan-numeric.php
View File

@ -37,17 +37,4 @@ class Numeric extends Metadata_Type {
]
];
}
/**
* @param $itemMetadata \Tainacan\Entities\Item_Metadata_Entity The instace of the entity itemMetadata
* @return string
*/
public function render( $itemMetadata ){
return '<tainacan-numeric
metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'"
item_id="'.$itemMetadata->get_item()->get_id().'"
value=\''.json_encode( $itemMetadata->get_value() ).'\'
name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-numeric>';
}
}

14
src/views/admin/components/metadata-types/relationship/class-tainacan-relationship.php
View File

@ -65,20 +65,6 @@ class Relationship extends Metadata_Type {
]
];
}
/**
* @param $itemMetadata \Tainacan\Entities\Item_Metadata_Entity The instace of the entity itemMetadata
* @return string
*/
public function render( $itemMetadata ){
return '<tainacan-relationship
collection_id="' . $this->get_options()['collection_id'] . '"
metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'"
item_id="'.$itemMetadata->get_item()->get_id().'"
value=\''.json_encode( $itemMetadata->get_value() ).'\'
name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-relationship>';
}
public function validate_options(\Tainacan\Entities\Metadatum $metadatum) {
if ( !in_array($metadatum->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )

14
src/views/admin/components/metadata-types/selectbox/class-tainacan-selectbox.php
View File

@ -41,20 +41,6 @@ class Selectbox extends Metadata_Type {
]
];
}
/**
* @param $itemMetadata \Tainacan\Entities\Item_Metadata_Entity The instace of the entity itemMetadata
* @return string
*/
public function render( $itemMetadata ){
$options = $this->get_option('options');
return '<tainacan-selectbox
options="' . $options . '"
metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'"
item_id="'.$itemMetadata->get_item()->get_id().'"
value=\''.json_encode( $itemMetadata->get_value() ).'\'
name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-selectbox>';
}
/**
* @param \Tainacan\Entities\Metadatum $metadatum

1
src/views/admin/components/metadata-types/taxonomy/AddNewTerm.vue
View File

@ -53,6 +53,7 @@
:data="parentTerms"
field="name"
v-model="parentTermName"
clearable
@select="onSelectParentTerm($event)"
:loading="isFetchingParentTerms"
@input="fecthParentTerms($event)"

15
src/views/admin/components/metadata-types/taxonomy/class-tainacan-taxonomy.php
View File

@ -93,21 +93,6 @@ class Taxonomy extends Metadata_Type {
];
}
/**
* @param $itemMetadata Item_Metadata_Entity The instace of the entity itemMetadata
* @return string
*/
public function render( $itemMetadata ){
$options = ( isset( $this->get_options()['options'] ) ) ? $this->get_options()['options'] : '';
return '<tainacan-selectbox
options="' . $options . '"
metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'"
item_id="'.$itemMetadata->get_item()->get_id().'"
value=\''.json_encode( $itemMetadata->get_value() ).'\'
name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-selectbox>';
}
public function validate_options( Metadatum $metadatum) {
if ( !in_array($metadatum->get_status(), apply_filters('tainacan-status-require-validation', ['publish','future','private'])) )

12
src/views/admin/components/metadata-types/text/class-tainacan-text.php
View File

@ -25,18 +25,6 @@ class Text extends Metadata_Type {
</div>
');
}
/**
* @param $itemMetadata \Tainacan\Entities\Item_Metadata_Entity The instace of the entity itemMetadata
* @return string
*/
public function render( $itemMetadata ){
return '<tainacan-text metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'"
item_id="'.$itemMetadata->get_item()->get_id().'"
value=\''.json_encode( $itemMetadata->get_value() ).'\'
name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-text>';
}
/**
* Get the value as a HTML string with links

13
src/views/admin/components/metadata-types/textarea/class-tainacan-textarea.php
View File

@ -26,19 +26,6 @@ class Textarea extends Metadata_Type {
');
}
/**
* @param $itemMetadata \Tainacan\Entities\Item_Metadata_Entity The instace of the entity itemMetadata
* @return string
*/
public function render( $itemMetadata ) {
return '<tainacan-textarea
metadatum_id ="'.$itemMetadata->get_metadatum()->get_id().'"
item_id="'.$itemMetadata->get_item()->get_id().'"
value=\''.json_encode( $itemMetadata->get_value() ).'\'
name="'.$itemMetadata->get_metadatum()->get_name().'"></tainacan-textarea>';
}
public function get_multivalue_prefix() {
return '<p>';

1
src/views/admin/components/navigation/tainacan-collection-subheader.vue
View File

@ -242,7 +242,6 @@ export default {
color: turquoise5;
text-shadow: none;
background-color: var(--tainacan-turquoise2);
font-size: 0.75em;
font-weight: 400;
padding: 10px 14px;
}

37
src/views/admin/components/navigation/tainacan-header.vue
View File

@ -41,22 +41,19 @@
</button>
</div>
<div class="search-area is-hidden-mobile">
<div class="control has-icons-right is-small is-clearfix">
<input
autocomplete="on"
:aria-label="$i18n.get('instruction_search_in_repository')"
:placeholder="$i18n.get('instruction_search_in_repository')"
class="input is-small search-header"
type="search"
:value="searchQuery"
@input="futureSearchQuery = $event.target.value"
@keyup.enter="updateSearch()">
<span class="icon is-right">
<i
@click="updateSearch()"
class="tainacan-icon tainacan-icon-search"/>
</span>
</div>
<b-input
type="search"
autocomplete="on"
:aria-label="$i18n.get('instruction_search_in_repository')"
:placeholder="$i18n.get('instruction_search_in_repository')"
class="search-header"
size="is-small"
:value="searchQuery"
@input.native="futureSearchQuery = $event.target.value"
@keyup.enter.native="updateSearch()"
icon-right="magnify"
icon-right-clickable
@icon-right-click="updateSearch()" />
<b-dropdown
ref="advancedSearchShortcut"
class="advanced-search-header-dropdown"
@ -276,14 +273,6 @@
.search-header:focus, .search-header:active {
width: 372px !important;
}
.icon:not(.add-i) {
pointer-events: all;
color: var(--tainacan-blue5);
cursor: pointer;
height: 27px;
font-size: 1.125em;
width: 30px !important;
}
}
}
}

2
src/views/admin/components/navigation/tainacan-repository-subheader.vue
View File

@ -131,7 +131,6 @@ export default {
color: var(--tainacan-white);
text-shadow: 1px 1px var(--tainacan-turquoise4);
background-color: var(--tainacan-turquoise3);
font-size: 0.75em;
font-weight: 400;
padding: 10px 14px;
}
@ -142,7 +141,6 @@ export default {
.repository-header-tooltips .tooltip-inner {
color: var(--tainacan-white);
background-color: var(--tainacan-blue3);
font-size: 0.75em;
font-weight: 400;
padding: 10px 14px;
}

80
src/views/admin/pages/lists/activities-page.vue
View File

@ -42,7 +42,6 @@
@input="searchActivities()"
:date-formatter="(date) => dateFormatter(date)"
:date-parser="(date) => dateParser(date)"
size="is-small"
icon="calendar-today"
:years-range="[-50, 3]"
:day-names="[
@ -82,53 +81,48 @@
<b-field
style="margin-left: auto"
class="header-item">
<div class="control has-icons-right is-small is-clearfix">
<b-autocomplete
:data="users"
:placeholder="$i18n.get('instruction_type_search_users_filter')"
keep-first
open-on-focus
@input="fetchUsersForFiltering"
@focus.once="($event) => fetchUsersForFiltering($event.target.value)"
@select="filterActivitiesByUser"
:loading="isFetchingUsers"
field="name"
icon="account">
<template slot-scope="props">
<div class="media">
<div
v-if="props.option.avatar_urls && props.option.avatar_urls['24']"
class="media-left">
<img
width="24"
:src="props.option.avatar_urls['24']">
</div>
<div class="media-content">
{{ props.option.name }}
</div>
<b-autocomplete
clearable
:data="users"
:placeholder="$i18n.get('instruction_type_search_users_filter')"
keep-first
open-on-focus
@input="fetchUsersForFiltering"
@focus.once="($event) => fetchUsersForFiltering($event.target.value)"
@select="filterActivitiesByUser"
:loading="isFetchingUsers"
field="name"
icon="account">
<template slot-scope="props">
<div class="media">
<div
v-if="props.option.avatar_urls && props.option.avatar_urls['24']"
class="media-left">
<img
width="24"
:src="props.option.avatar_urls['24']">
</div>
</template>
<div class="media-content">
{{ props.option.name }}
</div>
</div>
</template>
<template slot="empty">{{ $i18n.get('info_no_user_found') }}</template>
</b-autocomplete>
</div>
</b-autocomplete>
</b-field>
<b-field class="header-item">
<div class="control has-icons-right is-small is-clearfix">
<input
class="input is-small"
:placeholder="$i18n.get('instruction_search')"
type="search"
:aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('activities')"
autocomplete="on"
v-model="searchQuery"
@keyup.enter="searchActivities()">
<span
@click="searchActivities()"
class="icon is-right">
<i class="tainacan-icon tainacan-icon-search" />
</span>
</div>
<b-input
:placeholder="$i18n.get('instruction_search')"
type="search"
size="is-small"
:aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('activities')"
autocomplete="on"
v-model="searchQuery"
@keyup.enter.native="searchActivities()"
icon-right="magnify"
icon-right-clickable
@icon-right-click="searchActivities()" />
</b-field>
</div>

1
src/views/admin/pages/lists/capabilities-page.vue
View File

@ -13,6 +13,7 @@
class="header-item">
<div class="control has-icons-right is-small is-clearfix">
<b-autocomplete
clearable
v-model="filteredRole"
:data="filteredRoles"
:placeholder="$i18n.get('instruction_type_search_roles_filter')"

26
src/views/admin/pages/lists/collections-page.vue
View File

@ -125,21 +125,17 @@
<!-- Textual Search -------------->
<b-field class="header-item">
<div class="control has-icons-right is-small is-clearfix">
<input
class="input is-small"
:placeholder="$i18n.get('instruction_search')"
type="search"
:aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('collections')"
autocomplete="on"
v-model="searchQuery"
@keyup.enter="searchCollections()">
<span
@click="searchCollections()"
class="icon is-right">
<i class="tainacan-icon tainacan-icon-search" />
</span>
</div>
<b-input
:placeholder="$i18n.get('instruction_search')"
type="search"
size="is-small"
:aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('collections')"
autocomplete="on"
v-model="searchQuery"
@keyup.enter.native="searchCollections()"
icon-right="magnify"
icon-right-clickable
@icon-right-click="searchCollections()" />
</b-field>
</div>

54
src/views/admin/pages/lists/items-page.vue
View File

@ -77,22 +77,17 @@
<div
role="search"
class="search-area">
<div class="control has-icons-right is-small is-clearfix">
<input
class="input is-small"
:placeholder="$i18n.get('instruction_search')"
type="search"
:aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('items')"
:value="searchQuery"
@input="futureSearchQuery = $event.target.value"
@keyup.enter="updateSearch()">
<span
aria-controls="items-list-results"
@click="updateSearch()"
class="icon is-right">
<i class="tainacan-icon tainacan-icon-1-25em tainacan-icon-search"/>
</span>
</div>
<b-input
size="is-small"
:placeholder="$i18n.get('instruction_search')"
type="search"
:aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('items')"
:value="searchQuery"
@input.native="futureSearchQuery = $event.target.value"
@keyup.enter.native="updateSearch()"
icon-right="magnify"
icon-right-clickable
@icon-right-click="updateSearch()" />
<a
@click="openAdvancedSearch = !openAdvancedSearch"
style="font-size: 0.75em;"
@ -1332,17 +1327,6 @@
position: relative;
position: sticky;
}
.label {
font-size: 0.75em;
font-weight: normal;
}
.checkbox {
margin-bottom: 5px;
align-items: baseline;
}
}
#filter-menu-compress-button {
position: absolute;
@ -1426,7 +1410,7 @@
color: var(--tainacan-label-color);
font-size: 0.875em;
font-weight: normal;
margin-top: 3px;
margin-top: 2px;
margin-bottom: 2px;
cursor: default;
}
@ -1498,11 +1482,6 @@
.control {
width: 100%;
.icon {
pointer-events: all;
cursor: pointer;
color: var(--tainacan-label-color);
}
margin-bottom: 5px;
}
.is-pulled-right {
@ -1510,10 +1489,6 @@
right: 15px;
top: 100%;
}
.input {
border: 1px solid var(--tainacan-input-border-color);
min-height: 30px !important;
}
a {
margin-left: 12px;
white-space: nowrap;
@ -1566,6 +1541,7 @@
p {
margin: 0 auto;
font-size: 0.885em;
}
&>div {
@ -1575,8 +1551,8 @@
.button:hover,
.button:active,
.button:focus {
background: none;
color:var(--tainacan-yellow2);
background: none !important;
color: var(--tainacan-yellow2) !important;
font-weight: bold;
border: none;
cursor: pointer;

26
src/views/admin/pages/lists/taxonomies-page.vue
View File

@ -87,21 +87,17 @@
<!-- Textual Search -------------->
<b-field class="header-item">
<div class="control has-icons-right is-small is-clearfix">
<input
class="input is-small"
:placeholder="$i18n.get('instruction_search')"
type="search"
:aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('taxonomies')"
autocomplete="on"
v-model="searchQuery"
@keyup.enter="searchTaxonomies()">
<span
@click="searchTaxonomies()"
class="icon is-right">
<i class="tainacan-icon tainacan-icon-search" />
</span>
</div>
<b-input
:placeholder="$i18n.get('instruction_search')"
type="search"
size="is-small"
:aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('taxonomies')"
autocomplete="on"
v-model="searchQuery"
@keyup.enter.native="searchTaxonomies()"
icon-right="magnify"
icon-right-clickable
@icon-right-click="searchTaxonomies()" />
</b-field>
</div>

46
src/views/admin/scss/_control.scss Normal file
View File

@ -0,0 +1,46 @@
// This used to be inside the TainacanForm class but there are meny places where this settings might be desirable.
.control {
font-size: 1em;
.is-clickable {
pointer-events: auto !important;
cursor: pointer;
}
&.has-icons-right,
&.has-icons-left {
.icon {
height: 100%;
.mdi::before {
color: var(--tainacan-info-color);
display: inline-block;
font: normal normal normal 20px/1 "TainacanIcons";
font-size: inherit;
text-rendering: auto;
vertical-align: middle;
line-height: inherit;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 1.25em;
text-transform: none !important;
letter-spacing: normal !important;
}
.mdi-alert-circle::before {
content: "close";
color: inherit;
}
.mdi-magnify::before {
content: 'search';
}
.mdi-close-circle::before {
content: 'close';
font-size: 1em;
}
.mdi-account::before {
content: 'user';
}
}
}
&.has-icons-right .icon .mdi-magnify::before {
color: var(--tainacan-blue5);
}
}

4
src/views/admin/scss/_custom_variables.scss
View File

@ -138,6 +138,8 @@
color: var(--tainacan-black) !important;
}
a {
a,
a:hover,
a:focus {
color: var(--tainacan-secondary);
}

63
src/views/admin/scss/_dropdown-and-autocomplete.scss
View File

@ -20,11 +20,8 @@
cursor: default;
}
}
&>.control.has-icons-left .icon {
height: 100%;//2.125em;
width: 2.125em;
}
.dropdown-menu {
font-size: 1em;
padding: 0px;
margin-top: 0;
border-radius: 0px;
@ -61,6 +58,7 @@
.media-left {
margin-right: 0.5em;
display: flex;
}
.media-content {
display: flex;
@ -101,21 +99,6 @@
.taginput.is-expanded {
width: 100%;
}
.taginput-container .mdi-magnify::before,
.autocomplete .mdi-magnify::before {
color: var(--tainacan-info-color);
content: 'search';
display: inline-block;
font: normal normal normal 20px/1 "TainacanIcons";
font-size: inherit;
text-rendering: auto;
vertical-align: middle;
line-height: inherit;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
font-size: 1.25em;
text-transform: none !important;
}
.taginput-container {
padding: 0px !important;
@ -158,6 +141,9 @@
}
}
}
.autocomplete .icon {
height: 100% !important;
}
}
.selected-list-box {
padding: 4px 6px 0px 6px;
@ -222,6 +208,14 @@
// }
// }
& .dropdown.is-mobile-modal {
@media screen and (max-width: 768px) {
.field.has-addons {
font-size: 1.125em;
}
}
}
.dropdown-menu {
background: transparent;
border: none;
@ -232,6 +226,7 @@
}
.datepicker-header {
.pagination {
a>span>i:before {
display: inline-block;
@ -253,7 +248,7 @@
&>span>i:before {
content: 'previous';
font-size: 1em;
font-size: 1.25em;
}
}
@ -263,7 +258,7 @@
&>span>i:before {
content: 'next';
font-size: 1em;
font-size: 1.25em;
}
}
}
@ -271,7 +266,8 @@
.datepicker-table {
padding: 0;
margin-bottom: 0px;
margin: 0px;
width: 100%;
.datepicker-cell {
border: none !important;
@ -316,6 +312,7 @@
padding-bottom: 0.5em;
.pagination {
font-size: 1.1em;
flex-wrap: wrap;
.pagination-list {
@ -325,24 +322,36 @@
width: 100% !important;
.control {
height: 24px !important;
select {
border: none !important;
min-height: 26px;
}
}
.control:first-child {
margin-right: 1px;
.select {
border-right: 1px solid var(--tainacan-input-border-color);
margin-right: 1px;
}
}
}
}
.pagination-previous {
margin: 0;
height: 24px;
height: 1.5em;
padding: 0;
font-size: 0.75em;
order: 3;
min-height: 24px;
margin-bottom: 0.35em;
}
.pagination-next {
margin: 0;
height: 24px;
height: 1.5em;
padding: 0;
font-size: 0.75em;
min-height: 24px;
margin-bottom: 0.35em;
}
}
}

9
src/views/admin/scss/_filters-menu-modal.scss
View File

@ -1,7 +1,10 @@
#filters-modal {
z-index: 999;
padding: 0;
&.is-fullscreen {
z-index: 9999;
}
.modal-content {
padding: 24px 18px $page-side-padding;
padding: 24px 18px 24px 4.1666667vw;
@ -22,7 +25,7 @@
.modal-close {
top: 32px;
right: calc(8.3333333% + 28px);
background-color: var(--tainacan-white);
background-color: var(--tainacan-background-color);
&::before, &::after {
background-color: var(--tainacan-secondary);
@ -32,7 +35,7 @@
@media screen and (max-width: 768px) {
.modal-content {
background-color: var(--tainacan-white);
background-color: var(--tainacan-background-color);
margin: 0 12% 0 0;
margin: 0 12vw 0 0;
padding: $page-small-side-padding;

1
src/views/admin/scss/_inputs.scss
View File

@ -46,6 +46,7 @@ input[type="week"].input {
&::placeholder {
font-size: 0.875em;
color: var(--tainacan-info-color) !important;
text-overflow: ellipsis;
}
&::-ms-input-placeholder {
font-size: 0.875em;

9
src/views/admin/scss/_modals.scss
View File

@ -1,5 +1,6 @@
// Tainacan modals
.modal .animation-content {
background: none;
width: 91.6666667%;
width: 91.6666667vw;
max-height: 86%;
@ -96,11 +97,12 @@
}
// Bulma modals customized for Tainacan (custom-dialog.vue)
.dialog {
.modal-background {
background-color: rgba(0, 0, 0, 0.70);
}
.modal-card {
background-color: var(--tainacan-white);
background-color: var(--tainacan-background-color);
color: var(--tainacan-secondary);
border-radius: 10px;
flex-wrap: wrap;
@ -135,6 +137,7 @@
background: var(--tainacan-background-color);
padding: 0px 0px 12px 20px;
width: 50%;
font-size: 0.875em;
}
.modal-card-foot {
justify-content: space-between;
@ -159,7 +162,7 @@
border: none;
}
.button:not(.is-success):not(.is-secondary) {
background-color: var(--tainacan-white);
background-color: var(--tainacan-background-color);
color: var(--tainacan-secondary);
border: 1px solid var(--tainacan-gray4);
}
@ -179,7 +182,7 @@
top: 100px;
bottom: 100px;
right: 100px;
background-color: var(--tainacan-white);
background-color: var(--tainacan-background-color);
z-index: 99999999999 !important;
.media-toolbar button.button:not(.is-small):not(.is-medium):not(.is-large){

4
src/views/admin/scss/_pagination.scss
View File

@ -26,10 +26,6 @@
color: var(--tainacan-input-color) !important;
}
.control {
font-size: 1em;
}
.shown-items {
font-size: 0.875em;
}

7
src/views/admin/scss/_selects.scss
View File

@ -5,13 +5,16 @@
&:not(.is-multiple) {
height: auto;
}
&.is-small select {
min-height: 24px !important;
}
select {
background: transparent; // WordPress 5.3 adds arrows here
border: none;
border-radius: 1px !important;
font-weight: normal;
font-size: 0.875em !important;
min-height: 30px !important;
line-height: 1.5em;
height: auto !important;
padding: calc(0.375em - 1px) 20px calc(0.375em - 1px) 10px !important;
margin-top: 0px !important;
@ -27,6 +30,7 @@
&[disabled=disabled] {
background: var(--tainacan-gray1) !important;
}
}
&:not(.is-loading)::after {
content: "arrowdown" !important;
@ -42,6 +46,7 @@
text-transform: none !important;
letter-spacing: normal !important;
font-size: 1.2em;
line-height: 1.5em;
}
&.is-loading.is-small::after {
font-size: 0.875em;

27
src/views/admin/scss/_tainacan-form.scss
View File

@ -4,9 +4,6 @@
width: 100%;
padding: 0;
.control {
font-size: 1em;
}
.form-submit {
justify-content: space-between !important;
padding: 12px 0px ;
@ -80,7 +77,7 @@
border: 1px solid var(--tainacan-input-border-color);
background-color: var(--tainacan-gray1) !important;
color: var(--tainacan-secondary) !important;
padding: 0.26em 0.6em !important;
padding: 0.25em 0.6em !important;
border-radius: 0 !important;
.mdi::before {
@ -105,28 +102,6 @@
}
}
}
.control {
&.has-icons-right {
.icon {
height: 2.0em;
.mdi-alert-circle::before {
content: "close";
display: inline-block;
font: normal normal normal 20px/1 "TainacanIcons";
font-size: inherit;
text-rendering: auto;
vertical-align: middle;
line-height: inherit;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
transform: none !important;
text-transform: none !important;
letter-spacing: normal !important;
font-size: 1em;
}
}
}
}
.radio, .checkbox {
align-items: center;
margin-bottom: 5px;

4
src/views/admin/scss/_tooltips.scss
View File

@ -21,6 +21,7 @@
}
}
.tooltip {
font-size: 0.6875em;
z-index: 999999999;
display: block !important;
@ -31,7 +32,7 @@
.tooltip-inner {
background: var(--tainacan-primary);
color: var(--tainacan-info-color);
font-size: 0.6875em;
font-size: 1em;
border-radius: 5px;
padding: 10px 14px;
max-width: 280px;
@ -138,6 +139,7 @@
pointer-events: none;
cursor: none;
flex-wrap: wrap;
font-size: 1.25em;
.metadata-type-label {
font-weight: 600;

1
src/views/admin/scss/tainacan-admin.scss
View File

@ -11,6 +11,7 @@
// Import Tainacan custom styles
@import "../scss/_tainacan-form.scss";
@import "../scss/_control.scss";
@import "../scss/_buttons.scss";
@import "../scss/_selects.scss";
@import "../scss/_inputs.scss";

1
src/views/gutenberg-blocks/tainacan-collections/carousel-collections-list/carousel-collections-list-theme.vue
View File

@ -213,6 +213,7 @@ export default {
paged: undefined,
totalCollections: 0,
swiperOptions: {
watchOverflow: true,
mousewheel: true,
observer: true,
preventInteractionOnTransition: true,

1
src/views/gutenberg-blocks/tainacan-items/carousel-items-list/carousel-items-list-theme.vue
View File

@ -223,6 +223,7 @@ export default {
paged: undefined,
totalItems: 0,
swiperOptions: {
watchOverflow: true,
mousewheel: true,
observer: true,
preventInteractionOnTransition: true,

1
src/views/gutenberg-blocks/tainacan-terms/carousel-terms-list/carousel-terms-list-theme.vue
View File

@ -204,6 +204,7 @@ export default {
paged: undefined,
totalTerms: 0,
swiperOptions: {
watchOverflow: true,
mousewheel: true,
observer: true,
preventInteractionOnTransition: true,

93
src/views/theme-search/pages/theme-items-page.vue
View File

@ -58,22 +58,17 @@
<div
role="search"
class="search-area">
<div class="control has-icons-right is-small is-clearfix">
<input
class="input is-small"
:placeholder="$i18n.get('instruction_search')"
type="search"
:aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('items')"
:value="searchQuery"
@input="futureSearchQuery = $event.target.value"
@keyup.enter="updateSearch()">
<span
aria-controls="items-list-results"
@click="updateSearch()"
class="icon is-right">
<i class="tainacan-icon tainacan-icon-1-25em tainacan-icon-search"/>
</span>
</div>
<b-input
size="is-small"
:placeholder="$i18n.get('instruction_search')"
type="search"
:aria-label="$i18n.get('instruction_search') + ' ' + $i18n.get('items')"
:value="searchQuery"
@input.native="futureSearchQuery = $event.target.value"
@keyup.enter.native="updateSearch()"
icon-right="magnify"
icon-right-clickable
@icon-right-click="updateSearch()" />
<a
v-if="!hideAdvancedSearch"
@click="openAdvancedSearch = !openAdvancedSearch"
@ -1185,29 +1180,6 @@
padding: 0;
}
.filters-menu {
border-right: 0;
.columns {
display: flex;
}
.taginput-container {
.control.has-icons-left .icon {
top: 5px;
}
}
.label {
font-size: 0.75em;
font-weight: normal;
}
.checkbox {
margin-bottom: 5px;
align-items: baseline;
}
}
#filter-menu-compress-button {
position: absolute;
z-index: 99;
@ -1306,7 +1278,7 @@
color: var(--tainacan-label-color);
font-size: 0.875em;
font-weight: normal;
margin-top: 3px;
margin-top: 2px;
margin-bottom: 2px;
cursor: default;
}
@ -1373,11 +1345,6 @@
.control {
width: 100%;
.icon {
pointer-events: all;
cursor: pointer;
color: var(--tainacan-blue5);
}
margin: -2px 0 5px 0;
}
.is-pulled-right {
@ -1385,9 +1352,6 @@
right: 0;
top: 100%;
}
.input {
border: 1px solid var(--tainacan-input-border-color);
}
a {
margin-left: 12px;
white-space: nowrap;
@ -1410,6 +1374,39 @@
}
}
.metadata-alert {
display: flex;
justify-content: space-between;
align-items: center;
margin: 6px $page-side-padding;
border-radius: 3px;
padding: 4px 12px;
color: var(--tainacan-yellow2);
background: var(--tainacan-yellow1);
animation-name: appear;
animation-duration: 0.5s;
p {
margin: 0 auto;
font-size: 0.885em;
}
&>div {
display: flex;
.button,
.button:hover,
.button:active,
.button:focus {
background: none !important;
color: var(--tainacan-yellow2) !important;
font-weight: bold;
border: none;
cursor: pointer;
}
}
}
#items-list-area {
position: relative;
height: 100%;

66
src/views/theme-search/theme-search.vue
View File

@ -47,6 +47,7 @@ export default {
@import "../../../node_modules/buefy/src/scss/components/_loading.scss";
@import "../../../node_modules/buefy/src/scss/components/_dropdown.scss";
@import "../../../node_modules/buefy/src/scss/components/_modal.scss";
@import "../../../node_modules/buefy/src/scss/components/_dialog.scss";
@import "../../../node_modules/buefy/src/scss/components/_notices.scss";
@import "../../../node_modules/buefy/src/scss/components/_numberinput.scss";
@ -63,6 +64,7 @@ export default {
@import "../admin/scss/_selects.scss";
@import "../admin/scss/_dropdown-and-autocomplete.scss";
@import "../admin/scss/_tooltips.scss";
@import "../admin/scss/_control.scss";
@import "../admin/scss/_tainacan-form.scss";
@import "../admin/scss/_filters-menu-modal.scss";
@import "./scss/_layout.scss";
@ -102,8 +104,11 @@ export default {
opacity: 0; // Will make it 1 once window.load is done;
}
a, a:not([href]){ color: var(--tainacan-secondary) }
a:hover, a:hover:not([href]) {
a, a:not([href]) {
color: var(--tainacan-secondary);
}
a:hover,
a:hover:not([href]) {
cursor: pointer;
color: var(--tainacan-secondary);
text-decoration: underline;
@ -112,18 +117,10 @@ export default {
list-style: none;
}
.dropdown {
display: inline-flex;
position: relative;
vertical-align: top;
}
// We need this because bootstrap messes up with this class
.dropdown-menu {
display: block;
}
.dropdown .dropdown-trigger .button .icon,
.autocomplete .dropdown-trigger .button .icon {
align-items: center;
}
.dropdown.is-inline .dropdown-content {
display: flex;
border: none;
@ -136,53 +133,6 @@ export default {
}
}
}
.collapse-all {
font-size: 0.75em;
}
.collapse .collapse-trigger {
display: inline;
cursor: pointer;
.label {
vertical-align: middle;
margin-bottom: 0px;
}
}
.metadata-alert {
display: flex;
justify-content: space-between;
align-items: center;
margin: 6px $page-side-padding;
border-radius: 3px;
padding: 4px 12px;
color: var(--tainacan-yellow2);
background: var(--tainacan-yellow1);
animation-name: appear;
animation-duration: 0.5s;
p {
margin: 0 auto;
}
&>div {
display: flex;
.button,
.button:hover,
.button:active,
.button:focus {
background: none;
color:var(--tainacan-yellow2);
font-weight: bold;
border: none;
cursor: pointer;
}
}
}
.b-checkbox.checkbox.is-small {
font-size: 1em;
}
}
.loading-overlay {
min-height: auto !important;

53
tests/test-category-metadatum-types.php
View File

@ -746,6 +746,57 @@ class TaxonomyMetadatumTypes extends TAINACAN_UnitTestCase {
$this->assertTrue( $taxCheck instanceof \Tainacan\Entities\Taxonomy );
$this->assertEquals($tax->get_id(), $taxCheck->get_id());
}
}
function test_set_metadata_to_not_allow_new_terms_after_taxonomy_is_set_to_it() {
$Tainacan_Metadata = \Tainacan\Repositories\Metadata::get_instance();
$Tainacan_Taxonomies = \Tainacan\Repositories\Taxonomies::get_instance();
$Tainacan_ItemMetadata = \Tainacan\Repositories\Item_Metadata::get_instance();
$collection = $this->tainacan_entity_factory->create_entity(
'collection',
array(
'name' => 'test',
'status' => 'publish'
),
true
);
$tax = $this->tainacan_entity_factory->create_entity(
'taxonomy',
array(
'name' => 'tax_test',
'status' => 'publish'
),
true
);
$metadatum = $this->tainacan_entity_factory->create_entity(
'metadatum',
array(
'name' => 'meta',
'description' => 'description',
'collection' => $collection,
'metadata_type' => 'Tainacan\Metadata_Types\Taxonomy',
'status' => 'publish',
'metadata_type_options' => [
'taxonomy_id' => $tax->get_id(),
'allow_new_terms' => 'yes'
]
),
true
);
$tax->set_allow_insert('no');
$tax->validate();
$Tainacan_Taxonomies->insert($tax);
$checkMeta = $Tainacan_Metadata->fetch( $metadatum->get_id() );
$this->assertEquals('no', $checkMeta->get_metadata_type_options()['allow_new_terms']);
}
}