phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] calendar/inc class.uialarm.inc.php class.uicale...


From: Sigurd Nes
Subject: [Phpgroupware-cvs] calendar/inc class.uialarm.inc.php class.uicale...
Date: Wed, 06 Dec 2006 17:58:01 +0000

CVSROOT:        /sources/phpgroupware
Module name:    calendar
Changes by:     Sigurd Nes <sigurdne>   06/12/06 17:58:01

Modified files:
        inc            : class.uialarm.inc.php class.uicalendar.inc.php 
                         class.uicustom_fields.inc.php 
                         class.uiholiday.inc.php 

Log message:
        alternate_row_color <->alternate_row_class

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uialarm.inc.php?cvsroot=phpgroupware&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicalendar.inc.php?cvsroot=phpgroupware&r1=1.129&r2=1.130
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicustom_fields.inc.php?cvsroot=phpgroupware&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uiholiday.inc.php?cvsroot=phpgroupware&r1=1.10&r2=1.11

Patches:
Index: class.uialarm.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uialarm.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- class.uialarm.inc.php       6 Dec 2005 09:02:44 -0000       1.11
+++ class.uialarm.inc.php       6 Dec 2006 17:58:01 -0000       1.12
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: class.uialarm.inc.php,v 1.11 2005/12/06 09:02:44 skwashd Exp $ 
*/
+       /* $Id: class.uialarm.inc.php,v 1.12 2006/12/06 17:58:01 sigurdne Exp $ 
*/
 
        class uialarm
        {
@@ -88,7 +88,7 @@
                {
                        if (!isset($var['tr_color']))
                        {
-                               $var['tr_color'] = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color();
+                               $var['tr_color'] = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_class();
                        }
                        $this->template->set_var($var);
                        $this->template->parse($row,$list,True);

Index: class.uicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -b -r1.129 -r1.130
--- class.uicalendar.inc.php    6 Dec 2006 15:12:46 -0000       1.129
+++ class.uicalendar.inc.php    6 Dec 2006 17:58:01 -0000       1.130
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: class.uicalendar.inc.php,v 1.129 2006/12/06 15:12:46 sigurdne 
Exp $ */
+       /* $Id: class.uicalendar.inc.php,v 1.130 2006/12/06 17:58:01 sigurdne 
Exp $ */
 
        class uicalendar
        {
@@ -2098,7 +2098,7 @@
                                $datetime = 
$this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset;
 
                                $info[strval($event['id'])] = array(
-                                       'tr_color'      => 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color(),
+                                       'tr_color'      => 
$GLOBALS['phpgw']->nextmatchs->alternate_row_class(),
                                        'date'          => 
$GLOBALS['phpgw']->common->show_date($datetime),
                                        'link'          => 
$this->link_to_entry($event,$event['start']['month'],$event['start']['mday'],$event['start']['year'])
                                );
@@ -2180,7 +2180,7 @@
                        }
                        if (!isset($var['tr_color']))
                        {
-                               $var['tr_color'] = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color();
+                               $var['tr_color'] = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_class();
                        }
                        $p->set_var($var);
                        $p->parse($row,$list,True);
@@ -3168,7 +3168,7 @@
 
                function nm_on_off()
                {
-                       if($GLOBALS['phpgw']->nextmatchs->alternate_row_color() 
== $this->theme['row_on'])
+                       if($GLOBALS['phpgw']->nextmatchs->alternate_row_class() 
== $this->theme['row_on'])
                        {
                                return '_on';
                        }
@@ -4307,7 +4307,7 @@
                                $holidays = $this->bo->cached_holidays[$date];
                                if($weekly)
                                {
-                                       $cellcolor = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($cellcolor);
+                                       $cellcolor = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_class($cellcolor);
                                }
                                
                                $day_image = '';

Index: class.uicustom_fields.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uicustom_fields.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- class.uicustom_fields.inc.php       6 Dec 2006 15:12:46 -0000       1.3
+++ class.uicustom_fields.inc.php       6 Dec 2006 17:58:01 -0000       1.4
@@ -10,7 +10,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: class.uicustom_fields.inc.php,v 1.3 2006/12/06 15:12:46 
sigurdne Exp $ */
+       /* $Id: class.uicustom_fields.inc.php,v 1.4 2006/12/06 17:58:01 
sigurdne Exp $ */
 
        
require_once(PHPGW_INCLUDE_ROOT.'/calendar/inc/class.bocustom_fields.inc.php');
        $GLOBALS['phpgw_info']['flags']['included_classes']['bocustom_fields'] 
= True; // for 0.9.14
@@ -99,7 +99,7 @@
                        ));
                        if ($name !== 'add')
                        {
-                               $this->tpl->set_var('tr_color',$values['title'] 
? $GLOBALS['phpgw_info']['theme']['th_bg'] : 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color());
+                               $this->tpl->set_var('tr_color',$values['title'] 
? $GLOBALS['phpgw_info']['theme']['th_bg'] : 
$GLOBALS['phpgw']->nextmatchs->alternate_row_class());
                                $this->tpl->parse('rows','row',True);
                        }
                }

Index: class.uiholiday.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uiholiday.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- class.uiholiday.inc.php     6 Dec 2006 15:12:46 -0000       1.10
+++ class.uiholiday.inc.php     6 Dec 2006 17:58:01 -0000       1.11
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: class.uiholiday.inc.php,v 1.10 2006/12/06 15:12:46 sigurdne Exp 
$ */
+       /* $Id: class.uiholiday.inc.php,v 1.11 2006/12/06 17:58:01 sigurdne Exp 
$ */
 
        class uiholiday
        {
@@ -90,7 +90,7 @@
                                $p->set_var('submit_extra',' width="5%"');
                                while (list(,$value) = each($locales))
                                {
-                                       $tr_color = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
+                                       $tr_color = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_class($tr_color);
                                        if (! $value)  $value  = '&nbsp;';
 
                                        $var = Array(
@@ -178,7 +178,7 @@
                                $maxmatchs = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs'];
                                for($i=$this->bo->start; $i < count($holidays) 
&& $i < $this->bo->start+$maxmatchs; $i++)
                                {
-                                       $tr_color = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
+                                       $tr_color = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_class($tr_color);
                                        if (!$holidays[$i]['name'])
                                        {
                                                $holidays[$i]['name'] = 
'&nbsp;';
@@ -502,7 +502,7 @@
                function display_item(&$p,$field,$data)
                {
                        $var = Array(
-                               'tr_color' => 
$GLOBALS['phpgw']->nextmatchs->alternate_row_color(),
+                               'tr_color' => 
$GLOBALS['phpgw']->nextmatchs->alternate_row_class(),
                                'field' => $field,
                                'data'  => $data
                        );




reply via email to

[Prev in Thread] Current Thread [Next in Thread]