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

Fixes spacing left by compress button in Item Edition Page. Removes Edit attachments button from Item Page and adds compress button.

This commit is contained in:
mateuswetah 2018-05-22 20:00:20 -03:00
parent c564864a31
commit 4921806b4f
2 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,11 +1,11 @@
<template> <template>
<div> <div>
<tainacan-title />
<button <button
id="metadata-column-compress-button" id="metadata-column-compress-button"
@click="isMetadataColumnCompressed = !isMetadataColumnCompressed"> @click="isMetadataColumnCompressed = !isMetadataColumnCompressed">
<b-icon :icon="isMetadataColumnCompressed ? 'menu-left' : 'menu-right'" /> <b-icon :icon="isMetadataColumnCompressed ? 'menu-left' : 'menu-right'" />
</button> </button>
<tainacan-title />
<form <form
v-if="!isLoading" v-if="!isLoading"
class="tainacan-form" class="tainacan-form"
@ -278,7 +278,7 @@
<div class="uploaded-files"> <div class="uploaded-files">
<file-item <file-item
:style="{ margin: 12 + 'px'}" :style="{ margin: 15 + 'px'}"
v-if="attachmentsList.length > 0" v-if="attachmentsList.length > 0"
v-for="(attachment, index) in attachmentsList" v-for="(attachment, index) in attachmentsList"
:key="index" :key="index"
@ -688,6 +688,7 @@ export default {
position: relative; position: relative;
z-index: 99; z-index: 99;
float: right; float: right;
top: 70px;
max-width: 36px; max-width: 36px;
height: 36px; height: 36px;
width: 36px; width: 36px;
@ -789,11 +790,15 @@ export default {
max-width: 100%; max-width: 100%;
resize: vertical; resize: vertical;
overflow: auto; overflow: auto;
p { margin: 4px 15px }
} }
.uploaded-files { .uploaded-files {
display: flex; display: flex;
flex-flow: wrap; flex-flow: wrap;
margin-left: -15px;
margin-right: -15px;
} }
.thumbnail-field { .thumbnail-field {

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

@ -3,9 +3,12 @@
<b-loading <b-loading
:active.sync="isLoading" :active.sync="isLoading"
:can-cancel="false"/> :can-cancel="false"/>
<button
id="metadata-column-compress-button"
@click="isMetadataColumnCompressed = !isMetadataColumnCompressed">
<b-icon :icon="isMetadataColumnCompressed ? 'menu-left' : 'menu-right'" />
</button>
<tainacan-title/> <tainacan-title/>
<div class="columns"> <div class="columns">
<div class="column is-5-5"> <div class="column is-5-5">
<div class="column is-12"> <div class="column is-12">
@ -68,16 +71,9 @@
<label>{{ $i18n.get('label_attachments') }}</label> <label>{{ $i18n.get('label_attachments') }}</label>
</div> </div>
<div class="section-box section-attachments"> <div class="section-box section-attachments">
<button
type="button"
class="button is-secondary"
@click.prevent="attachmentMediaFrame.openFrame($event)">
{{ $i18n.get("label_edit_attachments") }}
</button>
<div class="uploaded-files"> <div class="uploaded-files">
<file-item <file-item
:style="{ margin: 12 + 'px'}" :style="{ margin: 15 + 'px'}"
v-if="attachmentsList.length > 0" v-if="attachmentsList.length > 0"
v-for="(attachment, index) in attachmentsList" v-for="(attachment, index) in attachmentsList"
:key="index" :key="index"
@ -90,7 +86,9 @@
</div> </div>
</div> </div>
<div class="column is-4-5"> <div
v-show="!isMetadataColumnCompressed"
class="column is-4-5">
<label class="section-label">{{ $i18n.get('fields') }}</label> <label class="section-label">{{ $i18n.get('fields') }}</label>
<br> <br>
<a <a
@ -148,6 +146,7 @@
collectionId: Number, collectionId: Number,
itemId: Number, itemId: Number,
isLoading: false, isLoading: false,
isMetadataColumnCompressed: false,
open: false, open: false,
} }
}, },
@ -207,6 +206,28 @@
@import '../../scss/_variables.scss'; @import '../../scss/_variables.scss';
#metadata-column-compress-button {
position: relative;
z-index: 99;
float: right;
top: 70px;
max-width: 36px;
height: 36px;
width: 36px;
border: none;
background-color: $tainacan-input-background;
color: $secondary;
padding: 0px;
border-top-left-radius: 2px;
border-bottom-left-radius: 2px;
cursor: pointer;
.icon {
margin-top: 2px;
margin-right: 8px;
}
}
.page-container { .page-container {
padding: 25px 0px; padding: 25px 0px;
@ -309,11 +330,16 @@
max-width: 100%; max-width: 100%;
resize: vertical; resize: vertical;
overflow: auto; overflow: auto;
padding: 15px;
p { margin: 4px 15px }
} }
.uploaded-files { .uploaded-files {
display: flex; display: flex;
flex-flow: wrap; flex-flow: wrap;
margin-left: -15px;
margin-right: -15px;
} }
</style> </style>