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 <filters-tags-list
class="filter-tags-list" class="filter-tags-list"
:filters="filters" :filters="filters"
v-if="hasFiltered">Teste</filters-tags-list> v-if="hasFiltered && !openAdvancedSearch">Teste</filters-tags-list>
<!-- SEARCH CONTROL ------------------------- --> <!-- SEARCH CONTROL ------------------------- -->
<div <div

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

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

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

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

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

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

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

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