diff --git a/calendar/templates/default/header.inc.php b/calendar/templates/default/header.inc.php
index 5c24b62ce3..9b48823e80 100755
--- a/calendar/templates/default/header.inc.php
+++ b/calendar/templates/default/header.inc.php
@@ -39,32 +39,19 @@
$today = date('Ymd',time());
- $str = ' | | ';
- add_col($tpl,$str);
+ add_col($tpl,' | ');
- $link = $this->page('day','&date='.$today);
- $str = ' '.add_image_ahref($link,'today.gif',lang('Today')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('day','&date='.$today),'today.gif',lang('Today')).' | ');
- $link = $this->page('week','&date='.$today);
- $str = ' '.add_image_ahref($link,'week.gif',lang('This week')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('week','&date='.$today),'week.gif',lang('This week')).' | ');
- $link = $this->page('month','&date='.$today);
- $str = ' '.add_image_ahref($link,'month.gif',lang('This month')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('month','&date='.$today),'month.gif',lang('This month')).' | ');
- $link = $this->page('year','&date='.$today);
- $str = ' '.add_image_ahref($link,'year.gif',lang('This Year')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('year','&date='.$today),'year.gif',lang('This Year')).' | ');
- $link = $this->page('planner','&date='.$today);
- $str = ' '.add_image_ahref($link,'planner.gif',lang('Planner')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('planner','&date='.$today),'planner.gif',lang('Planner')).' | ');
- $link = $this->page('matrixselect');
- $str = ' '.add_image_ahref($link,'view.gif',lang('Daily Matrix View')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('matrixselect'),'view.gif',lang('Daily Matrix View')).' | ');
$remainder = 63;
if($this->bo->check_perms(PHPGW_ACL_PRIVATE))
diff --git a/calendar/templates/idsociety/header.inc.php b/calendar/templates/idsociety/header.inc.php
index 5c24b62ce3..9b48823e80 100755
--- a/calendar/templates/idsociety/header.inc.php
+++ b/calendar/templates/idsociety/header.inc.php
@@ -39,32 +39,19 @@
$today = date('Ymd',time());
- $str = ' | ';
- add_col($tpl,$str);
+ add_col($tpl,' | ');
- $link = $this->page('day','&date='.$today);
- $str = ' '.add_image_ahref($link,'today.gif',lang('Today')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('day','&date='.$today),'today.gif',lang('Today')).' | ');
- $link = $this->page('week','&date='.$today);
- $str = ' '.add_image_ahref($link,'week.gif',lang('This week')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('week','&date='.$today),'week.gif',lang('This week')).' | ');
- $link = $this->page('month','&date='.$today);
- $str = ' '.add_image_ahref($link,'month.gif',lang('This month')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('month','&date='.$today),'month.gif',lang('This month')).' | ');
- $link = $this->page('year','&date='.$today);
- $str = ' '.add_image_ahref($link,'year.gif',lang('This Year')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('year','&date='.$today),'year.gif',lang('This Year')).' | ');
- $link = $this->page('planner','&date='.$today);
- $str = ' '.add_image_ahref($link,'planner.gif',lang('Planner')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('planner','&date='.$today),'planner.gif',lang('Planner')).' | ');
- $link = $this->page('matrixselect');
- $str = ' '.add_image_ahref($link,'view.gif',lang('Daily Matrix View')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('matrixselect'),'view.gif',lang('Daily Matrix View')).' | ');
$remainder = 63;
if($this->bo->check_perms(PHPGW_ACL_PRIVATE))
diff --git a/calendar/templates/justweb/header.inc.php b/calendar/templates/justweb/header.inc.php
index 5c24b62ce3..9b48823e80 100755
--- a/calendar/templates/justweb/header.inc.php
+++ b/calendar/templates/justweb/header.inc.php
@@ -39,32 +39,19 @@
$today = date('Ymd',time());
- $str = ' | ';
- add_col($tpl,$str);
+ add_col($tpl,' | ');
- $link = $this->page('day','&date='.$today);
- $str = ' '.add_image_ahref($link,'today.gif',lang('Today')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('day','&date='.$today),'today.gif',lang('Today')).' | ');
- $link = $this->page('week','&date='.$today);
- $str = ' '.add_image_ahref($link,'week.gif',lang('This week')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('week','&date='.$today),'week.gif',lang('This week')).' | ');
- $link = $this->page('month','&date='.$today);
- $str = ' '.add_image_ahref($link,'month.gif',lang('This month')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('month','&date='.$today),'month.gif',lang('This month')).' | ');
- $link = $this->page('year','&date='.$today);
- $str = ' '.add_image_ahref($link,'year.gif',lang('This Year')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('year','&date='.$today),'year.gif',lang('This Year')).' | ');
- $link = $this->page('planner','&date='.$today);
- $str = ' '.add_image_ahref($link,'planner.gif',lang('Planner')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('planner','&date='.$today),'planner.gif',lang('Planner')).' | ');
- $link = $this->page('matrixselect');
- $str = ' '.add_image_ahref($link,'view.gif',lang('Daily Matrix View')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('matrixselect'),'view.gif',lang('Daily Matrix View')).' | ');
$remainder = 63;
if($this->bo->check_perms(PHPGW_ACL_PRIVATE))
diff --git a/calendar/templates/verdilak/header.inc.php b/calendar/templates/verdilak/header.inc.php
index 5c24b62ce3..9b48823e80 100755
--- a/calendar/templates/verdilak/header.inc.php
+++ b/calendar/templates/verdilak/header.inc.php
@@ -39,32 +39,19 @@
$today = date('Ymd',time());
- $str = ' | ';
- add_col($tpl,$str);
+ add_col($tpl,' | ');
- $link = $this->page('day','&date='.$today);
- $str = ' '.add_image_ahref($link,'today.gif',lang('Today')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('day','&date='.$today),'today.gif',lang('Today')).' | ');
- $link = $this->page('week','&date='.$today);
- $str = ' '.add_image_ahref($link,'week.gif',lang('This week')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('week','&date='.$today),'week.gif',lang('This week')).' | ');
- $link = $this->page('month','&date='.$today);
- $str = ' '.add_image_ahref($link,'month.gif',lang('This month')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('month','&date='.$today),'month.gif',lang('This month')).' | ');
- $link = $this->page('year','&date='.$today);
- $str = ' '.add_image_ahref($link,'year.gif',lang('This Year')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('year','&date='.$today),'year.gif',lang('This Year')).' | ');
- $link = $this->page('planner','&date='.$today);
- $str = ' '.add_image_ahref($link,'planner.gif',lang('Planner')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('planner','&date='.$today),'planner.gif',lang('Planner')).' | ');
- $link = $this->page('matrixselect');
- $str = ' '.add_image_ahref($link,'view.gif',lang('Daily Matrix View')).' | ';
- add_col($tpl,$str);
+ add_col($tpl,' '.add_image_ahref($this->page('matrixselect'),'view.gif',lang('Daily Matrix View')).' | ');
$remainder = 63;
if($this->bo->check_perms(PHPGW_ACL_PRIVATE))