From 3ccfe3fb93d9fe3e73fdf8cf70f21247a84a52d9 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Mon, 11 Nov 2013 14:02:08 +0000
Subject: [PATCH] Add app prefix name to calendar css classes

---
 calendar/inc/class.calendar_ui.inc.php        |   6 +-
 calendar/inc/class.calendar_uiforms.inc.php   |   2 +-
 calendar/inc/class.calendar_uiviews.inc.php   | 132 ++++++-------
 calendar/js/dragDropFunctions.js              |   2 +-
 calendar/setup/etemplates.inc.php             |  18 +-
 .../class.module_calendar_planner.inc.php     |   2 +-
 calendar/templates/default/app.css            | 184 +++++++++---------
 calendar/templates/default/conflicts.xet      |   2 +-
 calendar/templates/default/edit.xet           |   6 +-
 calendar/templates/default/event_widget.tpl   |  18 +-
 calendar/templates/default/freetimesearch.xet |   9 +-
 calendar/templates/default/import.xet         |   2 +-
 calendar/templates/default/list.xet           |  12 +-
 calendar/templates/default/meeting.xet        |   2 +-
 calendar/templates/default/print.xet          |   2 +-
 15 files changed, 204 insertions(+), 195 deletions(-)

diff --git a/calendar/inc/class.calendar_ui.inc.php b/calendar/inc/class.calendar_ui.inc.php
index c4918eb83c..7028d04bf2 100644
--- a/calendar/inc/class.calendar_ui.inc.php
+++ b/calendar/inc/class.calendar_ui.inc.php
@@ -199,7 +199,7 @@ class calendar_ui
 		}
 		if (count($no_access))
 		{
-			$msg = '<p class="redItalic" align="center">'.lang('Access denied to the calendar of %1 !!!',implode(', ',$no_access))."</p>\n";
+			$msg = '<p class="message" align="center">'.lang('Access denied to the calendar of %1 !!!',implode(', ',$no_access))."</p>\n";
 
 			if ($GLOBALS['egw_info']['flags']['currentapp'] == 'home')
 			{
@@ -241,9 +241,9 @@ class calendar_ui
 		$GLOBALS['egw_info']['flags']['include_wz_tooltip'] = true;
 		common::egw_header();
 
-		if ($_GET['msg']) echo '<p class="redItalic" align="center">'.html::htmlspecialchars($_GET['msg'])."</p>\n";
+		if ($_GET['msg']) echo '<p class="message" align="center">'.html::htmlspecialchars($_GET['msg'])."</p>\n";
 
-		if ($this->bo->warnings) echo '<p class="redItalic" align="center">'.implode('<br />',$this->bo->warnings)."</p>\n";
+		if ($this->bo->warnings) echo '<p class="message" align="center">'.implode('<br />',$this->bo->warnings)."</p>\n";
 	}
 
 	/**
diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index bb80bd7e06..eb8c1ec6a9 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -1187,7 +1187,7 @@ class calendar_uiforms extends calendar_ui
 					}
 					else
 					{
-						$GLOBALS['egw']->framework->render('<p class="redItalic" align="center">'.lang('Permission denied')."</p>\n",null,true);
+						$GLOBALS['egw']->framework->render('<p class="message" align="center">'.lang('Permission denied')."</p>\n",null,true);
 						common::egw_exit();
 					}
 				}
diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index a2ba093d44..5626682d3d 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -256,7 +256,7 @@ class calendar_uiviews extends calendar_ui
 		}
 		if ($this->group_warning)
 		{
-			$group_warning = '<p class="redItalic" align="center">'.$this->group_warning."</p>\n";
+			$group_warning = '<p class="message" align="center">'.$this->group_warning."</p>\n";
 		}
 		switch($this->cal_prefs['mainscreen_showevents'])
 		{
@@ -419,7 +419,7 @@ class calendar_uiviews extends calendar_ui
 			// The first date entry in the view may be in the last month.
 			if (($month - 1) % self::YEARVIEW_COLS == 0)
 			{
-				$content .= '<div class="calTimeGrid" style="height: 162px;">'."\n";
+				$content .= '<div class="calendar_calTimeGrid" style="height: 162px;">'."\n";
 				$content .= "\t".'<div class="calDayColsNoGrip">'."\n";
 			}
 
@@ -432,12 +432,12 @@ class calendar_uiviews extends calendar_ui
 			// End of the last week in month
 			$month_end = strtotime("+6 days",$month_end);
 
-			$content .= "\t\t".'<div class="calDayCol" style="left: '.
+			$content .= "\t\t".'<div class="calendar_calDayCol" style="left: '.
 				((($month - 1) % self::YEARVIEW_COLS) * (100 / self::YEARVIEW_COLS)).'%; width: '.
 				((100 / self::YEARVIEW_COLS) - 0).'%;";>'."\n";
 
 			// Year Header
-			$content .= "\t\t\t".'<div class="calDayColHeader '.($month % 2 == 0 ? "th" : "row_on").'"'.
+			$content .= "\t\t\t".'<div class="calendar_calDayColHeader '.($month % 2 == 0 ? "th" : "row_on").'"'.
 				' style="height: 20px; line-height: 20px; z-index: 0;" title="'.lang(adodb_date('F',strtotime("+1 week",$month_start))).' '.adodb_date('Y',strtotime("+1 week",$month_start)).'">'."\n";
 			if (($month) == 1)
 			{
@@ -466,7 +466,7 @@ class calendar_uiviews extends calendar_ui
 			$content .= "\t\t\t".'<div'.
 					' style="position: absolute; width: 100%; height: 16px;'.
 					' top: 24px;">'."\n";
-			$content .= "\t\t\t\t".'<div class="cal_year_legend"'.
+			$content .= "\t\t\t\t".'<div class="calendar_cal_year_legend"'.
 				' style="text-align: center; position: absolute; width: 11.5%; height: 16px; left: 0.5%;">'.lang('Wk').'</div>'."\n";
 			// Day Columns, Legend
 			for ($i = 0; $i <= 6; $i++)
@@ -474,11 +474,11 @@ class calendar_uiviews extends calendar_ui
 				$day_date = ($i ? strtotime("+$i days",$month_start) : $month_start);
 				if (adodb_date('w',$day_date) % 6 == 0)
 				{
-					$style = 'cal_year_legend_weekend';
+					$style = 'calendar_cal_year_legend_weekend';
 				}
 				else
 				{
-					$style = 'cal_year_legend';
+					$style = 'calendar_cal_year_legend';
 				}
 
 				$content .= "\t\t\t\t".'<div class="'.$style.'"'.
@@ -495,7 +495,7 @@ class calendar_uiviews extends calendar_ui
 						' style="position: absolute; width: 100%; height: 16px;'.
 						' top: '.((($week_in_month + 1) * 20) + 2).'px;">'."\n";
 
-				$content .= "\t\t\t\t".'<div class="cal_year_legend"'.
+				$content .= "\t\t\t\t".'<div class="calendar_cal_year_legend"'.
 					' style="text-align: center;position: absolute; width: 11.5%; height: 16px; left: 0.5%;" '.
 					'title="'.lang('Wk').' '.$this->week_number($week_start).'/'.adodb_date('Y',$week_start).'">'."\n";
 				$content .= "\t\t\t\t\t".
@@ -515,31 +515,31 @@ class calendar_uiviews extends calendar_ui
 					$this->_day_class_holiday($day_ymd,$class,$holidays,false,false);
 					if (adodb_date('n',$day_date) != $month)
 					{
-						$css_class .= 'cal_year_legend';
+						$css_class .= 'calendar_cal_year_legend';
 						$in_month = false;
 					}
 					else
 					{
-						$css_class .= 'calEvent calEventAllAccepted';
+						$css_class .= 'calendar_calEvent calendar_calEventAllAccepted';
 						if (adodb_date('w',$day_date) % 6 == 0)
 						{
-							$css_class .= ' cal_year_weekend';
+							$css_class .= ' calendar_cal_year_weekend';
 						}
 						else
 						{
 							if ($holidays)
 							{
-								$css_class .= ' calHoliday';
+								$css_class .= ' calendar_calHoliday';
 							}
 							else
 							{
-								$css_class .= ' cal_year_free';
+								$css_class .= ' calendar_cal_year_legend';
 							}
 						}
 
 						if ($day_ymd == $this->bo->date2string($this->bo->now_su))
 						{
-							$css_class .= ' cal_year_today';
+							$css_class .= ' calendar_cal_year_today';
 						}
 					}
 					$content .= "\t\t\t\t".'<!-- Day cell -->'."\n";
@@ -583,7 +583,7 @@ class calendar_uiviews extends calendar_ui
 								$width = $this->time2pos($event['end_m'] - $event['start_m']);
 								$color = $data['color'] ? $data['color'] : 'gray';
 
-								$content .= $indent.'<div class="plannerEvent'.($data['private'] ? 'Private' : '').
+								$content .= $indent.'<div class="calendar_plannerEvent'.($data['private'] ? 'Private' : '').
 									'" style="position: absolute; left: '.$left.'%; width: '.$width.'%; height: '.
 									$row_height.'%; top: '.($n * $row_height).'%;'.
 									'background-color: '.$color.';" '.$data['popup'].' '.
@@ -981,13 +981,13 @@ class calendar_uiviews extends calendar_ui
 					}
 				}
 				$cols[1] = html::div(
-					html::div($todo_label,'','calDayTodosHeader th')."\n".
-					html::div($todos,'','calDayTodosTable'),'','calDayTodos');
+					html::div($todo_label,'','calendar_calDayTodosHeader th')."\n".
+					html::div($todos,'','calendar_calDayTodosTable'),'','calendar_calDayTodos');
 				$cols['.1'] = 'width=30%';
 				echo html::table(array(
 					0 => $cols,
 					'.0' => 'valign="top"'
-				),'class="calDayView"');
+				),'class="calendar_calDayView"');
 			}
 			else
 			{
@@ -1188,9 +1188,9 @@ class calendar_uiviews extends calendar_ui
 		{
 			$height = ($this->rowsToDisplay+1) * 12;
 		}
-		$html = $indent.'<div class="calTimeGrid" style="height: '.$height.'px;'.$overflow.'">'."\n";
+		$html = $indent.'<div class="calendar_calTimeGrid" style="height: '.$height.'px;'.$overflow.'">'."\n";
 
-		$html .= $indent."\t".'<div class="calGridHeader" style="height: '.
+		$html .= $indent."\t".'<div class="calendar_calGridHeader" style="height: '.
 			$this->rowHeight.'%;">'.$title."</div>\n";
 
 		if ($this->use_time_grid)
@@ -1213,7 +1213,7 @@ class calendar_uiviews extends calendar_ui
 						$set_id = ' id="'.$id.'"';
 					}
 				}
-				$html .= $indent."\t".'<div'.$set_id.' class="calTimeRow'.($off ? 'Off row_off' : ' row_on').
+				$html .= $indent."\t".'<div'.$set_id.' class="calendar_calTimeRow'.($off ? 'Off row_off' : ' row_on').
 					'" style="height: '.$this->rowHeight.'%; top:'. $i*$this->rowHeight .'%;">'."\n";
 				// show time for full hours, allways for 45min interval and at least on every 3 row
 				$time = '';
@@ -1228,8 +1228,8 @@ class calendar_uiviews extends calendar_ui
 					$time = $GLOBALS['egw']->common->formattime(sprintf('%02d',$t/60),sprintf('%02d',$t%60));
 				}
 				if ($add_links) $time = $this->add_link($time,$this->date,(int) ($t/60),$t%60);
-				$html .= $indent."\t\t".'<div class="calTimeRowTime">'.$time."</div>\n";
-				$html .= $indent."\t</div>\n";	// calTimeRow
+				$html .= $indent."\t\t".'<div class="calendar_calTimeRowTime">'.$time."</div>\n";
+				$html .= $indent."\t</div>\n";	// calendar_calTimeRow
 				$off = !$off;
 			}
 		}
@@ -1240,7 +1240,7 @@ class calendar_uiviews extends calendar_ui
 
 			$dayCols_width = $width - $this->timeRow_width - 1;
 
-			$html .= $indent."\t".'<div id="calDayCols" class="calDayCols'.
+			$html .= $indent."\t".'<div id="calendar_calDayCols" class="calendar_calDayCols'.
 				($this->use_time_grid ? ($this->bo->common_prefs['timeformat'] == 12 ? '12h' : '') : 'NoTime').'">'."\n";
 
 			if (html::$user_agent == 'msie')	// necessary IE hack - stupid thing ...
@@ -1275,9 +1275,9 @@ class calendar_uiviews extends calendar_ui
 			}
 			if (html::$user_agent == 'msie') $html .= "</div>\n";
 
-			$html .= $indent."\t</div>\n";	// calDayCols
+			$html .= $indent."\t</div>\n";	// calendar_calDayCols
 		}
-		$html .= $indent."</div>\n";	// calTimeGrid
+		$html .= $indent."</div>\n";	// calendar_calTimeGrid
 
 		if ($this->scroll_to_wdstart)
 		{
@@ -1358,7 +1358,7 @@ class calendar_uiviews extends calendar_ui
 	{
 		if ($this->debug > 1 || $this->debug==='dayColWidget') $this->bo->debug_message('uiviews::dayColWidget(%1,%2,left=%3,width=%4,)',False,$day_ymd,$events,$pleft,$pwidth);
 
-		$html = $indent.'<div id="calColumn'.$this->calColumnCounter++.'" class="calDayCol" style="left: '.$pleft.
+		$html = $indent.'<div id="calColumn'.$this->calColumnCounter++.'" class="calendar_calDayCol" style="left: '.$pleft.
 			'%; width: '.$pwidth.'%;">'."\n";
 
 		// Creation of the header-column with date, evtl. holiday-names and a matching background-color
@@ -1405,7 +1405,7 @@ class calendar_uiviews extends calendar_ui
 			}
 		}
 		if (is_bool($short_title) || ($short_title != "")) {
-			$html .= $indent."\t".'<div style="height: '. $this->rowHeight .'%;" class="calDayColHeader '.$class.'"'.
+			$html .= $indent."\t".'<div style="height: '. $this->rowHeight .'%;" class="calendar_calDayColHeader '.$class.'"'.
 				($holidays ? ' title="'.html::htmlspecialchars($holidays).'"':'').'>'.$title."</div>\n";
 		}
 
@@ -1440,7 +1440,7 @@ class calendar_uiviews extends calendar_ui
 				$droppableID='drop_'.$droppableDateTime.'_O'.($owner<0?str_replace('-','group',$owner):$owner);
 
 				$html .= $indent."\t".'<div id="' . $droppableID . '" style="height:'. $this->rowHeight .'%; top: '. $i*$this->rowHeight .
-					'%;" class="calAddEvent"';
+					'%;" class="calendar_calAddEvent"';
 				if ($this->allowEdit)
 				{
 					$html .= ' onclick="'.$this->popup($GLOBALS['egw']->link('/index.php',$linkData)).';return false;"';
@@ -1482,7 +1482,7 @@ class calendar_uiviews extends calendar_ui
 			$html .= $this->eventColWidget($eventCol,$left,$width,$indent."\t",
 				$owner ? $owner : $this->user, 20+10*$n);
 		}
-		$html .= $indent."</div>\n";	// calDayCol
+		$html .= $indent."</div>\n";	// calendar_calDayCol
 
 		return $html;
 	}
@@ -1524,7 +1524,7 @@ class calendar_uiviews extends calendar_ui
 				}
 				else
 				{
-					$class = 'calHoliday';
+					$class = 'calendar_calHoliday';
 
 					//If the birthdays are already displayed as event, don't
 					//show them in the caption
@@ -1540,7 +1540,7 @@ class calendar_uiviews extends calendar_ui
 		{
 			if ($day_ymd == $this->bo->date2string($this->bo->now_su))
 			{
-				$class = 'calToday';
+				$class = 'calendar_calToday';
 			}
 			else
 			{
@@ -1556,7 +1556,7 @@ class calendar_uiviews extends calendar_ui
 				}
 			}
 		}
-		if ($bday) $class .= ' calBirthday';
+		if ($bday) $class .= ' calendar_calBirthday';
 	}
 
 	/**
@@ -1574,8 +1574,8 @@ class calendar_uiviews extends calendar_ui
 	{
 		if ($this->debug > 1 || $this->debug==='eventColWidget') $this->bo->debug_message('uiviews::eventColWidget(%1,left=%2,width=%3,)',False,$events,$left,$width);
 
-		$html = $indent.'<div class="calEventCol" style="left: '.$left.'%; width:'.$width.'%;'.
-			// the "calEventCol" spans across a whole column (as the name suggests) - setting the
+		$html = $indent.'<div class="calendar_calEventCol" style="left: '.$left.'%; width:'.$width.'%;'.
+			// the "calendar_calEventCol" spans across a whole column (as the name suggests) - setting the
 			// z-index here would give the whole invisible column a z-index and thus the underlying
 			// regions are not clickable anymore. The z_index has now moved the the eventWidget
 			// function.
@@ -1684,8 +1684,8 @@ class calendar_uiviews extends calendar_ui
 			$bodybgcolor1 = $bodybgcolor2 = 'white';
 		}
 
-		// get status class of event: calEventAllAccepted, calEventAllAnswered or calEventSomeUnknown
-		$status_class = 'calEventAllAccepted';
+		// get status class of event: calendar_calEventAllAccepted, calendar_calEventAllAnswered or calendar_calEventSomeUnknown
+		$status_class = 'calendar_calEventAllAccepted';
 		foreach($event['participants'] as $id => $status)
 		{
 			if ($id < 0) continue;	// as we cant accept/reject groups, we dont care about them here
@@ -1698,10 +1698,10 @@ class calendar_uiviews extends calendar_ui
 				case '':	// app without status
 					break;
 				case 'U':
-					$status_class = 'calEventSomeUnknown';
+					$status_class = 'calendar_calEventSomeUnknown';
 					break 2;	// break foreach
 				default:
-					$status_class = 'calEventAllAnswered';
+					$status_class = 'calendar_calEventAllAnswered';
 					break;
 			}
 		}
@@ -1899,7 +1899,7 @@ class calendar_uiviews extends calendar_ui
 			}
 		}
 
-		$html = $indent.'<div id="'.$draggableID.'" class="calEvent'.($is_private ? 'Private' : '').' '.$status_class.
+		$html = $indent.'<div id="'.$draggableID.'" class="calendar_calEvent'.($is_private ? 'Private' : '').' '.$status_class.
 			'" style="'.$style.' border-color: '.$headerbgcolor.'; background: '.$background.'; z-index: '.$z_index.';"'.
 			$popup.' '.html::tooltip($tooltip,False,$ttip_options).
 			$dd_emulation.'>'.$prefix_icon."\n".$ie_fix.$html."\n".
@@ -2005,7 +2005,7 @@ class calendar_uiviews extends calendar_ui
 		}
 		if (!empty($content))
 		{
-			return '<span class="calEventLabel">'.$label.'</span>:'.
+			return '<span class="calendar_calEventLabel">'.$label.'</span>:'.
 				($one_per_line ? '<br>' : ' ').
 				nl2br(html::htmlspecialchars($content)).'<br>';
 		}
@@ -2075,10 +2075,10 @@ class calendar_uiviews extends calendar_ui
 	 */
 	function &plannerWidget(&$events,$start,$end,$by_cat=0,$indent='')
 	{
-		$content = $indent.'<div class="plannerWidget">'."\n";
+		$content = $indent.'<div class="calendar_plannerWidget">'."\n";
 
 		// display the header, containing a headerTitle and multiple headerRows with the scales
-		$content .= $indent."\t".'<div class="plannerHeader">'."\n";
+		$content .= $indent."\t".'<div class="calendar_plannerHeader">'."\n";
 
 		// display the headerTitle, and get sort2labels
 		switch($by_cat)
@@ -2102,10 +2102,10 @@ class calendar_uiviews extends calendar_ui
 				$sort2label = array();
 				break;
 		}
-		$content .= $indent."\t\t".'<div class="plannerHeaderTitle th">'.$title."</div>\n";
+		$content .= $indent."\t\t".'<div class="calendar_plannerHeaderTitle th">'.$title."</div>\n";
 
 		// display the headerRows with the scales
-		$content .= $indent."\t\t".'<div class="plannerHeaderRows">'."\n";
+		$content .= $indent."\t\t".'<div class="calendar_plannerHeaderRows">'."\n";
 		// set start & end to timestamp and first & last to timestamp of 12h midday, to avoid trouble with daylight saving
 		foreach(array('start' => 'first','end' => 'last') as $t => $v)
 		{
@@ -2335,7 +2335,7 @@ class calendar_uiviews extends calendar_ui
 	{
 		$day_width = round(100 / $days,2);
 
-		$content .= $indent.'<div class="plannerScale">'."\n";
+		$content .= $indent.'<div class="calendar_plannerScale">'."\n";
 		for($t = $start,$left = 0,$i = 0; $i < $days; $t += $days_in_month*DAY_s,$left += $days_in_month*$day_width,$i += $days_in_month)
 		{
 			$t_arr = $this->bo->date2array($t);
@@ -2405,7 +2405,7 @@ class calendar_uiviews extends calendar_ui
 				$title = '&nbsp;';
 			}
 			$class = $class == 'row_on' ? 'th' : 'row_on';
-			$content .= $indent."\t".'<div class="plannerMonthScale '.$class.'" style="left: '.$left.'%; width: '.($day_width*$days_in_month).'%;">'.
+			$content .= $indent."\t".'<div class="calendar_plannerMonthScale '.$class.'" style="left: '.$left.'%; width: '.($day_width*$days_in_month).'%;">'.
 				$title."</div>\n";
 		}
 		$content .= $indent."</div>\n";		// end of plannerScale
@@ -2425,7 +2425,7 @@ class calendar_uiviews extends calendar_ui
 	{
 		$week_width = round(100 / $days * ($days <= 7 ? $days : 7),2);
 
-		$content .= $indent.'<div class="plannerScale">'."\n";
+		$content .= $indent.'<div class="calendar_plannerScale">'."\n";
 		for($t = $start,$left = 0,$i = 0; $i < $days; $t += 7*DAY_s,$left += $week_width,$i += 7)
 		{
 			$title = lang('Week').' '.$this->week_number($t);
@@ -2451,7 +2451,7 @@ class calendar_uiviews extends calendar_ui
 				));
 			}
 			$class = $class == 'row_on' ? 'th' : 'row_on';
-			$content .= $indent."\t".'<div class="plannerWeekScale '.$class.'" style="left: '.$left.'%; width: '.$week_width.'%;">'.$title."</div>\n";
+			$content .= $indent."\t".'<div class="calendar_plannerWeekScale '.$class.'" style="left: '.$left.'%; width: '.$week_width.'%;">'.$title."</div>\n";
 		}
 		$content .= $indent."</div>\n";		// end of plannerScale
 
