merge RTx-Calendar 0.14

2 files changed, 8 insertions, 8 deletions

diff --git a/rt/share/html/NoAuth/Calendar/dhandler b/rt/share/html/NoAuth/Calendar/dhandler
index 4b4aa631e..ea08c9a76 100644
--- a/rt/share/html/NoAuth/Calendar/dhandler
+++ b/rt/share/html/NoAuth/Calendar/dhandler
@@ -101,14 +101,14 @@ my $cal = $calendar->as_string;
 $r->content_type('text/calendar;charset=utf-8');
 $m->clear_buffer();
 $m->out($cal);
-$m->abort; 
+$m->abort;
 
 sub add_event {
     my ($Reminder, $uid) = @_;
 
     return unless defined $Reminder->RefersTo->First;
     my $Ticket  = $Reminder->RefersTo->First->TargetObj;
-    
+
     my %event = (
 	summary => $Reminder->Subject ? $Reminder->Subject : '',
 	url        => "${RT::WebURL}/Ticket/Display.html?id=" . $Ticket->id,
@@ -142,7 +142,7 @@ sub add_todo {
 	$vtodo{attendee} = "MAILTO:" . $Ticket->OwnerObj->EmailAddress;
     } elsif ($Ticket->QueueObj->CommentAddress) {
 	$vtodo{organizer} = "MAILTO:" . $Ticket->QueueObj->CommentAddress;
-	$vtodo{attendee} = "MAILTO:" . $Ticket->QueueObj->CommentAddress; 
+	$vtodo{attendee} = "MAILTO:" . $Ticket->QueueObj->CommentAddress;
     }
 
     $vtodo{priority} = $Ticket->Priority
diff --git a/rt/share/html/NoAuth/css/calendar.css b/rt/share/html/NoAuth/css/calendar.css
index c6b584e96..93edccf4c 100644
--- a/rt/share/html/NoAuth/css/calendar.css
+++ b/rt/share/html/NoAuth/css/calendar.css
@@ -1,8 +1,8 @@
-.tooltip{position:relative;z-index:1;}
-.tooltip:hover{z-index:5;color:#000;}
-.tooltip span.tip{display: none; text-align:left;}
+.rtxcalendar .tooltip{position:relative;z-index:1;}
+.rtxcalendar .tooltip:hover{z-index:5;color:#000;}
+.rtxcalendar .tooltip span.tip{display: none; text-align:left;}
 
-div.tooltip:hover span.tip{
+.rtxcalendar div.tooltip:hover span.tip{
 display:block;
 position:absolute;
 top:12px; left:24px; width:350px;
@@ -13,7 +13,7 @@ font-size: 0.8em;
 color:#505050;
 }
 
-.calendardate {
+.rtxcalendar .date {
   text-align: right;
   background-color: #f8f8ff;
   width:100%;