2 commits - plugins/calendar

[Thomas Brüderli]

 plugins/calendar/calendar.php             |    1 +
 plugins/calendar/calendar_base.js         |    3 ---
 plugins/calendar/lib/calendar_ui.php      |    1 +
 plugins/calendar/skins/larry/calendar.css |    4 ++--
 4 files changed, 4 insertions(+), 5 deletions(-)

New commits:
commit 398c6cb971c30b6af7642c5d78948e541544308f
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Oct 4 12:34:05 2012 +0200

    Small style adaption to official Larry styles

diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
index 539377b..034a724 100644
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -1285,8 +1285,8 @@ div.fc-event-location {
 }
 
 .calendarmain .fc-view-table td.fc-list-header {
-	color: #004853;
-	font-size: 13px;
+	color: #004458;
+	font-size: 12px;
 }
 
 .calendarmain .fc-view-table tr.fc-event td {


commit 2a3237c69778deb066566c21fe97e2938d4d371e
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Thu Oct 4 12:33:26 2012 +0200

    No more hard-coded attachment container object (was broken in Larry skin)

diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index dc6cd99..b676fb0 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -1502,6 +1502,7 @@ class calendar extends rcube_plugin
       "rcmail.set_env('deleteicon', '" . $this->api->output->env['deleteicon'] . "');\n".
       "rcmail.set_env('cancelicon', '" . $this->api->output->env['cancelicon'] . "');\n".
       "rcmail.set_env('loadingicon', '" . $this->api->output->env['loadingicon'] . "');\n".
+      "rcmail.gui_object('attachmentlist', '"  . $this->ui->attachmentlist_id . "');\n".
       "rcmail.add_label(" . json_encode($texts) . ");\n"
     );
     exit;
diff --git a/plugins/calendar/calendar_base.js b/plugins/calendar/calendar_base.js
index 0b8c904..62f3588 100644
--- a/plugins/calendar/calendar_base.js
+++ b/plugins/calendar/calendar_base.js
@@ -47,9 +47,6 @@ function rcube_calendar(settings)
             $.getScript('./plugins/calendar/lib/js/fullcalendar.js'),
             $.get(rcmail.url('calendar/inlineui'), function(html){ $(document.body).append(html); }, 'html')
           ).then(function() {
-            // register attachments form
-            rcmail.gui_object('attachmentlist', 'attachmentlist');
-            
             // disable attendees feature (autocompletion and stuff is not initialized)
             for (var c in rcmail.env.calendars)
               rcmail.env.calendars[c].attendees = false;
diff --git a/plugins/calendar/lib/calendar_ui.php b/plugins/calendar/lib/calendar_ui.php
index 63038e8..b4c989e 100644
--- a/plugins/calendar/lib/calendar_ui.php
+++ b/plugins/calendar/lib/calendar_ui.php
@@ -606,6 +606,7 @@ class calendar_ui
       $this->rc->output->set_env('loadingicon', $skin_path . $attrib['loadingicon']);
 
     $this->rc->output->add_gui_object('attachmentlist', $attrib['id']);
+    $this->attachmentlist_id = $attrib['id'];
 
     return html::tag('ul', $attrib, '', html::$common_attrib);
   }