@@ -2470,7 +2470,7 @@ class calendar_uiviews extends calendar_ui
 	{
 		$day_width = round(100 / $days,2);
 
-		$content .= $indent.'<div class="plannerScale'.($days > 3 ? 'Day' : '').'">'."\n";
+		$content .= $indent.'<div class="calendar_plannerScale'.($days > 3 ? 'Day' : '').'">'."\n";
 		for($t = $start,$left = 0,$i = 0; $i < $days; $t += DAY_s,$left += $day_width,++$i)
 		{
 			$this->_day_class_holiday($this->bo->date2string($t),$class,$holidays,$days > 7);
@@ -2493,7 +2493,7 @@ class calendar_uiviews extends calendar_ui
 					'menuaction'   => 'calendar.calendar_uiviews.planner',
 					'planner_days' => 1,
 					'date'         => date('Ymd',$t),
-				),false,strpos($class,'calHoliday') !== false || strpos($class,'calBirthday') !== false ? '' : ' title="'.html::htmlspecialchars(lang('Dayview')).'"');
+				),false,strpos($class,'calendar_calHoliday') !== false || strpos($class,'calendar_calBirthday') !== false ? '' : ' title="'.html::htmlspecialchars(lang('Dayview')).'"');
 			}
 			if ($days < 5)
 			{
@@ -2512,7 +2512,7 @@ class calendar_uiviews extends calendar_ui
 					));
 				}
 			}
-			$content .= $indent."\t".'<div class="plannerDayScale '.$class.'" style="left: '.$left.'%; width: '.$day_width.'%;"'.
+			$content .= $indent."\t".'<div class="calendar_plannerDayScale '.$class.'" style="left: '.$left.'%; width: '.$day_width.'%;"'.
 				($holidays ? ' title="'.html::htmlspecialchars($holidays).'"' : '').'>'.$title."</div>\n";
 		}
 		$content .= $indent."</div>\n";		// end of plannerScale
@@ -2531,7 +2531,7 @@ class calendar_uiviews extends calendar_ui
 		$day_width = round(100 / 31,2);
 
 		// month scale with navigation
-		$content .= $indent.'<div class="plannerScale">'."\n";
+		$content .= $indent.'<div class="calendar_plannerScale">'."\n";
 
 		$title = lang(egw_time::to($this->first,'F')).' '.egw_time::to($this->first,'Y').' - '.
 			lang(egw_time::to($this->last,'F')).' '.egw_time::to($this->last,'Y');
@@ -2564,17 +2564,17 @@ class calendar_uiviews extends calendar_ui
 					'date'       => $next_year,
 				));
 
-		$content .= $indent."\t".'<div class="plannerMonthScale th" style="left: 0; width: 100%;">'.
+		$content .= $indent."\t".'<div class="calendar_plannerMonthScale th" style="left: 0; width: 100%;">'.
 				$title."</div>\n";
 		$content .= $indent."</div>\n";		// end of plannerScale
 
 		// day of month scale
-		$content .= $indent.'<div class="plannerScale">'."\n";
+		$content .= $indent.'<div class="calendar_plannerScale">'."\n";
 		$today = egw_time::to('now','d');
 		for($left = 0,$i = 0; $i < 31; $left += $day_width,++$i)
 		{
 			$class = $i & 1 ? 'row_on' : 'row_off';
-			$content .= $indent."\t".'<div class="plannerDayOfMonthScale '.$class.'" style="left: '.$left.'%; width: '.$day_width.'%;">'.
+			$content .= $indent."\t".'<div class="calendar_plannerDayOfMonthScale '.$class.'" style="left: '.$left.'%; width: '.$day_width.'%;">'.
 				(1+$i)."</div>\n";
 		}
 		$content .= $indent."</div>\n";		// end of plannerScale
@@ -2609,13 +2609,13 @@ class calendar_uiviews extends calendar_ui
 		}
 		$cell_width = round(100 / $hours * $decr,2);
 
-		$content .= $indent.'<div class="plannerScale">'."\n";
+		$content .= $indent.'<div class="calendar_plannerScale">'."\n";
 		for($t = $start,$left = 0,$i = 0; $i < $hours; $t += $decr*HOUR_s,$left += $cell_width,$i += $decr)
 		{
 			$title = date($this->cal_prefs['timeformat'] == 12 ? 'ha' : 'H',$t);
 
 			$class = $class == 'row_on' ? 'th' : 'row_on';
-			$content .= $indent."\t".'<div class="plannerHourScale '.$class.'" style="left: '.$left.'%; width: '.($cell_width).'%;">'.$title."</div>\n";
+			$content .= $indent."\t".'<div class="calendar_plannerHourScale '.$class.'" style="left: '.$left.'%; width: '.($cell_width).'%;">'.$title."</div>\n";
 		}
 		$content .= $indent."</div>\n";		// end of plannerScale
 
@@ -2625,7 +2625,7 @@ class calendar_uiviews extends calendar_ui
 	/**
 	 * Creates a row for one user or category, with a header (user or category name) and (multiple) rows with non-overlapping events
 	 *
-	 * Uses the eventRowWidget to display a row of non-overlapping events
+	 * Uses the calendar_eventRowWidget to display a row of non-overlapping events
 	 *
 	 * @param array $events to show
 	 * @param int $start start-time of the row
@@ -2637,10 +2637,10 @@ class calendar_uiviews extends calendar_ui
 	 */
 	function plannerRowWidget($events,$start,$end,$header,$class,$indent='')
 	{
-		$content = $indent.'<div class="plannerRowWidget '.$class.'">'."\n";
+		$content = $indent.'<div class="calendar_plannerRowWidget '.$class.'">'."\n";
 
 		// display the row-header
-		$content .= $indent."\t".'<div class="plannerRowHeader">'.$header."</div>\n";
+		$content .= $indent."\t".'<div class="calendar_plannerRowHeader">'.$header."</div>\n";
 
 		// sorting the events in non-overlapping rows
 		$rows = array(array());
@@ -2653,7 +2653,7 @@ class calendar_uiviews extends calendar_ui
 		}
 		//echo $header; _debug_array($rows);
 		// display the rows
