summaryrefslogtreecommitdiffstats
path: root/src/components/Properties
diff options
context:
space:
mode:
authorJohn Molakvoæ <skjnldsv@users.noreply.github.com>2018-09-25 18:13:49 +0200
committerGitHub <noreply@github.com>2018-09-25 18:13:49 +0200
commitc81275bb0daa10b08d69685de748e14923faa889 (patch)
tree9165a1b42627e656f8ea2a18e22fcaa0341736b2 /src/components/Properties
parent9a7d7b81c5618f831d2dd0accd2778d468d1f885 (diff)
parent4d699610180a35eea466fcd149d669dc01334b2e (diff)
Merge branch 'vue' into vue-cdav-lib
Diffstat (limited to 'src/components/Properties')
-rw-r--r--src/components/Properties/PropertyDateTime.vue3
-rw-r--r--src/components/Properties/PropertyMultipleText.vue3
-rw-r--r--src/components/Properties/PropertySelect.vue3
-rw-r--r--src/components/Properties/PropertyText.vue3
-rw-r--r--src/components/Properties/PropertyTitle.vue7
5 files changed, 15 insertions, 4 deletions
diff --git a/src/components/Properties/PropertyDateTime.vue b/src/components/Properties/PropertyDateTime.vue
index bc903273..db312bcd 100644
--- a/src/components/Properties/PropertyDateTime.vue
+++ b/src/components/Properties/PropertyDateTime.vue
@@ -23,7 +23,8 @@
<template>
<div v-if="propModel" :class="`grid-span-${gridLength}`" class="property">
<!-- title if first element -->
- <property-title v-if="isFirstProperty && propModel.icon" :icon="propModel.icon" :readable-name="propModel.readableName" />
+ <property-title v-if="isFirstProperty && propModel.icon" :icon="propModel.icon" :readable-name="propModel.readableName"
+ :info="propModel.info" />
<div class="property__row">
<!-- type selector -->
diff --git a/src/components/Properties/PropertyMultipleText.vue b/src/components/Properties/PropertyMultipleText.vue
index dcbf080f..6804c9e5 100644
--- a/src/components/Properties/PropertyMultipleText.vue
+++ b/src/components/Properties/PropertyMultipleText.vue
@@ -23,7 +23,8 @@
<template>
<div v-if="propModel" :class="`grid-span-${gridLength}`" class="property">
<!-- title if first element -->
- <property-title v-if="isFirstProperty && propModel.icon" :icon="propModel.icon" :readable-name="propModel.readableName" />
+ <property-title v-if="isFirstProperty && propModel.icon" :icon="propModel.icon" :readable-name="propModel.readableName"
+ :info="propModel.info" />
<div class="property__row">
<!-- type selector -->
diff --git a/src/components/Properties/PropertySelect.vue b/src/components/Properties/PropertySelect.vue
index 21e28dc2..a6469f00 100644
--- a/src/components/Properties/PropertySelect.vue
+++ b/src/components/Properties/PropertySelect.vue
@@ -23,7 +23,8 @@
<template>
<div v-if="propModel" :class="`grid-span-${gridLength}`" class="property">
<!-- title if first element -->
- <property-title v-if="isFirstProperty && propModel.icon" :icon="propModel.icon" :readable-name="propModel.readableName" />
+ <property-title v-if="isFirstProperty && propModel.icon" :icon="propModel.icon" :readable-name="propModel.readableName"
+ :info="propModel.info" />
<div class="property__row">
diff --git a/src/components/Properties/PropertyText.vue b/src/components/Properties/PropertyText.vue
index 9cf499c4..d5488bab 100644
--- a/src/components/Properties/PropertyText.vue
+++ b/src/components/Properties/PropertyText.vue
@@ -23,7 +23,8 @@
<template>
<div v-if="propModel" :class="`grid-span-${gridLength}`" class="property">
<!-- title if first element -->
- <property-title v-if="isFirstProperty && propModel.icon" :icon="propModel.icon" :readable-name="propModel.readableName" />
+ <property-title v-if="isFirstProperty && propModel.icon" :icon="propModel.icon" :readable-name="propModel.readableName"
+ :info="propModel.info" />
<div class="property__row">
<!-- type selector -->
diff --git a/src/components/Properties/PropertyTitle.vue b/src/components/Properties/PropertyTitle.vue
index 360e813a..f60eaf36 100644
--- a/src/components/Properties/PropertyTitle.vue
+++ b/src/components/Properties/PropertyTitle.vue
@@ -24,6 +24,8 @@
<h3 class="property__title property__row">
<div :class="icon" class="property__label property__title--icon" />
{{ readableName }}
+ <!-- display tooltip with hint if available -->
+ <div v-tooltip.right="info" v-if="info" class="icon-details" />
</h3>
</template>
@@ -41,6 +43,11 @@ export default {
type: String,
default: '',
required: true
+ },
+ info: {
+ type: String,
+ default: '',
+ required: false
}
}
}