Skip to content

Commit

Permalink
Merge branch 'fix/#5238/info-popup' into 'develop'
Browse files Browse the repository at this point in the history
[Issue #5238] Info popup

See merge request canopsis/canopsis-pro!3371
  • Loading branch information
mmourcia committed Dec 20, 2023
2 parents bea9ee5 + f94c828 commit 3a61d8f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template lang="pug">
v-card(dark)
v-card
v-card-title.primary.pa-2.white--text
v-layout(justify-space-between, align-center)
h4 {{ $t('alarm.infoPopup') }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const widgetColumnsAlarmMixin = {
return (this.columns ?? []).map(column => ({
...column,

popupTemplate: this.infoPopupsMap[column.value],
popupTemplate: this.infoPopupsMap[column.value] ?? this.infoPopupsMap[`alarm.${column.value}`],
filter: this.$i18n.locale && this.getColumnFilter(column.value),
getComponent: getAlarmsListWidgetColumnComponentGetter(column),
colorIndicatorEnabled: Object.values(COLOR_INDICATOR_TYPES).includes(column.colorIndicator),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

exports[`alarm-column-cell-popup-body Renders \`alarm-column-cell-popup-body\` with full alarm 1`] = `
<div
class="v-card v-sheet theme--dark"
class="v-card v-sheet theme--light"
>
<div
class="v-card__title primary pa-2 white--text"
Expand All @@ -14,15 +14,15 @@ exports[`alarm-column-cell-popup-body Renders \`alarm-column-cell-popup-body\` w
Info popup
</h4>
<button
class="ma-0 ml-3 v-btn v-btn--icon v-btn--small theme--dark white"
class="ma-0 ml-3 v-btn v-btn--icon v-btn--small theme--light white"
type="button"
>
<div
class="v-btn__content"
>
<i
aria-hidden="true"
class="v-icon material-icons theme--dark error--text"
class="v-icon material-icons theme--light error--text"
style="font-size: 16px;"
>
close
Expand Down

0 comments on commit 3a61d8f

Please sign in to comment.