[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] todo/inc class.ui.inc.php,1.2.2.14,1.2.2.14.2.1
|
From: |
Bettina Gille <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] todo/inc class.ui.inc.php,1.2.2.14,1.2.2.14.2.1 |
|
Date: |
Tue, 14 Oct 2003 12:22:51 +0000 |
Update of /cvsroot/phpgroupware/todo/inc
In directory subversions:/tmp/cvs-serv6753/inc
Modified Files:
Tag: Version-0_9_16-branch
class.ui.inc.php
Log Message:
fixed bug #5844
Index: class.ui.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/todo/inc/class.ui.inc.php,v
retrieving revision 1.2.2.14
retrieving revision 1.2.2.14.2.1
diff -C2 -d -r1.2.2.14 -r1.2.2.14.2.1
*** class.ui.inc.php 28 Apr 2002 18:48:10 -0000 1.2.2.14
--- class.ui.inc.php 14 Oct 2003 12:22:48 -0000 1.2.2.14.2.1
***************
*** 3,9 ****
* phpGroupWare - Todo list
*
* http://www.phpgroupware.org
*
! * Written by Joseph Engo <address@hidden> *
* Bettina Gille address@hidden *
* -----------------------------------------------
*
* This program is free software; you can redistribute it and/or modify
it *
* under the terms of the GNU General Public License as published by
the *
--- 3,13 ----
* phpGroupWare - Todo list
*
* http://www.phpgroupware.org
*
! * This program is part of the GNU project, see http://www.gnu.org/
*
! *
*
! * Written by Joseph Engo <address@hidden> *
* Bettina Gille address@hidden *
* -----------------------------------------------
*
+ * Copyright 2000 - 2003 Free Software Foundation, Inc
*
+ *
*
* This program is free software; you can redistribute it and/or modify
it *
* under the terms of the GNU General Public License as published by
the *
***************
*** 110,113 ****
--- 114,119 ----
function show_list()
{
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('todo') . ': ' . lang('list todos');
+
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 131,135 ****
$this->set_app_langs();
- $this->t->set_var(lang_action,lang('todo list'));
$this->t->set_var('lang_all',lang('All'));
--- 137,140 ----
***************
*** 400,416 ****
function add()
{
! global $cat_id, $new_cat, $values, $submit,
$new_parent, $parent;
! if ($new_parent)
{
! $parent = $new_parent;
}
! if ($new_cat)
{
! $cat_id = $new_cat;
}
! if ($submit)
{
$values['cat'] = $cat_id;
--- 405,423 ----
function add()
{
! $cat_id = get_var('cat_id',array('GET','POST'));
! $parent = get_var('parent',array('GET','POST'));
! $values = get_var('values',array('POST'));
! if ($_POST['new_parent'])
{
! $parent = $_POST['new_parent'];
}
! if ($_POST['new_cat'])
{
! $cat_id = $_POST['new_cat'];
}
! if ($_POST['submit'])
{
$values['cat'] = $cat_id;
***************
*** 425,433 ****
{
$this->bo->save($values);
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list&cat_id=' .
$cat_id));
$GLOBALS['phpgw']->common->phpgw_exit();
}
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
--- 432,442 ----
{
$this->bo->save($values);
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=todo.ui.show_list&cat_id='
. $cat_id);
$GLOBALS['phpgw']->common->phpgw_exit();
}
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('todo') . ': ' . ($parent?lang('Add sub project'):lang('Add main
project'));
+
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 440,452 ****
$this->t->set_var('actionurl',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.add'));
- if ($parent)
- {
- $this->t->set_var('lang_todo_action',lang('Add
sub project'));
- }
- else
- {
- $this->t->set_var('lang_todo_action',lang('Add
main project'));
- }
-
$this->t->set_var('cat_list',$this->cats->formated_list('select','all',$cat_id,'True'));
$this->t->set_var('todo_list',$this->formatted_todo($parent));
--- 449,452 ----
***************
*** 495,507 ****
function view()
{
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
! $values = $this->bo->read($GLOBALS['todo_id']);
$this->t->set_file('_view','view.tpl');
$this->set_app_langs();
- $this->t->set_var('lang_todo_action',lang('View todo
item'));
$this->t->set_var('value_title',$GLOBALS['phpgw']->strip_html($values['title']));
$this->t->set_var('value_descr',$GLOBALS['phpgw']->strip_html($values['descr']));
--- 495,510 ----
function view()
{
+ $todo_id = get_var('todo_id',array('GET'));
+
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('todo') . ': ' . lang('view todo');
+
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
! $values = $this->bo->read($todo_id);
$this->t->set_file('_view','view.tpl');
$this->set_app_langs();
$this->t->set_var('value_title',$GLOBALS['phpgw']->strip_html($values['title']));
$this->t->set_var('value_descr',$GLOBALS['phpgw']->strip_html($values['descr']));
***************
*** 539,543 ****
$this->t->set_var('history',$this->historylog->return_html(array(),'','',$GLOBALS['todo_id']));
!
$this->t->set_var('done_action',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list'));
$this->t->pfp('out','_view');
}
--- 542,546 ----
$this->t->set_var('history',$this->historylog->return_html(array(),'','',$GLOBALS['todo_id']));
!
$this->t->set_var('done_action',$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list&cat_id='
. $values['cat']));
$this->t->pfp('out','_view');
}
***************
*** 545,561 ****
function edit()
{
! global $cat_id, $new_cat, $values, $submit,
$new_parent, $parent, $todo_id;
! if ($new_parent)
{
! $parent = $new_parent;
}
! if ($new_cat)
{
! $cat_id = $new_cat;
}
! if ($submit)
{
$values['cat'] = $cat_id;
--- 548,567 ----
function edit()
{
! $todo_id =
get_var('todo_id',array('GET','POST'));
! $cat_id = get_var('cat_id',array('GET','POST'));
! $parent = get_var('parent',array('POST','GET'));
! $values = get_var('values',array('POST'));
! if ($_POST['new_parent'])
{
! $parent = $_POST['new_parent'];
}
! if ($_POST['new_cat'])
{
! $cat_id = $_POST['new_cat'];
}
! if ($_POST['submit'])
{
$values['cat'] = $cat_id;
***************
*** 571,579 ****
{
$this->bo->save($values,'edit');
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list&cat_id=' .
$cat_id));
$GLOBALS['phpgw']->common->phpgw_exit();
}
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
--- 577,587 ----
{
$this->bo->save($values,'edit');
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=todo.ui.show_list&cat_id='
. $cat_id);
$GLOBALS['phpgw']->common->phpgw_exit();
}
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('todo') . ': ' . ($parent?lang('Edit sub project'):lang('Edit main
project'));
+
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 588,600 ****
$values = $this->bo->read($todo_id);
- if ($values['parent'] != 0)
- {
- $this->t->set_var('lang_todo_action',lang('Edit
sub project'));
- }
- else
- {
- $this->t->set_var('lang_todo_action',lang('Edit
main project'));
- }
-
$this->t->set_var('cat_list',$this->cats->formated_list('select','all',$values['cat'],'True'));
$this->t->set_var('todo_list',$this->formatted_todo($values['parent']));
--- 596,599 ----
***************
*** 664,672 ****
function delete()
{
! global $confirm, $todo_id, $subs;
! if ($confirm)
{
! if ($subs)
{
$this->bo->delete($todo_id,True);
--- 663,671 ----
function delete()
{
! $todo_id = get_var('todo_id',array('GET','POST'));
! if ($_POST['confirm'])
{
! if ($_POST['subs'])
{
$this->bo->delete($todo_id,True);
***************
*** 676,682 ****
$this->bo->delete($todo_id);
}
! Header('Location: ' .
$GLOBALS['phpgw']->link('/index.php','menuaction=todo.ui.show_list'));
}
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
--- 675,683 ----
$this->bo->delete($todo_id);
}
!
$GLOBALS['phpgw']->redirect_link('/index.php','menuaction=todo.ui.show_list');
}
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('todo') . ': ' . lang('delete todo');
+
$GLOBALS['phpgw']->common->phpgw_header();
echo parse_navbar();
***************
*** 708,712 ****
function matrix()
{
! global $month, $year, $o;
$GLOBALS['phpgw']->common->phpgw_header();
--- 709,717 ----
function matrix()
{
! $month = get_var('month',array('POST','GET'));
! $year = get_var('year',array('POST','GET'));
! $o = get_var('o',array('POST','GET'));
!
! $GLOBALS['phpgw_info']['flags']['app_header'] =
lang('todo') . ': ' . lang('matrix view');
$GLOBALS['phpgw']->common->phpgw_header();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] todo/inc class.ui.inc.php,1.2.2.14,1.2.2.14.2.1,
Bettina Gille <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] todo/templates/default form.tpl, 1.15.2.1, 1.15.2.1.2.1 list.tpl, 1.13.2.4, 1.13.2.4.2.1 view.tpl, 1.1, 1.1.4.1
- Next by Date:
[Phpgroupware-cvs] addressbook/inc class.uiaddressbook.inc.php, 1.36.2.15.2.24, 1.36.2.15.2.25
- Previous by thread:
[Phpgroupware-cvs] todo/templates/default form.tpl, 1.15.2.1, 1.15.2.1.2.1 list.tpl, 1.13.2.4, 1.13.2.4.2.1 view.tpl, 1.1, 1.1.4.1
- Next by thread:
[Phpgroupware-cvs] addressbook/inc class.uiaddressbook.inc.php, 1.36.2.15.2.24, 1.36.2.15.2.25
- Index(es):