From 4dd6eb589355ce78eaea8fafe2c953214c034676 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Tue, 3 Apr 2018 12:24:31 +0200 Subject: [PATCH] Elastic: Fix calendar printing and other css issues --- plugins/calendar/print.js | 10 +- .../skins/elastic/templates/print.html | 1 + plugins/libkolab/skins/elastic/images/eye.svg | 1 + .../skins/elastic/include/calendar.less | 120 ++++++++++++++++-- 4 files changed, 114 insertions(+), 18 deletions(-) create mode 100644 plugins/libkolab/skins/elastic/images/eye.svg diff --git a/plugins/calendar/print.js b/plugins/calendar/print.js index 5c8a6005..a469f538 100644 --- a/plugins/calendar/print.js +++ b/plugins/calendar/print.js @@ -6,7 +6,7 @@ * @licstart The following is the entire license notice for the * JavaScript code in this file. * - * Copyright (C) 2011, Kolab Systems AG + * Copyright (C) 2011-2018, Kolab Systems AG * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as @@ -34,11 +34,11 @@ window.rcmail && rcmail.addEventListener('init', function(evt) { { return String(str).replace(//g, '>').replace(/"/g, '"'); }; - + var rc_loading; var showdesc = true; var settings = $.extend(rcmail.env.calendar_settings, rcmail.env.libcal_settings); - + // create list of event sources AKA calendars var src, event_sources = []; var add_url = (rcmail.env.search ? '&q='+escape(rcmail.env.search) : ''); @@ -52,9 +52,11 @@ window.rcmail && rcmail.addEventListener('init', function(evt) { id: id }, rcmail.env.calendars[id]); + source.color = '#' + source.color.replace(/^#/, ''); + event_sources.push(source); } - + var viewdate = new Date(); if (rcmail.env.date) viewdate.setTime(rcmail.env.date * 1000); diff --git a/plugins/calendar/skins/elastic/templates/print.html b/plugins/calendar/skins/elastic/templates/print.html index 4b5a23d5..af96fcdd 100644 --- a/plugins/calendar/skins/elastic/templates/print.html +++ b/plugins/calendar/skins/elastic/templates/print.html @@ -13,6 +13,7 @@
+