* added 'icon' property for popups
All checks were successful
continuous-integration/drone/push Build is passing
All checks were successful
continuous-integration/drone/push Build is passing
* show a popup after creating a share link for alum and box * set min width to 320 px for sharing dialog
This commit is contained in:
parent
77e835e33e
commit
19f221556a
@ -14,6 +14,7 @@ body {
|
|||||||
bottom: 16px;
|
bottom: 16px;
|
||||||
left: -160px;
|
left: -160px;
|
||||||
margin-left: 50%;
|
margin-left: 50%;
|
||||||
|
z-index: 1200;
|
||||||
}
|
}
|
||||||
|
|
||||||
h1 {
|
h1 {
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
<template>
|
<template>
|
||||||
<div class="popup-control flex-column shadow ma8" :class="{fadeOut: fadeout}">
|
<div
|
||||||
|
class="popup-control flex-column shadow ma8"
|
||||||
|
:class="{ fadeOut: fadeout }"
|
||||||
|
>
|
||||||
<div class="flex-row" :class="item.type">
|
<div class="flex-row" :class="item.type">
|
||||||
<awesome-icon icon="circle-info" size="2x" class="ma" />
|
<awesome-icon :icon="item.icon || 'circle-info'" size="2x" class="ma" />
|
||||||
<div class="flex-column pa8-top ma8-bottom ma8-right">
|
<div class="flex-column pa8-top ma8-bottom ma8-right">
|
||||||
<h3 class="ma-off">{{ item.title }}</h3>
|
<h3 class="ma-off">{{ item.title }}</h3>
|
||||||
<p class="ma-off ma8-top">{{ item.message }}</p>
|
<p class="ma-off ma8-top">{{ item.message }}</p>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<template>
|
<template>
|
||||||
<DialogBase ref="dialogWindow" title="Shared items" button-text="close">
|
<DialogBase ref="dialogWindow" title="Shared items" button-text="close">
|
||||||
<div class="flex-column">
|
<div class="flex-column" id="sharedContent">
|
||||||
<ul v-if="shares.length > 0">
|
<ul v-if="shares.length > 0">
|
||||||
<li
|
<li
|
||||||
class="flex-row pa4-top pa4-bottom"
|
class="flex-row pa4-top pa4-bottom"
|
||||||
@ -21,7 +21,11 @@
|
|||||||
<p class="grow ma-off">
|
<p class="grow ma-off">
|
||||||
{{ share.title }}
|
{{ share.title }}
|
||||||
</p>
|
</p>
|
||||||
<button class="flat danger faded" @click="shareDisable(share)" title="Disable Sharing">
|
<button
|
||||||
|
class="flat danger faded"
|
||||||
|
@click="shareDisable(share)"
|
||||||
|
title="Disable Sharing"
|
||||||
|
>
|
||||||
<awesome-icon icon="trash-alt" />
|
<awesome-icon icon="trash-alt" />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
@ -107,4 +111,8 @@ li p {
|
|||||||
li .cover {
|
li .cover {
|
||||||
width: 32px;
|
width: 32px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#sharedContent {
|
||||||
|
min-width: 320px;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
@ -165,6 +165,7 @@ export default {
|
|||||||
axios.post(context.rootGetters.server + "/api/albums/" + album._id + "/share", {}, context.rootGetters.headers).then(res => {
|
axios.post(context.rootGetters.server + "/api/albums/" + album._id + "/share", {}, context.rootGetters.headers).then(res => {
|
||||||
album.share = res.data;
|
album.share = res.data;
|
||||||
resolve();
|
resolve();
|
||||||
|
context.dispatch("addPoUp", { title: "Share successful", message: "Url was copied into your clipboard", type: "success", icon:"share" }, { root: true });
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -141,6 +141,7 @@ export default {
|
|||||||
axios.post(context.rootGetters.server + "/api/boxes/" + box._id + "/share", {}, context.rootGetters.headers).then(res => {
|
axios.post(context.rootGetters.server + "/api/boxes/" + box._id + "/share", {}, context.rootGetters.headers).then(res => {
|
||||||
box.share = res.data;
|
box.share = res.data;
|
||||||
resolve();
|
resolve();
|
||||||
|
context.dispatch("addPoUp", { title: "Share successful", message: "Url was copied into your clipboard", type: "success", icon: "share" }, { root: true });
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
Loading…
Reference in New Issue
Block a user