From 25d67a6ba75d719091dfbee68c1ef9c291d16101 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Wed, 17 Dec 2014 09:42:44 +0100
Subject: [PATCH] Assets_path related fixes (#3182)

---
 plugins/calendar/calendar_ui.js    | 3 ++-
 plugins/kolab_files/kolab_files.js | 5 +++--
 plugins/kolab_notes/notes.js       | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 32d4773f..6590f0ee 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -1936,9 +1936,10 @@ function rcube_calendar_ui(settings)
           rcmail.gettext('expandattendeegroup','libcalendaring') + '</a>';
       }
 
+      var img_src = rcmail.assets_path('program/resources/blank.gif');
       var html = '<td class="role">' + select + '</td>' +
         '<td class="name">' + dispname + '</td>' +
-        '<td class="availability"><img src="./program/resources/blank.gif" class="availabilityicon ' + avail + '" data-email="' + data.email + '" alt="" /></td>' +
+        '<td class="availability"><img src="' + img_src + '" class="availabilityicon ' + avail + '" data-email="' + data.email + '" alt="" /></td>' +
         '<td class="confirmstate"><span class="' + String(data.status).toLowerCase() + '" title="' + Q(tooltip) + '">' + Q(data.status || '') + '</span></td>' +
         (data.cutype != 'RESOURCE' ? '<td class="invite">' + (organizer || readonly || !invbox ? '' : invbox) + '</td>' : '') +
         '<td class="options">' + (organizer || readonly ? '' : dellink) + '</td>';
diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index b168b734..fc866b18 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -142,7 +142,7 @@ function kolab_files_init()
     sort_col: 'name',
     sort_reverse: false,
     search_threads: rcmail.env.search_threads,
-    resources_dir: 'program/resources',
+    resources_dir: rcmail.assets_path('program/resources'),
     supported_mimetypes: rcmail.env.file_mimetypes
   });
 
@@ -1938,7 +1938,8 @@ function kolab_files_ui()
     // otherwise the form will be posted to a new window
     if (document.all) {
       var html = '<iframe id="'+frame_name+'" name="'+frame_name+'"'
-        + ' src="program/resources/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
+        + ' src="' + rcmail.assets_path('program/resources/blank.gif') + '"'
+        + ' style="width:0;height:0;visibility:hidden;"></iframe>';
       document.body.insertAdjacentHTML('BeforeEnd', html);
     }
     // for standards-compliant browsers
diff --git a/plugins/kolab_notes/notes.js b/plugins/kolab_notes/notes.js
index 0f342e59..9666d278 100644
--- a/plugins/kolab_notes/notes.js
+++ b/plugins/kolab_notes/notes.js
@@ -370,7 +370,7 @@ function rcube_kolab_notes_ui(settings)
             selector: '#notecontent',
             theme: 'modern',
             language: settings.editor.lang,
-            content_css: 'program/js/tinymce/roundcube/content.css?v1',
+            content_css: rcmail.assets_path('program/js/tinymce/roundcube/content.css?v2'),
             plugins: 'autolink charmap code link paste tabfocus searchreplace table textcolor',
             toolbar: 'bold italic underline | alignleft aligncenter alignright alignjustify '
                 + '| bullist numlist outdent indent blockquote | forecolor backcolor fontselect fontsizeselect '