[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: preferences/inc class.uicategories.inc.php,1.2.2
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: preferences/inc class.uicategories.inc.php,1.2.2.3,1.2.2.4 |
|
Date: |
Wed, 13 Mar 2002 16:32:02 -0500 |
Update of /cvsroot/phpgroupware/preferences/inc
In directory subversions:/tmp/cvs-serv28246
Modified Files:
Tag: Version-0_9_14-branch
class.uicategories.inc.php
Log Message:
fixed cats to work in global cats apps part
Index: class.uicategories.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/preferences/inc/class.uicategories.inc.php,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -C2 -r1.2.2.3 -r1.2.2.4
*** class.uicategories.inc.php 10 Feb 2002 19:54:10 -0000 1.2.2.3
--- class.uicategories.inc.php 13 Mar 2002 21:31:59 -0000 1.2.2.4
***************
*** 54,58 ****
'order' => $this->order
);
-
$this->bo->save_sessiondata($data,$cats_app);
}
--- 54,57 ----
***************
*** 60,63 ****
--- 59,63 ----
function set_langs()
{
+
$this->t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$this->t->set_var('lang_access',lang('Private'));
$this->t->set_var('lang_save',lang('Save'));
***************
*** 76,79 ****
--- 76,88 ----
}
+ function cat_data($edata,$data)
+ {
+ for ($j=0;$j<count($edata);$j++)
+ {
+ $td_data .= '<td>' . $data[$edata[$j]] .
'</td>' . "\n";
+ }
+ return $td_data;
+ }
+
function index()
{
***************
*** 89,96 ****
);
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
! $this->t->set_file(array('cat_list_t' =>
'listcats.tpl'));
$this->t->set_block('cat_list_t','cat_list','list');
--- 98,112 ----
);
+ if ($extra)
+ {
+ $edata = explode(',',$extra);
+ }
+
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
! $this->t->set_file(array('cat_list_t' =>
'listcats.tpl',
!
'data_column' => 'listcats.tpl'));
!
$this->t->set_block('cat_list_t','data_column','column');
$this->t->set_block('cat_list_t','cat_list','list');
***************
*** 128,144 ****
//------------------- list header variable template-declarations
-------------------------
-
$this->t->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
$this->t->set_var('sort_name',$this->nextmatchs->show_sort_order($this->sort,'cat_name',$this->order,'/index.php',lang('Name'),$link_data));
$this->t->set_var('sort_description',$this->nextmatchs->show_sort_order($this->sort,'cat_description',$this->order,'/index.php',lang('Description'),$link_data));
! if ($extra)
{
! $this->t->set_var('sort_data','<td bgcolor="' .
$GLOBALS['phpgw_info']['theme']['th_bg'] . '">'
!
. $this->nextmatchs->show_sort_order($this->sort,'cat_data',
!
$this->order,'/index.php',lang($extra),$link_data) . '</td>');
}
else
{
! $this->t->set_var('sort_data','');
}
--- 144,161 ----
//------------------- list header variable template-declarations
-------------------------
$this->t->set_var('sort_name',$this->nextmatchs->show_sort_order($this->sort,'cat_name',$this->order,'/index.php',lang('Name'),$link_data));
$this->t->set_var('sort_description',$this->nextmatchs->show_sort_order($this->sort,'cat_description',$this->order,'/index.php',lang('Description'),$link_data));
! if (is_array($edata))
{
! for($i=0;$i<count($edata);$i++)
! {
! $this->t->set_var('th_data','<td
bgcolor="' . $GLOBALS['phpgw_info']['theme']['th_bg'] . '">' . lang($edata[$i])
. '</td>');
!
$this->t->fp('column','data_column',True);
! }
}
else
{
! $this->t->set_var('th_data','');
}
***************
*** 153,156 ****
--- 170,177 ----
$appendix = '<' . lang('Global') .
'>';
}
+ elseif ($cats[$i]['owner'] == '-1')
+ {
+ $appendix = '<' . lang('Global') .
' ' . $GLOBALS['phpgw_info']['apps'][$cats_app]['title'] . '>';
+ }
else
{
***************
*** 170,185 ****
if (!$descr) { $descr = ' '; }
! if ($extra)
{
! $data = $cats[$i]['data'];
! if (! $data)
{
! $data = ' ';
}
- $this->t->set_var('td_data','<td>' .
$data . '</td>');
- }
- else
- {
- $this->t->set_var('td_data','');
}
--- 191,207 ----
if (!$descr) { $descr = ' '; }
! if (is_array($edata))
{
! $data = unserialize($cats[$i]['data']);
! if (! is_array($data))
{
! $holder = '<td> </td>' .
"\n";
! $placeholder =
str_repeat($holder,count($edata));
!
$this->t->set_var('td_data',$placeholder);
! }
! else
! {
!
$this->t->set_var('td_data',$this->cat_data($edata,$data));
}
}
***************
*** 188,192 ****
$name = '<font color="FF0000"><b>' .
$GLOBALS['phpgw']->strip_html($cats[$i]['name']) . '</b></font>' . $appendix;
$descr = '<font color="FF0000"><b>' .
$descr . '</b></font>';
- $data = '<font color="FF0000"><b>' .
$data . '</b></font>';
}
--- 210,213 ----
***************
*** 265,268 ****
--- 286,290 ----
$this->t->set_file(array('form' =>
'category_form.tpl'));
+ $this->t->set_block('form','data_row','row');
$this->t->set_block('form','add','addhandle');
$this->t->set_block('form','edit','edithandle');
***************
*** 277,282 ****
--- 299,311 ----
}
+ if (!$global_cats)
+ {
+ $global_cats = False;
+ }
+
if ($submit)
{
+ $data = serialize($cat_data);
+
$values = array
(
***************
*** 285,289 ****
'name' => $cat_name,
'access' => $cat_access,
! 'data' => $cat_data
);
--- 314,318 ----
'name' => $cat_name,
'access' => $cat_access,
! 'data' => $data
);
***************
*** 306,331 ****
if ($cats_level)
{
! if ($global_cats)
! {
! $cats_list =
$this->bo->cats->formated_list('select','all',$cat_parent,True);
! }
! else
! {
! $cats_list =
$this->bo->cats->formated_list('select','all',$cat_parent);
! }
}
else
{
! if ($global_cats)
! {
! $cats_list =
$this->bo->cats->formated_list('select','mains',$cat_parent,True);
! }
! else
! {
! $cats_list =
$this->bo->cats->formated_list('select','mains',$cat_parent);
! }
}
! $this->t->set_var('category_list',$cats_list);
$this->t->set_var('cat_name',$cat_name);
$this->t->set_var('cat_description',$cat_description);
--- 335,346 ----
if ($cats_level)
{
! $type = 'all';
}
else
{
! $type = 'mains';
}
!
$this->t->set_var('category_list',$this->bo->cats->formated_list('select',$type,$cat_parent,$global_cats));
$this->t->set_var('cat_name',$cat_name);
$this->t->set_var('cat_description',$cat_description);
***************
*** 336,346 ****
if ($extra)
{
! $this->t->set_var('td_data','<input
name="cat_data" size="50" value="' . $GLOBALS['phpgw']->strip_html($cat_data) .
'">');
! $this->t->set_var('lang_data',lang($extra));
! }
! else
! {
! $this->t->set_var('td_data','');
! $this->t->set_var('lang_data','');
}
--- 351,361 ----
if ($extra)
{
! $edata = explode(',',$extra);
! for($i=0;$i<count($edata);$i++)
! {
! $this->t->set_var('td_data','<input
name="cat_data[' . $edata[$i] . ']" size="50" value="' . $cat_data[$edata[$i]]
. '">');
!
$this->t->set_var('lang_data',lang($edata[$i]));
! $this->t->fp('row','data_row',True);
! }
}
***************
*** 384,387 ****
--- 399,403 ----
$this->t->set_file(array('form' =>
'category_form.tpl'));
+ $this->t->set_block('form','data_row','row');
$this->t->set_block('form','add','addhandle');
$this->t->set_block('form','edit','edithandle');
***************
*** 396,401 ****
--- 412,424 ----
}
+ if (!$global_cats)
+ {
+ $global_cats = False;
+ }
+
if ($submit)
{
+ $data = serialize($cat_data);
+
$values = array
(
***************
*** 405,409 ****
'name' => $cat_name,
'access' => $cat_access,
! 'data' => $cat_data
);
--- 428,432 ----
'name' => $cat_name,
'access' => $cat_access,
! 'data' => $data
);
***************
*** 430,460 ****
$this->t->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats[0]['description']));
! if ($cats_level)
{
! if ($global_cats)
! {
! $cats_list =
$this->bo->cats->formated_list('select','all',$cats[0]['parent'],True);
! }
! else
! {
! $cats_list =
$this->bo->cats->formated_list('select','all',$cats[0]['parent']);
! }
}
else
{
! if ($global_cats)
! {
! $cats_list =
$this->bo->cats->formated_list('select','mains',$cats[0]['parent'],True);
! }
! else
! {
! $cats_list =
$this->bo->cats->formated_list('select','mains',$cats[0]['parent']);
! }
}
! $this->t->set_var('category_list',$cats_list);
$this->t->set_var('access','<input type="checkbox"
name="cat_access" value="True"'
!
. ($cats[0]['access'] == 'private' ?' checked':'') . '>');
if ($cats[0]['owner'] == $this->account)
--- 453,482 ----
$this->t->set_var('cat_description',$GLOBALS['phpgw']->strip_html($cats[0]['description']));
! if ($cats_level)
{
! $type = 'all';
}
else
{
! $type = 'mains';
}
!
$this->t->set_var('category_list',$this->bo->cats->formated_list('select',$type,$cats[0]['parent'],$global_cats));
$this->t->set_var('access','<input type="checkbox"
name="cat_access" value="True"'
!
. ($cats[0]['access'] == private ?' checked':'') . '>');
!
! if ($extra)
! {
! $edata = explode(',',$extra);
!
! $data = unserialize($cats[0]['data']);
! for($i=0;$i<count($edata);$i++)
! {
! $this->t->set_var('td_data','<input
name="cat_data[' . $edata[$i] . ']" size="50" value="' . $data[$edata[$i]] .
'">');
!
$this->t->set_var('lang_data',lang($edata[$i]));
! $this->t->fp('row','data_row',True);
! }
! }
if ($cats[0]['owner'] == $this->account)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: preferences/inc class.uicategories.inc.php,1.2.2.3,1.2.2.4,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: admin/setup phpgw_de.lang,1.14,1.14.2.1 phpgw_en.lang,1.23.2.1,1.23.2.2
- Next by Date:
[Phpgroupware-cvs] CVS: projects/inc class.uiprojects.inc.php,1.47.2.2,1.47.2.3 hook_admin.inc.php,1.6,1.6.2.1
- Previous by thread:
[Phpgroupware-cvs] CVS: admin/setup phpgw_de.lang,1.14,1.14.2.1 phpgw_en.lang,1.23.2.1,1.23.2.2
- Next by thread:
[Phpgroupware-cvs] CVS: projects/inc class.uiprojects.inc.php,1.47.2.2,1.47.2.3 hook_admin.inc.php,1.6,1.6.2.1
- Index(es):