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

Receives document_as_html from item api.

This commit is contained in:
Mateus Machado Luna 2018-05-02 14:52:45 -03:00
parent c5a273b4b5
commit ac4316edf7
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/admin/admin.vue
View File

@ -80,7 +80,7 @@
margin: $header-height auto 0 auto;
position: relative;
overflow-y: auto;
height: calc(100% - 52px);
height: calc(100% - 53px);
@media screen and (max-width: 769px) {
& {

12
src/admin/components/edition/item-edition-form.vue
View File

@ -65,7 +65,7 @@
form.document_type != undefined && form.document_type != null &&
form.document != '' && form.document_type != 'empty'">
<div v-if="form.document_type == 'attachment'">
File ID: {{ form.document }}
<div v-html="item.document_as_html" />
<button
class="button is-primary"
size="is-small"
@ -80,7 +80,7 @@
</button>
</div>
<div v-if="form.document_type == 'text'">
<p>{{ form.document }}</p>
<div v-html="item.document_as_html" />
<button
class="button is-primary"
size="is-small"
@ -95,7 +95,7 @@
</button>
</div>
<div v-if="form.document_type == 'url'">
<p>{{ form.document }}</p>
<div v-html="item.document_as_html" />
<button
class="button is-primary"
size="is-small"
@ -469,7 +469,11 @@ export default {
onSave: (file) => {
this.form.document_type = 'attachment';
this.form.document = file.id + '';
this.updateItemDocument({ item_id: this.itemId, document: this.form.document, document_type: this.form.document_type });
this.updateItemDocument({ item_id: this.itemId, document: this.form.document, document_type: this.form.document_type })
.then((item) => {
this.item.document_as_html = item.document_as_html;
})
.catch(error => this.$console.error(error));
}
}
);

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

@ -83,7 +83,7 @@ export default {
margin-left: -12px;
.level-item{
height: 52px;
height: $header-height;
width: 180px;
transition: margin 0.15s linear;
-webkit-transition: margin 0.15s linear;
@ -91,7 +91,7 @@ export default {
cursor: pointer;
&:hover{
background-color: #257887;
background-color: #257787;
}
&:focus {
box-shadow: none;

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

@ -14,6 +14,7 @@
:is-full-page="false"
:active.sync="isLoadingFilters"/>
<h3>{{ $i18n.get('filters') }}</h3>
<filters-items-list
v-if="!isLoadingFilters && filters.length > 0"
:filters="filters"/>

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

@ -53,11 +53,11 @@ $colors: map-merge($colors, $addColors);
$size-small: 0.85em; // 0.75em on Bulma.
// Tainacan Header and side menus
$header-height: 52px;
$header-height: 53px;
$subheader-height: 82px;
$side-menu-width: 180px;
$filter-menu-width: 200px;
$page-height: calc(100% - 52px);
$page-height: calc(100% - 53px);
// Overall Pages padding:
$page-side-padding: 82px;