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/bulk-edit-items

This commit is contained in:
weryques 2018-08-29 12:40:56 -03:00
parent 7d0d04e490 f5f520dff6
commit 8eedca3715
5 changed files with 64 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -111,7 +111,7 @@
<filters-tags-list
class="filter-tags-list"
:filters="filters"
v-if="hasFiltered">Teste</filters-tags-list>
v-if="hasFiltered && !openAdvancedSearch">Teste</filters-tags-list>
<!-- SEARCH CONTROL ------------------------- -->
<div

2
src/admin/pages/lists/term-items-page.vue
View File

@ -113,7 +113,7 @@
<filters-tags-list
class="filter-tags-list"
:filters="filters"
v-if="hasFiltered">Teste</filters-tags-list>
v-if="hasFiltered && !openAdvancedSearch">Teste</filters-tags-list>
<!-- SEARCH CONTROL ------------------------- -->
<div

1
src/admin/pages/singles/item-page.vue
View File

@ -244,6 +244,7 @@
{{ $i18n.getFrom('items','edit_item') }}
</router-link>
<a
target="_blank"
class="button is-success is-pulled-right"
:href="item.url">
{{ $i18n.getFrom('items', 'view_item') }}

12
src/admin/scss/_variables.scss
View File

@ -247,9 +247,9 @@ $modal-z: 9999999;
height: 0px;
max-height: 0px;
min-height: 0px;
-ms-transform: translate(2%, -30%); /* IE 9 */
-webkit-transform: translate(2%, -30%); /* Safari */
transform: translate(2%, -30%);
-ms-transform: translate(0%, -30%); /* IE 9 */
-webkit-transform: translate(0%, -30%); /* Safari */
transform: translate(0%, -30%);
}
to {
height: 80px;
@ -277,9 +277,9 @@ $modal-z: 9999999;
max-height: 0px;
min-height: 0px;
opacity: 0;
-ms-transform: translate(2%, -30%); /* IE 9 */
-webkit-transform: translate(2%, -30%); /* Safari */
transform: translate(2%, -30%);
-ms-transform: translate(0%, -30%); /* IE 9 */
-webkit-transform: translate(0%, -30%); /* Safari */
transform: translate(0%, -30%);
}
}

106
src/classes/metadata-types/tainacan-form-item.vue
View File

@ -19,59 +19,63 @@
:title="metadatum.metadatum.name"
:message="metadatum.metadatum.description"/>
</span>
<div
v-show="isCollapsed || metadatumTypeMessage == 'is-danger'"
v-if="isTextInputComponent( metadatum.metadatum.metadata_type_object.component )">
<component
:id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
:is="metadatum.metadatum.metadata_type_object.component"
v-model="inputs[0]"
:metadatum="metadatum"
@input="emitIsChangingValue()"/>
<div v-if="metadatum.metadatum.multiple == 'yes'">
<div
v-if="index > 0"
v-for="(input, index) in inputsList "
:key="index"
class="multiple-inputs">
<component
:id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
:is="metadatum.metadatum.metadata_type_object.component"
v-model="inputs[index]"
:metadatum="metadatum"
@input="emitIsChangingValue()"/>
<a
v-if="index > 0"
@click="removeInput(index)"
class="is-inline add-link">
<b-icon
icon="minus-circle"
size="is-small"
type="is-secondary"/>
{{ $i18n.get('label_remove_value') }}</a>
<transition name="filter-item">
<div
v-show="isCollapsed || metadatumTypeMessage == 'is-danger'"
v-if="isTextInputComponent( metadatum.metadatum.metadata_type_object.component )">
<component
:id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
:is="metadatum.metadatum.metadata_type_object.component"
v-model="inputs[0]"
:metadatum="metadatum"
@input="emitIsChangingValue()"/>
<div v-if="metadatum.metadatum.multiple == 'yes'">
<div
v-if="index > 0"
v-for="(input, index) in inputsList "
:key="index"
class="multiple-inputs">
<component
:id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
:is="metadatum.metadatum.metadata_type_object.component"
v-model="inputs[index]"
:metadatum="metadatum"
@input="emitIsChangingValue()"/>
<a
v-if="index > 0"
@click="removeInput(index)"
class="is-inline add-link">
<b-icon
icon="minus-circle"
size="is-small"
type="is-secondary"/>
{{ $i18n.get('label_remove_value') }}</a>
</div>
<a
@click="addInput"
class="is-inline add-link">
<b-icon
icon="plus-circle"
size="is-small"
type="is-secondary"/>
{{ $i18n.get('label_add_value') }}</a>
</div>
<a
@click="addInput"
class="is-inline add-link">
<b-icon
icon="plus-circle"
size="is-small"
type="is-secondary"/>
{{ $i18n.get('label_add_value') }}</a>
</div>
</div>
<div
v-show="isCollapsed"
v-else>
<component
:id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
:is="metadatum.metadatum.metadata_type_object.component"
v-model="inputs"
:metadatum="metadatum"
@input="emitIsChangingValue()"/>
</div>
</transition>
<transition name="filter-item">
<div
v-show="isCollapsed"
v-if="!isTextInputComponent( metadatum.metadatum.metadata_type_object.component )">
<component
:id="metadatum.metadatum.metadata_type_object.component + '-' + metadatum.metadatum.slug"
:is="metadatum.metadatum.metadata_type_object.component"
v-model="inputs"
:metadatum="metadatum"
@input="emitIsChangingValue()"/>
</div>
</transition>
</b-field>
</template>