extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 00:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar: button to close a single calendar if multiple calendars are shown (day, week and planner view)

Browse Source 
r37672: formatting close button a little nicer / less visual obstructing
This commit is contained in:
Ralf Becker 2012-01-09 22:00:56 +00:00
parent cbf2807997
commit 24ac31ec70
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -328,6 +328,13 @@ class calendar_ui
} }
$this->$state = $states[$state]; $this->$state = $states[$state];
} }
// remove a given calendar from the view
if (isset($_GET['close']) && ($k = array_search($_GET['close'], $owners=explode(',',$this->owner))) !== false)
{
unset($owners[$k]);
$this->owner = $states['owner'] = implode(',',$owners);
}
if (substr($this->view,0,8) == 'planner_') if (substr($this->view,0,8) == 'planner_')
{ {
$states['sortby'] = $this->sortby = $this->view == 'planner_cat' ? 'category' : 'user'; $states['sortby'] = $this->sortby = $this->view == 'planner_cat' ? 'category' : 'user';

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

@ -767,6 +767,21 @@ class calendar_uiviews extends calendar_ui
return $this->week(4,$home); return $this->week(4,$home);
} }
/**
* Display a button to close one of multiple calendars shown
*
* Necessare to eg. close the calendar of a contact
*
* @param string $uid calendar to close
*/
private function close_button($uid)
{
return html::a_href(html::image('phpgwapi', 'close.button', 'Close','style="width: 12px; padding-top: 1px;"'), array(
'menuaction' => 'calendar.calendar_uiviews.index',
'close' => $uid,
));
}
/** /**
* Displays the weekview, with 5 or 7 days * Displays the weekview, with 5 or 7 days
* *
@ -861,6 +876,7 @@ class calendar_uiviews extends calendar_ui
{ {
$search_params['users'] = $uid; $search_params['users'] = $uid;
$content .= '<b>'.$label."</b>\n"; $content .= '<b>'.$label."</b>\n";
$content .= $this->close_button($uid);
$content .= $this->timeGridWidget($this->tagWholeDayOnTop($this->bo->search($search_params)), $content .= $this->timeGridWidget($this->tagWholeDayOnTop($this->bo->search($search_params)),
count($users) * $this->cal_prefs['interval'],400 / count($users),'','',$uid); count($users) * $this->cal_prefs['interval'],400 / count($users),'','',$uid);
} }
@ -925,7 +941,7 @@ class calendar_uiviews extends calendar_ui
foreach($this->_get_planner_users(false) as $uid => $label) foreach($this->_get_planner_users(false) as $uid => $label)
{ {
$search_params['users'] = $uid; $search_params['users'] = $uid;
list(,$dayEvents['<b>'.$label.'</b>']) = each($this->bo->search($search_params)); list(,$dayEvents['<b>'.$label.'</b>'.$this->close_button($uid)]) = each($this->bo->search($search_params));
$owner[] = $uid; $owner[] = $uid;
} }
} }
@ -959,7 +975,7 @@ class calendar_uiviews extends calendar_ui
{ {
foreach(array('task','phone','note') as $type) foreach(array('task','phone','note') as $type)
{ {
$todo_label .= '&nbsp;'.html::a_href( html::image('infolog',$type,lang('Add')),'infolog.uiinfolog.edit',array( $todo_label .= '&nbsp;'.html::a_href( html::image('infolog',$type,lang('Add')),'infolog.infolog_ui.edit',array(
'type' => $type, 'type' => $type,
'start_time' => $ts, 'start_time' => $ts,
),' target="_blank" onclick="window.open(this.href,this.target,\'dependent=yes,width=750,height=590,scrollbars=yes,status=yes\'); return false;"'); ),' target="_blank" onclick="window.open(this.href,this.target,\'dependent=yes,width=750,height=590,scrollbars=yes,status=yes\'); return false;"');
@ -1230,8 +1246,11 @@ function open_edit(series)
if ($t == $this->wd_start) if ($t == $this->wd_start)
{ {
list($id) = @each($daysEvents); list($id) = @each($daysEvents);
$id = 'wd_start_'.$id; if (is_numeric($id))
$set_id = ' id="'.$id.'"'; {
$id = 'wd_start_'.$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="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";
@ -2228,6 +2247,7 @@ function open_edit(series)
} }
} }
} }
$owners = explode(',',$this->owner);
// display a plannerRowWidget for each row (user or category) // display a plannerRowWidget for each row (user or category)
foreach($sort2label as $sort => $label) foreach($sort2label as $sort => $label)
{ {
@ -2245,6 +2265,11 @@ function open_edit(series)
$time->modify('+1month -1second'); $time->modify('+1month -1second');
$end = $time->format('ts'); $end = $time->format('ts');
} }
// display close button only for directly set users, eg. not group-members (as we cant unset them!)
if ($by_cat === 'user' && in_array($sort, $owners))
{
$label .= $this->close_button($sort);
}
$content .= $this->plannerRowWidget(isset($rows[$sort]) ? $rows[$sort] : array(),$start,$end,$label,$class,$indent."\t"); $content .= $this->plannerRowWidget(isset($rows[$sort]) ? $rows[$sort] : array(),$start,$end,$label,$class,$indent."\t");
} }
$content .= $indent."</div>\n"; // end of the plannerWidget $content .= $indent."</div>\n"; // end of the plannerWidget