holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add app prefix name to calendar css classes

Browse Source
This commit is contained in:
Hadi Nategh 2013-11-11 14:02:08 +00:00
parent f7c9f87f10
commit 3ccfe3fb93
15 changed files with 204 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_ui.inc.php
View File

@ -199,7 +199,7 @@ class calendar_ui
} }
if (count($no_access)) 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') if ($GLOBALS['egw_info']['flags']['currentapp'] == 'home')
{ {
@ -241,9 +241,9 @@ class calendar_ui
$GLOBALS['egw_info']['flags']['include_wz_tooltip'] = true; $GLOBALS['egw_info']['flags']['include_wz_tooltip'] = true;
common::egw_header(); 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";
} }
/** /**

2
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -1187,7 +1187,7 @@ class calendar_uiforms extends calendar_ui
} }
else 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(); common::egw_exit();
} }
} }

132
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -256,7 +256,7 @@ class calendar_uiviews extends calendar_ui
} }
if ($this->group_warning) 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']) 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. // The first date entry in the view may be in the last month.
if (($month - 1) % self::YEARVIEW_COLS == 0) 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"; $content .= "\t".'<div class="calDayColsNoGrip">'."\n";
} }
@ -432,12 +432,12 @@ class calendar_uiviews extends calendar_ui
// End of the last week in month // End of the last week in month
$month_end = strtotime("+6 days",$month_end); $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: '. ((($month - 1) % self::YEARVIEW_COLS) * (100 / self::YEARVIEW_COLS)).'%; width: '.
((100 / self::YEARVIEW_COLS) - 0).'%;";>'."\n"; ((100 / self::YEARVIEW_COLS) - 0).'%;";>'."\n";
// Year Header // 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"; ' 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) if (($month) == 1)
{ {
@ -466,7 +466,7 @@ class calendar_uiviews extends calendar_ui
$content .= "\t\t\t".'<div'. $content .= "\t\t\t".'<div'.
' style="position: absolute; width: 100%; height: 16px;'. ' style="position: absolute; width: 100%; height: 16px;'.
' top: 24px;">'."\n"; ' 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"; ' style="text-align: center; position: absolute; width: 11.5%; height: 16px; left: 0.5%;">'.lang('Wk').'</div>'."\n";
// Day Columns, Legend // Day Columns, Legend
for ($i = 0; $i <= 6; $i++) 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); $day_date = ($i ? strtotime("+$i days",$month_start) : $month_start);
if (adodb_date('w',$day_date) % 6 == 0) if (adodb_date('w',$day_date) % 6 == 0)
{ {
$style = 'cal_year_legend_weekend'; $style = 'calendar_cal_year_legend_weekend';
} }
else else
{ {
$style = 'cal_year_legend'; $style = 'calendar_cal_year_legend';
} }
$content .= "\t\t\t\t".'<div class="'.$style.'"'. $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;'. ' style="position: absolute; width: 100%; height: 16px;'.
' top: '.((($week_in_month + 1) * 20) + 2).'px;">'."\n"; ' 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%;" '. ' 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"; 'title="'.lang('Wk').' '.$this->week_number($week_start).'/'.adodb_date('Y',$week_start).'">'."\n";
$content .= "\t\t\t\t\t". $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); $this->_day_class_holiday($day_ymd,$class,$holidays,false,false);
if (adodb_date('n',$day_date) != $month) if (adodb_date('n',$day_date) != $month)
{ {
$css_class .= 'cal_year_legend'; $css_class .= 'calendar_cal_year_legend';
$in_month = false; $in_month = false;
} }
else else
{ {
$css_class .= 'calEvent calEventAllAccepted'; $css_class .= 'calendar_calEvent calendar_calEventAllAccepted';
if (adodb_date('w',$day_date) % 6 == 0) if (adodb_date('w',$day_date) % 6 == 0)
{ {
$css_class .= ' cal_year_weekend'; $css_class .= ' calendar_cal_year_weekend';
} }
else else
{ {
if ($holidays) if ($holidays)
{ {
$css_class .= ' calHoliday'; $css_class .= ' calendar_calHoliday';
} }
else else
{ {
$css_class .= ' cal_year_free'; $css_class .= ' calendar_cal_year_legend';
} }
} }
if ($day_ymd == $this->bo->date2string($this->bo->now_su)) 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"; $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']); $width = $this->time2pos($event['end_m'] - $event['start_m']);
$color = $data['color'] ? $data['color'] : 'gray'; $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: '. '" style="position: absolute; left: '.$left.'%; width: '.$width.'%; height: '.
$row_height.'%; top: '.($n * $row_height).'%;'. $row_height.'%; top: '.($n * $row_height).'%;'.
'background-color: '.$color.';" '.$data['popup'].' '. 'background-color: '.$color.';" '.$data['popup'].' '.
@ -981,13 +981,13 @@ class calendar_uiviews extends calendar_ui
} }
} }
$cols[1] = html::div( $cols[1] = html::div(
html::div($todo_label,'','calDayTodosHeader th')."\n". html::div($todo_label,'','calendar_calDayTodosHeader th')."\n".
html::div($todos,'','calDayTodosTable'),'','calDayTodos'); html::div($todos,'','calendar_calDayTodosTable'),'','calendar_calDayTodos');
$cols['.1'] = 'width=30%'; $cols['.1'] = 'width=30%';
echo html::table(array( echo html::table(array(
0 => $cols, 0 => $cols,
'.0' => 'valign="top"' '.0' => 'valign="top"'
),'class="calDayView"'); ),'class="calendar_calDayView"');
} }
else else
{ {
@ -1188,9 +1188,9 @@ class calendar_uiviews extends calendar_ui
{ {
$height = ($this->rowsToDisplay+1) * 12; $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"; $this->rowHeight.'%;">'.$title."</div>\n";
if ($this->use_time_grid) if ($this->use_time_grid)
@ -1213,7 +1213,7 @@ class calendar_uiviews extends calendar_ui
$set_id = ' id="'.$id.'"'; $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"; '" 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 // show time for full hours, allways for 45min interval and at least on every 3 row
$time = ''; $time = '';
@ -1228,8 +1228,8 @@ class calendar_uiviews extends calendar_ui
$time = $GLOBALS['egw']->common->formattime(sprintf('%02d',$t/60),sprintf('%02d',$t%60)); $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); 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\t".'<div class="calendar_calTimeRowTime">'.$time."</div>\n";
$html .= $indent."\t</div>\n"; // calTimeRow $html .= $indent."\t</div>\n"; // calendar_calTimeRow
$off = !$off; $off = !$off;
} }
} }
@ -1240,7 +1240,7 @@ class calendar_uiviews extends calendar_ui
$dayCols_width = $width - $this->timeRow_width - 1; $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"; ($this->use_time_grid ? ($this->bo->common_prefs['timeformat'] == 12 ? '12h' : '') : 'NoTime').'">'."\n";
if (html::$user_agent == 'msie') // necessary IE hack - stupid thing ... 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"; 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) 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); 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"; '%; width: '.$pwidth.'%;">'."\n";
// Creation of the header-column with date, evtl. holiday-names and a matching background-color // 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 != "")) { 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"; ($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); $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 . $html .= $indent."\t".'<div id="' . $droppableID . '" style="height:'. $this->rowHeight .'%; top: '. $i*$this->rowHeight .
'%;" class="calAddEvent"'; '%;" class="calendar_calAddEvent"';
if ($this->allowEdit) if ($this->allowEdit)
{ {
$html .= ' onclick="'.$this->popup($GLOBALS['egw']->link('/index.php',$linkData)).';return false;"'; $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", $html .= $this->eventColWidget($eventCol,$left,$width,$indent."\t",
$owner ? $owner : $this->user, 20+10*$n); $owner ? $owner : $this->user, 20+10*$n);
} }
$html .= $indent."</div>\n"; // calDayCol $html .= $indent."</div>\n"; // calendar_calDayCol
return $html; return $html;
} }
@ -1524,7 +1524,7 @@ class calendar_uiviews extends calendar_ui
} }
else else
{ {
$class = 'calHoliday'; $class = 'calendar_calHoliday';
//If the birthdays are already displayed as event, don't //If the birthdays are already displayed as event, don't
//show them in the caption //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)) if ($day_ymd == $this->bo->date2string($this->bo->now_su))
{ {
$class = 'calToday'; $class = 'calendar_calToday';
} }
else 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); 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.'%;'. $html = $indent.'<div class="calendar_calEventCol" style="left: '.$left.'%; width:'.$width.'%;'.
// the "calEventCol" spans across a whole column (as the name suggests) - setting the // 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 // 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 // regions are not clickable anymore. The z_index has now moved the the eventWidget
// function. // function.
@ -1684,8 +1684,8 @@ class calendar_uiviews extends calendar_ui
$bodybgcolor1 = $bodybgcolor2 = 'white'; $bodybgcolor1 = $bodybgcolor2 = 'white';
} }
// get status class of event: calEventAllAccepted, calEventAllAnswered or calEventSomeUnknown // get status class of event: calendar_calEventAllAccepted, calendar_calEventAllAnswered or calendar_calEventSomeUnknown
$status_class = 'calEventAllAccepted'; $status_class = 'calendar_calEventAllAccepted';
foreach($event['participants'] as $id => $status) foreach($event['participants'] as $id => $status)
{ {
if ($id < 0) continue; // as we cant accept/reject groups, we dont care about them here 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 case '': // app without status
break; break;
case 'U': case 'U':
$status_class = 'calEventSomeUnknown'; $status_class = 'calendar_calEventSomeUnknown';
break 2; // break foreach break 2; // break foreach
default: default:
$status_class = 'calEventAllAnswered'; $status_class = 'calendar_calEventAllAnswered';
break; 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.';"'. '" style="'.$style.' border-color: '.$headerbgcolor.'; background: '.$background.'; z-index: '.$z_index.';"'.
$popup.' '.html::tooltip($tooltip,False,$ttip_options). $popup.' '.html::tooltip($tooltip,False,$ttip_options).
$dd_emulation.'>'.$prefix_icon."\n".$ie_fix.$html."\n". $dd_emulation.'>'.$prefix_icon."\n".$ie_fix.$html."\n".
@ -2005,7 +2005,7 @@ class calendar_uiviews extends calendar_ui
} }
if (!empty($content)) if (!empty($content))
{ {
return '<span class="calEventLabel">'.$label.'</span>:'. return '<span class="calendar_calEventLabel">'.$label.'</span>:'.
($one_per_line ? '<br>' : ' '). ($one_per_line ? '<br>' : ' ').
nl2br(html::htmlspecialchars($content)).'<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='') 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 // 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 // display the headerTitle, and get sort2labels
switch($by_cat) switch($by_cat)
@ -2102,10 +2102,10 @@ class calendar_uiviews extends calendar_ui
$sort2label = array(); $sort2label = array();
break; 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 // 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 // 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) 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); $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) 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); $t_arr = $this->bo->date2array($t);
@ -2405,7 +2405,7 @@ class calendar_uiviews extends calendar_ui
$title = '&nbsp;'; $title = '&nbsp;';
} }
$class = $class == 'row_on' ? 'th' : 'row_on'; $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"; $title."</div>\n";
} }
$content .= $indent."</div>\n"; // end of plannerScale $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); $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) 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); $title = lang('Week').' '.$this->week_number($t);
@ -2451,7 +2451,7 @@ class calendar_uiviews extends calendar_ui
)); ));
} }
$class = $class == 'row_on' ? 'th' : 'row_on'; $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 $content .= $indent."</div>\n"; // end of plannerScale
@ -2470,7 +2470,7 @@ class calendar_uiviews extends calendar_ui
{ {
$day_width = round(100 / $days,2); $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) 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); $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', 'menuaction' => 'calendar.calendar_uiviews.planner',
'planner_days' => 1, 'planner_days' => 1,
'date' => date('Ymd',$t), '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) 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"; ($holidays ? ' title="'.html::htmlspecialchars($holidays).'"' : '').'>'.$title."</div>\n";
} }
$content .= $indent."</div>\n"; // end of plannerScale $content .= $indent."</div>\n"; // end of plannerScale
@ -2531,7 +2531,7 @@ class calendar_uiviews extends calendar_ui
$day_width = round(100 / 31,2); $day_width = round(100 / 31,2);
// month scale with navigation // 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').' - '. $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'); 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, '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"; $title."</div>\n";
$content .= $indent."</div>\n"; // end of plannerScale $content .= $indent."</div>\n"; // end of plannerScale
// day of month scale // day of month scale
$content .= $indent.'<div class="plannerScale">'."\n"; $content .= $indent.'<div class="calendar_plannerScale">'."\n";
$today = egw_time::to('now','d'); $today = egw_time::to('now','d');
for($left = 0,$i = 0; $i < 31; $left += $day_width,++$i) for($left = 0,$i = 0; $i < 31; $left += $day_width,++$i)
{ {
$class = $i & 1 ? 'row_on' : 'row_off'; $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"; (1+$i)."</div>\n";
} }
$content .= $indent."</div>\n"; // end of plannerScale $content .= $indent."</div>\n"; // end of plannerScale
@ -2609,13 +2609,13 @@ class calendar_uiviews extends calendar_ui
} }
$cell_width = round(100 / $hours * $decr,2); $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) 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); $title = date($this->cal_prefs['timeformat'] == 12 ? 'ha' : 'H',$t);
$class = $class == 'row_on' ? 'th' : 'row_on'; $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 $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 * 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 array $events to show
* @param int $start start-time of the row * @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='') 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 // 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 // sorting the events in non-overlapping rows
$rows = array(array()); $rows = array(array());
@ -2653,7 +2653,7 @@ class calendar_uiviews extends calendar_ui
} }
//echo $header; _debug_array($rows); //echo $header; _debug_array($rows);
// display the 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) 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) if ($this->sortby == 'month' && $days < 31)
{ {
// add a filler for non existing days in that month // 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"; ' style="left:'.(15+$width).'%; width:'.(85-$width).'%;" ></div>'."\n";
} }
$content .= $indent."</div>\n"; // end of the plannerRowWidget $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)); $class = trim(str_replace(array('row_on','row_off'),'',$class));
if ($class) // no regular weekday if ($class) // no regular weekday
{ {
$content .= $indent.'<div class="eventRowsMarkedDay '.$class. $content .= $indent.'<div class="calendar_eventRowsMarkedDay '.$class.
'" style="left: '.$left.'%; width:'.$day_width.'%;"'. '" style="left: '.$left.'%; width:'.$day_width.'%;"'.
($holidays ? ' title="'.html::htmlspecialchars($holidays).'"' : ''). ($holidays ? ' title="'.html::htmlspecialchars($holidays).'"' : '').
' ></div>'."\n"; ' ></div>'."\n";
@ -2724,7 +2724,7 @@ class calendar_uiviews extends calendar_ui
*/ */
function eventRowWidget($events,$start,$end,$indent='') function eventRowWidget($events,$start,$end,$indent='')
{ {
$content = $indent.'<div class="eventRowWidget">'."\n"; $content = $indent.'<div class="calendar_eventRowWidget">'."\n";
foreach($events as $event) foreach($events as $event)
{ {
@ -2807,7 +2807,7 @@ class calendar_uiviews extends calendar_ui
$width = $this->_planner_pos($event['end'],$start,$end) - $left; $width = $this->_planner_pos($event['end'],$start,$end) - $left;
$color = $data['color'] ? $data['color'] : 'gray'; $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'].' '. '%; width: '.$width.'%; background-color: '.$color.';"'.$data['popup'].' '.
html::tooltip($data['tooltip'],False,array('BorderWidth'=>0,'Padding'=>0)).'>'."\n".$data['html'].$indent."</div>\n"; html::tooltip($data['tooltip'],False,array('BorderWidth'=>0,'Padding'=>0)).'>'."\n".$data['html'].$indent."</div>\n";
} }

2
calendar/js/dragDropFunctions.js
View File

@ -66,7 +66,7 @@ function dropEvent()
dd.obj.div.innerHTML = dd.obj.oldInnerHTML; 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.div.style.width = "100%";
dd.obj.moveTo(dd.obj.defx,dd.obj.defy); dd.obj.moveTo(dd.obj.defx,dd.obj.defy);

18
calendar/setup/etemplates.inc.php
View File

File diff suppressed because one or more lines are too long

2
calendar/sitemgr/class.module_calendar_planner.inc.php
View File

@ -241,7 +241,7 @@ class module_calendar_planner extends Module
} }
else 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; return $html;

