added samples to flagcollection and linked material in thematique
This commit is contained in:
parent
406d215a04
commit
50f76ff0cd
|
@ -1549,10 +1549,7 @@ aside.messages {
|
||||||
#content-left .flag-collection > ul > li article.card.minicard > header h1 {
|
#content-left .flag-collection > ul > li article.card.minicard > header h1 {
|
||||||
margin: 0; }
|
margin: 0; }
|
||||||
#content-left .flag-collection > ul > li article.card.minicard > nav.tools {
|
#content-left .flag-collection > ul > li article.card.minicard > nav.tools {
|
||||||
top: auto;
|
padding: 0 0.2em; }
|
||||||
bottom: 0;
|
|
||||||
padding: 0 0.2em;
|
|
||||||
background: transparent; }
|
|
||||||
#content-left .flag-collection > ul > li article.card.minicard > nav.tools .mdi.unflag {
|
#content-left .flag-collection > ul > li article.card.minicard > nav.tools .mdi.unflag {
|
||||||
cursor: pointer; }
|
cursor: pointer; }
|
||||||
|
|
||||||
|
@ -1878,12 +1875,12 @@ article.card {
|
||||||
article.card.minicard > header span.ref {
|
article.card.minicard > header span.ref {
|
||||||
line-height: 0.5; }
|
line-height: 0.5; }
|
||||||
article.card.minicard > nav.tools {
|
article.card.minicard > nav.tools {
|
||||||
top: auto;
|
|
||||||
bottom: 0;
|
|
||||||
padding: 0 0.2em;
|
padding: 0 0.2em;
|
||||||
background: transparent; }
|
background: rgba(255, 255, 255, 0.8); }
|
||||||
article.card.minicard > nav.tools .mdi.unflag {
|
article.card.minicard > nav.tools .mdi.unflag {
|
||||||
cursor: pointer; }
|
cursor: pointer; }
|
||||||
|
article.card.minicard > nav.tools .tool.samples:hover .tool-content {
|
||||||
|
max-width: 140px; }
|
||||||
article.card.linkedmaterialcard {
|
article.card.linkedmaterialcard {
|
||||||
width: 190px;
|
width: 190px;
|
||||||
height: 110px; }
|
height: 110px; }
|
||||||
|
@ -2003,6 +2000,12 @@ article.card {
|
||||||
color: #1a1a1a; }
|
color: #1a1a1a; }
|
||||||
article.card nav.tools .tool.flags li.create-flag span.add-btn.loading:before {
|
article.card nav.tools .tool.flags li.create-flag span.add-btn.loading:before {
|
||||||
animation: rotating 2s linear infinite; }
|
animation: rotating 2s linear infinite; }
|
||||||
|
article.card nav.tools .tool.samples .tool-content {
|
||||||
|
font-size: 0.756em; }
|
||||||
|
article.card nav.tools .tool.samples .tool-content ul li {
|
||||||
|
font-weight: bold; }
|
||||||
|
article.card nav.tools .tool.samples .tool-content ul li span.showroom {
|
||||||
|
font-weight: 400; }
|
||||||
article.card:hover nav.tools {
|
article.card:hover nav.tools {
|
||||||
opacity: 1; }
|
opacity: 1; }
|
||||||
article.card section.images {
|
article.card section.images {
|
||||||
|
@ -2087,7 +2090,7 @@ article.card {
|
||||||
article.card.modal-card section.col-right nav.tools div.tool-content {
|
article.card.modal-card section.col-right nav.tools div.tool-content {
|
||||||
min-width: 385px; }
|
min-width: 385px; }
|
||||||
article.card.modal-card section.col-right section.tool.samples div.tool-content ul {
|
article.card.modal-card section.col-right section.tool.samples div.tool-content ul {
|
||||||
font-size: 0.882em;
|
font-size: 0.756em;
|
||||||
font-weight: 300; }
|
font-weight: 300; }
|
||||||
article.card.modal-card section.col-right section.tool.samples div.tool-content ul li {
|
article.card.modal-card section.col-right section.tool.samples div.tool-content ul li {
|
||||||
padding-right: 0.5em; }
|
padding-right: 0.5em; }
|
||||||
|
@ -2150,9 +2153,9 @@ article.card {
|
||||||
#main-content > article.thematique div.col-left section.visuel img {
|
#main-content > article.thematique div.col-left section.visuel img {
|
||||||
width: 100%; }
|
width: 100%; }
|
||||||
|
|
||||||
#main-content > article.thematique aside.linked-materials ul {
|
#main-content > article.thematique aside.linked-materials div.card-list > ul {
|
||||||
width: calc(100% + 13px); }
|
width: calc(100% + 13px); }
|
||||||
#main-content > article.thematique aside.linked-materials ul li {
|
#main-content > article.thematique aside.linked-materials div.card-list > ul > li {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
width: 205px;
|
width: 205px;
|
||||||
|
|
File diff suppressed because one or more lines are too long
|
@ -493,13 +493,18 @@ aside.messages{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
>nav.tools{
|
>nav.tools{
|
||||||
top: auto;
|
// top: auto;
|
||||||
bottom: 0;
|
// bottom: 0;
|
||||||
padding:0 0.2em;
|
padding:0 0.2em;
|
||||||
background:transparent;
|
// background:transparent;
|
||||||
.mdi.unflag{
|
.mdi.unflag{
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
.tool.samples{
|
||||||
|
.tool-content{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -998,13 +1003,18 @@ article.card{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
>nav.tools{
|
>nav.tools{
|
||||||
top: auto;
|
// top: auto;
|
||||||
bottom: 0;
|
// bottom: 0;
|
||||||
padding:0 0.2em;
|
padding:0 0.2em;
|
||||||
background:transparent;
|
background:rgba(255,255,255, 0.8);
|
||||||
.mdi.unflag{
|
.mdi.unflag{
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
.tool.samples:hover{
|
||||||
|
.tool-content{
|
||||||
|
max-width:140px;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
&.linkedmaterialcard{
|
&.linkedmaterialcard{
|
||||||
|
@ -1117,6 +1127,7 @@ article.card{
|
||||||
max-height: 195px;
|
max-height: 195px;
|
||||||
max-width:200px;
|
max-width:200px;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
.tool.flags{
|
.tool.flags{
|
||||||
|
@ -1164,9 +1175,21 @@ article.card{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.tool.samples{
|
||||||
|
.tool-content{
|
||||||
|
font-size: 0.756em;
|
||||||
|
ul li{
|
||||||
|
font-weight: bold;
|
||||||
|
span.showroom{
|
||||||
|
font-weight: 400;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
opacity: 0;
|
opacity: 0;
|
||||||
transition: opacity 0.2s ease-in-out;
|
transition: opacity 0.2s ease-in-out;
|
||||||
}
|
}
|
||||||
|
|
||||||
&:hover{
|
&:hover{
|
||||||
nav.tools{
|
nav.tools{
|
||||||
opacity:1;
|
opacity:1;
|
||||||
|
@ -1304,7 +1327,7 @@ article.card{
|
||||||
ul{
|
ul{
|
||||||
// display: flex;
|
// display: flex;
|
||||||
// flex-flow: row wrap;
|
// flex-flow: row wrap;
|
||||||
font-size: 0.882em;
|
font-size: 0.756em;
|
||||||
font-weight: 300;
|
font-weight: 300;
|
||||||
// line-height: 1.35;
|
// line-height: 1.35;
|
||||||
li{
|
li{
|
||||||
|
@ -1426,15 +1449,18 @@ article.card{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
aside.linked-materials{
|
aside.linked-materials{
|
||||||
ul{
|
div.card-list{
|
||||||
|
>ul{
|
||||||
width:calc(100% + #{$column_goutiere});
|
width:calc(100% + #{$column_goutiere});
|
||||||
li{
|
>li{
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
width:$column_width;
|
width:$column_width;
|
||||||
margin:0 $column_goutiere $column_goutiere 0;
|
margin:0 $column_goutiere $column_goutiere 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
h3.field__label{
|
h3.field__label{
|
||||||
font-size: 1em;
|
font-size: 1em;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
|
|
|
@ -6,5 +6,12 @@ fragment MateriauFields on Materiau {
|
||||||
style_minicard{
|
style_minicard{
|
||||||
url
|
url
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
samples{
|
||||||
|
showroom{
|
||||||
|
name
|
||||||
|
id
|
||||||
|
}
|
||||||
|
location
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
fragment MateriauFields on Materiau {
|
fragment MateriauFields on Materiau {
|
||||||
|
id
|
||||||
title
|
title
|
||||||
short_description
|
short_description
|
||||||
reference
|
reference
|
||||||
|
body
|
||||||
note{
|
note{
|
||||||
id
|
id
|
||||||
contenu
|
contenu
|
||||||
|
@ -68,16 +70,6 @@ fragment MateriauFields on Materiau {
|
||||||
family_name
|
family_name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
attachments {
|
|
||||||
description
|
|
||||||
file{
|
|
||||||
fid
|
|
||||||
filename
|
|
||||||
url
|
|
||||||
filesize
|
|
||||||
}
|
|
||||||
}
|
|
||||||
body
|
|
||||||
samples{
|
samples{
|
||||||
showroom{
|
showroom{
|
||||||
name
|
name
|
||||||
|
|
|
@ -14,6 +14,13 @@ fragment ThematiqueFields on Thematique {
|
||||||
url
|
url
|
||||||
style_cardmedium_url
|
style_cardmedium_url
|
||||||
style_hd_url
|
style_hd_url
|
||||||
|
}
|
||||||
|
samples{
|
||||||
|
showroom{
|
||||||
|
name
|
||||||
|
id
|
||||||
|
}
|
||||||
|
location
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
images {
|
images {
|
||||||
|
|
|
@ -7,6 +7,20 @@
|
||||||
<span v-if="item.reference" class="ref">{{ item.reference }}</span>
|
<span v-if="item.reference" class="ref">{{ item.reference }}</span>
|
||||||
</header>
|
</header>
|
||||||
<nav class="tools">
|
<nav class="tools">
|
||||||
|
<section class="tool samples" v-if="item.samples && item.samples.length">
|
||||||
|
<span class="btn mdi mdi-beaker-outline"/>
|
||||||
|
<div class="tool-content">
|
||||||
|
<span class="label">{{ $t("materio.Samples") }}</span>
|
||||||
|
<ul>
|
||||||
|
<li
|
||||||
|
v-for="sample in item.samples"
|
||||||
|
:key="sample.showroom.id"
|
||||||
|
>
|
||||||
|
<span class="showroom">{{ sample.showroom.name }}</span>: {{ sample.location }}
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
<section class="tool flags">
|
<section class="tool flags">
|
||||||
<span
|
<span
|
||||||
class="mdi unflag"
|
class="mdi unflag"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<li v-if="flagcolls" v-for="coll in flagcolls" :key="coll.id">
|
<li v-if="flagcolls" v-for="coll in flagcolls" :key="coll.id">
|
||||||
<h5
|
<h5
|
||||||
:flagcollid="coll.id"
|
:flagcollid="coll.id"
|
||||||
@click.prevent="onOpenFlagColl"
|
@click.prevent="onOpenFlagColl(coll.id)"
|
||||||
>{{ coll.name }} <span class="length">({{ coll.items.length }})</span></h5>
|
>{{ coll.name }} <span class="length">({{ coll.items.length }})</span></h5>
|
||||||
<div class="actions">
|
<div class="actions">
|
||||||
<span
|
<span
|
||||||
|
@ -133,8 +133,8 @@ export default {
|
||||||
this.is_deleting_folder = false
|
this.is_deleting_folder = false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
onOpenFlagColl (e) {
|
onOpenFlagColl (flagcollid) {
|
||||||
const flagcollid = e.target.getAttribute('flagcollid');
|
// const flagcollid = e.target.getAttribute('flagcollid');
|
||||||
console.log("UserFlags onOpenFlagColl", flagcollid);
|
console.log("UserFlags onOpenFlagColl", flagcollid);
|
||||||
this.openFlagColl(flagcollid)
|
this.openFlagColl(flagcollid)
|
||||||
.then(() => {
|
.then(() => {
|
||||||
|
|
Loading…
Reference in New Issue