From 901f9f0b50196cc421020517f0808bae5fc1492c Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 23 Apr 2020 14:57:19 -0600 Subject: [PATCH] * Calendar: Add videoconference icon to event tooltip --- calendar/js/et2_widget_event.js | 3 + calendar/js/et2_widget_event.ts | 4 + calendar/templates/pixelegg/app.css | 11 -- calendar/templates/pixelegg/app.less | 6 - .../pixelegg/images/videoconference.svg | 115 ++++++++++++++++++ 5 files changed, 122 insertions(+), 17 deletions(-) create mode 100644 calendar/templates/pixelegg/images/videoconference.svg diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js index 3e3bfb268e..73d42012a5 100644 --- a/calendar/js/et2_widget_event.js +++ b/calendar/js/et2_widget_event.js @@ -517,6 +517,9 @@ var et2_calendar_event = /** @class */ (function (_super) { if (this.options.value.participants[egw.user('account_id')] && this.options.value.participants[egw.user('account_id')][0] == 'U') { icons.push(''); } + if (this.options.value["##videoconference"]) { + icons.push(''); + } } // Always include non-blocking, regardless of privacy if (this.options.value.non_blocking) { diff --git a/calendar/js/et2_widget_event.ts b/calendar/js/et2_widget_event.ts index 29244b49da..99748667d4 100644 --- a/calendar/js/et2_widget_event.ts +++ b/calendar/js/et2_widget_event.ts @@ -658,6 +658,10 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached { icons.push(''); } + if(this.options.value["##videoconference"]) + { + icons.push(''); + } } // Always include non-blocking, regardless of privacy diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index 0d1b753f54..c79cc22ec7 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -2195,17 +2195,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget -moz-border-radius: 2px; border-radius: 2px; } -.calendar_calEventIcons img[src$="svg"] { - background-color: #828282 !important; - background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPjxsaW5lYXJHcmFkaWVudCBpZD0iZzc0MyIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiIHgxPSIwJSIgeTE9IjAlIiB4Mj0iMCUiIHkyPSIxMDAlIj48c3RvcCBzdG9wLWNvbG9yPSIjODI4MjgyIiBvZmZzZXQ9IjAiLz48c3RvcCBzdG9wLWNvbG9yPSIjODI4MjgyIiBvZmZzZXQ9IjEiLz48L2xpbmVhckdyYWRpZW50PjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxIiBoZWlnaHQ9IjEiIGZpbGw9InVybCgjZzc0MykiLz48L3N2Zz4=) !important; - background-image: -moz-linear-gradient(top, #828282, #828282) !important; - background-image: -ms-linear-gradient(top, #828282, #828282) !important; - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#828282), to(#828282)) !important; - background-image: -webkit-linear-gradient(top, #828282, #828282) !important; - background-image: -o-linear-gradient(top, #828282, #828282) !important; - background-image: linear-gradient(top, #828282, #828282) !important; - background-repeat: repeat-x !important; -} .calendar_calEventHeaderSmall .calendar_calEventIcons img { height: 13px; } diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less index 03b6c9b4dd..3e1d3b23d4 100755 --- a/calendar/templates/pixelegg/app.less +++ b/calendar/templates/pixelegg/app.less @@ -820,12 +820,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget top: 0px; background-color: @gray_10; .rounded (2px); - - img[src$="svg"] { - .gradient_vertical (@gray_50, @gray_50) !important; - } - - } .calendar_calEventHeaderSmall .calendar_calEventIcons img{ height: 13px; diff --git a/calendar/templates/pixelegg/images/videoconference.svg b/calendar/templates/pixelegg/images/videoconference.svg new file mode 100644 index 0000000000..e304bb2a57 --- /dev/null +++ b/calendar/templates/pixelegg/images/videoconference.svg @@ -0,0 +1,115 @@ + +image/svg+xml \ No newline at end of file