[20852] update todo
Sigurd Nes <[email protected]>
| Newsgroups | gmane.comp.web.phpgroupware.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 20852
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20852
Author: sigurdne
Date: 2009-11-20 10:29:28 +0000 (Fri, 20 Nov 2009)
Log Message:
-----------
update todo
Modified Paths:
--------------
people/sigurdne/modules/todo/trunk/inc/class.bopreferences.inc.php
people/sigurdne/modules/todo/trunk/inc/class.botodo.inc.php
people/sigurdne/modules/todo/trunk/inc/class.menu.inc.php
people/sigurdne/modules/todo/trunk/inc/class.sotodo.inc.php
people/sigurdne/modules/todo/trunk/inc/class.uipreferences.inc.php
people/sigurdne/modules/todo/trunk/inc/class.uitodo.inc.php
people/sigurdne/modules/todo/trunk/inc/hook_deleteaccount.inc.php
people/sigurdne/modules/todo/trunk/setup/phpgw_it.lang
people/sigurdne/modules/todo/trunk/setup/phpgw_sv.lang
people/sigurdne/modules/todo/trunk/templates/base/preference_acl_row.tpl
people/sigurdne/modules/todo/trunk/templates/base/preference_colspan.tpl
Added Paths:
-----------
people/sigurdne/modules/todo/trunk/templates/portico/
people/sigurdne/modules/todo/trunk/templates/portico/images/
people/sigurdne/modules/todo/trunk/templates/portico/images/navbar.png
Modified: people/sigurdne/modules/todo/trunk/inc/class.bopreferences.inc.php
===================================================================
--- people/sigurdne/modules/todo/trunk/inc/class.bopreferences.inc.php 2009-11-20 10:29:23 UTC (rev 20851)
+++ people/sigurdne/modules/todo/trunk/inc/class.bopreferences.inc.php 2009-11-20 10:29:28 UTC (rev 20852)
@@ -2,32 +2,17 @@
/**
* Todo preferences
*
- * @author Dave Hall <[email protected]>
* @author Craig Knudsen <[email protected]>
* @author Mark Peters <[email protected]>
* @copyright Copyright (C) Craig Knudsen <[email protected]>
- * @copyright Copyright (C) 2002-2008 Free Software Foundation, Inc. http://www.fsf.org/
+ * @copyright Copyright (C) 2002,2005 Free Software Foundation, Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
* @package todo
* @version $Id$
* @internal Based on Webcalendar by Craig Knudsen http://www.radix.net/~cknudsen
*/
- /*
- 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 Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/**
* Todo preferences
*
@@ -35,55 +20,41 @@
*/
class todo_bopreferences
{
- /**
- * @var array $public_functions the publicly callable methods of the class
- */
- public $public_functions = array
- (
- 'preferences' => true
+ var $public_functions = Array(
+ 'preferences' => True
);
- /**
- * @var array $prefs Preference values for todo
- */
- protected $prefs;
+ var $prefs;
+ var $debug = False;
- /**
- * Constructor
- *
- * @return void
- */
- public function __construct()
+ function __construct()
{
$GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs');
$this->prefs['todo'] = $GLOBALS['phpgw_info']['user']['preferences']['todo'];
}
- /**
- * Handle the updated preferences
- *
- * @return void
- */
- public function preferences()
+ function preferences()
{
- if ( !phpgw::get_var('submit', 'string', 'POST') )
+ $submit = get_var('submit',Array('POST'));
+ if($submit)
{
- return;
- }
-
$GLOBALS['phpgw']->preferences->read();
- $prefs = phpgw::get_var('prefs', 'string', 'POST');
- if ( $prefs['mainscreen_showevents'] )
+ $prefs = get_var('prefs',Array('POST'));
+ if($prefs['mainscreen_showevents'] == True)
{
- $GLOBALS['phpgw']->preferences->add('todo', 'mainscreen_showevents', $prefs['mainscreen_showevents']);
+ $GLOBALS['phpgw']->preferences->add('todo','mainscreen_showevents',$prefs['mainscreen_showevents']);
}
else
{
- $GLOBALS['phpgw']->preferences->delete('todo', 'mainscreen_showevents');
+ $GLOBALS['phpgw']->preferences->delete('todo','mainscreen_showevents');
}
- $GLOBALS['phpgw']->preferences->save_repository(true);
+ $GLOBALS['phpgw']->preferences->save_repository(True);
- $GLOBALS['phpgw']->redirect_link('/preferences/index.php');
+ Header('Location: '.$GLOBALS['phpgw']->link('/preferences/index.php'));
+ $GLOBALS['phpgw_info']['flags']['nodisplay'] = True;
+ exit;
}
}
+ }
+
Modified: people/sigurdne/modules/todo/trunk/inc/class.botodo.inc.php
===================================================================
--- people/sigurdne/modules/todo/trunk/inc/class.botodo.inc.php 2009-11-20 10:29:23 UTC (rev 20851)
+++ people/sigurdne/modules/todo/trunk/inc/class.botodo.inc.php 2009-11-20 10:29:28 UTC (rev 20852)
@@ -1,38 +1,21 @@
<?php
/**
- * Todo business logic
+ * Todo business
*
* @author Joseph Engo <[email protected]>
- * @author Bettina Gille <[email protected]>
- * @copyright Copyright (C) 2000-2008 Free Software Foundation, Inc. http://www.fsf.org/
+ * @author Bettina Gille [[email protected]]
+ * @copyright Copyright (C) 2000-2003,2005 Free Software Foundation, Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
* @package todo
* @version $Id$
*/
- /*
- 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 Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
- phpgw::import_class('phpgwapi.datetime');
-
/**
- * Todo business logic
+ * Todo business
*
* @package todo
*/
- class todo_botodo
+ class botodo
{
var $start;
var $query;
@@ -46,7 +29,7 @@
*/
var $debug = false;
- public $public_functions = array
+ var $public_functions = array
(
'cached_accounts' => True,
'_list' => True,
@@ -60,14 +43,10 @@
'list_methods' => True
);
- /**
- * Constructor
- *
- * @return void
- */
- public function __construct($session=False)
+ function botodo($session=False)
{
$this->sotodo = CreateObject('todo.sotodo');
+ $this->datetime =& $GLOBALS['phpgw']->datetime;
if ($session)
{
@@ -84,11 +63,7 @@
if(!empty($_start) || ($_start == '0') || ($_start == 0))
{
- if($this->debug)
- {
- echo '<br>overriding $start: "' . $this->start . '" now "' . $_start . '"';
- }
-
+ if($this->debug) { echo '<br>overriding $start: "' . $this->start . '" now "' . $_start . '"'; }
$this->start = $_start;
}
@@ -113,7 +88,6 @@
{
echo '<br>overriding $sort: "' . $this->sort . '" now "' . $_sort . '"';
}
-
$this->sort = $_sort;
}
@@ -123,7 +97,6 @@
{
echo '<br>overriding $order: "' . $this->order . '" now "' . $_order . '"';
}
-
$this->order = $_order;
}
@@ -133,7 +106,6 @@
{
echo '<br>overriding $filter: "' . $this->filter . '" now "' . $_filter . '"';
}
-
$this->filter = $_filter;
}
}
@@ -220,12 +192,13 @@
function cached_accounts($account_id)
{
- return array($account_id => $GLOBALS['phpgw']->accounts->get($account_id));
+ return $GLOBALS['phpgw']->accounts->get($account_id);
}
function employee_list($type)
{
- return $GLOBALS['phpgw']->accounts->get_list($type);
+ $employees = $GLOBALS['phpgw']->accounts->get_list($type);
+ return $employees;
}
function format_assigned($a = '')
@@ -234,23 +207,43 @@
{
$a = substr($a,1,strlen($a)-2);
}
-
- return explode(',', $a);
+ $a = explode(',',$a);
+ return $a;
}
function list_assigned($assi = '')
{
$aout = '';
-
if (is_array($assi))
{
foreach ( $assi as $a )
{
+
+ /**
+ * Begin Orlando Fix
+ *
+ * I had to comment the conditionals because variable $adata
+ * doesn't return the 'type' field of the accounts
+ */
+
$adata = $this->cached_accounts($a);
- $aout .= (string)$adata[$a] . '<br />';
- }
+
+ /*if ($adata[$a]['type'] == 'u')
+ {
+ $aout .= $GLOBALS['phpgw']->common->display_fullname($adata[$a]['lid'],
+ $adata[$a]['firstname'],$adata[$a]['lastname']) . '<br>';
}
+ elseif($adata[$a]['type'] == 'g')
+ {
+ $aout .= $adata[$a]['firstname'] . ' ' . lang('Group') . '<br>';
+ }*/
+ $aout .= $GLOBALS['phpgw']->common->display_fullname($adata->lid,$adata->firstname,$adata->lastname) . '<br>';
+ /**
+ * End Orlando Fix
+ */
+ }
+ }
return $aout;
}
@@ -271,28 +264,19 @@
$parent = $params['parent'];
}
- $todos = $this->sotodo->read_todos(
- $start, $limit, $query, $filter, $order, $sort, $cat_id, $tree, $parent);
-
+ $todos = $this->sotodo->read_todos($start, $limit, $query, $filter, $order, $sort, $cat_id, $tree, $parent);
$this->total_records = $this->sotodo->total_records;
$r = array();
-
foreach ( $todos as $todo )
{
- $sdate = $todo['sdate'] - phpgwapi_datetime::user_timezone();
+ $sdate = $todo['sdate'] - $this->datetime->tz_offset;
+ $todo['sdate'] = $GLOBALS['phpgw']->common->show_date($sdate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
- $todo['sdate'] = $GLOBALS['phpgw']->common->show_date(
- $sdate,
- $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
-
- if (isset($todo['edate']) && $todo['edate'] != 0)
+ if ( isset($todo['edate']) && $todo['edate'] != 0)
{
- $edate = $todo['edate'] - phpgwapi_datetime::user_timezone();
-
- $todo['edate'] = $GLOBALS['phpgw']->common->show_date(
- $edate,
- $GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
+ $edate = $todo['edate'] - $this->datetime->tz_offset;
+ $todo['edate'] = $GLOBALS['phpgw']->common->show_date($edate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']);
}
if ($todo['assigned'])
@@ -305,6 +289,7 @@
$todo['assigned_group'] = $this->format_assigned($todo['assigned_group']);
}
+ $v['owner'] = $GLOBALS['phpgw']->accounts->name2id($todo['owner']);
$r[] = array
(
'id' => (int) $todo['id'],
@@ -339,7 +324,6 @@
function check_values($values)
{
$error = array();
-
if (!$values['title'])
{
$error[] = lang('Please enter a title');
@@ -350,14 +334,14 @@
$error[] = lang('Description can not exceed 8000 characters in length');
}
- if (isset($values['daysfromstart']) && $values['daysfromstart'] && ! ereg('^[0-9]+$', $values['daysfromstart']))
+ if ($values['daysfromstart'] && ! ereg('^[0-9]+$',$values[daysfromstart]))
{
$error[] = lang('You can only enter numbers for days from now');
}
if ($values['smonth'] || $values['sday'] || $values['syear'])
{
- if(! phpgwapi_datetime::date_valid($values['syear'], $values['smonth'], $values['sday']))
+ if(! $this->datetime->date_valid($values['syear'],$values['smonth'],$values['sday']))
{
$error[] = lang('You have entered an invalid start date');
}
@@ -365,7 +349,7 @@
if ($values['emonth'] || $values['eday'] || $values['eyear'])
{
- if(!phpgwapi_datetime::date_valid($values['eyear'], $values['emonth'], $values['eday']))
+ if(! $this->datetime->date_valid($values['eyear'],$values['emonth'],$values['eday']))
{
$error[] = lang('You have entered an invalid end date');
}
@@ -378,12 +362,9 @@
}
*/
- if (($values['smonth'] || $values['sday'] || $values['syear']) &&
- ($values['emonth'] || $values['eday'] || $values['eyear']))
+ if (($values['smonth'] || $values['sday'] || $values['syear']) && ($values['emonth'] || $values['eday'] || $values['eyear']))
{
- if(phpgwapi_datetime::date_compare(
- $values['eyear'], $values['emonth'], $values['eday'],
- $values['syear'], $values['smonth'], $values['sday']) == -1)
+ if($this->datetime->date_compare($values['eyear'],$values['emonth'],$values['eday'],$values['syear'],$values['smonth'],$values['sday']) == -1)
{
$error[] = lang('Ending date can not be before start date');
}
@@ -397,7 +378,7 @@
function save($values)
{
- if (isset($values['access']) && $values['access'])
+ if ($values['access'])
{
$values['access'] = 'private';
}
@@ -414,8 +395,7 @@
{
if ($values['smonth'] || $values['sday'] || $values['syear'])
{
- $values['sdate'] = mktime(0, 0, 0, $values['smonth'],
- $values['sday'], $values['syear']);
+ $values['sdate'] = mktime(0,0,0,$values['smonth'], $values['sday'], $values['syear']);
}
}
@@ -426,14 +406,11 @@
if ($values['emonth'] || $values['eday'] || $values['eyear'])
{
- $values['edate'] = mktime(2, 0, 0, $values['emonth'],
- $values['eday'], $values['eyear']);
+ $values['edate'] = mktime(2,0,0,$values['emonth'],$values['eday'],$values['eyear']);
}
else if ($values['daysfromstart'] > 0)
{
- $values['edate'] = mktime(0, 0, 0, date('m', $values['sdate']),
- date('d', $values['sdate']) + $values['daysfromstart'],
- date('Y',$values['sdate']));
+ $values['edate'] = mktime(0,0,0,date('m',$values['sdate']), date('d',$values['sdate'])+$values['daysfromstart'], date('Y',$values['sdate']));
}
if ( isset($values['id']) && (int)$values['id'] > 0)
@@ -445,21 +422,39 @@
{
$todo_id = $this->sotodo->add_todo($values);
}
-
return $todo_id;
}
function exists($todo_id)
{
- return (bool)$this->sotodo->exists($todo_id);
+ $exists = $this->sotodo->exists($todo_id);
+
+ if ($exists)
+ {
+ return True;
+ }
+ else
+ {
+ return False;
+ }
}
function delete($todo_id, $subs = False)
{
- $this->sotodo->delete_todo(
- is_array($todo_id) ? $todo_id[0] : $todo_id,
- (bool)$subs);
+ if (is_array($todo_id))
+ {
+ $todo_id = $todo_id[0];
+ }
+ if ($subs)
+ {
+ $this->sotodo->delete_todo($todo_id,True);
+ }
+ else
+ {
+ $this->sotodo->delete_todo($todo_id);
+ }
return True;
}
}
+?>
Modified: people/sigurdne/modules/todo/trunk/inc/class.menu.inc.php
===================================================================
--- people/sigurdne/modules/todo/trunk/inc/class.menu.inc.php 2009-11-20 10:29:23 UTC (rev 20851)
+++ people/sigurdne/modules/todo/trunk/inc/class.menu.inc.php 2009-11-20 10:29:28 UTC (rev 20852)
@@ -6,13 +6,13 @@
* @copyright Copyright (C) 2007 Free Software Foundation, Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
* @package todo
- * @version $Id: class.menu.inc.php 727 2008-02-08 04:13:28Z dave $
+ * @version $Id: class.menu.inc.php 1781 2008-11-02 19:51:19Z sigurd $
*/
/*
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 Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -24,6 +24,7 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
/**
* Menus
*
Modified: people/sigurdne/modules/todo/trunk/inc/class.sotodo.inc.php
===================================================================
--- people/sigurdne/modules/todo/trunk/inc/class.sotodo.inc.php 2009-11-20 10:29:23 UTC (rev 20851)
+++ people/sigurdne/modules/todo/trunk/inc/class.sotodo.inc.php 2009-11-20 10:29:28 UTC (rev 20852)
@@ -2,77 +2,39 @@
/**
* Todo storage
*
- * @author Dave Hall <[email protected]>
* @author Joseph Engo <[email protected]>
* @author Bettina Gille [[email protected]]
- * @copyright Copyright (C) 2000-2008 Free Software Foundation, Inc. http://www.fsf.org/
+ * @copyright Copyright (C) 2000-2003,2005 Free Software Foundation, Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
* @package todo
* @version $Id$
*/
- /*
- 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 Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/**
* Todo storage
*
* @package todo
*/
- class todo_sotodo
+ class sotodo
{
- /**
- * @var integer $account the current user
- */
- protected $account;
+ var $db;
+ var $grants;
+ var $historylog;
+ var $owner;
- /**
- * @var phpgwapi_db $db reference to global database object
- */
- protected $db;
-
- /**
- * @var array $grants list of available grants for todo
- */
- protected $grants;
-
- /**
- * @var phpgwapi_historylog $historylog record history handler
- */
- protected $historylog;
-
- /**
- * @var array $user_groups groups the current user is a member of
- */
- protected $user_groups;
-
- /**
- * Constructor
- *
- * @return void
- */
- public function __construct()
+ function sotodo()
{
$this->db =& $GLOBALS['phpgw']->db;
$this->grants = $GLOBALS['phpgw']->acl->get_grants('todo');
$this->account = $GLOBALS['phpgw_info']['user']['account_id'];
$this->user_groups = $GLOBALS['phpgw']->accounts->membership($this->account);
- $this->historylog = CreateObject('phpgwapi.historylog','todo');
+ $this->historylog = CreateObject('phpgwapi.historylog','todo', '.');
// This is so our transactions follow across classes
$this->historylog->db =& $this->db;
+
+ $this->owner = $GLOBALS['phpgw_info']['user']['account_id'];
}
function type($tree)
@@ -81,13 +43,13 @@
{
case 'mains':
return ' AND todo_id_parent = 0';
-
+ break;
case 'subs':
return ' AND todo_id_parent != 0';
-
+ break;
default:
- return '';
}
+ return '';
}
function read_todos($start = 0, $limit = True, $query = '', $filter = '', $order = '', $sort = '', $cat_id = '', $tree = '', $parent = '')
@@ -112,17 +74,26 @@
$filter = 'none';
}
- $filtermethod = "(( todo_owner = '{$this->account}' OR todo_assigned = '{$this->account}'";
+ $filtermethod = "(( todo_owner = {$this->account} OR todo_assigned = '{$this->account}'";
+ /**
+ * Begin Orlando Fix
+ *
+ * I had to change the way $group variables were read to
+ * object -> attributes
+ */
if ( is_array($this->user_groups) && count($this->user_groups) )
{
- $filtermethod .= ' OR assigned_group IN(\'0\'';
+ $filtermethod .= " OR assigned_group IN('0'";
foreach ( $this->user_groups as $group )
{
- $filtermethod .= ', \'' . $group->id.'\'';
+ $filtermethod .= ",'" . $group->id."' ";
}
$filtermethod .= ')';
}
+ /**
+ * End Orlando Fix
+ */
$filtermethod .= ')';
@@ -152,14 +123,15 @@
$filtermethod .= ' AND todo_cat = ' . (int) $cat_id;
}
+
$querymethod = '';
if($query)
{
$query = $this->db->db_addslashes($query);
-
$querymethod = " AND (todo_des LIKE '%$query%' OR todo_title LIKE '%$query%')";
}
+
$parentmethod = '';
if($parent)
{
@@ -258,14 +230,37 @@
$values['assigned'] = $this->db->db_addslashes($values['assigned']);
$values['assigned_group'] = $this->db->db_addslashes($values['assigned_group']);
+ /**
+ * Begin Orlando Fix
+ *
+ * I had to include another field in the INSERT query: entry_date
+ * because it didn't accept null values, and it now stores the actual time()
+ */
$this->db->transaction_begin();
- $this->db->query('insert into phpgw_todo (todo_id_main,todo_id_parent,todo_level,todo_owner,todo_access,todo_cat,'
- . 'todo_des,todo_title,todo_pri,todo_status,todo_datecreated,todo_startdate,todo_enddate,todo_assigned,assigned_group,entry_date) values ('
- . (int)$values['main'] . ',' . (int)$values['parent'] . ',' . (int)$values['level'] . ',' . $this->account . ",'" . (int)!!$values['access']
- . "'," . (int)$values['cat'] . ",'" . $values['descr'] . "','" . $values['title'] . "'," . (int)$values['pri'] . ",'"
- . (int)$values['status'] . "'," . time() . ',' . (int)$values['sdate'] . ',' . (int)$values['edate'] . ",'" . $values['assigned']
- . "','" . $values['assigned_group'] . "',". 1 .")", __LINE__, __FILE__);
+ $sql= "insert into phpgw_todo (todo_id_main,todo_id_parent,todo_level,todo_owner,todo_access,todo_cat,todo_des,todo_title,todo_pri,todo_status,todo_datecreated,todo_startdate,todo_enddate,todo_assigned,assigned_group,entry_date) "
+ ."values ("
+ .(int)$values['main']
+ ."," . (int)$values['parent']
+ ."," . (int)$values['level']
+ ." ," . $this->account . ","
+ .(int)!!$values['access']
+ .",". (int)$values['cat']
+ .",'" . $values['descr'] ."' "
+ .",'" . $values['title'] ."' "
+ ."," . (int)$values['pri']
+ .",". (int)$values['status']
+ .",'" . time() ."'"
+ .",'" . (int)$values['sdate'] ."' "
+ .',' . (int)$values['edate']
+ .",'" . $values['assigned']
+ ."','" . $values['assigned_group'] ."'"
+ ."," .time() . ")";
+
+ $this->db->query($sql, __LINE__, __FILE__);
$todo_id = $this->db->get_last_insert_id('phpgw_todo','todo_id');
+ /**
+ * End Orlando Fix
+ */
if (!$values['parent'] || $values['parent'] == 0)
{
@@ -324,7 +319,7 @@
}
$this->db->query('DELETE from phpgw_todo where todo_id=' . intval($todo_id) . $subdelete . " AND ((todo_access='public' "
- . 'AND todo_owner != ' . $this->account . ') OR (todo_owner=' . $this->account . '))',__LINE__,__FILE__);
+ . 'AND todo_owner != ' . $this->owner . ') OR (todo_owner=' . $this->owner . '))',__LINE__,__FILE__);
if (!$sub && $sub_todos)
{
@@ -366,7 +361,7 @@
if($old_values['pri'] != $values['pri'])
{
- $this->historylog->add('U',$values['id'],$values['pri'],$old_values['pri']);
+ $this->historylog->add('U',$values['id'],$values['pri'], $old_values['pri']);
}
if($old_values['status'] != $values['status'])
@@ -396,7 +391,7 @@
if($old_values['cat'] != $values['cat'])
{
- $this->historylog->add('C',$values['id'],$values['cat'], $old_values['cat']);
+ $this->historylog->add('C',$values['id'],$values['cat'],$old_values['cat']);
}
$values['title'] = $this->db->db_addslashes($values['title']);
@@ -441,3 +436,4 @@
}
}
}
+?>
Modified: people/sigurdne/modules/todo/trunk/inc/class.uipreferences.inc.php
===================================================================
--- people/sigurdne/modules/todo/trunk/inc/class.uipreferences.inc.php 2009-11-20 10:29:23 UTC (rev 20851)
+++ people/sigurdne/modules/todo/trunk/inc/class.uipreferences.inc.php 2009-11-20 10:29:28 UTC (rev 20852)
@@ -2,80 +2,52 @@
/**
* Todo preferences
*
- * @author Dave Hall <[email protected]>
* @author Craig Knudsen <[email protected]>
* @author Mark Peters <[email protected]>
* @copyright Copyright (C) Craig Knudsen <[email protected]>
- * @copyright Copyright (C) 2002-2008 Free Software Foundation, Inc. http://www.fsf.org/
+ * @copyright Copyright (C) 2002,2005 Free Software Foundation, Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
* @package todo
* @version $Id$
* @internal Based on Webcalendar by Craig Knudsen http://www.radix.net/~cknudsen
*/
- /*
- 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 Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
/**
* Todo preferences
*
* @package todo
*/
- class todo_uipreferences
+ class uipreferences
{
- /**
- * @var array $public_methods the publicly callable methods of the class
- */
- public $public_functions = array
- (
- 'preferences' => true
- );
+// var $template_dir;
+ var $template;
- /**
- * @var todo_bopreferences $bo reference to todo preferences logic
- */
- protected $bo;
+ var $bo;
- /**
- * @var boolean $debug enable crude debugging mode?
- */
- protected $debug = false;
+ var $debug = False;
+// var $debug = True;
- /**
- * @var phpgwapi_Template $template reference to global template object
- */
- protected $template;
+ var $theme;
- /**
- * Constructor
- *
- * @return void
- */
- public function __construct()
+ var $public_functions = array(
+ 'preferences' => True
+ );
+
+ function uipreferences()
{
$GLOBALS['phpgw']->nextmatchs = CreateObject('phpgwapi.nextmatchs');
$this->template = $GLOBALS['phpgw']->template;
+ $this->theme = $GLOBALS['phpgw_info']['theme'];
$this->bo = CreateObject('todo.bopreferences');
}
- public function preferences()
+ function preferences()
{
unset($GLOBALS['phpgw_info']['flags']['noheader']);
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
- $GLOBALS['phpgw_info']['flags']['noappheader'] = true;
- $GLOBALS['phpgw_info']['flags']['noappfooter'] = true;
+ $GLOBALS['phpgw_info']['flags']['noappheader'] = True;
+ $GLOBALS['phpgw_info']['flags']['noappfooter'] = True;
$GLOBALS['phpgw']->common->phpgw_header();
$this->template->set_file(
@@ -91,6 +63,7 @@
$var = Array(
'title' => lang('ToDo Preferences'),
'action_url' => $GLOBALS['phpgw']->link('/index.php',Array('menuaction'=>'todo.bopreferences.preferences')),
+ 'bg_color ' => $this->theme['th_bg'],
'submit_lang' => lang('submit'),
'text' => ' '
);
@@ -102,8 +75,14 @@
$this->template->pparse('out','pref');
}
- protected function display_item($field,$data)
+ function output_template_array($row,$list,$var)
{
+ $this->template->set_var($var);
+ $this->template->parse($row,$list,True);
+ }
+
+ function display_item($field,$data)
+ {
static $tr_color;
$tr_color = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($tr_color);
$var = Array(
@@ -113,10 +92,4 @@
);
$this->output_template_array('row','pref_list',$var);
}
-
- protected function output_template_array($row,$list,$var)
- {
- $this->template->set_var($var);
- $this->template->parse($row,$list,True);
- }
}
Modified: people/sigurdne/modules/todo/trunk/inc/class.uitodo.inc.php
===================================================================
--- people/sigurdne/modules/todo/trunk/inc/class.uitodo.inc.php 2009-11-20 10:29:23 UTC (rev 20851)
+++ people/sigurdne/modules/todo/trunk/inc/class.uitodo.inc.php 2009-11-20 10:29:28 UTC (rev 20852)
@@ -2,77 +2,40 @@
/**
* Todo user interface
*
- * @author Dave Hall <[email protected]>
* @author Joseph Engo <[email protected]>
* @author Bettina Gille [[email protected]]
- * @copyright Copyright (C) 2000-2008 Free Software Foundation, Inc. http://www.fsf.org/
+ * @copyright Copyright (C) 2000-2003,2005 Free Software Foundation, Inc. http://www.fsf.org/
* @license http://www.gnu.org/licenses/gpl.html GNU General Public License
* @package todo
* @version $Id$
- */
-
- /*
- 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 Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/*
* Import required classes
*/
phpgw::import_class('phpgwapi.sbox');
- phpgw::import_class('phpgwapi.datetime');
/**
* Todo user interface
*
* @package todo
*/
- class todo_uitodo
+ class uitodo
{
- /**
- * @var array $public_functions the callable methods of the class
- */
- public $public_functions = array
+ var $grants;
+ var $historylog;
+ var $t;
+ var $public_functions = array
(
- 'show_list' => true,
- 'view' => true,
- 'add' => true,
- 'edit' => true,
- 'delete' => true,
- 'matrix' => true
+ 'show_list' => True,
+ 'view' => True,
+ 'add' => True,
+ 'edit' => True,
+ 'delete' => True,
+ 'matrix' => True
);
- /**
- * @var array $grants list of rights available to the user
- */
- protected $grants;
-
- /**
- * @var phpgwapi_historylog $historylog reference to history log object
- */
- protected $historylog;
-
- /**
- * @var phpgwapi_Template $t Reference to global template object
- */
- protected $t;
-
- /**
- * Constructor
- *
- * @return void
- */
- function __construct()
+ function uitodo()
{
$this->botodo = CreateObject('todo.botodo',True);
$this->nextmatchs = CreateObject('phpgwapi.nextmatchs');
@@ -182,8 +145,8 @@
if($show_page_header)
{
- $left = $this->nextmatchs->left('/index.php',$this->start,$this->botodo->total_records,'&menuaction=todo.ui.show_list');
- $right = $this->nextmatchs->right('/index.php',$this->start,$this->botodo->total_records,'&menuaction=todo.ui.show_list');
+ $left = $this->nextmatchs->left('/index.php',$this->start,$this->botodo->total_records,'&menuaction=todo.uitodo.show_list');
+ $right = $this->nextmatchs->right('/index.php',$this->start,$this->botodo->total_records,'&menuaction=todo.uitodo.show_list');
$this->t->set_var('left',$left);
$this->t->set_var('right',$right);
@@ -191,11 +154,11 @@
// ------------------------- end nextmatch template --------------------------------------
- $this->t->set_var('cat_action',$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'todo.ui.show_list')));
+ $this->t->set_var('cat_action',$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'todo.uitodo.show_list')));
$this->t->set_var('categories',$this->cats->formatted_list('select','all',$this->cat_id,'True'));
- $this->t->set_var('filter_action',$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'todo.ui.show_list')));
+ $this->t->set_var('filter_action',$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'todo.uitodo.show_list')));
$this->t->set_var('filter_list',$this->nextmatchs->filter(1,array('yours' => 1,'filter' => $this->filter)));
- $this->t->set_var('search_action',$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'todo.ui.show_list')));
+ $this->t->set_var('search_action',$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'todo.uitodo.show_list')));
$this->t->set_var('search_list',$this->nextmatchs->search(array('search_obj' => 1,'query' => $this->query)));
$body .= $this->t->fp('out','page_header');
@@ -248,7 +211,6 @@
case 1: $pri = lang('Low'); break;
case 2: $pri = '<b>' . lang('normal') . '</b>'; break;
case 3: $pri = '<font color="#CC0000"><b>' . lang('high') . '</b></font>'; break;
- default: $pri = NULL;
}
if ($todo_list[$i]['edate_epoch'] == 0)
@@ -258,7 +220,7 @@
else
{
$datedue = $todo_list[$i]['edate_epoch'];
- $datedue = $datedue - phpgwapi_datetime::user_timezone();
+ $datedue = $datedue - $this->botodo->datetime->tz_offset;
$month = $GLOBALS['phpgw']->common->show_date(time(),'n');
$day = $GLOBALS['phpgw']->common->show_date(time(),'d');
@@ -293,7 +255,7 @@
'title' => $title,
'datecreated' => $todo_list[$i]['sdate'],
'datedue' => $datedueout,
- 'owner' => (string)$GLOBALS['phpgw']->accounts->get($todo_list[$i]['owner']),
+ 'owner' => $todo_list[$i]['owner'],
'assigned' => $assigned
));
@@ -396,6 +358,7 @@
$user_list = '';
$accounts = $this->botodo->employee_list($type);
+ //_debug_array($accounts);
foreach ( $accounts as $account )
{
$user_list .= '<option value="' . $account->id . '"';
@@ -403,7 +366,7 @@
{
$user_list .= ' selected';
}
- $user_list .= '>' . $account . "</option>\n";
+ $user_list .= '>' . $GLOBALS['phpgw']->accounts->id2name($account->id) . "</option>\n";
}
return $user_list;
}
@@ -437,14 +400,14 @@
function add()
{
- $cat_id = isset($_POST['cat_id']) ? (int) $_POST['cat_id'] : 0;
- $new_cat = isset($_POST['new_cat']) ? (int) $_POST['new_cat'] : 0;
- $values = isset($_POST['values']) ? (array) $_POST['values'] : array();
- $submit = isset($_POST['submit']) ? !!$_POST['submit'] : false;
- $new_parent = isset($_POST['new_parent']) ? $_POST['new_parent'] : 0;
- $parent = phpgw::get_var('parent', 'int');
- $assigned = isset($_POST['assigned']) ? $_POST['assigned'] : 0;
- $assigned_group = isset($_POST['assigned_group']) ? $_POST['assigned_group'] : 0;
+ $cat_id = phpgw::get_var('cat_id', 'int', 'REQUEST', 0);
+ $new_cat = phpgw::get_var('new_cat', 'int', 'REQUEST', 0);
+ $values = phpgw::get_var('values');
+ $submit = phpgw::get_var('submit', 'bool');
+ $new_parent = phpgw::get_var('new_parent', 'int', 'REQUEST', 0);
+ $parent = phpgw::get_var('parent', 'int', 'REQUEST', 0);
+ $assigned = phpgw::get_var('assigned');
+ $assigned_group = phpgw::get_var('assigned_group');
if ($new_parent)
{
@@ -568,14 +531,13 @@
'lang_reset' => lang('Clear form'),
'edithandle' => '',
'addhandle' => '',
- //FIXME move this to sbox2 a control
'start_select_date' => $GLOBALS['phpgw']->common->dateformatorder(phpgwapi_sbox::getYears('values[syear]',$values['syear']),
phpgwapi_sbox::getMonthText('values[smonth]',$values['smonth']),phpgwapi_sbox::getDays('values[sday]',$values['sday'])),
'end_select_date' => $GLOBALS['phpgw']->common->dateformatorder(phpgwapi_sbox::getYears('values[eyear]',$values['eyear']),
phpgwapi_sbox::getMonthText('values[emonth]',$values['emonth']),phpgwapi_sbox::getDays('values[eday]',$values['eday'])),
'selfortoday' => '<input type="checkbox" name="values[seltoday]" value="True">',
'daysfromstartdate' => '<input type="text" name="values[daysfromstart]" size="3" maxlength="3">',
- 'access_list' => '<input type="checkbox" name="values[access]" value="True"' . ((!isset($values['access']) || $values['access'] == 'private') ? ' checked' : '') . '>'
+ 'access_list' => '<input type="checkbox" name="values[access]" value="True"' . (!isset($values['access']) || $values['access'] == 'private' ? ' checked' : '') . '>'
));
$this->t->pfp('out','todo_add');
@@ -596,12 +558,12 @@
$this->t->set_var('value_descr',$GLOBALS['phpgw']->strip_html($values['descr']));
$this->t->set_var('value_category',$this->cats->id2name($values['cat']));
- $sdate = $values['sdate'] - phpgwapi_datetime::user_timezone();
+ $sdate = $values['sdate'] - $this->botodo->datetime->tz_offset;
$this->t->set_var('value_start_date',$GLOBALS['phpgw']->common->show_date($sdate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']));
if ($values['edate'] && $values['edate'] != 0)
{
- $edate = $values['edate'] - phpgwapi_datetime::user_timezone();
+ $edate = $values['edate'] - $this->botodo->datetime->tz_offset;
$this->t->set_var('value_end_date',$GLOBALS['phpgw']->common->show_date($edate,$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']));
}
@@ -623,8 +585,21 @@
$this->t->set_var('assigned',$assigned);
$cached_data = $this->botodo->cached_accounts($values['owner']);
- $this->t->set_var('owner', (string) $cached_data[$values['owner']]);
+
+ /**
+ * Begin Orlando Fix
+ *
+ * I had to change how $cached_data variables were used( as arrays)
+ * so they can be read as: object -> attribute
+ */
+ $this->t->set_var('owner',$GLOBALS['phpgw']->common->display_fullname($cached_data->lid,
+ $cached_data->firstname,$cached_data->lastname));
+ /**
+ * End Orlando Fix
+ */
+
+
switch ($values['pri'])
{
case 1:
@@ -636,8 +611,6 @@
case 3:
$pri = '<font color="CC0000"><b>' . lang('high') . '</b></font>';
break;
- default:
- $pri = NULL;
}
$this->t->set_var('value_urgency',$pri);
@@ -658,7 +631,7 @@
$values = isset($_POST['values']) ? (array) $_POST['values'] : array();
$submit = isset($_POST['submit']) ? !!$_POST['submit'] : false;
$new_parent = isset($_POST['new_parent']) ? $_POST['new_parent'] : 0;
- $parent = phpgw::get_var('parent', 'int');
+ $parent = isset($_POST['parent']) ? (int) $_POST['parent'] : 0;
$assigned = isset($_POST['assigned']) ? $_POST['assigned'] : 0;
$assigned_group = isset($_POST['assigned_group']) ? $_POST['assigned_group'] : 0;
@@ -754,7 +727,6 @@
$values['syear'] = date('Y',$values['sdate']);
}
- // FIXME move to sbox as a control
$this->t->set_var('start_select_date',$GLOBALS['phpgw']->common->dateformatorder(phpgwapi_sbox::getYears('values[syear]',$values['syear']),
phpgwapi_sbox::getMonthText('values[smonth]',$values['smonth']),phpgwapi_sbox::getDays('values[sday]',$values['sday'])));
@@ -771,7 +743,6 @@
$values['eyear'] = date('Y',$values['edate']);
}
- // FIXME move to sbox as a control
$this->t->set_var('end_select_date',$GLOBALS['phpgw']->common->dateformatorder(phpgwapi_sbox::getYears('values[eyear]',$values['eyear']),
phpgwapi_sbox::getMonthText('values[emonth]',$values['emonth']),phpgwapi_sbox::getDays('values[eday]',$values['eday'])));
@@ -780,7 +751,7 @@
$this->t->set_var('lang_daysfromstartdate',' ');
$this->t->set_var('daysfromstartdate',' ');
- $this->t->set_var('access_list', '<input type="checkbox" name="values[access]" value="True"' . ((!isset($values['access']) || $values['access'] == 'private')?' checked':'') . '>');
+ $this->t->set_var('access_list', '<input type="checkbox" name="values[access]" value="True"' . ($values['access'] == 'private'?' checked':'') . '>');
if ($this->botodo->check_perms($this->grants[$values['owner']],PHPGW_ACL_DELETE) || $values['owner'] == $GLOBALS['phpgw_info']['user']['account_id'])
{
@@ -890,3 +861,4 @@
$this->matrix->out($GLOBALS['phpgw']->link('/index.php', array('menuaction' => 'todo.uitodo.matrix') ) );
}
}
+?>
Modified: people/sigurdne/modules/todo/trunk/inc/hook_deleteaccount.inc.php
===================================================================
--- people/sigurdne/modules/todo/trunk/inc/hook_deleteaccount.inc.php 2009-11-20 10:29:23 UTC (rev 20851)
+++ people/sigurdne/modules/todo/trunk/inc/hook_deleteaccount.inc.php 2009-11-20 10:29:28 UTC (rev 20852)
@@ -10,20 +10,18 @@
* @version $Id$
*/
+ $account_id = phpgw::get_var('account_id', 'int');
+ $new_owner = phpgw::get_var('new_owner', 'int');
+
// Delete all records for a user
$db =& $GLOBALS['phpgw']->db;
- $db->lock('phpgw_todo');
- $new_owner = phpgw::get_var('new_owner', 'int', 'POST');
- $account_id = phpgw::get_var('account_id', 'int', 'POST');
- if($new_owner==0)
+ if ( !$new_owner )
{
- $db->query('DELETE FROM phpgw_todo WHERE todo_owner=' . (int) $_POST['account_id'], __LINE__, __FILE__);
+ $db->query("DELETE FROM phpgw_todo WHERE todo_owner = {$account_id}", __LINE__, __FILE__);
}
else
{
- $db->query('UPDATE phpgw_todo SET todo_owner=' . (int) $_POST['new_owner']
- . ' WHERE todo_owner=' . (int) $_POST['account_id'], __LINE__, __FILE__);
+ $db->query("UPDATE phpgw_todo SET todo_owner = {$new_owner}"
+ . " WHERE todo_owner = {$account_id}", __LINE__, __FILE__);
}
- $db->unlock();
-?>
Modified: people/sigurdne/modules/todo/trunk/setup/phpgw_it.lang
===================================================================
--- people/sigurdne/modules/todo/trunk/setup/phpgw_it.lang 2009-11-20 10:29:23 UTC (rev 20851)
+++ people/sigurdne/modules/todo/trunk/setup/phpgw_it.lang 2009-11-20 10:29:28 UTC (rev 20852)
@@ -55,3 +55,4 @@
you have entered an ending invalid date todo it E' stata inserita una data finale non valida!
you have entered an invailed date todo it hai inserito una data non valida
you have entered an starting invalid date todo it E' stata inserita una data iniziale non valida!
+
Modified: people/sigurdne/modules/todo/trunk/setup/phpgw_sv.lang
===================================================================
--- people/sigurdne/modules/todo/trunk/setup/phpgw_sv.lang 2009-11-20 10:29:23 UTC (rev 20851)
+++ people/sigurdne/modules/todo/trunk/setup/phpgw_sv.lang 2009-11-20 10:29:28 UTC (rev 20852)
@@ -1,55 +1,55 @@
-access changed todo sv Behörighet ändrades
-access type todo sv Åtkomst typ
-add main project todo sv Lågg till huvudprojekt
-add sub project todo sv Lått till underprojekt
-adds or edits a todo item todo sv Lågg till eller ändra ett jobb
+access changed todo sv Beh\xF6righet \xE4ndrades
+access type todo sv \xC5tkomst typ
+add main project todo sv L\xE5gg till huvudprojekt
+add sub project todo sv L\xE5tt till underprojekt
+adds or edits a todo item todo sv L\xE5gg till eller \xE4ndra ett jobb
addsub todo sv Addsub
-are you sure you want to delete this entry todo sv Är du säker på att du vill ta bort detta jobb?
+are you sure you want to delete this entry todo sv \xC4r du s\xE4ker p\xE5 att du vill ta bort detta jobb?
assigned to todo sv Ansvarig
-category changed todo sv Kategori ändrades
-clear form todo sv Rensa formulär
-completed todo sv färdig
+category changed todo sv Kategori \xE4ndrades
+clear form todo sv Rensa formul\xE4r
+completed todo sv f\xE4rdig
created by todo sv Skapat av
-date due todo sv Färdig till
+date due todo sv F\xE4rdig till
days datedue todo sv dagar till slutdatum
deletes a todo item todo sv Raderar ett jobb
-description can not exceed 8000 characters in length todo sv Beskrivningen kan inte överstiga 8000 tecken !
-description changed todo sv Beskrivning ändrades
-do you also want to delete all sub projects ? todo sv Vill du även radera alla underprojekt ?
-edit main project todo sv Ändra huvudprojekt
-edit sub project todo sv Ändra underprojekt
-end date changed todo sv Slutdatum ändrades
-ending date can not be before start date todo sv Slutdatum kan inte vara före startdatum !
+description can not exceed 8000 characters in length todo sv Beskrivningen kan inte \xF6verstiga 8000 tecken !
+description changed todo sv Beskrivning \xE4ndrades
+do you also want to delete all sub projects ? todo sv Vill du \xE4ven radera alla underprojekt ?
+edit main project todo sv \xC4ndra huvudprojekt
+edit sub project todo sv \xC4ndra underprojekt
+end date changed todo sv Slutdatum \xE4ndrades
+ending date can not be before start date todo sv Slutdatum kan inte vara f\xF6re startdatum !
entry added todo sv Jobb sparat
-high todo sv Hög
+high todo sv H\xF6g
last updated todo sv Sist uppdaterat
-low todo sv Låg
+low todo sv L\xE5g
nobody todo sv Ingen
normal todo sv Normal
-or: days from startdate: todo sv eller: dagar från startdatum:
-or: select for today: todo sv eller: markera för idag:
-parent changed todo sv Övre nivå ändrades
-parent project todo sv Övre nivå
-please enter a title todo sv Lågg till en rubrik !
+or: days from startdate: todo sv eller: dagar fr\xE5n startdatum:
+or: select for today: todo sv eller: markera f\xF6r idag:
+parent changed todo sv \xD6vre niv\xE5 \xE4ndrades
+parent project todo sv \xD6vre niv\xE5
+please enter a title todo sv L\xE5gg till en rubrik !
project description todo sv Projekt beskrivning
-returns a the total number of records in the database, must call list_todos first todo sv Visar det totala antalet poster i databasen, måste anropa list_todos först
-show todo items on main screen todo sv Visa att göra på huvudsidan
-start date changed todo sv Startdatum ändrades
+returns a the total number of records in the database, must call list_todos first todo sv Visar det totala antalet poster i databasen, m\xE5ste anropa list_todos f\xF6rst
+show todo items on main screen todo sv Visa att g\xF6ra p\xE5 huvudsidan
+start date changed todo sv Startdatum \xE4ndrades
status todo sv Status
-status changed todo sv Status ändrades
-title changed todo sv Rubrik ändrades
-to do list common sv Att göra lista
-todo common sv Att göra
-todo list common sv Att göra lista
-todo list - add todo sv Att göra lista - lägg till
-todo list - edit todo sv Att göra lista - edit
-todo preferences todo sv Att göra inställningar
+status changed todo sv Status \xE4ndrades
+title changed todo sv Rubrik \xE4ndrades
+to do list common sv Att g\xF6ra lista
+todo common sv Att g\xF6ra
+todo list common sv Att g\xF6ra lista
+todo list - add todo sv Att g\xF6ra lista - l\xE4gg till
+todo list - edit todo sv Att g\xF6ra lista - edit
+todo preferences todo sv Att g\xF6ra inst\xE4llningar
urgency todo sv Prioritet
-urgency changed todo sv Prioritet ändrades
-view matrix of actual month todo sv Visa matrisvy över aktuell månad
+urgency changed todo sv Prioritet \xE4ndrades
+view matrix of actual month todo sv Visa matrisvy \xF6ver aktuell m\xE5nad
view todo item todo sv Visa jobb
which groups todo sv Vilken grupp
-you can only enter numbers for days from now todo sv Du kan bara ange antal dagar från nu !
+you can only enter numbers for days from now todo sv Du kan bara ange antal dagar fr\xE5n nu !
you have entered an ending invalid date todo sv Du har angett ett felaktigt slutdatum !
you have entered an invailed date todo sv du har skrivit in ett ogiltigt datum
you have entered an starting invalid date todo sv Du har angett ett felaktigt startdatum !
Modified: people/sigurdne/modules/todo/trunk/templates/base/preference_acl_row.tpl
===================================================================
--- people/sigurdne/modules/todo/trunk/templates/base/preference_acl_row.tpl 2009-11-20 10:29:23 UTC (rev 20851)
+++ people/sigurdne/modules/todo/trunk/templates/base/preference_acl_row.tpl 2009-11-20 10:29:28 UTC (rev 20852)
@@ -1,5 +1,5 @@
<!-- $Id$ -->
-<tr bgcolor="{row_color}">
+<tr class="{row_class}">
<td>{user}</td>
<td align="center"><input type="checkbox" name="{read}" value="Y"{read_selected}></td>
<td align="center"><input type="checkbox" name="{add}" value="Y"{add_selected}></td>
Modified: people/sigurdne/modules/todo/trunk/templates/base/preference_colspan.tpl
===================================================================
--- people/sigurdne/modules/todo/trunk/templates/base/preference_colspan.tpl 2009-11-20 10:29:23 UTC (rev 20851)
+++ people/sigurdne/modules/todo/trunk/templates/base/preference_colspan.tpl 2009-11-20 10:29:28 UTC (rev 20852)
@@ -1,5 +1,5 @@
<!-- $Id$ -->
-<tr bgcolor="{bg_color}">
+<tr class="th">
<td>{string}</td>
<td align="center">{read_lang}</td>
<td align="center">{add_lang}</td>
Added: people/sigurdne/modules/todo/trunk/templates/portico/images/navbar.png
===================================================================
(Binary files differ)
Property changes on: people/sigurdne/modules/todo/trunk/templates/portico/images/navbar.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream