From cf7dd57c666ed6efb05d308261134ddf36eddc46 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 13 Dec 2010 15:37:25 +0000 Subject: [PATCH] Use edit link (if available) only on icons, text link is for view --- calendar/inc/class.calendar_uiviews.inc.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php index 253bdb3d33..7bd24a73f2 100644 --- a/calendar/inc/class.calendar_uiviews.inc.php +++ b/calendar/inc/class.calendar_uiviews.inc.php @@ -970,16 +970,13 @@ function open_edit(series) if($todo['edit']) { list($width, $height) = explode('x', $todo['edit']['size']); unset($todo['edit']['size']); - $icon_href = html::a_href( $icons, $todo['edit'],'',' target="_blank" onclick="window.open(this.href,this.target,\'dependent=yes,width='.$width.',height='.$height.',scrollbars=yes,status=yes\'); return false;"'); - $href = html::a_href( $todo['title'], $todo['edit'],'',' target="_blank" onclick="window.open(this.href,this.target,\'dependent=yes,width=750,height=590,scrollbars=yes,status=yes\'); return false;"'); - } - else - { - $icon_href = $GLOBALS['egw']->html->a_href($icons,$todo['view']); - $href = $todo['view']; + $edit_icon_href = html::a_href( $icons, $todo['edit'],'',' target="_blank" onclick="window.open(this.href,this.target,\'dependent=yes,width='.$width.',height='.$height.',scrollbars=yes,status=yes\'); return false;"'); + $edit_href = html::a_href( $todo['title'], $todo['edit'],'',' target="_blank" onclick="window.open(this.href,this.target,\'dependent=yes,width=750,height=590,scrollbars=yes,status=yes\'); return false;"'); } + $icon_href = html::a_href($icons,$todo['view']); + $href = html::a_href($todo['title'], $todo['view']); $content .= " \n ". - ($this->bo->printer_friendly?$icons:$icon_href). + ($this->bo->printer_friendly?$icons:($edit_icon_href ? $edit_icon_href : $icon_href)). "\n ".($this->printer_friendly?$todo['title']: $href)."\n \n"; /**