184
calendar/templates/default/app.css
View File

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
.inputFullWidth input { width: 100%; } .calendar_inputFullWidth input { width: 100%; }
/****************************************************************** /******************************************************************
* CSS settings for the day, week and month view (timeGridWidget) * * 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. 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: 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 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ +++ calendar_calTimeGrid +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ #### calDayCols[12h|NoGrip] ########################################################### + #### calendar_calDayCols[12h|NoGrip] ###########################################################
+ #... calDayCol ............................. ... calDayCol .......................... + #... calendar_calDayCol ............................. ... calendar_calDayCol ..........................
+ #.+- calDayColHeader ---------------------+. .+- calDayColHeader ------------------+. + #.+- calendar_calDayColHeader ---------------------+. .+- calendar_calDayColHeader ------------------+.
+ #.| |. .| |. + #.| |. .| |.
+ #.+---------------------------------------+. .+------------------------------------+. + #.+---------------------------------------+. .+------------------------------------+.
+.calTimeRowTime.#.** calEventCol ***** ** calEventCol *****. .** calEventCol ***********************. +.calendar_calTimeRowTime.#.** calendar_calEventCol ***** ** calendar_calEventCol *****. .** calendar_calEventCol ***********************.
+. .#.* * * *. .* *. +. .#.* * * *. .* *.
+. .#.* * * *. .* *. +. .#.* * * *. .* *.
+................#.*+- calEvent -----+* * *. .* *. +................#.*+- calendar_calEvent -----+* * *. .* *.
+.calTimeRowTime.#.*| |* * *. .*+- calEvent[Private] --------------+*. +.calendar_calTimeRowTime.#.*| |* * *. .*+- calendar_calEvent[Private] --------------+*.
+. .#.*| |* *+- calEvent -----+*. .*| |*. +. .#.*| |* *+- calendar_calEvent -----+*. .*| |*.
+. .#.*+----------------+* *| |*. .*| |*. +. .#.*+----------------+* *| |*. .*| |*.
+................#.* * *| |*. .*| |*. +................#.* * *| |*. .*| |*.
+.calTimeRowTime.#.* * *+----------------+*. .*| |*. +.calendar_calTimeRowTime.#.* * *+----------------+*. .*| |*.
+. .#.* * * *. .*+----------------------------------+*. +. .#.* * * *. .*+----------------------------------+*.
*/ */
.redItalic { color: red; font-style: italic; } .calendar_size120b { font-size: 120%; font-weight: bold; }
.size120b { font-size: 120%; font-weight: bold; }
/* marks a day in the colum-header as today /* marks a day in the colum-header as today
*/ */
.calToday{ .calendar_calToday{
background: #ffffcc; background: #ffffcc;
} }
/* marks a day in the colum-header as holiday /* marks a day in the colum-header as holiday
*/ */
.calHoliday{ .calendar_calHoliday{
background: #dac0c0; background: #dac0c0;
} }
/* marks a day in the column-header additionaly as birthday of some contact, /* 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; color: black;
font-weight: bold; font-weight: bold;
font-style: italic; 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 /* timeGridWidget, contains timeRow's and dayCol's
*/ */
.calTimeGrid{ .calendar_calTimeGrid{
position: relative; position: relative;
top: 0px; top: 0px;
left: 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 /* 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; position: absolute;
width: 100%; width: 100%;
/* set via inline style on runtime: /* 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: * top:
*/ */
} }
.calTimeRow{ .calendar_calTimeRow{
/* background-color: silver; */ /* background-color: silver; */
} }
/* time in a timeRow /* time in a timeRow
*/ */
.calTimeRowTime{ .calendar_calTimeRowTime{
padding-left: 5px; padding-left: 5px;
height: 100%; height: 100%;
line-height: 14px; 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 /* contains (multiple) dayCol's
*/ */
.calDayCols,.calDayCols12h,.calDayColsNoGrid{ .calendar_calDayCols,.calendar_calDayCols12h,.calendar_calDayColsNoGrid{
position: absolute; position: absolute;
top: 0px; top: 0px;
/* bottom: 0px; does NOT work in IE, IE needs height: 100%! */ /* 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 /* 12h timeformat with am/pm
*/ */
.calDayCols12h{ .calendar_calDayCols12h{
left: 65px; left: 65px;
} }
/* no time grid --> no time column /* no time grid --> no time column
*/ */
.calDayColsNoTime{ .calendar_calDayColsNoTime{
left: 0px; left: 0px;
} }
/* contains (multiple) eventCol's /* contains (multiple) eventCol's
*/ */
.calDayCol{ .calendar_calDayCol{
position: absolute; position: absolute;
top: 0px; top: 0px;
height: 100%; 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; border-left: 1px solid silver;
} }
/* Calendar Id #
*/
.calendar_calId:before { content:"#" }
/* header for the dayCol /* header for the dayCol
*/ */
.calDayColHeader,.calGridHeader{ .calendar_calDayColHeader,.calendar_calGridHeader{
position: absolute; position: absolute;
top: 0px; top: 0px;
left: 0px; left: 0px;
@ -140,11 +142,11 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
line-height: 16px; line-height: 16px;
z-index: 30; z-index: 30;
} }
.calDayColHeader img { .calendar_calDayColHeader img {
vertical-align: middle; vertical-align: middle;
} }
.calViewUserNameBox { .calendar_calViewUserNameBox {
position: absolute; position: absolute;
top: -1px; top: -1px;
width: 95%; width: 95%;
@ -158,28 +160,28 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
padding-left: 10px; padding-left: 10px;
background: #dac0c0; background: #dac0c0;
} }
.calViewUserName { .calendar_calViewUserName {
font-weight: normal; font-weight: normal;
} }
.calViewUserName:first-letter { .calendar_calViewUserName:first-letter {
text-transform:uppercase; text-transform:uppercase;
} }
.calViewUserNameFirst { .calendar_calViewUserNameFirst {
} }
.calViewUserNameFirst:after { .calendar_calViewUserNameFirst:after {
content: ", "; content: ", ";
} }
/* header of the time-grid, eg. for the weeks in the month-view (leftmost of the day-col-headers) /* 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; text-align: left;
padding-left: 3px; padding-left: 3px;
} }
/* contains (multiple) events's /* contains (multiple) events's
*/ */
.calEventCol{ .calendar_calEventCol{
position: absolute; position: absolute;
top: 0px; top: 0px;
/* bottom: 0px; does NOT work in IE, IE needs height: 100%! */ /* 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 /* contains one event: header-row & -body
*/ */
.calEvent,.calEventPrivate{ .calendar_calEvent,.calendar_calEventPrivate{
position: absolute; position: absolute;
left: 0px; left: 0px;
right: 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) * background: depending on category (shade)
*/ */
} }
.calEvent:hover{ .calendar_calEvent:hover{
cursor: pointer; cursor: pointer;
} }
/** /**
* All participants accepted the invitation * All participants accepted the invitation
*/ */
.calEventAllAccepted { .calendar_calEventAllAccepted {
border-style: solid; border-style: solid;
border-width: 1px; 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 * All participants answered the invitation, but not all accepted
*/ */
.calEventAllAnswered { .calendar_calEventAllAnswered {
border-style: dotted; border-style: dotted;
border-width: 2px; 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 * Some participants did NOT answer the invitation
*/ */
.calEventSomeUnknown { .calendar_calEventSomeUnknown {
border-style: dashed; border-style: dashed;
border-width: 1px; border-width: 1px;
} }
.calEventTooltip{ .calendar_calEventTooltip{
border-radius: 6px; border-radius: 6px;
-moz-border-radius: 6px; -moz-border-radius: 6px;
-webkit-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; overflow: auto;
} }
.calAddEvent{ .calendar_calAddEvent{
position: absolute; position: absolute;
width: 100%; width: 100%;
z-index: 10; z-index: 10;
} }
.calAddEvent:hover{ .calendar_calAddEvent:hover{
background-color: #D2D7FF; background-color: #D2D7FF;
cursor: pointer; cursor: pointer;
} }
/* header-row of the event /* header-row of the event
*/ */
.calEventHeader,.calEventHeaderSmall{ .calendar_calEventHeader,.calendar_calEventHeaderSmall{
position: relative; /* as the calEventIcons use postion: absolute! */ position: relative; /* as the calendar_calEventIcons use postion: absolute! */
font-weight: bold; font-weight: bold;
font-size: 9pt; font-size: 9pt;
text-align: left; 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; * color: white || black depending on cat;
*/ */
} }
.calEventHeaderSmall{ .calendar_calEventHeaderSmall{
font-size: 8pt; font-size: 8pt;
line-height: 10pt; line-height: 10pt;
} }
.calEventIcons{ .calendar_calEventIcons{
position: absolute; position: absolute;
right: 0px; right: 0px;
top: 0px; top: 0px;
} }
.calEventIcons img{ .calendar_calEventIcons img{
height: 16px; height: 16px;
} }
.calEventHeaderSmall .calEventIcons img{ .calendar_calEventHeaderSmall .calendar_calEventIcons img{
height: 13px; height: 13px;
} }
/* body of the event /* body of the event
*/ */
.calEventBody,.calEventBodySmall{ .calendar_calEventBody,.calendar_calEventBodySmall{
padding: 0px 3px 0px; padding: 0px 3px 0px;
left: 2px; left: 2px;
right: 2px; right: 2px;
height: 99%; height: 99%;
} }
.calEventBodySmall{ .calendar_calEventBodySmall{
font-size: 95%; font-size: 95%;
} }
.calEventLabel{ .calendar_calEventLabel{
font-weight: bold; font-weight: bold;
font-size: 90%; font-size: 90%;
} }
.calEventTitle{ .calendar_calEventTitle{
font-weight: bold; font-weight: bold;
font-size: 110%; font-size: 110%;
} }
/* table of the dayView containing 2 cols: 1) day-view, 2) todos /* table of the dayView containing 2 cols: 1) day-view, 2) todos
*/ */
.calDayView{ .calendar_calDayView{
width: 100%; width: 100%;
} }
/* calDayTods is the day-view's todo column, containing the calDayTodoHeader and the calDayTodoTable /* calDayTods is the day-view's todo column, containing the calDayTodoHeader and the calDayTodoTable
*/ */
.calDayTodos .calDayTodosHeader { .calendar_calDayTodos .calendar_calDayTodosHeader {
margin: 0px; margin: 0px;
padding: 2px; padding: 2px;
font-weight: bold; font-weight: bold;
} }
.calDayTodos .calDayTodosTable { .calendar_calDayTodos .calendar_calDayTodosTable {
overflow: auto; overflow: auto;
max-height: 400px; max-height: 400px;
} }
.calDayTodos { .calendar_calDayTodos {
width: 250px; width: 250px;
margin-left: 10px; margin-left: 10px;
border: 1px solid silver; border: 1px solid silver;
} }
.calDayTodosHeader { .calendar_calDayTodosHeader {
text-align: center; 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; position: relative;
top: 0px; top: 0px;
left: 0px; left: 0px;
@ -350,27 +352,27 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
padding-right: 3px; 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; position: relative;
top: 0px; top: 0px;
left: 0px; left: 0px;
width: 100%; 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; position: relative;
top: 0px; top: 0px;
left: 0px; left: 0px;
width: 100%; 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; position: relative;
top: 0px; top: 0px;
left: 0%; left: 0%;
@ -378,11 +380,11 @@ e.g. the div with class calTimeGrid is generated by the timeGridWidget method of
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;
} }
.plannerScaleDay { .calendar_plannerScaleDay {
height: 28px; height: 28px;
line-height: 14px; line-height: 14px;
} }
.plannerDayScale,.plannerMonthScale,.plannerWeekScale,.plannerHourScale,.plannerDayOfMonthScale { .calendar_plannerDayScale,.calendar_plannerMonthScale,.calendar_plannerWeekScale,.calendar_plannerHourScale,.calendar_plannerDayOfMonthScale {
position: absolute; position: absolute;
top: 0px; top: 0px;
/* left+width: is set by the code on runtime */ /* 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: * width:
*/ */
} }
.plannerHourScale { .calendar_plannerHourScale {
font-size: 90%; font-size: 90%;
} }
.plannerDayScale { .calendar_plannerDayScale {
font-size: 90%; font-size: 90%;
} }
.plannerWeekScale { .calendar_plannerWeekScale {
line-height: 20px; line-height: 20px;
} }
.plannerMonthScale { .calendar_plannerMonthScale {
font-weight: bold; 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; 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; position: absolute;
top: 0px; top: 0px;
left: 0%; 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%; height: 100%;
line-height: 20px; line-height: 20px;
border: 1px solid white; border: 1px solid white;
} }
/* eventRows contain multiple eventRowWidgets /* calendar_eventRows contain multiple eventRowWidgets
*/ */
.eventRows, .plannerHeaderRows { .calendar_eventRows, .calendar_plannerHeaderRows {
position: relative; position: relative;
top: 0px; 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%; width: 85%;
} }
/** /**
* Filler for month with less then 31 days in yearly planner * Filler for month with less then 31 days in yearly planner
*/ */
.eventRowsFiller { .calendar_eventRowsFiller {
position: absolute; position: absolute;
top: 0px; top: 0px;
height: 93%; 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 * Weekend or other special days in yearly planner
*/ */
.eventRowsMarkedDay { .calendar_eventRowsMarkedDay {
position: absolute; position: absolute;
top: 0px; top: 0px;
height: 100%; height: 100%;
z-index: 10; z-index: 10;
} }
/* eventRowWidget contains non-overlapping events /* calendar_eventRowWidget contains non-overlapping events
*/ */
.eventRowWidget { .calendar_eventRowWidget {
position: relative; position: relative;
top: 0px; top: 0px;
left: 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; border: 1px solid white;
} }
.plannerEvent,.plannerEventPrivate{ .calendar_plannerEvent,.calendar_plannerEventPrivate{
position: absolute; position: absolute;
top: 0px; top: 0px;
height: 100%; 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 * background-color: depending on category
*/ */
} }
.plannerEvent img,.plannerEventPrivate img { .calendar_plannerEvent img,.calendar_plannerEventPrivate img {
padding-top: 2px; padding-top: 2px;
} }
.plannerEvent:hover{ .calendar_plannerEvent:hover{
cursor: pointer; cursor: pointer;
} }
/* Special colors for the year view */ /* Special colors for the year view */
.cal_year_legend_weekend { .calendar_cal_year_legend_weekend {
background-color: #CCCCCC; background-color: #CCCCCC;
} }
.cal_year_legend { .calendar_cal_year_legend {
background-color: #EFEFEF; background-color: #EFEFEF;
} }
.cal_year_free { .calendar_cal_year_legend {
background-color: #FFFFCC; background-color: #FFFFCC;
z-index: 0; z-index: 0;
} }
.cal_year_weekend { .calendar_cal_year_weekend {
background-color: #F9F9CC; background-color: #F9F9CC;
z-index: 0; z-index: 0;
} }
.cal_year_today { .calendar_cal_year_today {
border-color: #EE0000; border-color: #EE0000;
border-width: 2px; border-width: 2px;
} }

2
calendar/templates/default/conflicts.xet
View File

@ -2,7 +2,7 @@
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <overlay>
<template id="calendar.conflicts" template="" lang="" group="0" version="1.0.1.001"> <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> <grid>
<columns> <columns>
<column/> <column/>

6
calendar/templates/default/edit.xet
View File

@ -31,7 +31,7 @@
</row> </row>
<row class="row"> <row class="row">
<description for="location" value="Location" width="0"/> <description for="location" value="Location" width="0"/>
<textbox id="location" maxlength="255" class="inputFullWidth"/> <textbox id="location" maxlength="255" class="calendar_inputFullWidth"/>
</row> </row>
<row class="row_off"> <row class="row_off">
<description for="priority" value="Priority" width="0"/> <description for="priority" value="Priority" width="0"/>
@ -315,7 +315,7 @@
</columns> </columns>
<rows> <rows>
<row disabled="!@msg"> <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/> <description/>
<description/> <description/>
@ -324,7 +324,7 @@
<description value="Title"/> <description value="Title"/>
<hbox needed="1" options="0,0" span="all"> <hbox needed="1" options="0,0" span="all">
<textbox id="title" needed="1" size="75" maxlength="255" tabindex="1"/> <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> </hbox>
</row> </row>
<row> <row>

18
calendar/templates/default/event_widget.tpl
View File

@ -1,26 +1,26 @@
<!-- BEGIN event_widget --> <!-- 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} {header}
{indent} <div class="calEventIcons">{icons}</div> {indent} <div class="calendar_calEventIcons">{icons}</div>
{indent}</div> {indent}</div>
{indent}<div class="calEventBody{Small}">{title}</div> {indent}<div class="calendar_calEventBody{Small}">{title}</div>
<!-- END event_widget --> <!-- END event_widget -->
<!-- BEGIN event_widget_wholeday_on_top --> <!-- BEGIN event_widget_wholeday_on_top -->
{indent}<div class="calEventBody{Small}"> {indent}<div class="calendar_calEventBody{Small}">
{indent} {title} {indent} {title}
{indent}</div> {indent}</div>
<!-- END event_widget_wholeday_on_top --> <!-- END event_widget_wholeday_on_top -->
<!-- BEGIN event_tooltip --> <!-- BEGIN event_tooltip -->
<div class="calEventTooltip {status_class}" style="border-color: {bordercolor}; background: {bodybackground};"> <div class="calendar_calEventTooltip {status_class}" style="border-color: {bordercolor}; background: {bodybackground};">
<div class="calEventHeaderSmall" style="background-color: {bordercolor};"> <div class="calendar_calEventHeaderSmall" style="background-color: {bordercolor};">
<font color="{headercolor}">{timespan}</font> <font color="{headercolor}">{timespan}</font>
<div class="calEventIcons">{icons}</div> <div class="calendar_calEventIcons">{icons}</div>
</div> </div>
<div class="calEventBodySmall"> <div class="calendar_calEventBodySmall">
<p style="margin: 0px;"> <p style="margin: 0px;">
<span class="calEventTitle">{title}</span><br> <span class="calendar_calEventTitle">{title}</span><br>
{description}</p> {description}</p>
<p style="margin: 2px 0px;">{times} <p style="margin: 2px 0px;">{times}
{location} {location}

7
calendar/templates/default/freetimesearch.xet
View File

@ -35,8 +35,8 @@
</columns> </columns>
<rows> <rows>
<row> <row>
<description class="size120b" value="Freetime Search"/> <description class="calendar_size120b" value="Freetime Search"/>
<description class="redItalic" no_lang="1" id="msg"/> <description class="message" no_lang="1" id="msg"/>
</row> </row>
<row> <row>
<description value="Startdate / -time"/> <description value="Startdate / -time"/>
@ -76,8 +76,7 @@
</rows> </rows>
</grid> </grid>
<styles> <styles>
.size120b { text-size: 120%; font-weight: bold; } .calendar_size120b { text-size: 120%; font-weight: bold; }
.redItalic { color: red; font-style: italic; }
.end_hide { visibility: hidden; } .end_hide { visibility: hidden; }
</styles> </styles>
</template> </template>

2
calendar/templates/default/import.xet
View File

@ -9,7 +9,7 @@
</columns> </columns>
<rows> <rows>
<row> <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/> <description/>
</row> </row>
<row> <row>

12
calendar/templates/default/list.xet
View File

@ -1,6 +1,14 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <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"> <template id="calendar.list.rows" template="" lang="" group="0" version="1.9.004">
<grid width="100%"> <grid width="100%">
<columns> <columns>
@ -122,8 +130,8 @@
<html id="css" span="all"/> <html id="css" span="all"/>
</row> </row>
<row disabled="!@msg"> <row disabled="!@msg">
<description align="center" id="msg" no_lang="1" span="all" class="redItalic"/> <description align="center" id="msg" no_lang="1" span="all" class="message"/>
<description align="center" id="msg" no_lang="1" class="redItalic"/> <description align="center" id="msg" no_lang="1" class="message"/>
</row> </row>
<row> <row>
<nextmatch id="nm" template="calendar.list.rows" span="all"/> <nextmatch id="nm" template="calendar.list.rows" span="all"/>

2
calendar/templates/default/meeting.xet
View File

@ -2,7 +2,7 @@
<!-- $Id$ --> <!-- $Id$ -->
<overlay> <overlay>
<template id="calendar.meeting" template="" lang="" group="0" version="1.9.002"> <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"> <grid border="0">
<columns> <columns>
<column/> <column/>

2
calendar/templates/default/print.xet
View File

@ -83,7 +83,7 @@
</row> </row>
<row class="row"> <row class="row">
<description options=",,,location" value="Location" width="0"/> <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>
<row class="row_off"> <row class="row_off">
<description options=",,,priority" value="Priority" width="0"/> <description options=",,,priority" value="Priority" width="0"/>