[CS-Project-svn_notify] SF.net SVN: cs-project: [877] trunk/1.2
Brought to you by:
crazedsanity
Menu
▾
▴
[CS-Project-svn_notify] SF.net SVN: cs-project: [877] trunk/1.2
|
From: <cra...@us...> - 2008-04-09 03:57:23
|
Revision: 877
http://cs-project.svn.sourceforge.net/cs-project/?rev=877&view=rev
Author: crazedsanity
Date: 2008-04-08 20:57:22 -0700 (Tue, 08 Apr 2008)
Log Message:
-----------
More renaming of "todo" to "task" (issue #151)
Modified Paths:
--------------
trunk/1.2/lib/helpdeskClass.php
trunk/1.2/lib/site_config.php
trunk/1.2/templates/content/helpdesk/view.content.tmpl
trunk/1.2/templates/content/project/view/index.content.tmpl
Added Paths:
-----------
trunk/1.2/templates/content/related_task.shared.tmpl
Removed Paths:
-------------
trunk/1.2/templates/content/related_todo.shared.tmpl
Modified: trunk/1.2/lib/helpdeskClass.php
===================================================================
--- trunk/1.2/lib/helpdeskClass.php 2008-04-09 03:56:56 UTC (rev 876)
+++ trunk/1.2/lib/helpdeskClass.php 2008-04-09 03:57:22 UTC (rev 877)
@@ -457,38 +457,38 @@
//=========================================================================
- function get_todos($helpdeskId) {
+ function get_tasks($helpdeskId) {
$retval = 0;
$prefObj = new pref($this->db, $_SESSION['uid']);
- $todoDisplayPref = $prefObj->get_pref_value_by_name('projectDetails_todoDisplayOnlyMine');
+ $taskDisplayPref = $prefObj->get_pref_value_by_name('projectDetails_taskDisplayOnlyMine');
- $todoObj = new todoClass($this->db);
+ $taskObj = new taskClass($this->db);
- //attempt to get a list of the todos...
+ //attempt to get a list of the tasks...
//TODO: change this reference to "publicId" instead of "projectId"
- $todoObj->projectId = $helpdeskId;
+ $taskObj->projectId = $helpdeskId;
$critArr = array("record_id"=>$this->get_parent_from_ancestry($this->get_ancestry($helpdeskId,TRUE),0));
$contactCrit = NULL;
- if($todoDisplayPref != 'all') {
- if($todoDisplayPref == 'mine') {
+ if($taskDisplayPref != 'all') {
+ if($taskDisplayPref == 'mine') {
$contactCrit = array(
't.creator_contact_id' => $_SESSION['contact_id'],
't.assigned_contact_id' => $_SESSION['contact_id']
);
}
- elseif($todoDisplayPref == 'assigned') {
+ elseif($taskDisplayPref == 'assigned') {
$contactCrit = array(
't.assigned_contact_id' => $_SESSION['contact_id']
);
}
}
- $retval = $todoObj->get_todos($critArr, NULL, $contactCrit);
+ $retval = $taskObj->get_tasks($critArr, NULL, $contactCrit);
return($retval);
- }//end get_todos()
+ }//end get_tasks()
//=========================================================================
Modified: trunk/1.2/lib/site_config.php
===================================================================
--- trunk/1.2/lib/site_config.php 2008-04-09 03:56:56 UTC (rev 876)
+++ trunk/1.2/lib/site_config.php 2008-04-09 03:57:22 UTC (rev 877)
@@ -127,7 +127,7 @@
define('SEQ_HELPDESK', 'special__helpdesk_public_id_seq');
define('SEQ_PROJECT', 'special__project_public_id_seq');
define('SEQ_MAIN', 'record_table_record_id_seq');
-define('TABLE_TODOCOMMENT', 'todo_comment_table');
+define('TABLE_TODOCOMMENT', 'task_comment_table');
define('FORMAT_WORDWRAP', 90);
//=========================================================================
Modified: trunk/1.2/templates/content/helpdesk/view.content.tmpl
===================================================================
--- trunk/1.2/templates/content/helpdesk/view.content.tmpl 2008-04-09 03:56:56 UTC (rev 876)
+++ trunk/1.2/templates/content/helpdesk/view.content.tmpl 2008-04-09 03:57:22 UTC (rev 877)
@@ -190,7 +190,7 @@
<th>Todos:</th>
<td>
- <div id="related_todo">{related_todo}</div>
+ <div id="related_task">{related_task}</div>
</td>
</tr>
<tr>
Modified: trunk/1.2/templates/content/project/view/index.content.tmpl
===================================================================
--- trunk/1.2/templates/content/project/view/index.content.tmpl 2008-04-09 03:56:56 UTC (rev 876)
+++ trunk/1.2/templates/content/project/view/index.content.tmpl 2008-04-09 03:57:22 UTC (rev 877)
@@ -119,7 +119,7 @@
</tr>
<tr>
<td width="50%">
- <div id="related_todo" width="100%">{related_todo}</div>
+ <div id="related_task" width="100%">{related_task}</div>
<div id="related_note" style="padding-top:1em;">{related_note}</div>
</td>
Copied: trunk/1.2/templates/content/related_task.shared.tmpl (from rev 875, trunk/1.2/templates/content/related_todo.shared.tmpl)
===================================================================
--- trunk/1.2/templates/content/related_task.shared.tmpl (rev 0)
+++ trunk/1.2/templates/content/related_task.shared.tmpl 2008-04-09 03:57:22 UTC (rev 877)
@@ -0,0 +1,39 @@
+<table cellpadding="2" cellspacing="0" border="1">
+<tr>
+ <td colspan="8">
+ <b>Related Tasks: </b>
+ (<a href='/content/task/create?parentPublicId={public_id}&module={module}' target=_top>Create</a>):
+ <a href="/help/task" target="_blank">
+ <img src="/images/icon-help.png" border="0"></a>
+<!-- BEGIN taskPrefWarning -->
+ <BR><font color="red"><b>Warning:</b></font> Not all issues will be displayed, due to your <a href="/content/settings">preferences</a>.
+<!-- END taskPrefWarning -->
+ </td>
+</tr>
+<tr>
+ <th>Pri</th>
+ <th>Creator</th>
+ <th>Assigned</th>
+ <th>%</th>
+ <th>Status</th>
+ <th>Title</th>
+ <th>Deadline</th>
+ <th>Hours Left</th>
+</tr>
+
+<!-- BEGIN related_task_row -->
+<tr style="background-color: %%bgColor%%;" onmouseover="this.style.backgroundColor = '#ffffff'"
+ onmouseout="this.style.backgroundColor = '%%bgColor2%%'" onclick="location.href = '/content/task/view?ID=%%id%%'">
+ <td><font style="font-weight:%%font_weight%%;">%%priority%%</font></td>
+ <td><font style="font-weight:%%font_weight%%;">%%creator%%</font></td>
+ <td><font style="font-weight:%%font_weight%%;">%%assigned_user%%</font></td>
+ <td align="right"><font style="font-weight:%%font_weight%%;">%%progress%%%</font></td>
+ <td nowrap align="center">(%%status_text%%)</td>
+ <td><a href="/content/task/view?ID=%%id%%" target="_top" style="font-weight:%%font_weight%%;">
+ %%name%%</a></td>
+ <td>%%deadline%%</td>
+ <td><b>%%hours_remaining%%</b> (%%estimate_current%%) </td>
+
+</tr>
+<!-- END related_task_row -->
+</table>
\ No newline at end of file
Deleted: trunk/1.2/templates/content/related_todo.shared.tmpl
===================================================================
--- trunk/1.2/templates/content/related_todo.shared.tmpl 2008-04-09 03:56:56 UTC (rev 876)
+++ trunk/1.2/templates/content/related_todo.shared.tmpl 2008-04-09 03:57:22 UTC (rev 877)
@@ -1,39 +0,0 @@
-<table cellpadding="2" cellspacing="0" border="1">
-<tr>
- <td colspan="8">
- <b>Related Tasks: </b>
- (<a href='/content/todo/create?parentPublicId={public_id}&module={module}' target=_top>Create</a>):
- <a href="/help/task" target="_blank">
- <img src="/images/icon-help.png" border="0"></a>
-<!-- BEGIN todoPrefWarning -->
- <BR><font color="red"><b>Warning:</b></font> Not all issues will be displayed, due to your <a href="/content/settings">preferences</a>.
-<!-- END todoPrefWarning -->
- </td>
-</tr>
-<tr>
- <th>Pri</th>
- <th>Creator</th>
- <th>Assigned</th>
- <th>%</th>
- <th>Status</th>
- <th>Title</th>
- <th>Deadline</th>
- <th>Hours Left</th>
-</tr>
-
-<!-- BEGIN related_todo_row -->
-<tr style="background-color: %%bgColor%%;" onmouseover="this.style.backgroundColor = '#ffffff'"
- onmouseout="this.style.backgroundColor = '%%bgColor2%%'" onclick="location.href = '/content/todo/view?ID=%%id%%'">
- <td><font style="font-weight:%%font_weight%%;">%%priority%%</font></td>
- <td><font style="font-weight:%%font_weight%%;">%%creator%%</font></td>
- <td><font style="font-weight:%%font_weight%%;">%%assigned_user%%</font></td>
- <td align="right"><font style="font-weight:%%font_weight%%;">%%progress%%%</font></td>
- <td nowrap align="center">(%%status_text%%)</td>
- <td><a href="/content/todo/view?ID=%%id%%" target="_top" style="font-weight:%%font_weight%%;">
- %%name%%</a></td>
- <td>%%deadline%%</td>
- <td><b>%%hours_remaining%%</b> (%%estimate_current%%) </td>
-
-</tr>
-<!-- END related_todo_row -->
-</table>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