-		$content .= $indent."\t".'<div class="eventRows"';
+		$content .= $indent."\t".'<div class="calendar_eventRows"';
 
 		if ($this->sortby == 'month' && ($days = date('j',$end)) < 31)
 		{
@@ -2676,7 +2676,7 @@ class calendar_uiviews extends calendar_ui
 		if ($this->sortby == 'month' && $days < 31)
 		{
 			// add a filler for non existing days in that month
-			$content .= $indent."\t".'<div class="eventRowsFiller"'.
+			$content .= $indent."\t".'<div class="calendar_eventRowsFiller"'.
 				' style="left:'.(15+$width).'%; width:'.(85-$width).'%;" ></div>'."\n";
 		}
 		$content .= $indent."</div>\n";		// end of the plannerRowWidget
@@ -2702,7 +2702,7 @@ class calendar_uiviews extends calendar_ui
 			$class = trim(str_replace(array('row_on','row_off'),'',$class));
 			if ($class)	// no regular weekday
 			{
-				$content .= $indent.'<div class="eventRowsMarkedDay '.$class.
+				$content .= $indent.'<div class="calendar_eventRowsMarkedDay '.$class.
 					'" style="left: '.$left.'%; width:'.$day_width.'%;"'.
 					($holidays ? ' title="'.html::htmlspecialchars($holidays).'"' : '').
 					' ></div>'."\n";
@@ -2724,7 +2724,7 @@ class calendar_uiviews extends calendar_ui
 	 */
 	function eventRowWidget($events,$start,$end,$indent='')
 	{
-		$content = $indent.'<div class="eventRowWidget">'."\n";
+		$content = $indent.'<div class="calendar_eventRowWidget">'."\n";
 
 		foreach($events as $event)
 		{
@@ -2807,7 +2807,7 @@ class calendar_uiviews extends calendar_ui
 		$width = $this->_planner_pos($event['end'],$start,$end) - $left;
 		$color = $data['color'] ? $data['color'] : 'gray';
 
-		return $indent.'<div class="plannerEvent'.($data['private'] ? 'Private' : '').'" style="left: '.$left.
+		return $indent.'<div class="calendar_plannerEvent'.($data['private'] ? 'Private' : '').'" style="left: '.$left.
 			'%; width: '.$width.'%; background-color: '.$color.';"'.$data['popup'].' '.
 			html::tooltip($data['tooltip'],False,array('BorderWidth'=>0,'Padding'=>0)).'>'."\n".$data['html'].$indent."</div>\n";
 	}
diff --git a/calendar/js/dragDropFunctions.js b/calendar/js/dragDropFunctions.js
index 7f6e942a41..e2840aefce 100644
--- a/calendar/js/dragDropFunctions.js
+++ b/calendar/js/dragDropFunctions.js
@@ -66,7 +66,7 @@ function dropEvent()
 			dd.obj.div.innerHTML = dd.obj.oldInnerHTML;
 		}
 
-		// restore old width (calEvent width = 100%)
+		// restore old width (calendar_calEvent width = 100%)
 		dd.obj.div.style.width = "100%";
 
 		dd.obj.moveTo(dd.obj.defx,dd.obj.defy);
diff --git a/calendar/setup/etemplates.inc.php b/calendar/setup/etemplates.inc.php
index 4976021a18..1a07c6eecb 100644
--- a/calendar/setup/etemplates.inc.php
+++ b/calendar/setup/etemplates.inc.php
@@ -16,11 +16,11 @@ $templ_data[] = array('name' => 'calendar.cat_acl','template' => '','lang' => ''
 
 $templ_data[] = array('name' => 'calendar.confirm_edit_series','template' => '','lang' => '','group' => '0','version' => '1.7.003','data' => 'a:1:{i:0;a:7:{s:4:"rows";s:1:"1";s:4:"cols";s:1:"1";s:4:"name";s:20:"#confirm_edit_series";s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:5:"class";s:12:"promptheader";s:4:"name";s:14:"#dialog-header";s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:30:"This event is part of a series";}}i:2;a:6:{s:5:"class";s:6:"prompt";s:4:"name";s:14:"dialog-content";s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:189:"Do you really want to change the start of this series? If you do, the original series will be terminated as of today and a new series for the future reflecting your changes will be created.";}i:2;a:6:{s:5:"align";s:6:"center";s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:5:"label";s:19:"Create a new series";s:4:"name";s:27:"button[confirm_edit_series]";s:4:"type";s:6:"button";s:4:"help";s:73:"The original series will be terminated today and a new series be created.";}i:2;a:4:{s:5:"label";s:13:"Re-Edit event";s:4:"name";s:14:"button[reedit]";s:4:"type";s:6:"button";s:4:"help";s:30:"Allows to edit the event again";}i:3;a:4:{s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:4:"type";s:6:"button";s:4:"help";s:26:"Keep the series unchanged.";}}}}}','size' => '','style' => '','modified' => '1276104491',);
 
-$templ_data[] = array('name' => 'calendar.conflicts','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:3:{i:0;a:3:{s:4:"type";s:5:"label";s:5:"label";s:20:" Scheduling conflict";s:4:"span";s:9:",size120b";}i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:4:"name";s:34:"conflicts[$row][icon_participants]";s:5:"label";s:38:"@conflicts[$row][tooltip_participants]";s:7:"no_lang";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:5:"image";s:4:"name";s:27:"conflicts[$row][icon_recur]";s:5:"label";s:28:"@conflicts[$row][text_recur]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"name";s:21:"conflicts[$row][time]";s:7:"no_lang";s:1:"1";}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"name";s:22:"conflicts[$row][title]";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"b";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:41:"conflicts[$row][conflicting_participants]";s:7:"no_lang";s:1:"1";}s:4:"help";s:23:"conflict[$row][tooltip]";}}}s:4:"rows";i:1;s:4:"cols";i:4;}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:15:"Ignore conflict";s:4:"name";s:14:"button[ignore]";s:4:"help";s:37:"Saves the event ignoring the conflict";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[reedit]";s:5:"label";s:13:"Re-Edit event";s:4:"help";s:30:"Allows to edit the event again";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:15:"Freetime search";s:4:"name";s:16:"button[freetime]";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}}','size' => '','style' => '','modified' => '1119080124',);
+$templ_data[] = array('name' => 'calendar.conflicts','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:3:{i:0;a:3:{s:4:"type";s:5:"label";s:5:"label";s:20:" Scheduling conflict";s:4:"span";s:9:",calendar_size120b";}i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:4:{s:1:"A";a:4:{s:4:"type";s:5:"image";s:4:"name";s:34:"conflicts[$row][icon_participants]";s:5:"label";s:38:"@conflicts[$row][tooltip_participants]";s:7:"no_lang";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:5:"image";s:4:"name";s:27:"conflicts[$row][icon_recur]";s:5:"label";s:28:"@conflicts[$row][text_recur]";s:7:"no_lang";s:1:"1";}s:1:"C";a:3:{s:4:"type";s:5:"label";s:4:"name";s:21:"conflicts[$row][time]";s:7:"no_lang";s:1:"1";}s:1:"D";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:5:"label";s:4:"name";s:22:"conflicts[$row][title]";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"b";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:41:"conflicts[$row][conflicting_participants]";s:7:"no_lang";s:1:"1";}s:4:"help";s:23:"conflict[$row][tooltip]";}}}s:4:"rows";i:1;s:4:"cols";i:4;}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:15:"Ignore conflict";s:4:"name";s:14:"button[ignore]";s:4:"help";s:37:"Saves the event ignoring the conflict";}i:2;a:4:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[reedit]";s:5:"label";s:13:"Re-Edit event";s:4:"help";s:30:"Allows to edit the event again";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:15:"Freetime search";s:4:"name";s:16:"button[freetime]";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}}','size' => '','style' => '','modified' => '1119080124',);
 
 $templ_data[] = array('name' => 'calendar.delete_series','template' => '','lang' => '','group' => '0','version' => '1.7.003','data' => 'a:1:{i:0;a:8:{s:4:"type";s:4:"vbox";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"1";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:30:"This event is part of a series";}s:4:"name";s:14:"#dialog-header";s:4:"span";s:13:",promptheader";}i:2;a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:59:"Do you want to keep the series exceptions in your calendar?";}s:4:"span";s:7:",prompt";s:4:"name";s:14:"dialog-content";i:2;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:15:"Keep exceptions";s:4:"help";s:48:"All exceptions are converted into single events.";s:4:"name";s:30:"button[delete_keep_exceptions]";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:17:"Delete exceptions";s:4:"help";s:52:"The exceptions are deleted together with the series.";s:4:"name";s:25:"button[delete_exceptions]";}i:3;a:3:{s:4:"type";s:10:"buttononly";s:5:"label";s:6:"Cancel";s:7:"onclick";s:64:"document.getElementById(\'delete_series\').style.display = \'none\';";}s:5:"align";s:6:"center";}}s:4:"name";s:14:"#delete_series";}}','size' => '','style' => '','modified' => '1273136129',);
 
-$templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:7:{s:1:"A";s:3:"100";s:1:"B";s:3:"300";s:2:"h1";s:6:",!@msg";s:2:"c2";s:2:"th";s:2:"h2";s:2:"28";s:2:"h4";s:8:",!@owner";s:2:"h6";s:13:",!@recur_type";}i:1;a:4:{s:1:"A";a:5:{s:4:"span";s:13:"all,redItalic";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:4:"type";s:4:"html";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:74:{s:4:"size";s:6:"2,,0,0";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"size";s:6:"75,255";s:6:"needed";s:1:"1";s:4:"name";s:5:"title";s:4:"type";s:4:"text";s:8:"tabindex";i:1;}i:2;a:4:{s:4:"type";s:5:"label";s:5:"label";s:3:"#%s";s:4:"name";s:2:"id";s:4:"size";s:1:"b";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}i:37;a:1:{s:4:"type";s:5:"label";}i:38;a:1:{s:4:"type";s:5:"label";}i:39;a:1:{s:4:"type";s:5:"label";}i:40;a:1:{s:4:"type";s:5:"label";}i:41;a:1:{s:4:"type";s:5:"label";}i:42;a:1:{s:4:"type";s:5:"label";}i:43;a:1:{s:4:"type";s:5:"label";}i:44;a:1:{s:4:"type";s:5:"label";}i:45;a:1:{s:4:"type";s:5:"label";}i:46;a:1:{s:4:"type";s:5:"label";}i:47;a:1:{s:4:"type";s:5:"label";}i:48;a:1:{s:4:"type";s:5:"label";}i:49;a:1:{s:4:"type";s:5:"label";}i:50;a:1:{s:4:"type";s:5:"label";}i:51;a:1:{s:4:"type";s:5:"label";}i:52;a:1:{s:4:"type";s:5:"label";}i:53;a:1:{s:4:"type";s:5:"label";}i:54;a:1:{s:4:"type";s:5:"label";}i:55;a:1:{s:4:"type";s:5:"label";}i:56;a:1:{s:4:"type";s:5:"label";}i:57;a:1:{s:4:"type";s:5:"label";}i:58;a:1:{s:4:"type";s:5:"label";}i:59;a:1:{s:4:"type";s:5:"label";}i:60;a:1:{s:4:"type";s:5:"label";}i:61;a:1:{s:4:"type";s:5:"label";}i:62;a:1:{s:4:"type";s:5:"label";}i:63;a:1:{s:4:"type";s:5:"label";}i:64;a:1:{s:4:"type";s:5:"label";}i:65;a:1:{s:4:"type";s:5:"label";}i:66;a:1:{s:4:"type";s:5:"label";}i:67;a:1:{s:4:"type";s:5:"label";}i:68;a:1:{s:4:"type";s:5:"label";}i:69;a:1:{s:4:"type";s:5:"label";}i:70;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:5:{s:4:"span";s:3:"all";s:4:"name";s:76:"tabs=general|description|participants|recurrence|custom|links|alarms|history";s:4:"type";s:3:"tab";s:5:"label";s:71:"General|Description|Participants|Recurrence|Custom|Links|Alarms|History";s:4:"help";s:173:"Location, Start- and Endtimes, ...|Full description|Participants, Resources, ...|Repeating Event Information|Custom fields|Links, Attachments|Alarm management|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:8:"readonly";s:4:"true";s:4:"name";s:5:"owner";}s:1:"C";a:7:{s:5:"label";s:7:"Updated";s:8:"readonly";s:4:"true";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:8:"modified";s:4:"type";s:9:"date-time";s:4:"span";s:8:",noBreak";}s:1:"D";a:6:{s:5:"class";s:7:"noBreak";s:4:"type";s:14:"select-account";s:5:"label";s:2:"by";s:8:"readonly";s:4:"true";s:5:"align";s:5:"right";s:4:"name";s:8:"modifier";}}i:5;a:4:{s:1:"A";a:8:{s:4:"span";s:1:"3";s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:4:{s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"type";s:6:"button";s:4:"help";s:22:"saves the changes made";}i:2;a:4:{s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"type";s:6:"button";s:4:"help";s:17:"apply the changes";}i:3;a:5:{s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";s:4:"name";s:14:"button[cancel]";s:4:"type";s:6:"button";s:4:"help";s:16:"Close the window";}i:4;a:5:{s:8:"onchange";s:34:"this.form.submit(); this.value=\'\';";s:4:"name";s:6:"action";s:4:"size";s:10:"Actions...";s:4:"type";s:6:"select";s:4:"help";s:39:"Execute a further action for this entry";}i:5;a:4:{s:4:"type";s:8:"checkbox";s:5:"label";s:30:"Do not notify of these changes";s:4:"name";s:16:"no_notifications";s:4:"span";s:1:"2";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:150:"if ($cont[query_delete_exceptions]) { getElementById(\'delete_series\').style.display=\'block\'; return false; } else return confirm(\'Delete this event\');";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"type";s:6:"button";s:4:"help";s:17:"Delete this event";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:22:"calendar.delete_series";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:4;s:4:"rows";i:6;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.end_hide { display: block; white-space: nowrap; margin-left: 10px; }
+$templ_data[] = array('name' => 'calendar.edit','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:7:{s:1:"A";s:3:"100";s:1:"B";s:3:"300";s:2:"h1";s:6:",!@msg";s:2:"c2";s:2:"th";s:2:"h2";s:2:"28";s:2:"h4";s:8:",!@owner";s:2:"h6";s:13:",!@recur_type";}i:1;a:4:{s:1:"A";a:5:{s:4:"span";s:13:"all,message";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";s:4:"name";s:3:"msg";s:4:"type";s:4:"html";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:74:{s:4:"size";s:6:"2,,0,0";s:4:"span";s:3:"all";s:6:"needed";s:1:"1";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"size";s:6:"75,255";s:6:"needed";s:1:"1";s:4:"name";s:5:"title";s:4:"type";s:4:"text";s:8:"tabindex";i:1;}i:2;a:4:{s:4:"type";s:5:"label";s:5:"label";s:3:"#%s";s:4:"name";s:2:"id";s:4:"size";s:1:"b";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}i:37;a:1:{s:4:"type";s:5:"label";}i:38;a:1:{s:4:"type";s:5:"label";}i:39;a:1:{s:4:"type";s:5:"label";}i:40;a:1:{s:4:"type";s:5:"label";}i:41;a:1:{s:4:"type";s:5:"label";}i:42;a:1:{s:4:"type";s:5:"label";}i:43;a:1:{s:4:"type";s:5:"label";}i:44;a:1:{s:4:"type";s:5:"label";}i:45;a:1:{s:4:"type";s:5:"label";}i:46;a:1:{s:4:"type";s:5:"label";}i:47;a:1:{s:4:"type";s:5:"label";}i:48;a:1:{s:4:"type";s:5:"label";}i:49;a:1:{s:4:"type";s:5:"label";}i:50;a:1:{s:4:"type";s:5:"label";}i:51;a:1:{s:4:"type";s:5:"label";}i:52;a:1:{s:4:"type";s:5:"label";}i:53;a:1:{s:4:"type";s:5:"label";}i:54;a:1:{s:4:"type";s:5:"label";}i:55;a:1:{s:4:"type";s:5:"label";}i:56;a:1:{s:4:"type";s:5:"label";}i:57;a:1:{s:4:"type";s:5:"label";}i:58;a:1:{s:4:"type";s:5:"label";}i:59;a:1:{s:4:"type";s:5:"label";}i:60;a:1:{s:4:"type";s:5:"label";}i:61;a:1:{s:4:"type";s:5:"label";}i:62;a:1:{s:4:"type";s:5:"label";}i:63;a:1:{s:4:"type";s:5:"label";}i:64;a:1:{s:4:"type";s:5:"label";}i:65;a:1:{s:4:"type";s:5:"label";}i:66;a:1:{s:4:"type";s:5:"label";}i:67;a:1:{s:4:"type";s:5:"label";}i:68;a:1:{s:4:"type";s:5:"label";}i:69;a:1:{s:4:"type";s:5:"label";}i:70;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:5:{s:4:"span";s:3:"all";s:4:"name";s:76:"tabs=general|description|participants|recurrence|custom|links|alarms|history";s:4:"type";s:3:"tab";s:5:"label";s:71:"General|Description|Participants|Recurrence|Custom|Links|Alarms|History";s:4:"help";s:173:"Location, Start- and Endtimes, ...|Full description|Participants, Resources, ...|Repeating Event Information|Custom fields|Links, Attachments|Alarm management|Change history";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Owner";}s:1:"B";a:3:{s:4:"type";s:14:"select-account";s:8:"readonly";s:4:"true";s:4:"name";s:5:"owner";}s:1:"C";a:7:{s:5:"label";s:7:"Updated";s:8:"readonly";s:4:"true";s:7:"no_lang";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:8:"modified";s:4:"type";s:9:"date-time";s:4:"span";s:8:",noBreak";}s:1:"D";a:6:{s:5:"class";s:7:"noBreak";s:4:"type";s:14:"select-account";s:5:"label";s:2:"by";s:8:"readonly";s:4:"true";s:5:"align";s:5:"right";s:4:"name";s:8:"modifier";}}i:5;a:4:{s:1:"A";a:8:{s:4:"span";s:1:"3";s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:4:{s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"type";s:6:"button";s:4:"help";s:22:"saves the changes made";}i:2;a:4:{s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"type";s:6:"button";s:4:"help";s:17:"apply the changes";}i:3;a:5:{s:5:"label";s:6:"Cancel";s:7:"onclick";s:15:"window.close();";s:4:"name";s:14:"button[cancel]";s:4:"type";s:6:"button";s:4:"help";s:16:"Close the window";}i:4;a:5:{s:8:"onchange";s:34:"this.form.submit(); this.value=\'\';";s:4:"name";s:6:"action";s:4:"size";s:10:"Actions...";s:4:"type";s:6:"select";s:4:"help";s:39:"Execute a further action for this entry";}i:5;a:4:{s:4:"type";s:8:"checkbox";s:5:"label";s:30:"Do not notify of these changes";s:4:"name";s:16:"no_notifications";s:4:"span";s:1:"2";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:150:"if ($cont[query_delete_exceptions]) { getElementById(\'delete_series\').style.display=\'block\'; return false; } else return confirm(\'Delete this event\');";s:5:"align";s:5:"right";s:4:"name";s:14:"button[delete]";s:4:"type";s:6:"button";s:4:"help";s:17:"Delete this event";}}i:6;a:4:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:22:"calendar.delete_series";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:4;s:4:"rows";i:6;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '.end_hide { display: block; white-space: nowrap; margin-left: 10px; }
 .noBreak { white-space: nowrap; }
 .CatTree { width:200px; height:200px; overflow: auto;}','modified' => '1292883792',);
 
@@ -30,7 +30,7 @@ $templ_data[] = array('name' => 'calendar.edit.custom','template' => '','lang' =
 
 $templ_data[] = array('name' => 'calendar.edit.description','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:2:{s:2:"c1";s:7:"row,top";s:1:"A";s:2:"95";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:14:",,,description";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:5:"12,70";s:4:"name";s:11:"description";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:4:"size";s:8:"100%,210";s:7:"options";a:2:{i:0;s:4:"100%";i:1;s:3:"210";}}}','size' => '100%,210','style' => '','modified' => '1118480337',);
 
-$templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:7:"row_off";s:2:"c6";s:3:"row";s:2:"c7";s:3:"row";}i:1;a:2:{s:1:"A";a:4:{s:3:"for";s:5:"start";s:5:"width";s:2:"95";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:3:{s:6:"needed";s:1:"1";s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";}i:2;a:6:{s:5:"align";s:6:"center";s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";}}}i:2;a:2:{s:1:"A";a:4:{s:3:"for";s:8:"duration";s:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:6:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:220:"set_style_by_class(\'table\',\'end_hide\',\'display\',this.value == \'\' ? \'block\' : \'none\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";}i:2;a:3:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";}}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:85:"ajax_submit(this.form,\'calendar.calendar_uiforms.ajax_freetimesearch\'); return false;";s:4:"name";s:8:"freetime";s:4:"type";s:10:"buttononly";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}i:4;a:2:{s:1:"A";a:4:{s:3:"for";s:8:"location";s:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:4:{s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"span";s:15:",inputFullWidth";}}i:5;a:2:{s:1:"A";a:4:{s:3:"for";s:8:"priority";s:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";}s:1:"B";a:2:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";}}i:6;a:2:{s:1:"A";a:3:{s:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:7:"Options";}s:1:"B";a:5:{s:5:"label";s:12:"non blocking";s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";}}i:7;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:5:"label";s:7:"Private";s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,210";}i:2;a:6:{s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";s:4:"span";s:7:",row_on";i:1;a:4:{s:3:"for";s:8:"category";s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";s:4:"span";s:7:",row_on";}i:2;a:3:{s:4:"type";s:8:"tree-cat";s:4:"name";s:8:"category";s:4:"span";s:8:",CatTree";}}}}','size' => '','style' => '','modified' => '1343065389',);
+$templ_data[] = array('name' => 'calendar.edit.general','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:8:{i:0;a:7:{s:1:"A";s:2:"95";s:2:"c1";s:3:"row";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c5";s:7:"row_off";s:2:"c6";s:3:"row";s:2:"c7";s:3:"row";}i:1;a:2:{s:1:"A";a:4:{s:3:"for";s:5:"start";s:5:"width";s:2:"95";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:3:{s:6:"needed";s:1:"1";s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";}i:2;a:6:{s:5:"align";s:6:"center";s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";}}}i:2;a:2:{s:1:"A";a:4:{s:3:"for";s:8:"duration";s:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:6:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:220:"set_style_by_class(\'table\',\'end_hide\',\'display\',this.value == \'\' ? \'block\' : \'none\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";}i:2;a:3:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";}}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:5:"label";s:15:"Freetime search";s:7:"onclick";s:85:"ajax_submit(this.form,\'calendar.calendar_uiforms.ajax_freetimesearch\'); return false;";s:4:"name";s:8:"freetime";s:4:"type";s:10:"buttononly";s:4:"help";s:88:"Find free timeslots where the selected participants are availible for the given timespan";}}i:4;a:2:{s:1:"A";a:4:{s:3:"for";s:8:"location";s:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:4:{s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"size";s:4:",255";s:4:"span";s:15:",calendar_inputFullWidth";}}i:5;a:2:{s:1:"A";a:4:{s:3:"for";s:8:"priority";s:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";}s:1:"B";a:2:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";}}i:6;a:2:{s:1:"A";a:3:{s:5:"width";s:1:"0";s:4:"type";s:5:"label";s:5:"label";s:7:"Options";}s:1:"B";a:5:{s:5:"label";s:12:"non blocking";s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";}}i:7;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:4:{s:5:"label";s:7:"Private";s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";}}}s:4:"cols";i:2;s:4:"rows";i:7;s:4:"size";s:8:"100%,210";}i:2;a:6:{s:5:"align";s:5:"right";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";s:4:"span";s:7:",row_on";i:1;a:4:{s:3:"for";s:8:"category";s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";s:4:"span";s:7:",row_on";}i:2;a:3:{s:4:"type";s:8:"tree-cat";s:4:"name";s:8:"category";s:4:"span";s:8:",CatTree";}}}}','size' => '','style' => '','modified' => '1343065389',);
 
 $templ_data[] = array('name' => 'calendar.edit.history','template' => '','lang' => '','group' => '0','version' => '1.7.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:10:"historylog";s:4:"name";s:7:"history";s:4:"size";s:14:"history_status";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:17:"100%,210,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"210";i:6;s:4:"auto";}}}','size' => '100%,210,,,,,auto','style' => '','modified' => '1265901708',);
 
@@ -50,15 +50,15 @@ $templ_data[] = array('name' => 'calendar.export_csv_select','template' => '','l
   width: 170px;
 }','modified' => '1358792945',);
 
-$templ_data[] = array('name' => 'calendar.freetimesearch','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:9:",size120b";s:5:"label";s:15:"Freetime Search";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Startdate / -time";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:4:"help";s:33:"Startdate and -time of the search";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"duration";s:4:"help";s:23:"Duration of the meeting";s:8:"onchange";s:92:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\');";s:4:"size";s:12:"Use end date";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"help";s:57:"Enddate / -time of the meeting, eg. for more then one day";s:4:"span";s:9:",end_hide";}}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Timeframe";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:10:"start_time";s:4:"help";s:19:"Timeframe to search";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"til";}i:3;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:8:"end_time";s:4:"help";s:19:"Timeframe to search";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Weekdays";}i:5;a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:1:"3";s:4:"name";s:8:"weekdays";s:4:"help";s:25:"Weekdays to use in search";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:10:"New search";s:4:"name";s:6:"search";s:4:"help";s:36:"new search with the above parameters";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"search_window";s:4:"help";s:34:"how far to search (from startdate)";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"name";s:6:"cancel";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:8:"freetime";s:4:"span";s:3:"all";s:4:"name";s:4:"rows";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;}}','size' => '','style' => '.size120b { text-size: 120%; font-weight: bold; }
-.redItalic { color: red; font-style: italic; }
+$templ_data[] = array('name' => 'calendar.freetimesearch','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:9:",calendar_size120b";s:5:"label";s:15:"Freetime Search";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:10:",message";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:17:"Startdate / -time";}s:1:"B";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:4:"help";s:33:"Startdate and -time of the search";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"duration";s:4:"help";s:23:"Duration of the meeting";s:8:"onchange";s:92:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\');";s:4:"size";s:12:"Use end date";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:4:"help";s:57:"Enddate / -time of the meeting, eg. for more then one day";s:4:"span";s:9:",end_hide";}}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Timeframe";}s:1:"B";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"5";i:1;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:10:"start_time";s:4:"help";s:19:"Timeframe to search";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"til";}i:3;a:3:{s:4:"type";s:13:"date-houronly";s:4:"name";s:8:"end_time";s:4:"help";s:19:"Timeframe to search";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Weekdays";}i:5;a:4:{s:4:"type";s:10:"select-dow";s:4:"size";s:1:"3";s:4:"name";s:8:"weekdays";s:4:"help";s:25:"Weekdays to use in search";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:10:"New search";s:4:"name";s:6:"search";s:4:"help";s:36:"new search with the above parameters";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"search_window";s:4:"help";s:34:"how far to search (from startdate)";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"name";s:6:"cancel";s:5:"label";s:6:"Cancel";s:4:"help";s:16:"Close the window";s:7:"onclick";s:15:"window.close();";}}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:8:"template";s:4:"size";s:8:"freetime";s:4:"span";s:3:"all";s:4:"name";s:4:"rows";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;}}','size' => '','style' => '.calendar_size120b { text-size: 120%; font-weight: bold; }
+.message { color: red; font-style: italic; }
 .end_hide { visibility: hidden; }','modified' => '1149297367',);
 
 $templ_data[] = array('name' => 'calendar.freetimesearch.rows','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:2:{s:2:"c1";s:2:"th";s:2:"c2";s:3:"row";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Date";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Time";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Select";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Enddate";}}i:2;a:4:{s:1:"A";a:4:{s:4:"type";s:4:"date";s:4:"size";s:3:",16";s:4:"name";s:13:"${row}[start]";s:8:"readonly";s:1:"1";}s:1:"B";a:4:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[start]";s:4:"help";s:13:"select a time";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Select";s:4:"name";s:12:"select[$row]";s:4:"help";s:41:"use the selected time and close the popup";}s:1:"D";a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:11:"${row}[end]";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:2;s:4:"cols";i:4;}}','size' => '','style' => '','modified' => '1097183756',);
 
-$templ_data[] = array('name' => 'calendar.import','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"iCal file";}s:1:"B";a:3:{s:4:"type";s:4:"file";s:4:"name";s:9:"ical_file";s:6:"needed";s:1:"1";}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Import";s:4:"name";s:6:"import";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1131469789',);
+$templ_data[] = array('name' => 'calendar.import','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,message";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:5:"align";s:6:"center";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"iCal file";}s:1:"B";a:3:{s:4:"type";s:4:"file";s:4:"name";s:9:"ical_file";s:6:"needed";s:1:"1";}}i:3;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"Import";s:4:"name";s:6:"import";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1131469789',);
 
-$templ_data[] = array('name' => 'calendar.list','template' => '','lang' => '','group' => '0','version' => '1.9.003','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:6:",!@msg";s:2:"h1";s:6:",!@css";s:2:"c4";s:7:"noPrint";s:1:"B";s:3:"30%";s:2:"h4";s:34:",!@nm[selectcols]=/legacy_actions/";}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}}i:2;a:2:{s:1:"A";a:5:{s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";}s:1:"B";a:5:{s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:4:"type";s:5:"label";s:4:"span";s:10:",redItalic";}}i:3;a:2:{s:1:"A";a:4:{s:4:"name";s:2:"nm";s:4:"size";s:18:"calendar.list.rows";s:4:"type";s:9:"nextmatch";s:4:"span";s:3:"all";}s:1:"B";a:3:{s:4:"name";s:2:"nm";s:4:"size";s:18:"calendar.list.rows";s:4:"type";s:9:"nextmatch";}}i:4;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:5:{s:5:"label";s:13:"Select action";s:7:"onclick";s:183:"if (!egw_globalObjectManager.getObjectById(\'calendar.list.rows\').executeActionImplementation(this, \'popup\')) alert(egw::lang(\'You need to select some entries first!\')); return false;;";s:4:"name";s:14:"legacy_actions";s:4:"type";s:10:"buttononly";s:4:"help";s:13:"Select action";}i:2;a:8:{s:5:"label";s:9:"Check all";s:7:"onclick";s:94:"egw_globalObjectManager.getObjectById(\'calendar.list.rows\').toggleAllSelected(); return false;";s:6:"needed";s:1:"1";s:4:"name";s:9:"check_all";s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:4:"help";s:9:"Check all";s:4:"span";s:14:",checkAllArrow";}s:5:"align";s:5:"right";}}i:5;a:2:{s:1:"A";a:6:{s:5:"class";s:12:"action_popup";s:4:"name";s:12:"delete_popup";s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:6:{s:5:"class";s:6:"prompt";s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Delete";s:4:"span";s:13:",promptheader";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:77:"Do you want to delete this event as an exception, or delete the whole series?";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:5:"label";s:16:"Delete exception";s:7:"onclick";s:36:"nm_submit_popup(this); return false;";s:4:"name";s:6:"delete";s:4:"type";s:6:"button";}i:2;a:4:{s:5:"label";s:13:"Delete series";s:7:"onclick";s:74:"nm_popup_action.id = \'delete_series\'; nm_submit_popup(this); return false;";s:4:"name";s:13:"delete_series";s:4:"type";s:6:"button";}i:3;a:3:{s:5:"label";s:6:"Cancel";s:7:"onclick";s:35:"nm_hide_popup(this,\'delete_popup\');";s:4:"type";s:10:"buttononly";}}}s:4:"span";s:20:",action_popup prompt";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:6:{s:5:"class";s:12:"action_popup";s:4:"name";s:14:"undelete_popup";s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:6:{s:5:"class";s:6:"prompt";s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Un-delete";s:4:"span";s:13:",promptheader";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:83:"Do you want to Un-delete this event as an exception, or un-delete the whole series?";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:5:"label";s:19:"Un-delete exception";s:7:"onclick";s:36:"nm_submit_popup(this); return false;";s:4:"name";s:8:"undelete";s:4:"type";s:6:"button";}i:2;a:4:{s:5:"label";s:16:"Un-delete series";s:7:"onclick";s:76:"nm_popup_action.id = \'undelete_series\'; nm_submit_popup(this); return false;";s:4:"name";s:15:"undelete_series";s:4:"type";s:6:"button";}i:3;a:3:{s:5:"label";s:6:"Cancel";s:7:"onclick";s:37:"nm_hide_popup(this,\'undelete_popup\');";s:4:"type";s:10:"buttononly";}}}s:4:"span";s:20:",action_popup prompt";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:6;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '.noWrap { white-space: nowrap; }
+$templ_data[] = array('name' => 'calendar.list','template' => '','lang' => '','group' => '0','version' => '1.9.003','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:6:",!@msg";s:2:"h1";s:6:",!@css";s:2:"c4";s:7:"noPrint";s:1:"B";s:3:"30%";s:2:"h4";s:34:",!@nm[selectcols]=/legacy_actions/";}i:1;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:4:"html";s:4:"span";s:3:"all";s:4:"name";s:3:"css";}}i:2;a:2:{s:1:"A";a:5:{s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:4:"type";s:5:"label";s:4:"span";s:13:"all,message";}s:1:"B";a:5:{s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"msg";s:4:"type";s:5:"label";s:4:"span";s:10:",message";}}i:3;a:2:{s:1:"A";a:4:{s:4:"name";s:2:"nm";s:4:"size";s:18:"calendar.list.rows";s:4:"type";s:9:"nextmatch";s:4:"span";s:3:"all";}s:1:"B";a:3:{s:4:"name";s:2:"nm";s:4:"size";s:18:"calendar.list.rows";s:4:"type";s:9:"nextmatch";}}i:4;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:5:{s:5:"label";s:13:"Select action";s:7:"onclick";s:183:"if (!egw_globalObjectManager.getObjectById(\'calendar.list.rows\').executeActionImplementation(this, \'popup\')) alert(egw::lang(\'You need to select some entries first!\')); return false;;";s:4:"name";s:14:"legacy_actions";s:4:"type";s:10:"buttononly";s:4:"help";s:13:"Select action";}i:2;a:8:{s:5:"label";s:9:"Check all";s:7:"onclick";s:94:"egw_globalObjectManager.getObjectById(\'calendar.list.rows\').toggleAllSelected(); return false;";s:6:"needed";s:1:"1";s:4:"name";s:9:"check_all";s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:4:"help";s:9:"Check all";s:4:"span";s:14:",checkAllArrow";}s:5:"align";s:5:"right";}}i:5;a:2:{s:1:"A";a:6:{s:5:"class";s:12:"action_popup";s:4:"name";s:12:"delete_popup";s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:6:{s:5:"class";s:6:"prompt";s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"Delete";s:4:"span";s:13:",promptheader";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:77:"Do you want to delete this event as an exception, or delete the whole series?";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:5:"label";s:16:"Delete exception";s:7:"onclick";s:36:"nm_submit_popup(this); return false;";s:4:"name";s:6:"delete";s:4:"type";s:6:"button";}i:2;a:4:{s:5:"label";s:13:"Delete series";s:7:"onclick";s:74:"nm_popup_action.id = \'delete_series\'; nm_submit_popup(this); return false;";s:4:"name";s:13:"delete_series";s:4:"type";s:6:"button";}i:3;a:3:{s:5:"label";s:6:"Cancel";s:7:"onclick";s:35:"nm_hide_popup(this,\'delete_popup\');";s:4:"type";s:10:"buttononly";}}}s:4:"span";s:20:",action_popup prompt";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:6;a:2:{s:1:"A";a:6:{s:5:"class";s:12:"action_popup";s:4:"name";s:14:"undelete_popup";s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:6:{s:5:"class";s:6:"prompt";s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"Un-delete";s:4:"span";s:13:",promptheader";}i:2;a:2:{s:4:"type";s:5:"label";s:5:"label";s:83:"Do you want to Un-delete this event as an exception, or un-delete the whole series?";}i:3;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:4:{s:5:"label";s:19:"Un-delete exception";s:7:"onclick";s:36:"nm_submit_popup(this); return false;";s:4:"name";s:8:"undelete";s:4:"type";s:6:"button";}i:2;a:4:{s:5:"label";s:16:"Un-delete series";s:7:"onclick";s:76:"nm_popup_action.id = \'undelete_series\'; nm_submit_popup(this); return false;";s:4:"name";s:15:"undelete_series";s:4:"type";s:6:"button";}i:3;a:3:{s:5:"label";s:6:"Cancel";s:7:"onclick";s:37:"nm_hide_popup(this,\'undelete_popup\');";s:4:"type";s:10:"buttononly";}}}s:4:"span";s:20:",action_popup prompt";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:6;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '.noWrap { white-space: nowrap; }
 
 .image16 img {
   height: 16px;
@@ -76,7 +76,7 @@ $templ_data[] = array('name' => 'calendar.list.dates','template' => '','lang' =>
 
 $templ_data[] = array('name' => 'calendar.list.rows','template' => '','lang' => '','group' => '0','version' => '1.9.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"B";s:3:"40%";s:2:"c1";s:2:"th";s:2:"c2";s:40:"$row_cont[category] $row_cont[class],top";}i:1;a:13:{s:1:"A";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:5:"label";s:5:"Start";s:4:"name";s:9:"cal_start";s:4:"type";s:20:"nextmatch-sortheader";}i:2;a:3:{s:5:"label";s:3:"End";s:4:"name";s:7:"cal_end";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"B";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:3:{s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";s:4:"type";s:20:"nextmatch-sortheader";}i:2;a:3:{s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"C";a:3:{s:5:"label";s:5:"Title";s:4:"name";s:9:"cal_title";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"D";a:3:{s:5:"label";s:11:"Description";s:4:"name";s:15:"cal_description";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"E";a:3:{s:5:"label";s:10:"Recurrence";s:4:"name";s:6:"recure";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"F";a:3:{s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";s:4:"type";s:16:"nextmatch-header";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:5:"label";s:5:"Owner";s:8:"readonly";s:4:"true";s:4:"name";s:9:"cal_owner";s:4:"type";s:20:"nextmatch-sortheader";}i:2;a:3:{s:5:"label";s:8:"Location";s:4:"name";s:12:"cal_location";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"H";a:4:{s:5:"label";s:5:"Owner";s:8:"readonly";s:4:"true";s:4:"name";s:9:"cal_owner";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"I";a:3:{s:5:"label";s:8:"Location";s:4:"name";s:12:"cal_location";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"J";a:4:{s:5:"label";s:12:"Participants";s:4:"name";s:11:"participant";s:4:"size";s:3:"All";s:4:"type";s:23:"nextmatch-accountfilter";}s:1:"K";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:7:"Created";s:4:"name";s:11:"cal_created";}i:2;a:4:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:11:"cal_creator";s:4:"size";s:7:"Creator";s:5:"label";s:7:"Creator";}i:3;a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Last changed";}}s:1:"L";a:4:{s:5:"label";s:13:"Custom fields";s:8:"readonly";s:4:"true";s:4:"name";s:3:"cfs";s:4:"type";s:22:"nextmatch-customfields";}s:1:"M";a:7:{s:5:"label";s:7:"Actions";s:5:"class";s:7:"noPrint";s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:5:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Actions";s:4:"help";s:9:"Check all";s:4:"span";s:8:",noPrint";s:4:"name";s:14:"legacy_actions";}i:2;a:8:{s:5:"label";s:9:"Check all";s:7:"onclick";s:94:"egw_globalObjectManager.getObjectById(\'calendar.list.rows\').toggleAllSelected(); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";s:4:"name";s:9:"check_all";s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:4:"help";s:9:"Check all";}s:4:"span";s:8:",noPrint";}}i:2;a:13:{s:1:"A";a:5:{s:4:"name";s:5:"start";s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:5:{s:8:"readonly";s:4:"true";s:4:"name";s:13:"${row}[start]";s:4:"size";s:14:",$cont[format]";s:4:"type";s:9:"date-time";s:4:"span";s:7:",noWrap";}i:2;a:5:{s:8:"readonly";s:4:"true";s:4:"name";s:11:"${row}[end]";s:4:"size";s:14:",$cont[format]";s:4:"type";s:9:"date-time";s:4:"span";s:7:",noWrap";}}s:1:"B";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:6:{s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:4:"size";s:1:"2";s:4:"type";s:4:"hbox";i:1;a:5:{s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[title]";s:4:"size";s:1:"b";s:4:"type";s:5:"label";}i:2;a:5:{s:4:"type";s:5:"label";s:5:"label";s:3:"#%s";s:4:"name";s:10:"${row}[id]";s:4:"size";s:1:"b";s:5:"align";s:5:"right";}}i:2;a:5:{s:7:"no_lang";s:1:"1";s:4:"type";s:3:"box";s:4:"size";s:1:"1";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:19:"${row}[description]";s:4:"type";s:5:"label";}s:4:"span";s:16:",listDescription";}i:3;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:14:"${row}[recure]";s:4:"type";s:5:"label";}s:4:"span";s:9:",listVbox";}s:1:"C";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"name";s:13:"${row}[title]";s:4:"type";s:5:"label";}i:2;a:5:{s:4:"type";s:5:"label";s:5:"label";s:3:"#%s";s:4:"name";s:10:"${row}[id]";s:4:"size";s:1:"b";s:5:"align";s:5:"right";}}s:1:"D";a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:19:"${row}[description]";s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"name";s:14:"${row}[recure]";s:4:"type";s:5:"label";}s:1:"F";a:3:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:16:"${row}[category]";}s:1:"G";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:14:"select-account";s:5:"class";s:6:"noWrap";s:8:"readonly";s:4:"true";s:4:"name";s:13:"${row}[owner]";}i:2;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";s:4:"type";s:5:"label";}}s:1:"H";a:4:{s:4:"type";s:14:"select-account";s:5:"class";s:6:"noWrap";s:8:"readonly";s:4:"true";s:4:"name";s:13:"${row}[owner]";}s:1:"I";a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[location]";s:4:"type";s:5:"label";}s:1:"J";a:4:{s:8:"readonly";s:4:"true";s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[parts]";s:4:"type";s:4:"html";}s:1:"K";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:15:"${row}[created]";s:8:"readonly";s:1:"1";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:15:"${row}[creator]";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:16:"${row}[modified]";s:8:"readonly";s:1:"1";}}s:1:"L";a:2:{s:4:"name";s:4:"$row";s:4:"type";s:17:"customfields-list";}s:1:"M";a:5:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:7:{s:5:"class";s:7:"noPrint";s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:6:{s:5:"label";s:4:"View";s:7:"onclick";s:206:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&cal_id=$row_cont[id]&date=$row_cont[date]\'),\'425\',\'dependent=yes,width=750,height=450,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:4:"help";s:15:"View this event";}i:2;a:6:{s:5:"label";s:4:"Edit";s:7:"onclick";s:20:"$row_cont[edit_link]";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:4:"help";s:15:"Edit this event";}i:3;a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:36:"return confirm(\'Delete this event\');";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:4:"help";s:17:"Delete this event";}i:4;a:5:{s:5:"align";s:5:"right";s:4:"name";s:9:"checked[]";s:4:"size";s:35:"$row_cont[id]:$row_cont[recur_date]";s:4:"type";s:8:"checkbox";s:4:"help";s:45:"Select multiple contacts for a further action";}}i:2;a:5:{s:4:"size";s:6:"3,,0,0";s:4:"type";s:4:"hbox";i:1;a:4:{s:4:"type";s:6:"button";s:4:"size";s:15:"etemplate/merge";s:5:"label";s:5:"merge";s:4:"name";s:45:"document[$row_cont[id]:$row_cont[recur_date]]";}i:2;a:6:{s:5:"label";s:11:"Filemanager";s:4:"size";s:18:"filemanager/navbar";s:4:"type";s:6:"button";s:4:"name";s:26:"filemanager[$row_cont[id]]";s:4:"span";s:8:",image16";s:7:"onclick";s:139:"window.location.href=egw::link(\'/index.php\',\'menuaction=filemanager.filemanager_ui.index&path=/apps/calendar/$row_cont[id]\'); return false;";}i:3;a:5:{s:4:"type";s:6:"button";s:4:"size";s:9:"timesheet";s:5:"label";s:19:"Add timesheet entry";s:4:"name";s:29:"timesheet[$row_cont[info_id]]";s:7:"onclick";s:267:"window.open(egw::link(\'/index.php\',\'menuaction=timesheet.timesheet_ui.edit&link_app[]=$row_cont[app]&cat_id=$row_cont[category]&link_id[]=$row_cont[app_id]$row_cont[extra_links]\'),\'_blank\',\'dependent=yes,width=600,height=400,scrollbars=yes,status=yes\'); return false;";}}s:4:"span";s:8:",noPrint";}}}s:4:"cols";i:13;s:4:"rows";i:2;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1298450177',);
 
-$templ_data[] = array('name' => 'calendar.meeting','template' => '','lang' => '','group' => '0','version' => '1.9.002','data' => 'a:4:{i:0;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:4:"span";s:19:",redItalic leftPad5";}i:1;a:6:{s:4:"type";s:4:"grid";s:4:"size";s:3:",,0";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",!@ics_method=request";s:2:"h2";s:19:",!@ics_method=reply";}i:1;a:5:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:22:",meetingRequestMessage";s:5:"label";s:36:"This mail contains a meeting request";}s:1:"B";a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Accept";s:4:"name";s:14:"button[accept]";i:1;a:1:{s:4:"type";s:4:"hbox";}s:4:"span";s:9:",leftPad5";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[tentativ]";s:5:"label";s:9:"Tentative";s:4:"span";s:9:",leftPad5";}s:1:"D";a:4:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[reject]";s:5:"label";s:6:"Reject";s:4:"span";s:9:",leftPad5";}s:1:"E";a:6:{s:4:"type";s:10:"buttononly";s:4:"name";s:12:"button[edit]";s:5:"label";s:4:"Edit";s:4:"help";s:22:"Edit event in calendar";s:7:"onclick";s:184:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&cal_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=750,height=410,scrollbars=yes,status=yes\'); return false;";s:4:"span";s:9:",leftPad5";}}i:2;a:5:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:22:",meetingRequestMessage";s:5:"label";s:47:"This mail contains a reply to a meeting request";}s:1:"B";a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"span";s:9:",leftPad5";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:5;s:7:"options";a:1:{i:2;s:1:"0";}}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:10:{s:2:"c1";s:2:"th";s:1:"A";s:3:"100";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c3";s:3:"row";s:2:"c6";s:3:"row";s:2:"c7";s:7:"row,top";s:2:"c5";s:3:"row";s:2:"c8";s:7:"row,top";s:2:"h5";s:9:",!@recure";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:4:"name";s:16:"ics_method_label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"title";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"location";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:8:"readonly";s:1:"1";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:"-";}}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Recurrence";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:6:"recure";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Organizer";}s:1:"B";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:9:"organizer";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:11:"description";}}i:8;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"all_participants";}}}s:4:"rows";i:8;s:4:"cols";i:2;s:4:"size";s:21:"100%,,,meetingRequest";s:7:"options";a:2:{i:3;s:14:"meetingRequest";i:0;s:4:"100%";}}}','size' => ',,0','style' => '#popupMainDiv {
+$templ_data[] = array('name' => 'calendar.meeting','template' => '','lang' => '','group' => '0','version' => '1.9.002','data' => 'a:4:{i:0;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:4:"span";s:19:",message leftPad5";}i:1;a:6:{s:4:"type";s:4:"grid";s:4:"size";s:3:",,0";s:4:"data";a:3:{i:0;a:2:{s:2:"h1";s:21:",!@ics_method=request";s:2:"h2";s:19:",!@ics_method=reply";}i:1;a:5:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:22:",meetingRequestMessage";s:5:"label";s:36:"This mail contains a meeting request";}s:1:"B";a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"Accept";s:4:"name";s:14:"button[accept]";i:1;a:1:{s:4:"type";s:4:"hbox";}s:4:"span";s:9:",leftPad5";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:4:"name";s:16:"button[tentativ]";s:5:"label";s:9:"Tentative";s:4:"span";s:9:",leftPad5";}s:1:"D";a:4:{s:4:"type";s:6:"button";s:4:"name";s:14:"button[reject]";s:5:"label";s:6:"Reject";s:4:"span";s:9:",leftPad5";}s:1:"E";a:6:{s:4:"type";s:10:"buttononly";s:4:"name";s:12:"button[edit]";s:5:"label";s:4:"Edit";s:4:"help";s:22:"Edit event in calendar";s:7:"onclick";s:184:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&cal_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=750,height=410,scrollbars=yes,status=yes\'); return false;";s:4:"span";s:9:",leftPad5";}}i:2;a:5:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:22:",meetingRequestMessage";s:5:"label";s:47:"This mail contains a reply to a meeting request";}s:1:"B";a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"span";s:9:",leftPad5";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:5;s:7:"options";a:1:{i:2;s:1:"0";}}i:2;a:1:{s:4:"type";s:5:"label";}i:3;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:10:{s:2:"c1";s:2:"th";s:1:"A";s:3:"100";s:2:"c2";s:3:"row";s:2:"c4";s:3:"row";s:2:"c3";s:3:"row";s:2:"c6";s:3:"row";s:2:"c7";s:7:"row,top";s:2:"c5";s:3:"row";s:2:"c8";s:7:"row,top";s:2:"h5";s:9:",!@recure";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:3:"all";s:4:"name";s:16:"ics_method_label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:5:"title";}}i:3;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"Location";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:8:"location";}}i:4;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Date";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:5:"start";s:8:"readonly";s:1:"1";}i:2;a:5:{s:4:"type";s:9:"date-time";s:4:"name";s:3:"end";s:8:"readonly";s:1:"1";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:"-";}}}i:5;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Recurrence";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:6:"recure";}}i:6;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"Organizer";}s:1:"B";a:3:{s:4:"type";s:9:"url-email";s:4:"name";s:9:"organizer";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:11:"description";}}i:8;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Participants";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"all_participants";}}}s:4:"rows";i:8;s:4:"cols";i:2;s:4:"size";s:21:"100%,,,meetingRequest";s:7:"options";a:2:{i:3;s:14:"meetingRequest";i:0;s:4:"100%";}}}','size' => ',,0','style' => '#popupMainDiv {
  border: none;
  margin: 0;
 }
@@ -103,7 +103,7 @@ table.meetingRequest {
 
 ','modified' => '1338903760',);
 
-$templ_data[] = array('name' => 'calendar.print','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:15:{i:0;a:13:{s:1:"A";s:2:"95";s:2:"c2";s:2:"th";s:2:"c5";s:3:"row";s:2:"c6";s:7:"row_off";s:2:"c7";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:3:"row";s:2:"c9";s:3:"row";s:2:"h2";s:2:"28";s:2:"c1";s:2:"th";s:3:"c10";s:4:",top";s:3:"c11";s:2:"th";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:5:"print";s:7:"onclick";s:15:"window.print();";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:5:",bold";s:5:"label";s:8:"Calendar";s:4:"size";s:4:"bold";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"name";s:5:"title";s:4:"size";s:6:"80,255";s:8:"readonly";s:1:"1";s:4:"span";s:3:"all";}}i:3;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";s:8:"readonly";s:1:"1";}i:2;a:7:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";s:8:"readonly";s:1:"1";}}}i:4;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:7:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";s:8:"readonly";s:1:"1";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"size";s:4:",255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"span";s:15:",inputFullWidth";s:8:"readonly";s:1:"1";}}i:6;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:6:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";s:8:"readonly";s:1:"1";}}i:9;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:8:"readonly";s:1:"1";}}i:10;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:11:"description";s:8:"readonly";s:1:"1";}}i:11;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:13:"custom fields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:3:{s:4:"type";s:12:"customfields";s:4:"span";s:3:"all";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:13;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"name";s:27:"calendar.print.participants";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:14;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:20:"calendar.print.links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:14;s:4:"size";s:8:"100%,200";}}}','size' => '','style' => '','modified' => '1229596125',);
+$templ_data[] = array('name' => 'calendar.print','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:3:{s:4:"size";s:6:"1,,0,0";s:4:"type";s:4:"hbox";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:15:{i:0;a:13:{s:1:"A";s:2:"95";s:2:"c2";s:2:"th";s:2:"c5";s:3:"row";s:2:"c6";s:7:"row_off";s:2:"c7";s:3:"row";s:2:"c3";s:3:"row";s:2:"c4";s:3:"row";s:2:"c8";s:3:"row";s:2:"c9";s:3:"row";s:2:"h2";s:2:"28";s:2:"c1";s:2:"th";s:3:"c10";s:4:",top";s:3:"c11";s:2:"th";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"image";s:4:"name";s:5:"print";s:7:"onclick";s:15:"window.print();";}s:1:"B";a:4:{s:4:"type";s:5:"label";s:4:"span";s:5:",bold";s:5:"label";s:8:"Calendar";s:4:"size";s:4:"bold";}}i:2;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Title";}s:1:"B";a:5:{s:4:"type";s:4:"text";s:4:"name";s:5:"title";s:4:"size";s:6:"80,255";s:8:"readonly";s:1:"1";s:4:"span";s:3:"all";}}i:3;a:2:{s:1:"A";a:4:{s:5:"width";s:2:"95";s:4:"size";s:8:",,,start";s:4:"type";s:5:"label";s:5:"label";s:5:"Start";}s:1:"B";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"name";s:5:"start";s:4:"type";s:9:"date-time";s:8:"readonly";s:1:"1";}i:2;a:7:{s:5:"label";s:9:"whole day";s:4:"name";s:9:"whole_day";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:31:"Event will occupy the whole day";s:5:"align";s:6:"center";s:8:"readonly";s:1:"1";}}}i:4;a:2:{s:1:"A";a:4:{s:5:"width";s:1:"0";s:4:"size";s:11:",,,duration";s:4:"type";s:5:"label";s:5:"label";s:8:"Duration";}s:1:"B";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"hbox";i:1;a:7:{s:7:"no_lang";s:1:"1";s:8:"onchange";s:227:"set_style_by_class(\'table\',\'end_hide\',\'visibility\',this.value == \'\' ? \'visible\' : \'hidden\'); if (this.value == \'\') document.getElementById(form::name(\'end[str]\')).value = document.getElementById(form::name(\'start[str]\')).value;";s:4:"name";s:8:"duration";s:4:"size";s:12:"Use end date";s:4:"type";s:6:"select";s:4:"help";s:23:"Duration of the meeting";s:8:"readonly";s:1:"1";}i:2;a:4:{s:4:"name";s:3:"end";s:4:"type";s:9:"date-time";s:4:"span";s:9:",end_hide";s:8:"readonly";s:1:"1";}}}i:5;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,location";s:4:"type";s:5:"label";s:5:"label";s:8:"Location";s:5:"width";s:1:"0";}s:1:"B";a:5:{s:4:"size";s:4:",255";s:4:"name";s:8:"location";s:4:"type";s:4:"text";s:4:"span";s:15:",calendar_inputFullWidth";s:8:"readonly";s:1:"1";}}i:6;a:2:{s:1:"A";a:4:{s:4:"size";s:11:",,,priority";s:4:"type";s:5:"label";s:5:"label";s:8:"Priority";s:5:"width";s:1:"0";}s:1:"B";a:3:{s:4:"type";s:15:"select-priority";s:4:"name";s:8:"priority";s:8:"readonly";s:1:"1";}}i:7;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Options";s:5:"width";s:1:"0";}s:1:"B";a:6:{s:4:"name";s:12:"non_blocking";s:4:"size";s:11:",, ,disable";s:4:"type";s:8:"checkbox";s:4:"help";s:56:"A non blocking event will not conflict with other events";s:5:"label";s:12:"non blocking";s:8:"readonly";s:1:"1";}}i:8;a:2:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"name";s:6:"public";s:4:"size";s:3:"0,1";s:4:"type";s:8:"checkbox";s:5:"label";s:7:"Private";s:8:"readonly";s:1:"1";}}i:9;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"B";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:8:"category";s:8:"readonly";s:1:"1";}}i:10;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"B";a:3:{s:4:"type";s:8:"textarea";s:4:"name";s:11:"description";s:8:"readonly";s:1:"1";}}i:11;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:13:"custom fields";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:12;a:2:{s:1:"A";a:3:{s:4:"type";s:12:"customfields";s:4:"span";s:3:"all";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:13;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"name";s:27:"calendar.print.participants";s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:14;a:2:{s:1:"A";a:3:{s:4:"type";s:8:"template";s:4:"span";s:3:"all";s:4:"name";s:20:"calendar.print.links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:14;s:4:"size";s:8:"100%,200";}}}','size' => '','style' => '','modified' => '1229596125',);
 
 $templ_data[] = array('name' => 'calendar.print.links','template' => '','lang' => '','group' => '0','version' => '1.6.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:1:"A";s:2:"95";s:2:"c1";s:2:"th";s:2:"c2";s:11:"row_off,top";}i:1;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"type";s:5:"label";s:5:"label";s:14:"Existing links";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"span";s:3:"all";s:4:"name";s:7:"link_to";s:4:"type";s:9:"link-list";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:2;s:4:"size";s:17:"100%,200,,,,,auto";}}','size' => '100%,200,,,,,auto','style' => '','modified' => '1231922363',);
 
diff --git a/calendar/sitemgr/class.module_calendar_planner.inc.php b/calendar/sitemgr/class.module_calendar_planner.inc.php
index 986cdb93fe..08a75c2cf9 100644
--- a/calendar/sitemgr/class.module_calendar_planner.inc.php
+++ b/calendar/sitemgr/class.module_calendar_planner.inc.php
@@ -241,7 +241,7 @@ class module_calendar_planner extends Module
 		}
 		else
 		{
-			$html .= '<div class="redItalic" align="center">'.lang('No owner selected').'</div>';
+			$html .= '<div class="message" align="center">'.lang('No owner selected').'</div>';
 		}
 
 		return $html;
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 532c67a4a3..d0e5498406 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -1,6 +1,6 @@
 /* $Id$ */
 
-.inputFullWidth input { width: 100%; }
+.calendar_inputFullWidth input { width: 100%; }
 
 /******************************************************************
  * CSS settings for the day, week and month view (timeGridWidget) *
@@ -9,44 +9,43 @@
 /*
 Names used in the "graphic" are the css classes from this file.
 The function names in class uiviews have the leading cal removed and a trailing Widget added:
-e.g. the div with class calTimeGrid is generated by the timeGridWidget method of uiviews.
+e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget method of uiviews.
 
-+++ calTimeGrid +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+                #### calDayCols[12h|NoGrip] ###########################################################
-+                #... calDayCol ............................. ... calDayCol ..........................
-+                #.+- calDayColHeader ---------------------+. .+- calDayColHeader ------------------+.
++++ calendar_calTimeGrid +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
++                #### calendar_calDayCols[12h|NoGrip] ###########################################################
++                #... calendar_calDayCol ............................. ... calendar_calDayCol ..........................
++                #.+- calendar_calDayColHeader ---------------------+. .+- calendar_calDayColHeader ------------------+.
 +                #.|                                       |. .|                                    |.
 +                #.+---------------------------------------+. .+------------------------------------+.
-+.calTimeRowTime.#.** calEventCol ***** ** calEventCol *****. .** calEventCol ***********************.
++.calendar_calTimeRowTime.#.** calendar_calEventCol ***** ** calendar_calEventCol *****. .** calendar_calEventCol ***********************.
 +.              .#.*                  * *                  *. .*                                    *.
 +.              .#.*                  * *                  *. .*                                    *.
-+................#.*+- calEvent -----+* *                  *. .*                                    *.
-+.calTimeRowTime.#.*|                |* *                  *. .*+- calEvent[Private] --------------+*.
-+.              .#.*|                |* *+- calEvent -----+*. .*|                                  |*.
++................#.*+- calendar_calEvent -----+* *                  *. .*                                    *.
++.calendar_calTimeRowTime.#.*|                |* *                  *. .*+- calendar_calEvent[Private] --------------+*.
++.              .#.*|                |* *+- calendar_calEvent -----+*. .*|                                  |*.
 +.              .#.*+----------------+* *|                |*. .*|                                  |*.
 +................#.*                  * *|                |*. .*|                                  |*.
-+.calTimeRowTime.#.*                  * *+----------------+*. .*|                                  |*.
++.calendar_calTimeRowTime.#.*                  * *+----------------+*. .*|                                  |*.
 +.              .#.*                  * *                  *. .*+----------------------------------+*.
 
 */
 
-.redItalic { color: red; font-style: italic; }
-.size120b { font-size: 120%; font-weight: bold; }
+.calendar_size120b { font-size: 120%; font-weight: bold; }
 
 /* marks a day in the colum-header as today
  */
-.calToday{
+.calendar_calToday{
 	background: #ffffcc;
 }
 /* marks a day in the colum-header as holiday
  */
-.calHoliday{
+.calendar_calHoliday{
 	background: #dac0c0;
 }
 /* marks a day in the column-header additionaly as birthday of some contact,
- * it should work together with the backgrounds of calToday, calHoliday, th, row_on and row_off
+ * it should work together with the backgrounds of calendar_calToday, calendar_calHoliday, th, row_on and row_off
  */
-.calBirthday,.calBirthday a{
+.calendar_calBirthday,.calendar_calBirthday a{
 	color: black;
 	font-weight: bold;
 	font-style: italic;
@@ -54,7 +53,7 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 
 /* timeGridWidget, contains timeRow's and dayCol's
  */
-.calTimeGrid{
+.calendar_calTimeGrid{
 	position: relative;
 	top: 0px;
 	left: 0px;
@@ -67,7 +66,7 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 
 /* single row in the time-line, always used in conjunction with row_{on|off}, you dont need to set a bgcolor, but you can
  */
-.calTimeRow,.calTimeRowOff{
+.calendar_calTimeRow,.calendar_calTimeRowOff{
 	position: absolute;
 	width: 100%;
 /* set via inline style on runtime:
@@ -75,13 +74,13 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
  *  top:
  */
 }
-.calTimeRow{
+.calendar_calTimeRow{
 /*	background-color: silver; */
 }
 
 /* time in a timeRow
  */
-.calTimeRowTime{
+.calendar_calTimeRowTime{
 	padding-left: 5px;
 	height: 100%;
 	line-height: 14px;
@@ -91,7 +90,7 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 
 /* contains (multiple) dayCol's
  */
-.calDayCols,.calDayCols12h,.calDayColsNoGrid{
+.calendar_calDayCols,.calendar_calDayCols12h,.calendar_calDayColsNoGrid{
 	position: absolute;
 	top: 0px;
 /*	bottom: 0px; does NOT work in IE, IE needs height: 100%! */
@@ -101,18 +100,18 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 }
 /* 12h timeformat with am/pm
  */
-.calDayCols12h{
+.calendar_calDayCols12h{
 	left: 65px;
 }
 /* no time grid --> no time column
  */
-.calDayColsNoTime{
+.calendar_calDayColsNoTime{
 	left: 0px;
 }
 
 /* contains (multiple) eventCol's
  */
-.calDayCol{
+.calendar_calDayCol{
 	position: absolute;
 	top: 0px;
 	height: 100%;
@@ -122,10 +121,13 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
  */
 	border-left: 1px solid silver;
 }
+/* Calendar Id #
+*/
+.calendar_calId:before { content:"#" }
 
 /* header for the dayCol
  */
-.calDayColHeader,.calGridHeader{
+.calendar_calDayColHeader,.calendar_calGridHeader{
 	position: absolute;
 	top: 0px;
 	left: 0px;
@@ -140,11 +142,11 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 	line-height: 16px;
 	z-index: 30;
 }
-.calDayColHeader img {
+.calendar_calDayColHeader img {
 	vertical-align: middle;
 }
 
-.calViewUserNameBox {
+.calendar_calViewUserNameBox {
 	position: absolute;
 	top: -1px;
 	width: 95%;
@@ -158,28 +160,28 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 	padding-left: 10px;
 	background: #dac0c0;
 }
-.calViewUserName {
+.calendar_calViewUserName {
 	font-weight: normal;
 }
-.calViewUserName:first-letter {
+.calendar_calViewUserName:first-letter {
 	text-transform:uppercase;
 }
-.calViewUserNameFirst {
+.calendar_calViewUserNameFirst {
 }
-.calViewUserNameFirst:after {
+.calendar_calViewUserNameFirst:after {
 	content: ", ";
 }
 
 /* header of the time-grid, eg. for the weeks in the month-view (leftmost of the day-col-headers)
  */
-.calGridHeader{
+.calendar_calGridHeader{
 	text-align: left;
 	padding-left: 3px;
 }
 
 /* contains (multiple) events's
  */
-.calEventCol{
+.calendar_calEventCol{
 	position: absolute;
 	top: 0px;
 /*	bottom: 0px; does NOT work in IE, IE needs height: 100%! */
@@ -192,7 +194,7 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 
 /* contains one event: header-row & -body
  */
-.calEvent,.calEventPrivate{
+.calendar_calEvent,.calendar_calEventPrivate{
 	position: absolute;
 	left: 0px;
 	right: 0px;
@@ -209,14 +211,14 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
  *  background: depending on category (shade)
  */
 }
-.calEvent:hover{
+.calendar_calEvent:hover{
 	cursor: pointer;
 }
 
 /**
  * All participants accepted the invitation
  */
-.calEventAllAccepted {
+.calendar_calEventAllAccepted {
 	border-style: solid;
 	border-width: 1px;
 }
@@ -224,7 +226,7 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 /**
  * All participants answered the invitation, but not all accepted
  */
-.calEventAllAnswered {
+.calendar_calEventAllAnswered {
 	border-style: dotted;
 	border-width: 2px;
 }
@@ -232,12 +234,12 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 /**
  * Some participants did NOT answer the invitation
  */
-.calEventSomeUnknown {
+.calendar_calEventSomeUnknown {
 	border-style: dashed;
 	border-width: 1px;
 }
 
-.calEventTooltip{
+.calendar_calEventTooltip{
 	border-radius: 6px;
 	-moz-border-radius: 6px;
 	-webkit-border-radius: 6px;
@@ -245,21 +247,21 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 	overflow: auto;
 }
 
-.calAddEvent{
+.calendar_calAddEvent{
 	position: absolute;
 	width: 100%;
 	z-index: 10;
 }
 
-.calAddEvent:hover{
+.calendar_calAddEvent:hover{
 	background-color: #D2D7FF;
 	cursor: pointer;
 }
 
 /* header-row of the event
  */
-.calEventHeader,.calEventHeaderSmall{
-	position: relative;	/* as the calEventIcons use postion: absolute! */
+.calendar_calEventHeader,.calendar_calEventHeaderSmall{
+	position: relative;	/* as the calendar_calEventIcons use postion: absolute! */
 	font-weight: bold;
 	font-size: 9pt;
 	text-align: left;
@@ -271,77 +273,77 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
  *	color: white || black depending on cat;
  */
 }
-.calEventHeaderSmall{
+.calendar_calEventHeaderSmall{
 	font-size: 8pt;
 	line-height: 10pt;
 }
-.calEventIcons{
+.calendar_calEventIcons{
 	position: absolute;
 	right: 0px;
 	top: 0px;
 }
-.calEventIcons img{
+.calendar_calEventIcons img{
 	height: 16px;
 }
-.calEventHeaderSmall .calEventIcons img{
+.calendar_calEventHeaderSmall .calendar_calEventIcons img{
 	height: 13px;
 }
 
 /* body of the event
  */
-.calEventBody,.calEventBodySmall{
+.calendar_calEventBody,.calendar_calEventBodySmall{
 	padding: 0px 3px 0px;
 	left: 2px;
 	right: 2px;
 	height: 99%;
 }
 
-.calEventBodySmall{
+.calendar_calEventBodySmall{
 	font-size: 95%;
 }
 
-.calEventLabel{
+.calendar_calEventLabel{
 	font-weight: bold;
 	font-size: 90%;
 }
 
-.calEventTitle{
+.calendar_calEventTitle{
 	font-weight: bold;
 	font-size: 110%;
 }
 
 /* table of the dayView containing 2 cols: 1) day-view, 2) todos
 */
-.calDayView{
+.calendar_calDayView{
 	width: 100%;
 }
 /* calDayTods is the day-view's todo column, containing the calDayTodoHeader and the calDayTodoTable
  */
-.calDayTodos .calDayTodosHeader {
+.calendar_calDayTodos .calendar_calDayTodosHeader {
 	margin: 0px;
 	padding: 2px;
 	font-weight: bold;
 }
-.calDayTodos .calDayTodosTable {
+.calendar_calDayTodos .calendar_calDayTodosTable {
 	overflow: auto;
 	max-height: 400px;
 }
-.calDayTodos {
+.calendar_calDayTodos {
 	width: 250px;
 	margin-left: 10px;
 	border: 1px solid silver;
 }
-.calDayTodosHeader {
+.calendar_calDayTodosHeader {
 	text-align: center;
 }
 
 /******************************************************
- * CSS settings for the planner views (plannerWidget) *
+ * CSS settings for the planner views (calendar_plannerWidget) *
  ******************************************************/
 
-/* plannerWidget represents the whole planner, consiting of the plannerHeader and multiple plannerRowWidgets
+/* calendar_plannerWidget represents the whole planner, consiting of the calendar_plannerHeader and multiple plannerRowWidgets
  */
-.plannerWidget {
+.calendar_plannerWidget {
 	position: relative;
 	top: 0px;
 	left: 0px;
@@ -350,27 +352,27 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 	padding-right: 3px;
 }
 
-/* plannerHeader contains a plannerHeaderTitle and multiple plannerHeaderRows
+/* calendar_plannerHeader contains a calendar_plannerHeaderTitle and multiple calendar_plannerHeaderRows
  */
-.plannerHeader {
+.calendar_plannerHeader {
 	position: relative;
 	top: 0px;
 	left: 0px;
 	width: 100%;
 }
 
-/* plannerRowWidget contains a plannerRowHeader and multiple eventRowWidgets in an eventRows
+/* calendar_plannerRowWidget contains a calendar_plannerRowHeader and multiple eventRowWidgets in an calendar_eventRows
  */
-.plannerRowWidget {
+.calendar_plannerRowWidget {
 	position: relative;
 	top: 0px;
 	left: 0px;
 	width: 100%;
 }
 
-/* plannerScale represents a scale-row of the plannerHeader, containing multiple planner{Day|Week|Month}Scales
+/* calendar_plannerScale represents a scale-row of the calendar_plannerHeader, containing multiple planner{Day|Week|Month}Scales
  */
-.plannerScale,.plannerScaleDay {
+.calendar_plannerScale,.calendar_plannerScaleDay {
 	position: relative;
 	top: 0px;
 	left: 0%;
@@ -378,11 +380,11 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 	height: 20px;
 	line-height: 20px;
 }
-.plannerScaleDay {
+.calendar_plannerScaleDay {
 	height: 28px;
 	line-height: 14px;
 }
-.plannerDayScale,.plannerMonthScale,.plannerWeekScale,.plannerHourScale,.plannerDayOfMonthScale {
+.calendar_plannerDayScale,.calendar_plannerMonthScale,.calendar_plannerWeekScale,.calendar_plannerHourScale,.calendar_plannerDayOfMonthScale {
 	position: absolute;
 	top: 0px;
 	/* left+width: is set by the code on runtime */
@@ -394,47 +396,47 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
  *  width:
  */
 }
-.plannerHourScale {
+.calendar_plannerHourScale {
 	font-size: 90%;
 }
-.plannerDayScale {
+.calendar_plannerDayScale {
 	font-size: 90%;
 }
-.plannerWeekScale {
+.calendar_plannerWeekScale {
 	line-height: 20px;
 }
-.plannerMonthScale {
+.calendar_plannerMonthScale {
 	font-weight: bold;
 }
-.plannerDayScale img,.plannerWeekScale img,.plannerMonthScale img,.plannerDayOfMonthScale img {
+.calendar_plannerDayScale img,.calendar_plannerWeekScale img,.calendar_plannerMonthScale img,.calendar_plannerDayOfMonthScale img {
 	vertical-align: middle;
 }
 
-/* plannerRowHeader contains the user or category name of the plannerRowWidget
+/* calendar_plannerRowHeader contains the user or category name of the calendar_plannerRowWidget
  */
-.plannerRowHeader, .plannerHeaderTitle {
+.calendar_plannerRowHeader, .calendar_plannerHeaderTitle {
 	position: absolute;
 	top: 0px;
 	left: 0%;
-	width: 15%;		/* need to be identical for plannerRowHeader and plannerHeaderTitle and match left of eventRows/plannerHeaderRows */
+	width: 15%;		/* need to be identical for calendar_plannerRowHeader and calendar_plannerHeaderTitle and match left of calendar_eventRows/calendar_plannerHeaderRows */
 	height: 100%;
 	line-height: 20px;
 	border: 1px solid white;
 }
 
-/* eventRows contain multiple eventRowWidgets
+/* calendar_eventRows contain multiple eventRowWidgets
  */
-.eventRows, .plannerHeaderRows {
+.calendar_eventRows, .calendar_plannerHeaderRows {
 	position: relative;
 	top: 0px;
-	left: 15%;	/* need to be identical for eventRows and plannerHeaderRows and match width of plannerRowHeader/plannerHeaderTitle */
+	left: 15%;	/* need to be identical for calendar_eventRows and calendar_plannerHeaderRows and match width of calendar_plannerRowHeader/calendar_plannerHeaderTitle */
 	width: 85%;
 }
 
 /**
  * Filler for month with less then 31 days in yearly planner
  */
-.eventRowsFiller {
+.calendar_eventRowsFiller {
 	position: absolute;
 	top: 0px;
 	height: 93%;
@@ -446,16 +448,16 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 /**
  * Weekend or other special days in yearly planner
  */
-.eventRowsMarkedDay {
+.calendar_eventRowsMarkedDay {
 	position: absolute;
 	top: 0px;
 	height: 100%;
 	z-index: 10;
 }
 
-/* eventRowWidget contains non-overlapping events
+/* calendar_eventRowWidget contains non-overlapping events
  */
-.eventRowWidget {
+.calendar_eventRowWidget {
 	position: relative;
 	top: 0px;
 	left: 0px;
@@ -464,7 +466,7 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
 	border: 1px solid white;
 }
 
-.plannerEvent,.plannerEventPrivate{
+.calendar_plannerEvent,.calendar_plannerEventPrivate{
 	position: absolute;
 	top: 0px;
 	height: 100%;
@@ -477,29 +479,29 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
  *  background-color: depending on category
  */
 }
-.plannerEvent img,.plannerEventPrivate img {
+.calendar_plannerEvent img,.calendar_plannerEventPrivate img {
 	padding-top: 2px;
 }
-.plannerEvent:hover{
+.calendar_plannerEvent:hover{
 	cursor: pointer;
 }
 
 /* Special colors for the year view */
-.cal_year_legend_weekend {
+.calendar_cal_year_legend_weekend {
     background-color: #CCCCCC;
 }
-.cal_year_legend {
+.calendar_cal_year_legend {
     background-color: #EFEFEF;
 }
-.cal_year_free {
+.calendar_cal_year_legend {
     background-color: #FFFFCC;
     z-index: 0;
 }
-.cal_year_weekend {
+.calendar_cal_year_weekend {
     background-color: #F9F9CC;
     z-index: 0;
 }
-.cal_year_today {
+.calendar_cal_year_today {
     border-color: #EE0000;
     border-width: 2px;
 }
diff --git a/calendar/templates/default/conflicts.xet b/calendar/templates/default/conflicts.xet
index 25dc2a3abf..be31476669 100644
--- a/calendar/templates/default/conflicts.xet
+++ b/calendar/templates/default/conflicts.xet
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="calendar.conflicts" template="" lang="" group="0" version="1.0.1.001">
-		<description value=" Scheduling conflict" class="size120b"/>
+		<description value=" Scheduling conflict" class="calendar_size120b"/>
 		<grid>
 			<columns>
 				<column/>
diff --git a/calendar/templates/default/edit.xet b/calendar/templates/default/edit.xet
index 316b65ceba..aa5512580c 100644
--- a/calendar/templates/default/edit.xet
+++ b/calendar/templates/default/edit.xet
@@ -31,7 +31,7 @@
 					</row>
 					<row class="row">
 						<description for="location" value="Location" width="0"/>
-						<textbox id="location" maxlength="255" class="inputFullWidth"/>
+						<textbox id="location" maxlength="255" class="calendar_inputFullWidth"/>
 					</row>
 					<row class="row_off">
 						<description for="priority" value="Priority" width="0"/>
@@ -315,7 +315,7 @@
 			</columns>
 			<rows>
 				<row disabled="!@msg">
-					<html align="center" id="msg" no_lang="1" span="all" class="redItalic"/>
+					<html align="center" id="msg" no_lang="1" span="all" class="message"/>
 					<description/>
 					<description/>
 					<description/>
@@ -324,7 +324,7 @@
 					<description value="Title"/>
 					<hbox needed="1" options="0,0" span="all">
 						<textbox id="title" needed="1" size="75" maxlength="255" tabindex="1"/>
-						<description font_style="b" value="#%s" id="id"/>
+						<description font_style="b" id="id" class="calendar_calId"/>
 					</hbox>
 				</row>
 				<row>
diff --git a/calendar/templates/default/event_widget.tpl b/calendar/templates/default/event_widget.tpl
index 0c14ae3f82..c2190a7ee2 100644
--- a/calendar/templates/default/event_widget.tpl
+++ b/calendar/templates/default/event_widget.tpl
@@ -1,26 +1,26 @@
 <!-- BEGIN event_widget -->
-{indent}<div class="calEventHeader{Small}" style="background-color: {bordercolor}; color: {headercolor};">
+{indent}<div class="calendar_calEventHeader{Small}" style="background-color: {bordercolor}; color: {headercolor};">
 {indent}	{header}
-{indent}	<div class="calEventIcons">{icons}</div>
+{indent}	<div class="calendar_calEventIcons">{icons}</div>
 {indent}</div>
-{indent}<div class="calEventBody{Small}">{title}</div>
+{indent}<div class="calendar_calEventBody{Small}">{title}</div>
 <!-- END event_widget -->
 
 <!-- BEGIN event_widget_wholeday_on_top -->
-{indent}<div class="calEventBody{Small}">
+{indent}<div class="calendar_calEventBody{Small}">
 {indent}	{title}
 {indent}</div>
 <!-- END event_widget_wholeday_on_top -->
 
 <!-- BEGIN event_tooltip -->
-<div class="calEventTooltip {status_class}" style="border-color: {bordercolor}; background: {bodybackground};">
-	<div class="calEventHeaderSmall" style="background-color: {bordercolor};">
+<div class="calendar_calEventTooltip {status_class}" style="border-color: {bordercolor}; background: {bodybackground};">
+	<div class="calendar_calEventHeaderSmall" style="background-color: {bordercolor};">
 		<font color="{headercolor}">{timespan}</font>
-		<div  class="calEventIcons">{icons}</div>
+		<div  class="calendar_calEventIcons">{icons}</div>
 	</div>
-	<div class="calEventBodySmall">
+	<div class="calendar_calEventBodySmall">
 		<p style="margin: 0px;">
-		<span class="calEventTitle">{title}</span><br>
+		<span class="calendar_calEventTitle">{title}</span><br>
 		{description}</p>
 		<p style="margin: 2px 0px;">{times}
 		{location}
diff --git a/calendar/templates/default/freetimesearch.xet b/calendar/templates/default/freetimesearch.xet
index 2a34ad04e6..0f1a7c7f6d 100644
--- a/calendar/templates/default/freetimesearch.xet
+++ b/calendar/templates/default/freetimesearch.xet
@@ -35,8 +35,8 @@
 			</columns>
 			<rows>
 				<row>
-					<description class="size120b" value="Freetime Search"/>
-					<description class="redItalic" no_lang="1" id="msg"/>
+					<description class="calendar_size120b" value="Freetime Search"/>
+					<description class="message" no_lang="1" id="msg"/>
 				</row>
 				<row>
 					<description value="Startdate / -time"/>
@@ -76,9 +76,8 @@
 			</rows>
 		</grid>
 		<styles>
-			.size120b { text-size: 120%; font-weight: bold; }
-.redItalic { color: red; font-style: italic; }
-.end_hide { visibility: hidden; }
+			.calendar_size120b { text-size: 120%; font-weight: bold; }
+			.end_hide { visibility: hidden; }
 		</styles>
 	</template>
 </overlay>
\ No newline at end of file
diff --git a/calendar/templates/default/import.xet b/calendar/templates/default/import.xet
index 5154571925..e2fcb1020e 100644
--- a/calendar/templates/default/import.xet
+++ b/calendar/templates/default/import.xet
@@ -9,7 +9,7 @@
 			</columns>
 			<rows>
 				<row>
-					<description span="all" class="redItalic" id="msg" no_lang="1" align="center"/>
+					<description span="all" class="message" id="msg" no_lang="1" align="center"/>
 					<description/>
 				</row>
 				<row>
diff --git a/calendar/templates/default/list.xet b/calendar/templates/default/list.xet
index 0cc8575eb3..b0c71b680f 100644
--- a/calendar/templates/default/list.xet
+++ b/calendar/templates/default/list.xet
@@ -1,6 +1,14 @@
 <?xml version="1.0"?>
 <!-- $Id$ -->
 <overlay>
+	<template id="calendar.list.dates" template="" lang="" group="0" version="1.3.001">
+		<hbox>
+			<description value="Start"/>
+			<date id="startdate"/>
+			<description value="End"/>
+			<date id="enddate"/>
+		</hbox>
+	</template>
 	<template id="calendar.list.rows" template="" lang="" group="0" version="1.9.004">
 		<grid width="100%">
 			<columns>
@@ -122,8 +130,8 @@
 					<html id="css" span="all"/>
 				</row>
 				<row disabled="!@msg">
-					<description align="center" id="msg" no_lang="1" span="all" class="redItalic"/>
-					<description align="center" id="msg" no_lang="1" class="redItalic"/>
+					<description align="center" id="msg" no_lang="1" span="all" class="message"/>
+					<description align="center" id="msg" no_lang="1" class="message"/>
 				</row>
 				<row>
 					<nextmatch id="nm" template="calendar.list.rows" span="all"/>
diff --git a/calendar/templates/default/meeting.xet b/calendar/templates/default/meeting.xet
index c7332ba411..0ffbcc9bec 100644
--- a/calendar/templates/default/meeting.xet
+++ b/calendar/templates/default/meeting.xet
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="calendar.meeting" template="" lang="" group="0" version="1.9.002">
-		<description id="msg" class="redItalic leftPad5"/>
+		<description id="msg" class="message leftPad5"/>
 		<grid border="0">
 			<columns>
 				<column/>
diff --git a/calendar/templates/default/print.xet b/calendar/templates/default/print.xet
index 8b3ae927e2..974f5a33a7 100644
--- a/calendar/templates/default/print.xet
+++ b/calendar/templates/default/print.xet
@@ -83,7 +83,7 @@
 					</row>
 					<row class="row">
 						<description options=",,,location" value="Location" width="0"/>
-						<textbox maxlength="255" id="location" class="inputFullWidth" readonly="true"/>
+						<textbox maxlength="255" id="location" class="calendar_inputFullWidth" readonly="true"/>
 					</row>
 					<row class="row_off">
 						<description options=",,,priority" value="Priority" width="0"/>