tutos-commits Mailing List for TUTOS

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7855/php

Modified Files:
      Tag: BRANCH-2-0
	acl_new.php address.pinc config_default.pinc db.p3 
	task_show.php team_new.php user.pinc 
Log Message:
* task show shows sub tasks and bugs
* new config option for people selections (name order)
* DEBUG: bug_overview columns are not all re oderable


Index: acl_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_new.php,v
retrieving revision 1.32.2.3
retrieving revision 1.32.2.4
diff -u -r1.32.2.3 -r1.32.2.4
--- acl_new.php	27 Sep 2004 16:41:52 -0000	1.32.2.3
+++ acl_new.php	30 Sep 2004 17:09:33 -0000	1.32.2.4
@@ -69,7 +69,11 @@
            if ( method_exists($x,"gettype") && ($x->gettype() == "team") ) {
              $pre = $lang['team'] ." ";
            } 
-           if ( method_exists($x,"getFullName") ) {
+
+           if ( method_exists($x,"getOrderedFullname") ) {
+             $this->user->parties[$i] = $pre . $x->getOrderedFullname();
+	   }
+           else if ( method_exists($x,"getFullName") ) {
              $this->user->parties[$i] = $pre . $x->getFullName();
            }
            unset($x);

Index: address.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address.pinc,v
retrieving revision 1.105.2.3
retrieving revision 1.105.2.4
diff -u -r1.105.2.3 -r1.105.2.4
--- address.pinc	1 Sep 2004 16:44:53 -0000	1.105.2.3
+++ address.pinc	30 Sep 2004 17:09:33 -0000	1.105.2.4
@@ -157,14 +157,38 @@
   }
 
   /**
+   * Return the long name, respecting the « select name order » config
+   * variable
+   */
+  function getOrderedFullname() {
+    global $tutos, $lang;
+    if ( $this->m_name != "") {
+      if( $tutos[select_name_order] == "last" )
+	return sprintf($lang['AdrFormat1'],
+		       $this->l_name, $this->m_name ,$this->f_name);
+      else
+	return sprintf($lang['AdrFormat1'],
+		       $this->f_name, $this->m_name ,$this->l_name);
+    }
+    else {
+      if( $tutos[select_name_order] == "last" )
+	return sprintf($lang['AdrFormat2'],$this->l_name, $this->f_name);
+      else
+	return sprintf($lang['AdrFormat2'],$this->f_name, $this->l_name);
+    }
+  }
+
+  /**
    * Return the Long Name
    */
   function getFullname() {
-    global $lang;
+    global $tutos, $lang;
     if ( $this->m_name != "") {
-      return sprintf($lang['AdrFormat1'],$this->f_name, $this->m_name ,$this->l_name);
-    } else {
-      return sprintf($lang['AdrFormat2'],$this->f_name, $this->l_name);
+	return sprintf($lang['AdrFormat1'],
+		       $this->f_name, $this->m_name ,$this->l_name);
+    }
+    else {
+	return sprintf($lang['AdrFormat2'],$this->f_name, $this->l_name);
     }
   }
 

Index: config_default.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/config_default.pinc,v
retrieving revision 1.76.2.1
retrieving revision 1.76.2.2
diff -u -r1.76.2.1 -r1.76.2.2
--- config_default.pinc	11 May 2004 13:43:43 -0000	1.76.2.1
+++ config_default.pinc	30 Sep 2004 17:09:33 -0000	1.76.2.2
@@ -678,4 +678,10 @@
 #
 $tutos[version]="2.0-dev";
 #
+
+# name ordering for selecting addresses (people)
+#  first means first name first
+#  last  means last name first
+$tutos[select_name_order] = "first";
+
 ?>
\ No newline at end of file

Index: db.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db.p3,v
retrieving revision 1.138.2.1
retrieving revision 1.138.2.2
diff -u -r1.138.2.1 -r1.138.2.2
--- db.p3	14 Apr 2004 17:39:09 -0000	1.138.2.1
+++ db.p3	30 Sep 2004 17:09:33 -0000	1.138.2.2
@@ -9,7 +9,7 @@
 #
 # Tutos Array
 # these are constans used in config files ans elsewhere
-# DO NOT CHNAGE
+# DO NOT CHANGE
 #
 define ('dbtype',0);
 define ('dbname',1);
@@ -131,6 +131,9 @@
 define ('smtp_password',120);
 define ('loadedmodules',121);
 
+# name ordering for selecting addresses (people names)
+define ('select_name_order', 122);
+
 # Permissions and Object IDS (see also user.pinc) NO CHANGES HERE !
 # These are distinct IDS for the different Objcts in TUTOS
 # never ! change or reuse a ID

Index: task_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_show.php,v
retrieving revision 1.66.2.10
retrieving revision 1.66.2.11
diff -u -r1.66.2.10 -r1.66.2.11
--- task_show.php	28 Sep 2004 16:20:07 -0000	1.66.2.10
+++ task_show.php	30 Sep 2004 17:09:33 -0000	1.66.2.11
@@ -59,7 +59,7 @@
        $parents = array();
        $x = $this->obj->parent;
        while ( isset ( $x ) ) {
-         echo $pre . $lang[$x->gettype()] . " " . $x->getLink();
+         // echo $pre . $lang[$x->gettype()] . " " . $x->getLink();
 	 $parents[] = array('label' => $x->getFullName(),
 			    'title' => $x->getFullName(),
 			    'link'  => $x->getUrl(),
@@ -124,130 +124,34 @@
 			 'green' => $green,
 			 'red'   => $red));
 
-     $this->template('task_show');
-
-     /*
-     $this->obj->readTasks();
-     if ( count($this->obj->tasklist) > 0 ) {
-       @reset($this->obj->tasklist);
-       echo "<tr>\n";
-       echo $this->showfield($lang['Tasks']);
-       echo " <td valign=\"top\" colspan=\"3\">\n";
-       echo  makelink("task_overview.php?id=". $this->obj->id,$lang['TaskOverview'],sprintf($lang['TaskOverviewInfo'],$this->obj->getFullName()));
-       echo "<br>\n";
-       $n = 0;
-       while ( list ($i,$f) = @each ($this->obj->tasklist) ) {
-         if ( $n > 2 ) {
-         }
-         echo "  ". $f->getLink() ."<br>\n";
-        $n++;
-       }
-       echo " </td>\n";
-       echo "</tr>\n";
-     }
-     if ( $this->user->feature_ok(usetimetrack,PERM_SEE) ) {
-       $timesum = 0.0;
-       $costsum = 0.0;
-       $this->obj->readTimetrackSum();
-       $rows = 0;
-       if ( $this->obj->timetracksum > 0) {
-         $rows++;
-       }
-       @reset ($this->obj->tsum);
-       while( list ($i,$f) = @each ($this->obj->tsum)) {
-         if ( $this->obj->tsum[$i] > 0 ) {
-           $rows++;
-         }
-       }
-       $r = 0;
-       if ( $rows > 0 ) {
-         if ( $rows > 1 ) {
-           $rows++;
-         }
-         echo "<tr>\n";
-         echo "<td class=\"desc\" valign=\"top\" rowspan=\"". $rows ."\">". $lang['Timetrack'] ;
-         echo "</td>\n";
-
-         if ( $this->obj->timetracksum > 0) {
-           echo " <td valign=\"top\" align=\"right\">\n";
-           echo makelink("timetrack_overview.php?link_id=". $this->obj->id ,number_format($this->obj->timetracksum,2),$lang['TimetrackOverview']);
-           echo " </td>\n";
-           echo " <td align=\"left\">". $lang['hours'] ."</td>\n";
-           echo " <td>&nbsp;</td>\n";
-           echo "</tr>\n";
-           $r = 1;
-           $timesum += $this->obj->timetracksum;
-         }
-         @reset ($this->obj->tsum);
-         while( list ($i,$f) = @each ($this->obj->tsum)) {
-           if ( $this->obj->tsum[$i] > 0 ) {
-             if ( $r == 1 ) {
-               echo "<tr>\n";
-             }
-             echo " <td valign=\"top\" align=\"right\">";
-             echo makelink("timetrack_overview.php?link_id=". $this->obj->id ."&amp;show=".$i,number_format($this->obj->tsum[$i],2),$lang['TimetrackOverview']);
-             echo " </td>\n";
-             echo " <td align=\"left\">". $lang['hours'] ."</td>\n";
-             echo " <td>(". $lang[$i] .")</td>\n";
-             echo "</tr>\n";
-             $timesum += $this->obj->tsum[$i];
-             $r = 1;
-           }
-         }
-       }
-       if ( $rows > 1 ) {
-         // Summary
-         echo "<tr>\n";
-         echo " <td valign=\"top\" align=\"right\">==&nbsp;";
-         echo makelink("timetrack_overview.php?link_id=". $this->obj->id ."&amp;show=all" ,number_format($timesum,2),$lang['TimetrackOverview']);
-         echo " </td>\n";
-         echo " <td colspan=\"2\" align=\"left\">". $lang['hours'] ."</td>\n";
-         echo "</tr>\n";
-       }
-     }
-
-     // References to modules
-     show_module_infolists($this->user,$this->obj,4,$this->format);
-
-     echo $this->obj->getHistoryLink(4);
-     echo $this->DataTableEnd();
+     /**
+      * Get the task list
+      */
+     $tasklist = array();
+     if ( $this->user->feature_ok(usetaskmanagement, PERM_SEE) ) {
+       $this->obj->readTasks();
+
+       foreach( $this->obj->tasklist as $i => $f ) {
+	 $tmp = $this->obj->tasklist[$i]->printRow($this->obj);
+	 if( count($tmp) > 0 )
+	   $tasklist[] = $tmp;
+       }
+     }
+     $this->assign('tasklist',
+		   array('label'  =>
+			 $lang['TaskSubTask']." ".$this->obj->getFullName(),
+			 'llabel' => $lang['TaskOverview'],
+			 'link'   => "task_overview.php?id=".$this->obj->id,
+			 'ltitle' => sprintf($lang['TaskOverviewInfo'],
+					     $this->obj->getFullName()),
+			 'image'  => 'folder',
+			 'value'  => task::flatten_tasks($tasklist)));
+
+     $infos = show_module_infolists($this->user,$this->obj,4,$this->format);
+     // $this->debug($infos);
+     $this->assign('modules', $infos);
 
-     $c = $this->obj->getcompletion();
-     $m1 = max($c,100);
-     $m2 = min($c,100);
- 
-     $w = 400;
-
-     // One Percent
-     $p = $w / $m1;
-
-     $s = Round($p * 20);
-
-     DoubleTableStart(1,0);
-     echo " <tr>\n";
-     echo "  <th colspan=\"3\">". sprintf($lang['TaskCompleted'],$c) ."</th>\n";
-     echo " </tr>\n";
-     echo " <tr>\n";
-     echo "  <td colspan=\"2\">0 - 100 </td>\n";
-     echo "  <td align=\"center\" colspan=\"". ($w - 5 * $s) ."\"><font color=\"red\">&gt; 100</font></td>\n";
-     echo " </tr>\n";
-     echo " <tr>\n";
-     // Work done in time/volume
-     if ( Round($m2 * $p) > 0 ) {
-       echo "  <td class=\"taskdone\"><img height=\"20\" width=\"". Round($m2 * $p)."\" src=\"". $tutos['base'] ."/html/green.png\" alt=\"--------\"></td>\n";
-     }
-     // Work to do
-     if ( Round((100 - $c) * $p) > 0 ) {
-       echo "  <td class=\"tasktodo\"><img height=\"20\" width=\"". Round((100 - $c) * $p)."\" src=\"". $tutos['base'] ."/html/red.png\" alt=\"--------\"></td>\n";
-     }
-     // Work done more than scheduled
-     if ( Round(($c - 100) * $p) > 0 ) {
-       echo "  <td class=\"taskmuch\"><img height=\"20\" width=\"". Round(($c - 100) * $p)."\" src=\"". $tutos['base'] ."/html/blue.png\" alt=\"--------\"></td>\n";
-     }
- 
-     echo " </tr>\n";
-     DoubleTableEnd();
-     */
+     $this->template('task_show');
    }
 
    /**

Index: team_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_new.php,v
retrieving revision 1.43.2.2
retrieving revision 1.43.2.3
diff -u -r1.43.2.2 -r1.43.2.3
--- team_new.php	2 Sep 2004 15:39:42 -0000	1.43.2.2
+++ team_new.php	30 Sep 2004 17:09:33 -0000	1.43.2.3
@@ -88,20 +88,19 @@
        $r = $this->dbconn->Exec($q);
        $n = $r->numrows();
        $a = 0;
-       while ( $a < $n ) {
+       for ( $a = 0;  $a < $n; $a++ ) {
          $aid = $r->get($a,"id");
          if ($aid == $this->obj->id) {
-           $a++;
            continue;
          }
 
          $uids[$aid] = $lang['Team']." ".$r->get($a,"name");
          $cchecked[$aid] = "";
-         $a++;
        }
        $r->free();
        unset($x);
-     } else {
+     }
+     else {
        $this->user->readKnownParties();
        foreach($this->user->a_parties as $aid => $f) {
          $uids[$aid] = $f;

Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.130.2.9
retrieving revision 1.130.2.10
diff -u -r1.130.2.9 -r1.130.2.10
--- user.pinc	16 Sep 2004 15:59:41 -0000	1.130.2.9
+++ user.pinc	30 Sep 2004 17:09:33 -0000	1.130.2.10
@@ -15,7 +15,7 @@
   /**
    */
   function tutos_user(&$dbconn) {
-    global $current_user,$tutos,$lang;
+    global $current_user, $tutos, $lang;
 
     parent::tutos_address($dbconn);
 
@@ -319,7 +319,6 @@
 
     $t1 .= ")";
 
-
     #
     # users we may see by special (ACL) allowance
     #
@@ -330,14 +329,20 @@
 
     $r = $this->dbconn->Exec($q);
     $n = $r->numrows();
-    $a = 0;
-    while ( $a < $n ) {
+
+    for($a=0; $a < $n; $a++ ) {
       $id    = $r->get($a, "adr_id");
       $l_name = $r->get($a, "l_name");
       $f_name = $r->get($a, "f_name");
-      $this->parties[$id] = sprintf($lang['AdrFormat2'],$f_name, $l_name);
-      $this->a_parties[$id] = sprintf($lang['AdrFormat2'],$f_name ,$l_name);
-      $a++;
+
+      if( $tutos[select_name_order] == "last" ) {
+	$this->parties[$id]   = sprintf($lang['AdrFormat2'],$l_name, $f_name);
+	$this->a_parties[$id] = sprintf($lang['AdrFormat2'],$l_name ,$f_name);
+      }
+      else {
+	$this->parties[$id]   = sprintf($lang['AdrFormat2'],$f_name, $l_name);
+	$this->a_parties[$id] = sprintf($lang['AdrFormat2'],$f_name ,$l_name);
+      }
     }
     $r->free();
 
@@ -377,19 +382,26 @@
 
     $r = $this->dbconn->exec($q);
     $n = $r->numrows();
-    $a = 0;
-    while ( $a < $n ) {
+
+    for($a = 0;  $a < $n; $a++ ) {
       $id    = $r->get($a, "id");
       $l_name = $r->get($a, "l_name");
       $f_name = $r->get($a, "f_name");
-      $this->parties[$id] = sprintf($lang['AdrFormat2'],$f_name, $l_name);
-      $this->a_parties[$id] = sprintf($lang['AdrFormat2'],$f_name ,$l_name);
-      $a++;
+
+      if( $tutos[select_name_order] == "last" ) {
+	$this->parties[$id]   = sprintf($lang['AdrFormat2'],$l_name, $f_name);
+	$this->a_parties[$id] = sprintf($lang['AdrFormat2'],$l_name ,$f_name);
+      }
+      else {
+	$this->parties[$id]   = sprintf($lang['AdrFormat2'],$f_name, $l_name);
+	$this->a_parties[$id] = sprintf($lang['AdrFormat2'],$f_name ,$l_name);
+      }
     }
     $r->free();
-    # Self
-    $this->parties[$this->id] = $this->getFullName();
-    $this->a_parties[$this->id] = $this->getFullName();
+
+    // Self
+    $this->parties[$this->id]   = $this->getOrderedFullname();
+    $this->a_parties[$this->id] = $this->getOrderedFullname();
 
     return;
   }
@@ -423,18 +435,27 @@
 
     if( $project != -1 ) {
       $project->readroles();
-      @reset($project->role);
-      while( list($role, $xf) = each($project->role) ) {
+
+      foreach( $project->role as $role => $xf ) {
         if( isset($project->role[$role]) && is_array($project->role[$role]) ) {
-	  foreach( $project->role[$role] as $i => $o )
+	  foreach( $project->role[$role] as $i => $o ) {
+	    /**
+	     * Include only address and teams elements
+	     */
+	    if( $o->getType() != "address" && $o->getType() != "team" )
+	      continue;
+
 	    if( $with_id )
-	      $rlist[$o->id] = $o->getFullName();
+	      $rlist[$o->id] = $o->getOrderedFullname();
 	    else {
 	      $rids[]  = $o->id;
 	      $rlist[] = $o->getFullName();
 	    }
+	  }
         }
       }
+      if( $tutos[select_name_order] == "last" )
+	asort($rlist);
     }
 
     /**

Update of /cvsroot/tutos/tutos/templates/classic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7855/templates/classic

Modified Files:
      Tag: BRANCH-2-0
	product_show.tpl task_show.tpl 
Added Files:
      Tag: BRANCH-2-0
	buglist.tpl tasklist.tpl 
Log Message:
* task show shows sub tasks and bugs
* new config option for people selections (name order)
* DEBUG: bug_overview columns are not all re oderable


--- NEW FILE: buglist.tpl ---
{* TUTOS buglist template, used from product_show.tpl and task_show.tpl *}
{* $Id: buglist.tpl,v 1.1.2.1 2004/09/30 17:09:34 tapoueh Exp $ *}

{strip}
<table class={if $class != ""}"{$class}"{else}"summary"{/if}
       cellspacing={if $cellspacing != ""}"{$cellspacing}"{else}"0"{/if}
       {if $width != ""}width="{$width}"{/if}
       align={if $align != ""}"{$align}"{else}"left"{/if}
       {if $style != ""}style="{$style}"{/if}
>
{/strip}
<thead>
<tr>
<th colspan="4">
  <img src="{$base}/html/classic/bugs.png">{$modules.bugtracking.label}
</th>
</tr>
</thead>

<tbody>
<tr>
<td><img src="{$base}/html/classic/bugs.png"></td>
<td colspan="3">
  <a href="{$modules.bugtracking.slink}"
     title="{$modules.bugtracking.stitle}">{$modules.bugtracking.slabel}</a>
</td>
</tr>

{foreach from=$modules.bugtracking.summary item=b}
<tr>
  <td><img src="{$base}/html/classic/bugs.png"></td>
  <td><a href="{$b.link}" title="{$b.desc}">{$b.label}</a></td>
  <td class="data">{$b.nb}</td>
  <td class="data">{$b.volume}&nbsp;{$hours}</td>
</tr>
{/foreach}
</tbody>
</table>

--- NEW FILE: tasklist.tpl ---
{* TUTOS tasklist template, used from product_show.tpl and task_show.tpl *}
{* $Id: tasklist.tpl,v 1.1.2.1 2004/09/30 17:09:34 tapoueh Exp $ *}

{strip}
<table class={if $class != ""}"{$class}"{else}"summary"{/if}
       cellspacing={if $cellspacing != ""}"{$cellspacing}"{else}"0"{/if}
       {if $width != ""}width="{$width}"{/if}
       align={if $align != ""}"{$align}"{else}"left"{/if}
       {if $style != ""}style="{$style}"{/if}
>
{/strip}
<thead>
<tr>
<th colspan="2"><img src="{$base}/html/classic/task.png">{$tasklist.label}</th>
</tr>
</thead>

{if $task_overview}
<tr>
<td><img src="{$base}/html/classic/task_overview.png"></td>
<td>
  <a href="{$tasklist.link}" title="{$tasklist.ltitle}">{$tasklist.llabel}</a>
</td>
</tr>
{/if}

{foreach from=$tasklist.value item=task}
<tr>
<td><img src="{$base}/html/classic/task.png"></td>
<td style="white-space: nowrap;">
  {strip}
  {""|indent:$task.depth:"&nbsp;&nbsp;"}
  <a href="{$task.link}" title="{$task.title}">{$task.name}</a>
  {/strip}
</td>
</tr>
{/foreach}

</tbody>
</table>
Index: product_show.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/product_show.tpl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- product_show.tpl	27 Jul 2004 12:51:23 -0000	1.1.2.8
+++ product_show.tpl	30 Sep 2004 17:09:34 -0000	1.1.2.9
@@ -132,68 +132,15 @@
 <td valign="top">
 
 {if $tasklist.value != ""}
-<table class="summary" cellspacing="0"  align="left" width="100%">
-<thead>
-<tr>
-<th colspan="2"><img src="{$base}/html/classic/task.png">{$tasklist.label}</th>
-</tr>
-</thead>
-
-<tr>
-<td><img src="{$base}/html/classic/task_overview.png"></td>
-<td>
-  <a href="{$tasklist.link}" title="{$tasklist.ltitle}">{$tasklist.llabel}</a>
-</td>
-</tr>
-
-{foreach from=$tasklist.value item=task}
-<tr>
-<td><img src="{$base}/html/classic/task.png"></td>
-<td style="white-space: nowrap;">
-  {strip}
-  {""|indent:$task.depth:"&nbsp;&nbsp;"}
-  <a href="{$task.link}" title="{$task.title}">{$task.name}</a>
-  {/strip}
-</td>
-</tr>
-{/foreach}
+  {include file="classic/tasklist.tpl" task_overview=True}
 {/if}
-</tbody>
-</table>
 
 </td>
 <td valign="top">
 
 {* BugTracking *}
 {if count($modules.bugtracking) > 0}
-<table class="summary" cellspacing="0" align="right" width="100%">
-<thead>
-<tr>
-<th colspan="4">
-  <img src="{$base}/html/classic/bugs.png">{$modules.bugtracking.label}
-</th>
-</tr>
-</thead>
-
-<tbody>
-<tr>
-<td><img src="{$base}/html/classic/bugs.png"></td>
-<td colspan="3">
-  <a href="{$modules.bugtracking.slink}"
-     title="{$modules.bugtracking.stitle}">{$modules.bugtracking.slabel}</a>
-</td>
-</tr>
-
-{foreach from=$modules.bugtracking.summary item=b}
-<tr>
-  <td><img src="{$base}/html/classic/bugs.png"></td>
-  <td><a href="{$b.link}" title="{$b.desc}">{$b.label}</a></td>
-  <td class="data">{$b.nb}</td>
-  <td class="data">{$b.volume}&nbsp;{$hours}</td>
-</tr>
-{/foreach}
-</tbody>
-</table>
+  {include file="classic/buglist.tpl" align="right"}
 {/if}
 </td>
 

Index: task_show.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_show.tpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- task_show.tpl	13 Sep 2004 16:07:56 -0000	1.1.2.5
+++ task_show.tpl	30 Sep 2004 17:09:34 -0000	1.1.2.6
@@ -3,7 +3,16 @@
 
 <!-- task_show start -->
 
-<table class="single">
+<table>
+<colgroup>
+<col width="50%">
+<col width="50%">
+</colgroup>
+
+<tr>
+<td colspan="2" align="center">
+
+<table class="summary" cellspacing="0">
 <thead>
 <tr>
   <th class="desc" colspan="4">
@@ -84,23 +93,55 @@
 </tr>
 {/if}
 
+<tr>
+<td colspan="4" align="center">
 <table cellpadding="0" cellspacing="0">
 <tr>
-  <th colspan="3">{$completion.label}</th>
+  <th colspan="2" style="text-align: left;">{$completion.label}</th>
 </tr>
 <tr>
 <td>
   <table width="{$completion.w}" cellspacing="0" cellpadding="0">
+  <tr>
+  {if $completion.green == 0}
+  <td colspan="2" class="ow-red"></td>
+  {elseif $completion.red == 0}
+  <td colspan="2" class="ow-green"></td>
+  {else}
   <colgroup>
     <col width="{$completion.green}">
     <col width="{$completion.red}">
   </colgroup>
   <td class="ow-green"></td>
   <td class="ow-red"></td>
+  {/if}
+  </tr>
   </table>
 </td>
 </tr>
+</table>
+</td>
+</tr>
+
 <tbody>
 </table>
 
+</td>
+</tr>
+
+<tr>
+<td valign="top">
+{if $tasklist.value != ""}
+  {include file="classic/tasklist.tpl" align="left"}
+{/if}
+</td>
+
+<td valign="top">
+{if count($modules.bugtracking) > 0}
+  {include file="classic/buglist.tpl" align="right"}
+{/if}
+</td>
+</tr>
+
+</table>
 <!-- task_show stop -->
\ No newline at end of file

Update of /cvsroot/tutos/tutos/templates/classic/bugtracking
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7855/templates/classic/bugtracking

Modified Files:
      Tag: BRANCH-2-0
	bug_overview.tpl 
Log Message:
* task show shows sub tasks and bugs
* new config option for people selections (name order)
* DEBUG: bug_overview columns are not all re oderable


Index: bug_overview.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/bugtracking/Attic/bug_overview.tpl,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- bug_overview.tpl	29 Sep 2004 16:23:55 -0000	1.1.2.9
+++ bug_overview.tpl	30 Sep 2004 17:09:34 -0000	1.1.2.10
@@ -20,8 +20,9 @@
 {foreach from=$headers item=h}
  {* If we show bugs from project X, don't show it on every line *}
  {if not ( $h.name == 'ref' and $search.pid != "" ) }
-
   <th>
+  {* The 'ref' column should not allow re ordering *}
+  {if $h.name != "" and $h.name != "ref" }
    {include file="mklink.tpl"
             label_src="$base/html/classic/down.png" label_alt="down"
 	    search=$search start=$astart xf=$h.name xo=1}
@@ -29,6 +30,9 @@
    {include file="mklink.tpl"
             label_src="$base/html/classic/up.png" label_alt="up"
 	    search=$search start=$astart xf=$h.name xo=2}
+  {else}
+    {$h.label}
+  {/if}
   </th>
 
  {/if}
@@ -55,7 +59,8 @@
   <a href="{$bugs[b].link}" title="{$bugs[b].title}">{$bugs[b].name}</a>
  </td>
 
- <td class="data">{$bugs[b].date}</td>
+ <td class="data">{$bugs[b].creation}</td>
+ <td class="data">{$bugs[b].lasth}</td>
 
  {if $search.pid == "" }
  <td style="white-space: nowrap;">

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7855/php/bugtracking

Modified Files:
      Tag: BRANCH-2-0
	bug_overview.php 
Log Message:
* task show shows sub tasks and bugs
* new config option for people selections (name order)
* DEBUG: bug_overview columns are not all re oderable


Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.8.2.15
retrieving revision 1.8.2.16
diff -u -r1.8.2.15 -r1.8.2.16
--- bug_overview.php	29 Sep 2004 16:23:54 -0000	1.8.2.15
+++ bug_overview.php	30 Sep 2004 17:09:33 -0000	1.8.2.16
@@ -46,15 +46,17 @@
      $this->assign('filter ', $this->filter);
 
      // Overview Table Header
+     // Don't provide name to avoid ordering option
      $headers = array();
-     $headers[] = array('name' => 'id',     'label' => $lang['BugID']);
-     $headers[] = array('name' => 'date',   'label' => $lang['Date']);
-     $headers[] = array('name' => 'ref',    'label' => $lang['BugReference']);
-     $headers[] = array('name' => 'desc',   'label' => $lang['BugShort']);
+     $headers[] = array('name' => 'id',       'label' => $lang['BugID']);
+     $headers[] = array('name' => 'creation', 'label' => $lang['Date']);
+     $headers[] = array('label' => $lang['LastDate']);
+     $headers[] = array('name' => 'ref', 'label' => $lang['BugReference']);
+     $headers[] = array('name' => 'description', 'label' => $lang['BugShort']);
      $headers[] = array('name' => 'state',  'label' => $lang['BugState']);
      $headers[] = array('name' => 'class',  'label' => $lang['BugClass']);
-     $headers[] = array('name' => 'creator','label' => $lang['BugCreator']);
-     $headers[] = array('name' => 'solver', 'label' => $lang['BugAssignedTo']);
+     $headers[] = array('label' => $lang['BugCreator']);
+     $headers[] = array('label' => $lang['BugAssignedTo']);
 
      $this->assign('headers', $headers);
      $this->assign('nb_cols', count($headers) + 1);
@@ -122,7 +124,7 @@
 		       'link'     => $tutos[base]."/php/".$b->getUrl(),
 		       'title'    => myentities($b->short),
 		       'creation' => $b->creation->getDate(),
-		       'date'     => $last->getDate(),
+		       'lasth'    => $last->getDate(),
 		       'parent'   => $parent,
 		       'desc'     => myentities($b->short),
 		       'state'    => $b->getState(),
@@ -769,10 +771,10 @@
        if ( ! $b->see_ok() ) {
          continue;
        }
-	   if (! isset($h[$b->id]) ) {
+       if (! isset($h[$b->id]) ) {
          $this->blist[] = &$b;
-		 $h[$b->id] = 1;
-	   }
+	 $h[$b->id] = 1;
+       }
        unset($b);
      }
      $x = 0;

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7855/php/localization

Modified Files:
      Tag: BRANCH-2-0
	en.p3 fr.p3 
Log Message:
* task show shows sub tasks and bugs
* new config option for people selections (name order)
* DEBUG: bug_overview columns are not all re oderable


Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v
retrieving revision 1.47.2.2
retrieving revision 1.47.2.3
diff -u -r1.47.2.2 -r1.47.2.3
--- en.p3	31 Aug 2004 09:26:47 -0000	1.47.2.2
+++ en.p3	30 Sep 2004 17:09:33 -0000	1.47.2.3
@@ -131,6 +131,7 @@
 $lang['week']            = "Week";
 $lang['weeks']           = "weeks";
 $lang['Date']            = "Date";
+$lang['LastDate']        = "Date of last modification";
 $lang['NewEntry']        = "New";
 $lang['CloneEntry']      = "Clone";
 $lang['Search']          = "Search";

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.40.2.11
retrieving revision 1.40.2.12
diff -u -r1.40.2.11 -r1.40.2.12
--- fr.p3	27 Sep 2004 16:41:53 -0000	1.40.2.11
+++ fr.p3	30 Sep 2004 17:09:34 -0000	1.40.2.12
@@ -128,6 +128,7 @@
 $lang['week']            = "Semaine";
 $lang['weeks']           = "Semaines";
 $lang['Date']            = "Date";
+$lang['LastDate']        = "Dernière modif";
 $lang['NewEntry']        = "Nouveau";
 $lang['CloneEntry']      = "Clone";
 $lang['Search']          = "Chercher";

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22840/php

Modified Files:
      Tag: BRANCH-1-2
	permission.p3 
Log Message:
fix for missing extensions

Index: permission.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/permission.p3,v
retrieving revision 1.146.2.1
retrieving revision 1.146.2.2
diff -u -r1.146.2.1 -r1.146.2.2
--- permission.p3	26 Jul 2004 19:54:59 -0000	1.146.2.1
+++ permission.p3	30 Sep 2004 04:52:25 -0000	1.146.2.2
@@ -22,6 +22,14 @@
 include_once 'user.pinc';
 
 
+if (!extension_loaded('session')) {
+  if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+    dl('php_session.dll');
+  } else {
+    dl('session.so');
+  }
+}
+
 # use files to save session data
 @ini_set("session.save_handler","files");
 # We do that ourself

Update of /cvsroot/tutos/tutos/php/mailbox
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22840/php/mailbox

Modified Files:
      Tag: BRANCH-1-2
	mconfig.pinc 
Log Message:
fix for missing extensions

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mailbox/mconfig.pinc,v
retrieving revision 1.8.2.1
retrieving revision 1.8.2.2
diff -u -r1.8.2.1 -r1.8.2.2
--- mconfig.pinc	4 Sep 2004 16:32:56 -0000	1.8.2.1
+++ mconfig.pinc	30 Sep 2004 04:52:25 -0000	1.8.2.2
@@ -42,6 +42,13 @@
       "check"
       );
 
+if ( ($tutos[usemailboxes] != 0) && (!extension_loaded('imap')) ) {
+  if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+    dl('php_imap.dll');
+  } else {
+    dl('imap.so');
+  }
+}
 
 if ( ($tutos[usemailboxes] != 0) && ! function_exists('imap_open')) {
   $confmsg .= "<br>\nDisabled mailboxes (IMAP not supported by this PHP)<br>\n";

Update of /cvsroot/tutos/tutos/php/ldap
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22840/php/ldap

Modified Files:
      Tag: BRANCH-1-2
	mconfig.pinc 
Log Message:
fix for missing extensions

Index: mconfig.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/ldap/mconfig.pinc,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- mconfig.pinc	21 Feb 2004 17:25:01 -0000	1.10
+++ mconfig.pinc	30 Sep 2004 04:52:25 -0000	1.10.2.1
@@ -32,6 +32,14 @@
 if (!isset($tutos[useldap]))
   $tutos[useldap] = function_exists('ldap_connect') ? 1:0; 
 
+if (($tutos[useldap] != 0) && !extension_loaded('ldap')) {
+  if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+    dl('php_ldap.dll');
+  } else {
+    dl('ldap.so');
+  }
+}
+
 if ( ($tutos[useldap] != 0) && ! function_exists('ldap_connect')) {
   $confmsg .= "<br>\nDisabled ldap (not supported by this PHP)<br>\n";
   $confmsg .= "Please change your config file and add a line<br>\n";

Update of /cvsroot/tutos/tutos/php/db
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22840/php/db

Modified Files:
      Tag: BRANCH-1-2
	db_mysql.pinc db_oci.pinc db_pg.pinc 
Log Message:
fix for missing extensions

Index: db_mysql.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_mysql.pinc,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -u -r1.21 -r1.21.2.1
--- db_mysql.pinc	21 Mar 2004 09:58:20 -0000	1.21
+++ db_mysql.pinc	30 Sep 2004 04:52:25 -0000	1.21.2.1
@@ -13,6 +13,14 @@
 $tutos['dateformat'][] = 'mysqlformat1';
 $tutos['dateformat'][] = 'mysqlformat2';
 
+if (!extension_loaded('mysql')) {
+  if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+    dl('php_mysql.dll');
+  } else {
+    dl('mysql.so');
+  }
+}
+
 /**
  * check for string delivered in postgres format
  */

Index: db_oci.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_oci.pinc,v
retrieving revision 1.26
retrieving revision 1.26.2.1
diff -u -r1.26 -r1.26.2.1
--- db_oci.pinc	27 Apr 2004 14:32:51 -0000	1.26
+++ db_oci.pinc	30 Sep 2004 04:52:25 -0000	1.26.2.1
@@ -12,6 +12,14 @@
 #
 $tutos['dateformat'][] = 'ociformat1';
 
+if (!extension_loaded('oci8')) {
+  if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+    dl('php_oci8.dll');
+  } else {
+    dl('oci8.so');
+  }
+}
+
 /**
  * check for string delivered in postgres format
  */

Index: db_pg.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/db/db_pg.pinc,v
retrieving revision 1.28
retrieving revision 1.28.2.1
diff -u -r1.28 -r1.28.2.1
--- db_pg.pinc	21 Mar 2004 16:38:23 -0000	1.28
+++ db_pg.pinc	30 Sep 2004 04:52:25 -0000	1.28.2.1
@@ -17,6 +17,14 @@
 $tutos['dateformat'][] = 'pgformat6';
 $tutos['dateformat'][] = 'pgformat5';
 
+if (!extension_loaded('pgsql')) {
+  if (strtoupper(substr(PHP_OS, 0, 3) == 'WIN')) {
+    dl('php_pgsql.dll');
+  } else {
+    dl('pgsql.so');
+  }
+}
+
 /**
  * check for string delivered in postgres format
  */

Update of /cvsroot/tutos/tutos/html/classic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3491/html/classic

Modified Files:
      Tag: BRANCH-2-0
	style.css 
Log Message:
* OrderHeader re implementation with templates
* Code and template cleaning (navigation bar factorization)
* DEBUG: added missing acl detail menu from team_show


Index: style.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- style.css	6 Sep 2004 16:25:13 -0000	1.1.2.12
+++ style.css	29 Sep 2004 16:23:52 -0000	1.1.2.13
@@ -518,6 +518,7 @@
   margin:  5px;
   border-left: 1px solid #efefef;
   border-bottom: 1px dashed black;
+  white-space: nowrap;
 }
 
 table.overview thead th.check {

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3491/php

Modified Files:
      Tag: BRANCH-2-0
	acl_show.php address_overview.php address_tools.p3 
	company_overview.php product_overview.php product_show.php 
	team_overview.php team_show.php timetrack_overview.php 
Log Message:
* OrderHeader re implementation with templates
* Code and template cleaning (navigation bar factorization)
* DEBUG: added missing acl detail menu from team_show


Index: acl_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_show.php,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -r1.18.2.2 -r1.18.2.3
--- acl_show.php	28 Sep 2004 16:20:07 -0000	1.18.2.2
+++ acl_show.php	29 Sep 2004 16:23:53 -0000	1.18.2.3
@@ -104,13 +104,15 @@
      }
 
      // Menu
-     $x = array('url'   => "acl_new.php?id=".$this->obj->id,
-		'text'  => $lang['AclModify'],
-		'info'  => sprintf($lang['AclModifyI'],
-				    $this->obj->getFullName()),
-		'image' => 'modify',
-		'category' => array("obj"));
-     $this->addMenu($x);
+     if ( ($this->obj->id > 0) && $this->obj->del_ok() ) {
+       $x = array('url'   => "acl_new.php?id=".$this->obj->id,
+		  'text'  => $lang['AclModify'],
+		  'info'  => sprintf($lang['AclModifyI'],
+				     $this->obj->getFullName()),
+		  'image' => 'modify',
+		  'category' => array("obj"));
+       $this->addMenu($x);
+     }
    }
  }
 

Index: address_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_overview.php,v
retrieving revision 1.42.2.2
retrieving revision 1.42.2.3
diff -u -r1.42.2.2 -r1.42.2.3
--- address_overview.php	19 Jul 2004 16:40:40 -0000	1.42.2.2
+++ address_overview.php	29 Sep 2004 16:23:53 -0000	1.42.2.3
@@ -158,8 +158,8 @@
      $this->atool['link1'] = "address_overview.php";
      $this->atool['maxshow'] = $tutos[maxshow];
 
-     if ( isset($_GET['astart']) ) {
-       $this->atool['start'] = $_GET['astart'];
+     if ( isset($_GET['start']) ) {
+       $this->atool['start'] = $_GET['start'];
      } else {
        $this->atool['start'] = 0;
      }
@@ -279,11 +279,14 @@
      $this->atool['link2'] = $this->atool['link1'];
      order_parse($q,$this->atool['link1'],$xxx,$xxx,"l_name");
 
-	 if ($this->stop) {
-	   return;
-	 }
+     if ($this->stop) {
+       return;
+     }
      $this->result = $this->dbconn->Exec($q);
 
+     $this->assign('xf', $_GET['xf']);
+     $this->assign('xo', $_GET['xo']);
+
      if ( $this->format != 'xml' ) {
        if ( 0 == $this->result->numrows()) {
          $this->redirect = "address_select.php?msg=". UrlEncode($lang['Err0048']);

Index: address_tools.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_tools.p3,v
retrieving revision 1.67.2.6
retrieving revision 1.67.2.7
diff -u -r1.67.2.6 -r1.67.2.7
--- address_tools.p3	27 Aug 2004 15:26:00 -0000	1.67.2.6
+++ address_tools.p3	29 Sep 2004 16:23:53 -0000	1.67.2.7
@@ -231,34 +231,8 @@
      if( $bool )
        $cols++;
 
-   $layout->assign('cols', $cols);
-   $layout->assign('inner_cols', $cols - 2);
-   $layout->assign('next_start', $end);
-   $layout->assign('prev_start', $a == 0 ? $a : $a - $atool['maxshow']);
-
-   $layout->assign('NavBack', $lang['NavBack']);
-   $layout->assign('NavNext', $lang['NavNext']);
-
-   // We only support simple search
-   $layout->assign('name', $atool['search']['name']);
-
-   // Some informations to the navigation bar
-   $layout->assign('nb_adr', $n);
-   $layout->assign('astart', $a);
-   $layout->assign('aend',   $end > $n ? $n : $end);
-   $layout->assign('adr_per_page', $atool['maxshow']);
-   
-   // Generate direct links to page results
-   $nb_pages   = ceil($n / $atool['maxshow']);
-   $direct_nav = array();
-   for($i=0; $i < $nb_pages; $i++)
-     $direct_nav[] =
-       array('label'  => $i + 1,
-	     'astart' => $i * $atool['maxshow'],
-	     'title'  => sprintf($lang['pageof'], $i+1, $nb_pages));
-
-   // $layout->debug($direct_nav);
-   $layout->assign('direct_nav', $direct_nav);
+   // Prepare the navigation bar
+   $layout->assign_navbar($a, $end, $n, $atool['search']);
 
    $layout->assign('header',
 		   array('f_name'   => $lang['AdrFirstName'],

Index: company_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/company_overview.php,v
retrieving revision 1.43.2.4
retrieving revision 1.43.2.5
diff -u -r1.43.2.4 -r1.43.2.5
--- company_overview.php	23 Sep 2004 16:35:37 -0000	1.43.2.4
+++ company_overview.php	29 Sep 2004 16:23:53 -0000	1.43.2.5
@@ -50,14 +50,14 @@
 
      $this->assign('action', "company_overview.php");
      $this->assign('massupdate', $tutos[massupdate]);
-     $this->assign('search', $this->search);
 
      // Overview Table Header
      $headers = array();
-     $headers[] = array('label' => $lang['Company']);
+     $headers[] = array('name' => 'name', 'label' => $lang['Company']);
      $headers[] = array('label' => $lang['Department']);
 
      $this->assign('headers', $headers);
+
      $this->assign('nb_cols', count($headers) + 1);
      $this->assign('inner_cols', count($headers) - 1);
 
@@ -65,33 +65,12 @@
        $a = $n - $tutos[maxshow];
        $end = $n;
        $this->start = $a;
-     } else {
+     }
+     else {
        $a = $this->start;
        $end = $this->start + $tutos[maxshow];
      }
-
-     $this->assign('prev_start', $a == 0 ? $a : $a - $tutos[maxshow]);
-     $this->assign('next_start', $end);
-
-     $this->assign('NavBack',         $lang['NavBack']);
-     $this->assign('NavNext',         $lang['NavNext']);
-
-     $this->assign('nb', $n);
-     $this->assign('astart', $a);
-     $this->assign('aend',   $end > $n ? $n : $end);
-     $this->assign('per_page', $tutos[maxshow]);
-
-     // Generate direct links to page results
-     $nb_pages   = ceil($n / $tutos[maxshow]);
-     $direct_nav = array();
-     for($i=0; $i < $nb_pages; $i++)
-       $direct_nav[] =
-	 array('label'  => $i + 1,
-	       'astart' => $i * $tutos[maxshow],
-	       'title'  => sprintf($lang['pageof'], $i+1, $nb_pages));
-
-     $this->assign('direct_nav', $direct_nav);
-
+     $this->assign_navbar($a, $end, $n, $this->search);
 
      $companies = array();
 
@@ -224,7 +203,9 @@
 	 $this->redirect =  "company_show.php?id=".$c->id;
 	 $this->result->free();
        }
-     }  
+     }
+     $this->assign('xf', $_GET['xf']);
+     $this->assign('xo', $_GET['xo']);
 
      // menu
      $x = tutos_address::getSelectLink($this->user,$lang['Search']);

Index: product_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_overview.php,v
retrieving revision 1.99.2.8
retrieving revision 1.99.2.9
diff -u -r1.99.2.8 -r1.99.2.9
--- product_overview.php	6 Sep 2004 16:25:13 -0000	1.99.2.8
+++ product_overview.php	29 Sep 2004 16:23:53 -0000	1.99.2.9
@@ -57,28 +57,8 @@
        $end = $this->start + $tutos[maxshow];
      }
 
-     $this->assign('prev_start', $a == 0 ? $a : $a - $tutos[maxshow]);
-     $this->assign('next_start', $end);
-
-     $this->assign('NavBack',         $lang['NavBack']);
-     $this->assign('NavNext',         $lang['NavNext']);
-
-     $this->assign('nb_prod', $n);
-     $this->assign('astart',  $a);
-     $this->assign('aend',    $end > $n ? $n : $end);
-     $this->assign('adr_per_page', $tutos[maxshow]);
-
-     // Generate direct links to page results
-     $nb_pages   = ceil($n / $tutos[maxshow]);
-     $direct_nav = array();
-     for($i=0; $i < $nb_pages; $i++)
-       $direct_nav[] =
-	 array('label'  => $i + 1,
-	       'astart' => $i * $tutos[maxshow],
-	       'title'  => sprintf($lang['pageof'], $i+1, $nb_pages));
-
-     $this->assign('direct_nav', $direct_nav);
-     $this->assign('search', $this->filter);
+     // Prepare a navigation bar
+     $this->assign_navbar($a, $end, $n, $this->filter);
 
      // Make a big array of all visible products
      $projects = array();
@@ -132,6 +112,22 @@
      $this->assign('Manager',     $lang['ProdRole'][1]);
      $this->assign('ProdDesc',    $lang['ProdDesc']);
 
+     $this->assign('product',
+		   array('label' => $lang['Product'],
+			 'name'  => 'name'));
+
+     $this->assign('state',
+		   array('label'  => $lang['ProdState'],
+			 'name'   => 'state'));
+
+     $this->assign('version',
+		   array('label'  => $lang['ProdVersion'],
+			 'name'   => 'version'));
+
+     $this->assign('desc',
+		   array('label'  => $lang['ProdDesc'],
+			 'name'   => 'description'));
+
      $this->assign('projects', $projects);
      $this->template('product_overview');
  }
@@ -717,15 +713,19 @@
      $xxx = "";
      order_parse($this->q,$this->link1,$xxx,$xxx,"creation DESC");
 
-	 if ($this->stop) {
-	   return;
-	 }
+     if ($this->stop) {
+       return;
+     }
      $this->result = $this->dbconn->Exec($this->q);
      if ( 0 == $this->result->numrows()) {
        $this->redirect = "product_select.php?msg=". UrlEncode($lang['Err0048']);
        $this->result->free();
      }
 
+     $this->assign('xf', $_GET['xf']);
+     $this->assign('xo', $_GET['xo']);
+
+     
      //  menu
      $x = product::getSelectLink($this->user,$lang['Search']);
      $x['category'][] = "obj";

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.90.2.15
retrieving revision 1.90.2.16
diff -u -r1.90.2.15 -r1.90.2.16
--- product_show.php	28 Sep 2004 16:20:07 -0000	1.90.2.15
+++ product_show.php	29 Sep 2004 16:23:53 -0000	1.90.2.16
@@ -337,7 +337,9 @@
                    'category' => array("product","mod","obj")
                  );
        $this->addMenu($x);
+     }
 
+     if( ($this->obj->id > 0) && $this->obj->see_ok() ) {
        $x = array( 'url'   => "acl_show.php?id=".$this->obj->id,
                    'text'  => $lang['AclDetail'],
 		   'image' => 'acls',

Index: team_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_overview.php,v
retrieving revision 1.46.2.1
retrieving revision 1.46.2.2
diff -u -r1.46.2.1 -r1.46.2.2
--- team_overview.php	3 Aug 2004 15:39:32 -0000	1.46.2.1
+++ team_overview.php	29 Sep 2004 16:23:53 -0000	1.46.2.2
@@ -66,28 +66,7 @@
      }
 
      // Prepare navigation bar
-     $this->assign('prev_start', $a == 0 ? $a : $a - $tutos[maxshow]);
-     $this->assign('next_start', $end);
-
-     $this->assign('NavBack',         $lang['NavBack']);
-     $this->assign('NavNext',         $lang['NavNext']);
-
-     $this->assign('nb', $n);
-     $this->assign('astart',  $a);
-     $this->assign('aend',    $end > $n ? $n : $end);
-     $this->assign('nb_per_page', $tutos[maxshow]);
-
-     // Generate direct links to page results
-     $nb_pages   = ceil($n / $tutos[maxshow]);
-     $direct_nav = array();
-     for($i=0; $i < $nb_pages; $i++)
-       $direct_nav[] =
-	 array('label'  => $i + 1,
-	       'astart' => $i * $tutos[maxshow],
-	       'title'  => sprintf($lang['pageof'], $i+1, $nb_pages));
-
-     $this->assign('direct_nav', $direct_nav);
-
+     $this->assign_navbar($a, $end, $n, $this->search);
 
      $teams = array();
 
@@ -161,16 +140,21 @@
    Function prepare() {
      global $lang;
 
-     $this->name = $lang['TeamOverview'];
+     $this->name   = $lang['TeamOverview'];
+     $this->search = array();
 
      $this->link1 = "team_overview.php";
      $this->q = "SELECT * FROM ". $this->dbconn->prefix ."teams";
      $pre = " WHERE ";
 
-     if ( isset($_GET['name']) && ($_GET['name'] != "*") && ($_GET['name'] != "") ) {
+     if ( isset($_GET['name'])
+	  && ($_GET['name'] != "*") && ($_GET['name'] != "") ) {
        $this->q .= $pre .  $this->dbconn->Like("name",$_GET['name']);
-      $pre = " AND ";
-       $this->link1 = addUrlParameter($this->link1,"name=". UrlEncode($_GET['name']));
+       $pre = " AND ";
+       $this->link1 = addUrlParameter($this->link1,
+				      "name=". UrlEncode($_GET['name']));
+
+       $this->search['name'] = $_GET['name'];
      }
 
      check_dbacl( $this->q, $this->user->id);
@@ -180,6 +164,9 @@
      $this->link2 = $this->link1;
      order_parse($this->q,$this->link1,$xxx,$xxx,"name");
 
+     $this->assign('xf', $_GET['xf']);
+     $this->assign('xo', $_GET['xo']);
+
      # Menu      
      $x = team::getSelectLink($this->user,$lang['Search']);
      $this->addMenu($x);

Index: team_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/team_show.php,v
retrieving revision 1.51.2.2
retrieving revision 1.51.2.3
diff -u -r1.51.2.2 -r1.51.2.3
--- team_show.php	24 Aug 2004 15:33:53 -0000	1.51.2.2
+++ team_show.php	29 Sep 2004 16:23:54 -0000	1.51.2.3
@@ -141,6 +141,16 @@
        $this->addMenu($x);
      }
 
+     if( ($this->obj->id > 0) && $this->obj->see_ok() ) {
+       $x = array( 'url'   => "acl_show.php?id=".$this->obj->id,
+                   'text'  => $lang['AclDetail'],
+		   'image' => 'acls',
+                   'info'  => sprintf($lang['AclDetailI'],
+				      $this->obj->getFullname()),
+                   'category' => array("acl","obj")
+                 );
+       $this->addMenu($x);
+     }
      
      $this->link1 = "team_show.php?id=".$this->obj->id;
      $l = addUrlParameter($this->link1,"format=paper");

Index: timetrack_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_overview.php,v
retrieving revision 1.81.2.6
retrieving revision 1.81.2.7
diff -u -r1.81.2.6 -r1.81.2.7
--- timetrack_overview.php	21 Sep 2004 17:00:04 -0000	1.81.2.6
+++ timetrack_overview.php	29 Sep 2004 16:23:54 -0000	1.81.2.7
@@ -128,14 +128,29 @@
 
      $this->assign('action', "timetrack_overview.php");
 
-     $this->assign('TimetrackRef',    $lang['TimetrackRef']);
-     $this->assign('TimetrackWorker', $lang['TimetrackWorker']);
-     $this->assign('TaskVolumeDone',  $lang['TaskVolumeDone']);
-     $this->assign('TaskVolumeTodo',  $lang['TaskVolumeTodo']);
-     $this->assign('TimetrackDate',   $lang['TimetrackDate']);
-     $this->assign('Description',     $lang['Description']);
-     $this->assign('TTState',         $lang['TTState']);
-     $this->assign('ProdCost',        $lang['ProdCost']);
+     $this->assign('header',
+		   array(
+			 array('label' => $lang['TimetrackRef']),
+
+			 array('name'  => 'worker',
+			       'label' => $lang['TimetrackWorker']),
+
+			 array('name'  => 'volume',
+			       'label' => $lang['TaskVolumeDone']),
+
+			 array('name'  => 'volume_todo',
+			       'label' => $lang['TaskVolumeTodo']),
+
+			 array('name'  => 'creation',
+			       'label' => $lang['TimetrackDate']),
+
+			 array('name'  => 'desc',
+			       'label' => $lang['Description']),
+
+			 array('name'  => 'state',
+			       'label' => $lang['TTState']),
+
+			 array('label' => $lang['ProdCost'])));
 
      // $cols = 9;
   
@@ -165,33 +180,11 @@
        $x++;
      }
 
-     $this->assign('prev_start', $a == 0 ? $a : $a - $tutos[maxshow]);
-     $this->assign('next_start', $end);
-
-     $this->assign('NavBack',         $lang['NavBack']);
-     $this->assign('NavNext',         $lang['NavNext']);
-
-     $this->assign('nb_tts', $n);
-     $this->assign('astart', $a);
-     $this->assign('aend',   $end > $n ? $n : $end);
-     $this->assign('adr_per_page', $tutos[maxshow]);
-
-     // Generate direct links to page results
-     $nb_pages   = ceil($n / $tutos[maxshow]);
-     $direct_nav = array();
-     for($i=0; $i < $nb_pages; $i++)
-       $direct_nav[] =
-	 array('label'  => $i + 1,
-	       'astart' => $i * $tutos[maxshow],
-	       'title'  => sprintf($lang['pageof'], $i+1, $nb_pages));
-
-     $this->assign('direct_nav', $direct_nav);
-
      /**
       * We plan to support extended mode with $this->search, which is
       * to be filled with all search fields.
       */
-     $this->assign('search', $this->search);
+     $this->assign_navbar($a, $end, $n, $this->search);
 
      $tts = array();
   
@@ -641,10 +634,14 @@
      $this->result = $this->dbconn->Exec($q);
 
      if ( 0 == $this->result->numrows()) {
-       $this->redirect = "timetrack_select.php?msg=". UrlEncode($lang['Err0048']);
+       $this->redirect = "timetrack_select.php?msg=".
+	  UrlEncode($lang['Err0048']);
        $this->result->free();
      }
 
+     $this->assign('xf', $_GET['xf']);
+     $this->assign('xo', $_GET['xo']);
+
      # menu
      $x = timetrack::getSelectLink($this->user,$lang['Search']);
      $this->addmenu($x);

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3491/php/bugtracking

Modified Files:
      Tag: BRANCH-2-0
	bug_overview.php 
Log Message:
* OrderHeader re implementation with templates
* Code and template cleaning (navigation bar factorization)
* DEBUG: added missing acl detail menu from team_show


Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.8.2.14
retrieving revision 1.8.2.15
diff -u -r1.8.2.14 -r1.8.2.15
--- bug_overview.php	23 Sep 2004 16:35:39 -0000	1.8.2.14
+++ bug_overview.php	29 Sep 2004 16:23:54 -0000	1.8.2.15
@@ -72,28 +72,6 @@
        $end = $this->start + $tutos[maxshow];
      }
 
-     $this->assign('prev_start', $a == 0 ? $a : $a - $tutos[maxshow]);
-     $this->assign('next_start', $end);
-
-     $this->assign('NavBack',         $lang['NavBack']);
-     $this->assign('NavNext',         $lang['NavNext']);
-
-     $this->assign('nb_bugs', $n);
-     $this->assign('astart', $a);
-     $this->assign('aend',   $end > $n ? $n : $end);
-     $this->assign('bugs_per_page', $tutos[maxshow]);
-
-     // Generate direct links to page results
-     $nb_pages   = ceil($n / $tutos[maxshow]);
-     $direct_nav = array();
-     for($i=0; $i < $nb_pages; $i++)
-       $direct_nav[] =
-	 array('label'  => $i + 1,
-	       'astart' => $i * $tutos[maxshow],
-	       'title'  => sprintf($lang['pageof'], $i+1, $nb_pages));
-
-     $this->assign('direct_nav', $direct_nav);
-
      // The filter is not directly usable for our purpose
      $search = array();
      foreach( $this->filter as $k => $v ) {
@@ -102,7 +80,7 @@
        else
 	 $search[$k] = $v;
      }
-     $this->assign('search', $search);
+     $this->assign_navbar($a, $end, $n, $search);
 
      $this->filter['name'] = prepare_regpattern($this->filter['name']);
      $bugs = array();
@@ -773,6 +751,9 @@
      $n1 = $this->result1->numrows();
      $n2 = $this->result2->numrows();
 
+     $this->assign('xf', $_GET['xf']);
+     $this->assign('xo', $_GET['xo']);
+
 #	 echo "Q1:".$q1."<br>";
 #	 echo "Q2:".$q2."<br>";
 #	 echo "N1:".$n1."<br>";
@@ -802,10 +783,10 @@
        if ( ! $b->see_ok() ) {
          continue;
        }
-	   if (! isset($h[$b->id]) ) {
+       if (! isset($h[$b->id]) ) {
          $this->blist[] = &$b;
-		 $h[$b->id] = 1;
-	   }
+	 $h[$b->id] = 1;
+       }
        unset($b);
      }
 
@@ -817,10 +798,11 @@
 
      if ( 0 == $n) {
        $this->redirect = "bug_select.php?msg=". UrlEncode($lang['Err0048']);
-	   return;
-     } else if ( ($this->format == "html") && ($n == 1) ) {
+       return;
+     }
+     else if ( ($this->format == "html") && ($n == 1) ) {
        $this->redirect =  "bug_show.php?id=".$this->blist[0]->id;
-	   return;
+       return;
      }
 
 

Update of /cvsroot/tutos/tutos/php/layout
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3491/php/layout

Modified Files:
      Tag: BRANCH-2-0
	layout.pinc 
Log Message:
* OrderHeader re implementation with templates
* Code and template cleaning (navigation bar factorization)
* DEBUG: added missing acl detail menu from team_show


Index: layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/Attic/layout.pinc,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- layout.pinc	23 Sep 2004 16:35:39 -0000	1.1.2.7
+++ layout.pinc	29 Sep 2004 16:23:54 -0000	1.1.2.8
@@ -624,5 +624,34 @@
 			 'selected' => $selected->year));
 
   }
-}
 
+  /**
+   * Assign the smarty vars allowing to display a navigation bar
+   */
+  function assign_navbar($a, $end, $n, $search) {
+    global $tutos, $lang;
+
+    $this->assign('prev_start', $a == 0 ? $a : $a - $tutos[maxshow]);
+    $this->assign('next_start', $end);
+
+    $this->assign('NavBack', $lang['NavBack']);
+    $this->assign('NavNext', $lang['NavNext']);
+
+    $this->assign('nb', $n);
+    $this->assign('astart',  $a);
+    $this->assign('aend',    $end > $n ? $n : $end);
+    $this->assign('nb_per_page', $tutos[maxshow]);
+
+    // Generate direct links to page results
+    $nb_pages   = ceil($n / $tutos[maxshow]);
+    $direct_nav = array();
+    for($i=0; $i < $nb_pages; $i++)
+      $direct_nav[] =
+	array('label'  => $i + 1,
+	      'astart' => $i * $tutos[maxshow],
+	      'title'  => sprintf($lang['pageof'], $i+1, $nb_pages));
+
+    $this->assign('direct_nav', $direct_nav);
+    $this->assign('search', $search);
+  }
+}
\ No newline at end of file

Update of /cvsroot/tutos/tutos/templates/classic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3491/templates/classic

Modified Files:
      Tag: BRANCH-2-0
	address_overview.tpl company_overview.tpl product_overview.tpl 
	team_overview.tpl timetrack_overview.tpl 
Added Files:
      Tag: BRANCH-2-0
	navbar.tpl 
Log Message:
* OrderHeader re implementation with templates
* Code and template cleaning (navigation bar factorization)
* DEBUG: added missing acl detail menu from team_show


--- NEW FILE: navbar.tpl ---
{* TUTOS classic template navigation bar *}
{ $Id: navbar.tpl,v 1.1.2.1 2004/09/29 16:23:55 tapoueh Exp $ *}

  {if $astart > 0}
   {include file="mklink.tpl"
            label_src="$base/html/classic/left.png" label_alt="$NavBack"
	    search=$search start=$prev_start xf=$xf xo=$xo}
  {else}
     
  {/if}

  {if count($direct_nav) > 1}
   {foreach from=$direct_nav item=d name=navbar}
    {if $d.astart == $astart}
      <b>{$d.label}</b>
    {else}
     {include file="mklink.tpl"
              label=$d.label search=$search start=$d.astart xf=$xf xo=$xo}
    {/if}
    {if not $smarty.foreach.navbar.last} - {/if}
   {/foreach}
  {else}
   &nbsp;
  {/if}

  {if $next_start < $nb}
   {include file="mklink.tpl"
            label_src="$base/html/classic/right.png" label_alt="$NavNext"
	    search=$search start=$next_start xf=$xf xo=$xo}
  {/if}

Index: address_overview.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/address_overview.tpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- address_overview.tpl	23 Jul 2004 14:57:05 -0000	1.1.2.4
+++ address_overview.tpl	29 Sep 2004 16:23:54 -0000	1.1.2.5
@@ -8,7 +8,19 @@
 <tr>
 {foreach from=$header key=col item=val}
  {if $ashow.$col == 1}
-  <th>{$val}</th>
+  <th>
+  {if $col == "f_name" or $col == "l_name"}
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/down.png" label_alt="down"
+	    search=$search start=$astart xf=$col xo=1}
+   {$val}
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/up.png" label_alt="up"
+	    search=$search start=$astart xf=$col xo=2}
+   {else}
+   {$val}
+   {/if}
+  </th>
  {/if}
 {/foreach}
 </tr>
@@ -16,31 +28,11 @@
 
 <tfoot>
 <tr>
-  <td colspan="{$inner_cols}" align="center">
-  {if $astart > 0}
-  <a href="?name={$name}&astart={$prev_start}"
-     title="{$NavBack}"><img src="{$base}/html/classic/left.png" alt="{$NavBack}"></a>
-  {else}
-    &nbsp;
-  {/if}
-
-    {foreach from=$direct_nav item=d name=navbar}
-    {if $d.astart == $astart}
-      <b>{$d.label}</b>
-    {else}
-      <a href="?name={$name}&astart={$d.astart}"
-        title="{$d.title}">{$d.label}</a>
-    {/if}
-    {if not $smarty.foreach.navbar.last} - {/if}
-    {/foreach}
-
-  {if $next_start < $nb_adr}
-  <a href="?name={$name}&astart={$next_start}"
-     title="{$NavNext}"><img src="{$base}/html/classic/right.png" alt="{$NavNext}"></a>
-   {/if}
+  <td colspan="5" align="center">
+   {include file="classic/navbar.tpl"}
   </td>
   <td colspan="2" align="right">
-    {$astart} - {$aend} /&nbsp;{$nb_adr}
+    {$astart} - {$aend} /&nbsp;{$nb}
   </td>
 </tr>
 </tfoot>

Index: company_overview.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/company_overview.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- company_overview.tpl	13 Sep 2004 16:07:56 -0000	1.1.2.1
+++ company_overview.tpl	29 Sep 2004 16:23:54 -0000	1.1.2.2
@@ -18,7 +18,19 @@
 <thead>
 <tr>
 {foreach from=$headers item=h}
-  <th>{$h.label}</th>
+ <th>
+  {if $h.name != ""} 
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/down.png" label_alt="down"
+	    search=$search start=$astart xf=$h.name xo=1}
+   {$h.label}
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/up.png" label_alt="up"
+	    search=$search start=$astart xf=$h.name xo=2}
+  {else}
+   {$h.label}
+  {/if}
+ </th>
 {/foreach}
   <th><input type="checkbox" name="checkit" /></th>
 </tr>
@@ -27,49 +39,7 @@
 <tfoot>
 <tr>
   <td colspan="{$inner_cols}" align="center">
-  {if $astart > 0}
-      {strip}
-      <a href="?
-      {foreach from=$search key=k item=v}
-       {$k}={$v}&
-      {/foreach}
-      start={$prev_start}"
-      title="{$NavBack}">
-      <img src="{$base}/html/classic/left.png" alt="{$NavBack}">
-      </a>
-      {/strip}
-  {else}
-    &nbsp;
-  {/if}
-
-    {foreach from=$direct_nav item=d name=navbar}
-    {if $d.astart == $astart}
-      <b>{$d.label}</b>
-    {else}
-      {strip}
-      <a href="?
-      {foreach from=$search key=k item=v}
-       {$k}={$v}&
-      {/foreach}
-      start={$d.astart}" title="{$d.title}">{$d.label}</a>
-      {/strip}
-    {/if}
-    {if not $smarty.foreach.navbar.last} - {/if}
-    {/foreach}
-
-  {if $next_start < $nb}
-      {strip}
-      <a href="?
-      {foreach from=$search key=k item=v}
-       {$k}={$v}&
-      {/foreach}
-      start={$next_start}"
-      title="{$NavNext}">
-      <img src="{$base}/html/classic/right.png" alt="{$NavNext}">
-      </a>
-      {/strip}
-  {/if}
-  </td>
+   {include file="classic/navbar.tpl"}
   <td colspan="2" align="right">
     {$astart} - {$aend} /&nbsp;{$nb}
   </td>

Index: product_overview.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/product_overview.tpl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- product_overview.tpl	6 Sep 2004 16:25:14 -0000	1.1.2.8
+++ product_overview.tpl	29 Sep 2004 16:23:55 -0000	1.1.2.9
@@ -6,62 +6,57 @@
 <table class="overview" cellpadding="0" cellspacing="0" width="100%">
 <thead>
 <tr>
-  <th><img src="{$base}/html/classic/projects.png">{$Product|capitalize}</th>
-  <th>{$ProdVersion|capitalize}</th>
+  <th>
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/down.png" label_alt="down"
+	    search=$search start=$astart xf=$product.name xo=1}
+    <img src="{$base}/html/classic/projects.png">{$product.label|capitalize}
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/up.png" label_alt="up"
+	    search=$search start=$astart xf=$product.name xo=2}
+  </th>
+
+  <th>
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/down.png" label_alt="down"
+	    search=$search start=$astart xf=$version.name xo=1}
+   {$version.label|capitalize}
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/up.png" label_alt="up"
+	    search=$search start=$astart xf=$version.name xo=2}
+  </th>
+
   <th>{$Manager|capitalize}</th>
-  <th>{$ProdState|capitalize}</th>
-  <th>{$ProdDesc|capitalize}</th>
+
+  <th>
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/down.png" label_alt="down"
+	    search=$search start=$astart xf=$state.name xo=1}
+   {$state.label}
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/up.png" label_alt="up"
+	    search=$search start=$astart xf=$state.name xo=2}
+  </th>
+
+  <th>
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/down.png" label_alt="down"
+	    search=$search start=$astart xf=$desc.name xo=1}
+   {$desc.label|capitalize}
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/up.png" label_alt="up"
+	    search=$search start=$astart xf=$desc.name xo=2}
+  </th>
 </tr>
 </thead>
 
 <tfoot>
 <tr>
   <td colspan="4" align="center">
-  {if $astart > 0}
-      {strip}
-      <a href="?
-      {foreach from=$search key=k item=v}
-       {$k}={$v}&
-      {/foreach}
-      start={$prev_start}"
-      title="{$NavBack}">
-      <img src="{$base}/html/classic/left.png" alt="{$NavBack}">
-      </a>
-      {/strip}
-  {else}
-    &nbsp;
-  {/if}
-
-    {foreach from=$direct_nav item=d name=navbar}
-    {if $d.astart == $astart}
-      <b>{$d.label}</b>
-    {else}
-      {strip}
-      <a href="?
-      {foreach from=$search key=k item=v}
-       {$k}={$v}&
-      {/foreach}
-      start={$d.astart}" title="{$d.title}">{$d.label}</a>
-      {/strip}
-    {/if}
-    {if not $smarty.foreach.navbar.last} - {/if}
-    {/foreach}
-
-  {if $next_start < $nb_prod}
-      {strip}
-      <a href="?
-      {foreach from=$search key=k item=v}
-       {$k}={$v}&
-      {/foreach}
-      start={$next_start}"
-      title="{$NavNext}">
-      <img src="{$base}/html/classic/right.png" alt="{$NavNext}">
-      </a>
-      {/strip}
-  {/if}
+   {include file="classic/navbar.tpl"}
   </td>
   <td colspan="2" align="right">
-    {$astart} - {$aend} /&nbsp;{$nb_prod}
+    {$astart} - {$aend} /&nbsp;{$nb}
   </td>
 </tr>
 </tfoot>

Index: team_overview.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/team_overview.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- team_overview.tpl	3 Aug 2004 15:39:33 -0000	1.1.2.1
+++ team_overview.tpl	29 Sep 2004 16:23:55 -0000	1.1.2.2
@@ -6,8 +6,26 @@
 <table class="overview">
 <thead>
 <tr>
-  <th>{$Team}</th>
-  <th>{$TeamManager}</th>
+  <th>
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/down.png" label_alt="down"
+	    search=$search start=$astart xf=name xo=1}
+   {$Team}
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/up.png" label_alt="up"
+	    search=$search start=$astart xf=name xo=2}
+  </th>
+
+  <th>
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/down.png" label_alt="down"
+	    search=$search start=$astart xf=owner xo=1}
+   {$TeamManager}
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/up.png" label_alt="up"
+	    search=$search start=$astart xf=owner xo=2}
+  </th>
+
   <th>{$TeamCount}</th>
 </tr>
 </thead>
@@ -15,27 +33,7 @@
 <tfoot>
 <tr>
   <td colspan="{$inner_cols}" align="center">
-  {if $astart > 0}
-  <a href="?name={$name}&astart={$prev_start}"
-     title="{$NavBack}"><img src="{$base}/html/classic/left.png" alt="{$NavBack}"></a>
-  {else}
-    &nbsp;
-  {/if}
-
-    {foreach from=$direct_nav item=d name=navbar}
-    {if $d.astart == $astart}
-      <b>{$d.label}</b>
-    {else}
-      <a href="?name={$name}&astart={$d.astart}"
-        title="{$d.title}">{$d.label}</a>
-    {/if}
-    {if not $smarty.foreach.navbar.last} - {/if}
-    {/foreach}
-
-  {if $next_start < $nb}
-  <a href="?name={$name}&astart={$next_start}"
-     title="{$NavNext}"><img src="{$base}/html/classic/right.png" alt="{$NavNext}"></a>
-   {/if}
+   {include file="classic/navbar.tpl"}
   </td>
   <td colspan="2" align="right">
     {$astart} - {$aend} /&nbsp;{$nb}

Index: timetrack_overview.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/timetrack_overview.tpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- timetrack_overview.tpl	21 Sep 2004 17:00:06 -0000	1.1.2.5
+++ timetrack_overview.tpl	29 Sep 2004 16:23:55 -0000	1.1.2.6
@@ -8,69 +8,32 @@
 
 <thead>
 <tr>
-<th nowrap="nowrap" colspan="1">#</th>
-<th nowrap="nowrap" colspan="1">{$TimetrackRef}</th>
-<th nowrap="nowrap" colspan="1">{$TimetrackWorker}</th>
-<th nowrap="nowrap" colspan="1">{$TaskVolumeDone}</th>
-<th nowrap="nowrap" colspan="1">{$TaskVolumeTodo}</th>
-<th nowrap="nowrap" colspan="1">{$TimetrackDate}</th>
-<th nowrap="nowrap" colspan="1">{$Description}</th>
-<th nowrap="nowrap" colspan="1">{$TTState}</th>
-<th nowrap="nowrap" colspan="1">{$ProdCost}</th>
-<th nowrap>
-  <input type="checkbox" name="checkit" >
+<th>#</th>
+{foreach from=$header item=h}
+<th>
+  {if $h.name != ""}
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/down.png" label_alt="down"
+	    search=$search start=$astart xf=$h.name xo=1}
+   {$h.label}
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/up.png" label_alt="up"
+	    search=$search start=$astart xf=$h.name xo=2}
+   {else}
+   {$h.label}
+   {/if}
 </th>
+{/foreach}
 </tr>
 </thead>
 
 <tfoot>
 <tr>
   <td colspan="8" align="center">
-  {if $astart > 0}
-      {strip}
-      <a href="?
-      {foreach from=$search key=k item=v}
-       {$k}={$v}&
-      {/foreach}
-      start={$prev_start}"
-      title="{$NavBack}">
-      <img src="{$base}/html/classic/left.png" alt="{$NavBack}">
-      </a>
-      {/strip}
-  {else}
-    &nbsp;
-  {/if}
-
-    {foreach from=$direct_nav item=d name=navbar}
-    {if $d.astart == $astart}
-      <b>{$d.label}</b>
-    {else}
-      {strip}
-      <a href="?
-      {foreach from=$search key=k item=v}
-       {$k}={$v}&
-      {/foreach}
-      start={$d.astart}" title="{$d.title}">{$d.label}</a>
-      {/strip}
-    {/if}
-    {if not $smarty.foreach.navbar.last} - {/if}
-    {/foreach}
-
-  {if $next_start < $nb_tts}
-      {strip}
-      <a href="?
-      {foreach from=$search key=k item=v}
-       {$k}={$v}&
-      {/foreach}
-      start={$next_start}"
-      title="{$NavNext}">
-      <img src="{$base}/html/classic/right.png" alt="{$NavNext}">
-      </a>
-      {/strip}
-  {/if}
+   {include file="classic/navbar.tpl"}
   </td>
   <td colspan="2" align="right">
-    {$astart} - {$aend} /&nbsp;{$nb_tts}
+    {$astart} - {$aend} /&nbsp;{$nb}
   </td>
 </tr>
 </tfoot>

Update of /cvsroot/tutos/tutos/templates/classic/bugtracking
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3491/templates/classic/bugtracking

Modified Files:
      Tag: BRANCH-2-0
	bug_overview.tpl 
Log Message:
* OrderHeader re implementation with templates
* Code and template cleaning (navigation bar factorization)
* DEBUG: added missing acl detail menu from team_show


Index: bug_overview.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/bugtracking/Attic/bug_overview.tpl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- bug_overview.tpl	9 Sep 2004 10:39:39 -0000	1.1.2.8
+++ bug_overview.tpl	29 Sep 2004 16:23:55 -0000	1.1.2.9
@@ -18,11 +18,20 @@
 <thead>
 <tr>
 {foreach from=$headers item=h}
-  {* If we show bugs from project X, don't show it on every line *}
+ {* If we show bugs from project X, don't show it on every line *}
+ {if not ( $h.name == 'ref' and $search.pid != "" ) }
 
-  {if not ( $h.name == 'ref' and $search.pid != "" ) }
-  <th>{$h.label}</th>
-  {/if}
+  <th>
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/down.png" label_alt="down"
+	    search=$search start=$astart xf=$h.name xo=1}
+   {$h.label}
+   {include file="mklink.tpl"
+            label_src="$base/html/classic/up.png" label_alt="up"
+	    search=$search start=$astart xf=$h.name xo=2}
+  </th>
+
+ {/if}
 {/foreach}
   <th><input type="checkbox" name="checkit" /></th>
 </tr>
@@ -31,51 +40,10 @@
 <tfoot>
 <tr>
   <td colspan="{$inner_cols}" align="center">
-  {if $astart > 0}
-      {strip}
-      <a href="?
-      {foreach from=$search key=k item=v}
-       {$k}={$v}&
-      {/foreach}
-      start={$prev_start}"
-      title="{$NavBack}">
-      <img src="{$base}/html/classic/left.png" alt="{$NavBack}">
-      </a>
-      {/strip}
-  {else}
-    &nbsp;
-  {/if}
-
-    {foreach from=$direct_nav item=d name=navbar}
-    {if $d.astart == $astart}
-      <b>{$d.label}</b>
-    {else}
-      {strip}
-      <a href="?
-      {foreach from=$search key=k item=v}
-       {$k}={$v}&
-      {/foreach}
-      start={$d.astart}" title="{$d.title}">{$d.label}</a>
-      {/strip}
-    {/if}
-    {if not $smarty.foreach.navbar.last} - {/if}
-    {/foreach}
-
-  {if $next_start < $nb_bugs}
-      {strip}
-      <a href="?
-      {foreach from=$search key=k item=v}
-       {$k}={$v}&
-      {/foreach}
-      start={$next_start}"
-      title="{$NavNext}">
-      <img src="{$base}/html/classic/right.png" alt="{$NavNext}">
-      </a>
-      {/strip}
-  {/if}
+   {include file="classic/navbar.tpl"}
   </td>
   <td colspan="2" align="right">
-    {$astart} - {$aend} /&nbsp;{$nb_bugs}
+    {$astart} - {$aend} /&nbsp;{$nb}
   </td>
 </tr>
 </tfoot>

Update of /cvsroot/tutos/tutos/templates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3491/templates

Added Files:
      Tag: BRANCH-2-0
	mklink.tpl 
Log Message:
* OrderHeader re implementation with templates
* Code and template cleaning (navigation bar factorization)
* DEBUG: added missing acl detail menu from team_show


--- NEW FILE: mklink.tpl ---
{* Generate a link from $search key *}
{* $Id: mklink.tpl,v 1.1.2.1 2004/09/29 16:23:54 tapoueh Exp $ *}

{**
 * Parameters
 *
 * search: search parameters
 * start:  starting position
 * xf:     order field name
 * xo:     order choice (1 for ASC, 2 for DESC)
 *
 * label:  text of the link, OR
 * label_src: image source
 * label_alt: image alternative
 *}

{strip}
<a href="?
{foreach from=$search key=k item=v}
{if $v != ""}
{$k}={$v}&
{/if}
{/foreach}
{if $start}start={$start}&{/if}
{if $xf}xf={$xf}&{/if}
{if $xo}xo={$xo}{/if}">

 {if $label_src != ""}
  <img src="{$label_src}" alt="{$label_alt}"> 
 {else}
  {$label}
 {/if}
</a>
{/strip}

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11933/php

Modified Files:
      Tag: BRANCH-2-0
	acl.pinc acl_show.php product_show.php res_cal.php task.pinc 
	task_show.php 
Log Message:
* ACLs now have their templates (but acl_overview)
* Added menu entries for ACL management
* DEBUG: resource overview does not show finished tasks nor tasks
  belonging to finished projects


Index: acl.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl.pinc,v
retrieving revision 1.61.2.6
retrieving revision 1.61.2.7
diff -u -r1.61.2.6 -r1.61.2.7
--- acl.pinc	23 Sep 2004 16:35:36 -0000	1.61.2.6
+++ acl.pinc	28 Sep 2004 16:20:07 -0000	1.61.2.7
@@ -23,9 +23,9 @@
   $obj->acl[EVERYBODY]  = 0;
   acl_raise($obj,$adr->id,$tutos[delok]);
 
-  # 0 = everybody can use it
+  # 0 = everybody can see it
   if ( $tutos[defaultacl] == 0 ) {
-    $obj->acl[EVERYBODY]  = $tutos[useok];
+    $obj->acl[EVERYBODY]  = $tutos[seeok];
     return;
   }
   if ( ($adr->getType() != "address") &&  ($adr->getType() != "user") ) {
@@ -33,32 +33,30 @@
   }
 
   team::obj_read($adr);
-  # 1 = teams can use it
+  # 1 = teams can see it
   if ( $tutos[defaultacl] == 1 ) {
     # When no teams are defined everybody may see
     foreach($adr->teamlist as $i => $f) {
-      acl_raise($obj,$i,$tutos[useok]);
+      acl_raise($obj,$i,$tutos[seeok]);
     }
     return;
   }
-  # 2 = defaultgroups can use it
+  # 2 = defaultgroups can see it
   if ( $tutos[defaultacl] == 2 ) {
     if ( $adr->getType() == "user" ) {
       # When no defaultgroups are defined everybody may see
       if ( count($adr->acldefault) == 0 ) {
-        $obj->acl[EVERYBODY]  = $tutos[useok];
-      }
-      else {
+        $obj->acl[EVERYBODY]  = $tutos[seeok];
+      } else {
         foreach($adr->acldefault as $i => $f) {
-	  if ($i == MYTEAMS) {
-	    // expand a -2(MYTEAMS) to all the teams of that user
+		  if ($i == MYTEAMS) {
+            # expand a -2(MYTEAMS) to all the teams of that user
             foreach($adr->teamlist as $i2 => $f2) {
               acl_raise($obj,$i2,$f);
             }
-	  }
-	  else {
+		  } else {
             acl_raise($obj,$i,$f);
-	  }
+		  }
         }
       }
     }
@@ -212,8 +210,10 @@
 Function acl_ok(&$obj,$level) {
   global $tutos,$current_user;
 
+  /*
   if( $tutos[debug] )
     error_log("ACL: ".$obj->id." ".$level);
+  */
 
   if ( ($tutos[useacl] != 1) || $current_user->isAdmin()) {
     return 99;

Index: acl_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_show.php,v
retrieving revision 1.18.2.1
retrieving revision 1.18.2.2
diff -u -r1.18.2.1 -r1.18.2.2
--- acl_show.php	27 Sep 2004 16:41:52 -0000	1.18.2.1
+++ acl_show.php	28 Sep 2004 16:20:07 -0000	1.18.2.2
@@ -102,6 +102,15 @@
        $msg .= sprintf($lang['Err0023'],$lang[$this->obj->getType()]);
        $this->stop = true;
      }
+
+     // Menu
+     $x = array('url'   => "acl_new.php?id=".$this->obj->id,
+		'text'  => $lang['AclModify'],
+		'info'  => sprintf($lang['AclModifyI'],
+				    $this->obj->getFullName()),
+		'image' => 'modify',
+		'category' => array("obj"));
+     $this->addMenu($x);
    }
  }
 

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.90.2.14
retrieving revision 1.90.2.15
diff -u -r1.90.2.14 -r1.90.2.15
--- product_show.php	27 Sep 2004 16:41:52 -0000	1.90.2.14
+++ product_show.php	28 Sep 2004 16:20:07 -0000	1.90.2.15
@@ -286,6 +286,7 @@
      $this->menuprint("bug", true);
      //$this->menuprint("timetrack", true);
    }
+
    /**
     * prepare
     */
@@ -336,6 +337,15 @@
                    'category' => array("product","mod","obj")
                  );
        $this->addMenu($x);
+
+       $x = array( 'url'   => "acl_show.php?id=".$this->obj->id,
+                   'text'  => $lang['AclDetail'],
+		   'image' => 'acls',
+                   'info'  => sprintf($lang['AclDetailI'],
+				      $this->obj->getFullname()),
+                   'category' => array("acl","obj")
+                 );
+       $this->addMenu($x);
      }
 
      if ( $this->user->feature_ok(useprojects,PERM_NEW) ) {

Index: res_cal.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/res_cal.php,v
retrieving revision 1.30.2.9
retrieving revision 1.30.2.10
diff -u -r1.30.2.9 -r1.30.2.10
--- res_cal.php	27 Sep 2004 16:41:52 -0000	1.30.2.9
+++ res_cal.php	28 Sep 2004 16:20:07 -0000	1.30.2.10
@@ -89,6 +89,10 @@
      appointment::readCal($this,$this->start,$this->end);
      $n2 = count($this->callist);
 
+     $this->assign('TaskVolumeFull', $lang['TaskVolumeFull']);
+     $this->assign('TaskVolumeDone', $lang['TaskVolumeDone']);
+     $this->assign('TaskVolumeTodo', $lang['TaskVolumeTodo']);
+
      // $this->debug(count($this->uids));
      $project_tasks = array();
      $entries = array();
@@ -120,23 +124,22 @@
 
        // Fill Fields
        // Task Entries
-       $a = 0;
-       while ( $a < $n1 ) {
+       for($a = 0;  $a < $n1; $a++ ) {
          $task = new task($this->dbconn);
          $task->read_result($result1,$a);
 
-         if ( ! $task->see_ok() ) {
-           $a++;
+         if ( ! $task->see_ok() )
            continue;
-         }
+
+	 // Exclude ended tasks
+	 if( $task->isfinished() )
+	   continue;
 
 	 // Do not consider task from project not alive
 	 // Beware of cost if this is activated.
-	 /*
 	 $project = $task->getProject($project_tasks);
 	 if( $project->getType() == "product" && ! $project->isalive() )
 	   continue;
-	 */
 
 	 // Mark all fields covered by this task
          $m1 = Date("m/Y",$task->s_start->ts);
@@ -157,7 +160,6 @@
 	   $obj[$task->id] = &$task;
 	   $maxr = Max($maxr, $r);
 	 }
-         $a++;
          unset($task);
        }
        $result1->free();
@@ -254,6 +256,10 @@
              }
 	     else {
                if ( $obj[$old]->getType() == "task" ) {
+		 $volume      = $obj[$old]->volume;
+		 $volume_done = $obj[$old]->volume_done;
+		 $volume_todo = $obj[$old]->volume_todo;
+
 		 $entry['res'][$l][] =
 		    array('id'      => $old,
 			  'colspan' => $colspan,
@@ -261,7 +267,10 @@
 			  'label'   => myentities($obj[$old]->getFullName()),
 			  'link'    => $obj[$old]->getUrl(),
 			  'title'   => myentities($obj[$old]->getFullName()),
-			  'volume'  => $obj[$old]->volume);
+			  'volume'  => $volume,
+			  'volume_done' => $volume_done,
+			  'volume_todo' => $volume_todo,
+			  'volume_link' => 'timetrack_overview?link_id='.$old);
 
                }
 	       else {

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.130.2.13
retrieving revision 1.130.2.14
diff -u -r1.130.2.13 -r1.130.2.14
--- task.pinc	23 Sep 2004 16:35:38 -0000	1.130.2.13
+++ task.pinc	28 Sep 2004 16:20:07 -0000	1.130.2.14
@@ -631,6 +631,20 @@
   }
 
   /**
+   * Returns TRUE when task is alive (running)
+   */
+  function isalive() {
+    return $this->state == TASK_RUNNING;
+  }
+
+  /**
+   * Returns TRUE when task is finnished
+   */
+  function isfinished() {
+    return $this->state == TASK_FINISH;
+  }
+
+  /**
    * Add in the given array entries $task_id => $project_id
    * Returns the project
    */
@@ -689,7 +703,7 @@
 
        // print only unfinished tasks and task from alive products
        $project = $this->getProject($projects_tasks);
-       if ( $this->state == TASK_FINISH ||
+       if( $this->isfinished() ||
             ($project->getType == "project" && (! $project->isalive())) ) {
          return $result;
        }

Index: task_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_show.php,v
retrieving revision 1.66.2.9
retrieving revision 1.66.2.10
diff -u -r1.66.2.9 -r1.66.2.10
--- task_show.php	23 Sep 2004 16:35:39 -0000	1.66.2.9
+++ task_show.php	28 Sep 2004 16:20:07 -0000	1.66.2.10
@@ -273,6 +273,15 @@
                   'category' => array("task","mod","obj")
                  );
        $this->addMenu($x);
+
+       $x = array( 'url'   => "acl_show.php?id=".$this->obj->id,
+                   'text'  => $lang['AclDetail'],
+		   'image' => 'acls',
+                   'info'  => sprintf($lang['AclDetailI'],
+				      $this->obj->getFullname()),
+                   'category' => array("acl","obj")
+                 );
+       $this->addMenu($x);
      }
 
      if( ($this->obj->id > 0) && $this->obj->del_ok() ) {

Update of /cvsroot/tutos/tutos/php/bugtracking
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11933/php/bugtracking

Modified Files:
      Tag: BRANCH-2-0
	bug_show.php 
Log Message:
* ACLs now have their templates (but acl_overview)
* Added menu entries for ACL management
* DEBUG: resource overview does not show finished tasks nor tasks
  belonging to finished projects


Index: bug_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_show.php,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -r1.4.2.5 -r1.4.2.6
--- bug_show.php	23 Sep 2004 16:35:39 -0000	1.4.2.5
+++ bug_show.php	28 Sep 2004 16:20:07 -0000	1.4.2.6
@@ -189,6 +189,15 @@
                   'category' => array("bug","mod","obj")
                  );
        $this->addMenu($x);
+
+       $x = array( 'url'   => "acl_show.php?id=".$this->obj->id,
+                   'text'  => $lang['AclDetail'],
+		   'image' => 'acls',
+                   'info'  => sprintf($lang['AclDetailI'],
+				      $this->obj->getFullname()),
+                   'category' => array("acl","obj")
+                 );
+       $this->addMenu($x);
      }
 
      $x = timetrack::getaddlink($this->user,$this->obj);

Update of /cvsroot/tutos/tutos/templates/classic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11933/templates/classic

Modified Files:
      Tag: BRANCH-2-0
	res_cal.tpl 
Log Message:
* ACLs now have their templates (but acl_overview)
* Added menu entries for ACL management
* DEBUG: resource overview does not show finished tasks nor tasks
  belonging to finished projects


Index: res_cal.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/res_cal.tpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- res_cal.tpl	9 Sep 2004 10:39:38 -0000	1.1.2.5
+++ res_cal.tpl	28 Sep 2004 16:20:07 -0000	1.1.2.6
@@ -44,7 +44,19 @@
           class="{if $smarty.foreach.rows.last}sep{/if} {$r.class}">
     {strip}
       <a href="{$r.link}" title="{$r.title}">{$r.label}</a>
-      {if $r.volume}({$r.volume}&nbsp;{$hours}){/if}
+      {if $r.volume}
+      {strip}
+        &nbsp;
+        <a href="{$r.volume_link}"
+          title="{$r.volume_done}h / {$r.volume}h, {$TaskVolumeTodo}: {$r.volume_todo}h">
+	  {if $r.volume_todo == "" or $r.volume_todo <= 0}
+	    ({$r.volume}&nbsp;h)
+	  {else}
+	    ({$r.volume_todo}&nbsp;h)
+	  {/if}
+        </a>
+      {/strip}
+      {/if}
     {/strip}
     </td>
     {/if}

Update of /cvsroot/tutos/tutos/html/classic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11933/html/classic

Added Files:
      Tag: BRANCH-2-0
	acls.png 
Log Message:
* ACLs now have their templates (but acl_overview)
* Added menu entries for ACL management
* DEBUG: resource overview does not show finished tasks nor tasks
  belonging to finished projects


--- NEW FILE: acls.png ---
‰PNG



6çoÄü½I}xsãý“¡þݦÝf‹‘hìVkkƒz8B̕9™Qï׈y%.œêàxs2¶ßçöìeå6[t¯¯Û¡!§5äÃ<ž^AuIcâÝóŸÇQ¤Ò¡½àeÕ¢q–Í<~UÆPd~½s)““xÜ<~dυ(¨ã¨÷êÌeóTy<ü\7YZ\%™\Å«äì"€!„°\×-UÜyÉ.bÙAt	‚’D@Ӑe ˜ÁqAÖu€ 	!¤Šá²
†í!mÚäŠVÆ&cÙ¤SiUCQl»Ž
EŠ‚Oƒ€.8 C8ä¥T,bK²õu|ä¹b×ÿi|þæ厵~×õÖ&HE×t
B"—ÓÈ[Ù\jfâÕBòãkÀòPþ‘n»Uá
¼®ë†£@Ða3A`CaËÀ`¹®k—ƒÿZ3àò|Î

Update of /cvsroot/tutos/tutos/templates/classic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20710/templates/classic

Added Files:
      Tag: BRANCH-2-0
	acl_new.tpl acl_show.tpl 
Log Message:
* ACL templates


--- NEW FILE: acl_new.tpl ---
{* TUTOS ACL editing template *}
{* $Id: acl_new.tpl,v 1.1.2.1 2004/09/27 16:42:22 tapoueh Exp $ *}

<!-- acl_new begin -->

{include file="classic/js/deselect.tpl"}

<form action="{$action}" method="POST" name="aclnew">
{foreach from=$ids item=id}
<input type="hidden" name="id[]" value="{$id}">
{/foreach}

<table class="overview">
<thead>
<tr>
  <th colspan="4">{$title}</th>
</tr>
<tr>
  <th>{$ACLread}</th>
  <th>{$ACLread} - {$ACLuse}</th>
  <th>{$ACLread} - {$ACLuse} - {$ACLmodify}</th>
  <th>{$ACLread} - {$ACLuse} - {$ACLmodify} - {$ACLdelete}</th>
</tr>
</thead>

<tfoot>
<tr>
<td colspan="4" align="center">
<table cellspacing="2">
<tr>
 <td class="desc" colspan="1">
   <label for="OK">{$InputOk}</label>
 </td>
 <td colspan="1">
   <input id="OK" name="OK" type="submit" value="{$Enter}" title="{$Enter}">
 </td>

 <td class="desc" colspan="1" align="right">
   <label for="RESET">{$Reset}</label>
 </td>
 <td colspan="1">
   <input id="RESET" name="RESET" type="reset"
          value="{$Reset}" title="{$Reset}">
 </td>
 <td colspan="1">&nbsp;</td>
</tr>
</table>
</td>
</tr>
</tfoot>

<tbody>
<tr>
  <td>
  <select multiple size="15" name="{$seeok.name}">
   {html_options options=$seeok.options selected=$seeok.selected}
  </select>
  </td>

  <td>
  <select multiple size="15" name="{$useok.name}">
   {html_options options=$useok.options selected=$useok.selected}
  </select>
  </td>

  <td>
  <select multiple size="15" name="{$modok.name}">
   {html_options options=$modok.options selected=$modok.selected}
  </select>
  </td>

  <td>
  <select multiple size="15" name="{$delok.name}">
   {html_options options=$delok.options selected=$delok.selected}
  </select>
  </td>
</tr>

<tr>
 <td>{$seeok.info}</td>
 <td>{$useok.info}</td>
 <td>{$modok.info}</td>
 <td>{$delok.info}</td>
</tr>

<tr>
<td colspan="4">
 <input type="checkbox" name="{$keep.name}" value="{$keep.value}"
        {if $count > 1}checked="checked"{/if}>{$keep.label}
</td>
</tr>

<tr>
<td colspan="4">
 <input type="checkbox" name="{$recusive.name}" value="{$recusive.value}"
        {if $count > 1}checked="checked"{/if}>{$recursive.label}
</td>
</tr>

</tbody>
</table>

</form>

<!-- acl_new stop -->
--- NEW FILE: acl_show.tpl ---
{* TUTOS ACL listing template *}
{* $Id: acl_show.tpl,v 1.1.2.1 2004/09/27 16:42:22 tapoueh Exp $ *}

<!-- acl_new begin -->

<table class="overview">
<thead>
<tr>
  <th colspan="4">{$title}</th>
</tr>
<tr>
  <th>{$ACLread}</th>
  <th>{$ACLread} - {$ACLuse}</th>
  <th>{$ACLread} - {$ACLuse} - {$ACLmodify}</th>
  <th>{$ACLread} - {$ACLuse} - {$ACLmodify} - {$ACLdelete}</th>
</tr>
</thead>

<tbody>
<tr>
 <td>
  <table>  
  {foreach from=$seeok item=a}
  <tr><td>
   {if $a.link == ""}
     {$a.name}
   {else}
     <a href="{$a.link}" title="{$a.title}">{$a.name}</a>
   {/if}
   </td></tr>
  {foreachelse}
   &nbsp;
  {/foreach}
  </table>
 </td>

 <td>
  <table>  
  {foreach from=$useok item=a}
  <tr><td>
   {if $a.link == ""}
     {$a.name}
   {else}
     <a href="{$a.link}" title="{$a.title}">{$a.name}</a>
   {/if}
   </td></tr>
  {foreachelse}
   &nbsp;
  {/foreach}
  </table>
 </td>

 <td>
  <table>  
  {foreach from=$modok item=a}
  <tr><td>
   {if $a.link == ""}
     {$a.name}
   {else}
     <a href="{$a.link}" title="{$a.title}">{$a.name}</a>
   {/if}
   </td></tr>
  {foreachelse}
   &nbsp;
  {/foreach}
  </table>
 </td>

 <td>
  <table>  
  {foreach from=$delok item=a}
  <tr><td>
   {if $a.link == ""}
     {$a.name}
   {else}
     <a href="{$a.link}" title="{$a.title}">{$a.name}</a>
   {/if}
   </td></tr>
  {foreachelse}
   &nbsp;
  {/foreach}
  </table>
 </td>
</tr>

</tbody>
</table>

<!-- acl_new stop -->

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19880/php

Modified Files:
      Tag: BRANCH-2-0
	acl_new.php acl_show.php calendar.p3 product_show.php 
	res_cal.php task_ins.php timetrack.pinc timetrack_new.php 
Log Message:
* DEBUG: task_ins returns always to task_show
* DEBUG: added control of volume_todo field from timetrack
* templates for ACL management, overview then menu integration to come


Index: acl_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_new.php,v
retrieving revision 1.32.2.2
retrieving revision 1.32.2.3
diff -u -r1.32.2.2 -r1.32.2.3
--- acl_new.php	23 Sep 2004 16:35:36 -0000	1.32.2.2
+++ acl_new.php	27 Sep 2004 16:41:52 -0000	1.32.2.3
@@ -20,33 +20,28 @@
   */
  class acl_new extends layout {
    /**
-    *
+    * Return an options array
     */
-   Function acl_select($min,$max,$name) {
-     global $lang,$tutos;
+   Function acl_select($min, $max) {
+     global $lang, $tutos;
 
-     $nr["r"] = 0;
-     $nr["u"] = 1;
-     $nr["m"] = 2;
-     $nr["d"] = 3;
-     $js = "";
-     echo " <select multiple size=\"". min(count($this->user->parties),$tutos[maxshow]) ."\" name=\"". $name ."[]\" ". $js .">\n";
-     foreach ($this->user->parties as $i => $fn) {
+     $options  = array();
+     $selected = array();
 
+     foreach ($this->user->parties as $i => $fn) {
        $l = 0;
        foreach($this->obj as $val) {
          if ( isset($val->acl[$i]) ) {
-           $l = max($l,$val->acl[$i]);
+           $l = max($l, $val->acl[$i]);
          }
        }
-  
-     if ( ($l < $max) && ($l >= $min) ) {
-         echo "  <option value=\"". $i ."\" selected>&nbsp;". $fn ."&nbsp;</option>\n";
-       } else {
-         echo "  <option value=\"". $i ."\" >&nbsp;". $fn ."&nbsp;</option>\n";
-       }
+       if ( ($l < $max) && ($l >= $min) ) 
+	 $selected[] = $i;
+       
+       $options[$i] = $fn;
      }
-     echo " </select>\n";
+
+     return array($options, $selected);
    }
 
    /**
@@ -90,83 +85,74 @@
      }
      $this->assign('ids', $ids);
 
-     /*
-     echo $this->DataTableStart();
-
-     echo " <tr><th colspan=\"8\">";
-     if (count($this->obj) == 1) {
-       $title = $lang[$this->obj[0]->getType()] ." ". $this->obj[0]->getFullName();
-       echo sprintf($lang['AclModifyI'],menulink($this->obj[0]->getURL(),myentities($title)));
-     } else {
-       $title = count($this->obj) . " Objects";
-       echo sprintf($lang['AclModifyI'],$title);
-     }
-     echo "</th></tr>\n";
-
-     echo "<tr valign=\"top\">\n";
-     echo " <th width=\"22%\" colspan=\"2\">". $lang['ACLread'] ."</th>\n";
-     echo " <th width=\"22%\" colspan=\"2\">". $lang['ACLread'] ."+<br>". $lang['ACLuse'] ."</th>\n";
-     echo " <th width=\"22%\" colspan=\"2\">". $lang['ACLread'] ."+<br>". $lang['ACLuse'] ."+<br>". $lang['ACLmodify'] ."</th>\n";
-     echo " <th width=\"22%\" colspan=\"2\">". $lang['ACLread'] ."+<br>". $lang['ACLuse'] ."+<br>". $lang['ACLmodify'] ."+<br>". $lang['ACLdelete'] ."</th>\n";
-     echo "</tr>\n";
-
-//      if ( ($this->obj->gettype() == "user") || ($this->obj->gettype() == "team") ) {
-//        echo "<tr valign=\"top\">\n";
-//        echo " <td colspan=\"6\"><font size=\"-1\">(other users/teams need at least the see permission for ". $this->obj->getFullName()." to appear in selection lists)</font></td>\n";
-//        echo "</tr>\n";
-//      }
-//      if ( $this->obj->gettype() == "file" ) {
-//        echo "<tr valign=\"top\">\n";
-//        echo " <td colspan=\"6\"><font size=\"-1\">(need at least the modify permission for ". $this->obj->getFullName()." to download or show documents)</font></td>\n";
-//        echo "</tr>\n";
-//      }
-     echo "<tr>\n";
-     echo " <td colspan=\"2\" align=\"center\">\n";
-     $this->acl_select(1,$tutos[useok],"r");
-     echo " </td>\n";
-     echo " <td colspan=\"2\" align=\"center\">\n";
-     $this->acl_select($tutos[useok],$tutos[modok],"u");
-     echo " </td>\n";
-     echo " <td colspan=\"2\" align=\"center\">\n";
-     $this->acl_select($tutos[modok],$tutos[delok],"m");
-     echo " </td>\n";
-     echo " <td colspan=\"2\" align=\"center\">\n";
-     $this->acl_select($tutos[delok],99,"d");
-     echo " </td>\n";
-     echo "</tr>\n";
-
-     echo "<tr>\n";
-     echo " <td colspan=\"2\">&nbsp;". sprintf($lang['ACLreadI'],myentities($title)) ."&nbsp;</td>\n";
-     echo " <td colspan=\"2\">&nbsp;". sprintf($lang['ACLuseI'],myentities($title)) ."&nbsp;</td>\n";
-     echo " <td colspan=\"2\">&nbsp;". sprintf($lang['ACLmodI'] ,myentities($title)) ."&nbsp;</td>\n";
-     echo " <td colspan=\"2\">&nbsp;". sprintf($lang['ACLdelI'] ,myentities($title)) ."&nbsp;</td>\n";
-     echo "</tr>\n";
-
-     echo "<tr>\n";
-     echo " <td colspan=\"8\">&nbsp;<input type=\"checkbox\" value=\"1\" name=\"keep\" ". ((count($this->obj) > 1) ? "checked":"") .">". $lang['ACLKeepOld'] ."</td>\n";
-     echo "</tr>\n";
-     
-     echo "<tr>\n";
-     echo " <td colspan=\"8\">&nbsp;<input type=\"checkbox\" value=\"1\" name=\"recursive\" ". ((count($this->obj) > 1) ? "checked":"") .">". $lang['ACLRecursive'] ."</td>\n";
-     echo "</tr>\n";
-
-     echo "<tr>\n";
-     submit_reset(0,1,1,1,1,4);
-     echo "</tr>\n";
-
-     echo $this->DataTableEnd();
-     hiddenFormElements();
-     echo $this->getHidden();
-     echo "</form>\n";
-     */
+     if (count($this->obj) == 1)
+       $title = $this->obj[0]->getFullName();
+     else
+       $title = count($this->obj)." Objects";
+
+     $this->assign('title', sprintf($lang['AclModifyI'], $title));
+     $this->assign('ACLread',   $lang['ACLread']);
+     $this->assign('ACLuse',    $lang['ACLuse']);
+     $this->assign('ACLmodify', $lang['ACLmodify']);
+     $this->assign('ACLdelete', $lang['ACLdelete']);
+
+     $seeok = $this->acl_select(1, $tutos[useok]);
+     $this->assign('seeok',
+		   array('name'     => "r[]",
+			 'options'  => $seeok[0],
+			 'selected' => $seeok[1],
+			 'info'     => sprintf($lang['ACLreadI'],
+					       myentities($title))));
+
+     $useok = $this->acl_select($tutos[useok],$tutos[modok]);
+     $this->assign('useok',
+		   array('name'     => "u[]",
+			 'options'  => $useok[0],
+			 'selected' => $useok[1],
+			 'info'     => sprintf($lang['ACLuseI'],
+					       myentities($title))));
+
+     $modok = $this->acl_select($tutos[modok],$tutos[delok]);
+     $this->assign('modok',
+		   array('name'     => "m[]",
+			 'options'  => $modok[0],
+			 'selected' => $modok[1],
+			 'info'     => sprintf($lang['ACLmodI'],
+					       myentities($title))));
+
+     $delok = $this->acl_select($tutos[delok], 99);
+     $this->assign('delok',
+		   array('name'     => "d[]",
+			 'options'  => $delok[0],
+			 'selected' => $delok[1],
+			 'info'     => sprintf($lang['ACLdelI'],
+					       myentities($title))));
+
+     $this->assign('count', count($this->obj));
+     $this->assign('keep',
+		   array('name'  => 'keep',
+			 'value' => 1,
+			 'label' => $lang['ACLKeepOld']));
+
+     $this->assign('recursive',
+		   array('name'  => 'recursive',
+			 'value' => 1,
+			 'label' => $lang['ACLRecursive']));
+
+     $this->assign('InputOk',   $lang['InputOk']);
+     $this->assign('ChangesOk', $lang['ChangesOk']);
+     $this->assign('Enter', $lang['Enter']);
+     $this->assign('Reset', $lang['Reset']);
 
      $this->template('acl_new');
    }
+
    /**
-    * naviagte
+    * navigate
     */
    Function navigate() {
    }
+
    /**
     * prepare
     */

Index: acl_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/acl_show.php,v
retrieving revision 1.18
retrieving revision 1.18.2.1
diff -u -r1.18 -r1.18.2.1
--- acl_show.php	6 Nov 2003 21:23:25 -0000	1.18
+++ acl_show.php	27 Sep 2004 16:41:52 -0000	1.18.2.1
@@ -9,82 +9,76 @@
  include_once 'webelements.p3';
  include_once 'permission.p3';
 
+ include_once 'layout/layout.pinc';
+
  /* Check if user is allowed to use it */
  check_user();
  loadmodules('acl','show');
- loadlayout();
 
  /**
   * display  permissions
   */
  class acl_show extends layout {
    /**
-    *
+    * Show an ACL
     */
-   Function show($min,$max,$name) {
+   Function show($min, $max) {
      global $lang;
 
+     $acls = array();
+
      @reset ($this->obj->acl);
      while ( list ($i,$f) = @each ($this->obj->acl) ) {
-
        if ( ($f < $max) && ($f >= $min) ) {
-         $pre = "&nbsp;";
          if ( $i == 0 ) {
-           echo $pre . $lang['everybody'] ."<br>\n";
+	   $acls[] =  array('name' => $lang['everybody']);
            continue;
          }
 
+	 $pre = "";
          $x = getObject($this->dbconn,$i);
          if ( $x->gettype() == "team" ) {
            $pre .= $lang['team'] ." ";
          }
-         echo $pre . $x->getLink() ."<br>\n";
+
+	 $acls[] = array('name'  => $pre . $x->getFullName(),
+			 'title' => $x->getFullName(),
+			 'link'  => $x->getUrl());
          unset($x);
        }
      }
-     echo "&nbsp;";
+     return $acls;
    }
-   /* ---------------------------------------------------------------------------
-    *
+
+   /**
+    * infos
     */
    Function info() {
-     global $lang,$tutos;
-
+     global $lang, $tutos;
 
-     echo $this->DataTableStart();
-     echo " <tr><th colspan=\"8\">";
-     echo sprintf($lang['AclDetailI'],$lang[$this->obj->getType()] ." ". menulink($this->obj->getURL(),myentities($this->obj->getFullName())));
-     echo "</th></tr>\n";
-
-     echo "<tr valign=\"top\">\n";
-     echo " <th width=\"22%\" colspan=\"2\">". $lang['ACLread'] ."</th>\n";
-     echo " <th width=\"22%\" colspan=\"2\">". $lang['ACLread'] ."+<br>". $lang['ACLuse'] ."</th>\n";
-     echo " <th width=\"22%\" colspan=\"2\">". $lang['ACLread'] ."+<br>". $lang['ACLuse'] ."+<br>". $lang['ACLmodify'] ."</th>\n";
-     echo " <th width=\"22%\" colspan=\"2\">". $lang['ACLread'] ."+<br>". $lang['ACLuse'] ."+<br>". $lang['ACLmodify'] ."+<br>".  $lang['ACLdelete'] ."</th>\n";
-     echo "</tr>\n";
-
-     echo "<tr>\n";
-     echo " <td valign=\"top\" colspan=\"2\" class=\"line1\" nowrap>\n";
-     $this->show($tutos[seeok],$tutos[useok],"r");
-     echo " </td>\n";
-     echo " <td valign=\"top\" colspan=\"2\" class=\"line2\" nowrap>\n";
-     $this->show($tutos[useok],$tutos[modok],"u");
-     echo " </td>\n";
-     echo " <td valign=\"top\" colspan=\"2\" class=\"line1\" nowrap>\n";
-     $this->show($tutos[modok],$tutos[delok],"m");
-     echo " </td>\n";
-     echo " <td valign=\"top\" colspan=\"2\" class=\"line2\" nowrap>\n";
-     $this->show($tutos[delok],99,"d");
-     echo " </td>\n";
-     echo "</tr>\n";
+     $this->assign('title', sprintf($lang['AclDetailI'],
+				    $lang[$this->obj->getType()] ." ".
+				    myentities($this->obj->getFullName())));
+
+     $this->assign('ACLread',   $lang['ACLread']);
+     $this->assign('ACLuse',    $lang['ACLuse']);
+     $this->assign('ACLmodify', $lang['ACLmodify']);
+     $this->assign('ACLdelete', $lang['ACLdelete']);
+
+     $this->assign('seeok', $this->show($tutos[seeok], $tutos[useok]));
+     $this->assign('useok', $this->show($tutos[useok], $tutos[modok]));
+     $this->assign('modok', $this->show($tutos[modok], $tutos[delok]));
+     $this->assign('delok', $this->show($tutos[delok], 99));
 
-     echo $this->DataTableEnd();
+     $this->template('acl_show');
    }
+
    /**
     * navigate
     */
    Function navigate() {
    }
+
    /**
     * prepare
     */

Index: calendar.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Attic/calendar.p3,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- calendar.p3	23 Sep 2004 16:35:37 -0000	1.1.2.2
+++ calendar.p3	27 Sep 2004 16:41:52 -0000	1.1.2.3
@@ -33,7 +33,7 @@
   if( $w < 1 )
     return array();
 
-  // $ts = mktime(0, 0, 0, substr($t,4,2), substr($t,6,2), substr($t,0,4));
+  $ts = mktime(0, 0, 0, substr($t,4,2), substr($t,6,2), substr($t,0,4));
   $last_week = Date("Ymd", $ts -  7 * 86400);
   $next_week = Date("Ymd", $ts +  7 * 86400);
 
@@ -43,15 +43,13 @@
   $layout->assign('calendar', $lang['Calendar']);
   
   $layout->assign('lastw_href',  "?t=".$last_week);
-  $layout->assign('lastw_img',   left);
+  $layout->assign('lastw_img',   'left');
   $layout->assign('lastw_label', $lang['lastweek']);
   
   $layout->assign('nextw_href',  "?t=".$next_week);
-  $layout->assign('nextw_img',   right);
+  $layout->assign('nextw_img',   'right');
   $layout->assign('nextw_label', $lang['nextweek']);
 
-  $ts = mktime(12,0,0,substr($t,4,2),substr($t,6,2),substr($t,0,4));
-
   /* Back to last Monday or Sunday before ts */
   while ( Date("w",$ts) != $adr->weekstart ) {
     $ts -= 86400;

Index: product_show.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/product_show.php,v
retrieving revision 1.90.2.13
retrieving revision 1.90.2.14
diff -u -r1.90.2.13 -r1.90.2.14
--- product_show.php	23 Sep 2004 16:35:38 -0000	1.90.2.13
+++ product_show.php	27 Sep 2004 16:41:52 -0000	1.90.2.14
@@ -375,7 +375,7 @@
 
      if( $this->obj->id > 0
 	 && $this->user->feature_ok(usebugtracking, PERM_SEE) ) {
-       $x = array('url'   => "bugtracking/bug_overview.php?pid=".$this->obj->id,
+       $x = array('url'   => "bugtracking/bug_overview.php?show=all&pid=".$this->obj->id,
 		  'text'  => $lang['BugsOverview'],
 		  'image' => 'bugs',
 		  'info'  => $lang['BugsOverview'],

Index: res_cal.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/res_cal.php,v
retrieving revision 1.30.2.8
retrieving revision 1.30.2.9
diff -u -r1.30.2.8 -r1.30.2.9
--- res_cal.php	9 Sep 2004 10:39:37 -0000	1.30.2.8
+++ res_cal.php	27 Sep 2004 16:41:52 -0000	1.30.2.9
@@ -90,7 +90,7 @@
      $n2 = count($this->callist);
 
      // $this->debug(count($this->uids));
-
+     $project_tasks = array();
      $entries = array();
 
      $line = 0;
@@ -129,6 +129,15 @@
            $a++;
            continue;
          }
+
+	 // Do not consider task from project not alive
+	 // Beware of cost if this is activated.
+	 /*
+	 $project = $task->getProject($project_tasks);
+	 if( $project->getType() == "product" && ! $project->isalive() )
+	   continue;
+	 */
+
 	 // Mark all fields covered by this task
          $m1 = Date("m/Y",$task->s_start->ts);
          $d1 = Date("j",$task->s_start->ts);

Index: task_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_ins.php,v
retrieving revision 1.40.2.2
retrieving revision 1.40.2.3
diff -u -r1.40.2.2 -r1.40.2.3
--- task_ins.php	31 Aug 2004 16:37:56 -0000	1.40.2.2
+++ task_ins.php	27 Sep 2004 16:41:52 -0000	1.40.2.3
@@ -194,9 +194,10 @@
    $dbconn->Commit("WORK");
 
    if( count($rid) == 0 ) {
-      # When modifying a task we got back too much
-      # $gotourl= web_StackPop($newobj?2:3);
-     $gotourl = web_StackPop(2);
+     // When modifying a task we got back too much
+     // $gotourl= web_StackPop($newobj?2:3);
+     // $gotourl = web_StackPop(2);
+     $gotourl = "task_show.php?id=".$t->id;
    }
    else {
      // In that case goto product_role_new to give a role to the

Index: timetrack.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack.pinc,v
retrieving revision 1.64.2.4
retrieving revision 1.64.2.5
diff -u -r1.64.2.4 -r1.64.2.5
--- timetrack.pinc	16 Sep 2004 15:59:41 -0000	1.64.2.4
+++ timetrack.pinc	27 Sep 2004 16:41:52 -0000	1.64.2.5
@@ -299,21 +299,25 @@
     if( $this->volume_todo == -1 ) {
       if (isset($this->ref->volume_todo) && ($this->ref->volume_todo != -1) ) {
         $ref_todo = $this->ref->volume_todo;
-      } elseif (isset($this->ref->volume) && ($this->ref->volume != -1) ) {
+      }
+      elseif (isset($this->ref->volume) && ($this->ref->volume != -1) ) {
         // If no volume_todo has been set for the task, we consider
         // the planned volume as the volume_todo
         $ref_todo = $this->ref->volume;
-      } else {
-	    // the diff will be zero
+      }
+      else {
+	// the diff will be zero
         $ref_todo = $this->volume;
       }
       // And the calculated volume_todo is the volume todo before this
       // timetrack entry, minus this timetrack entry volume...
       $volume_todo = $ref_todo - $this->volume;
-    } else {
+    }
+    else {
       // If a volume has been entered, we then just take it
       $volume_todo = $this->volume_todo;
     }
+
     $msg = "";
     $q = new query($this->dbconn);
     $q->setTable($this->tablename);

Index: timetrack_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/timetrack_new.php,v
retrieving revision 1.50.2.5
retrieving revision 1.50.2.6
diff -u -r1.50.2.5 -r1.50.2.6
--- timetrack_new.php	9 Sep 2004 10:39:38 -0000	1.50.2.5
+++ timetrack_new.php	27 Sep 2004 16:41:52 -0000	1.50.2.6
@@ -105,6 +105,20 @@
 
      $this->assign_date($lang['atDateTime'], "wd", $this->obj->wday);
 
+     $this->assign('ref_type', $this->obj->ref->getType());
+
+     if( $this->obj->ref->getType() == "task" ) {
+       if( $this->obj->ref->volume_todo == -1 )
+         $volume_todo = $this->obj->ref->volume - $this->obj->ref->volume_done;
+       else
+         $volume_todo = $this->obj->ref->volume_todo;
+
+       $this->assign('volume_todo',
+		     array('name'  => 'volume_todo',
+			   'label' => $lang['TaskVolumeTodo'],
+			   'value' => $volume_todo));
+     }
+
      $this->assign('currency',
 		   array('id'       => 'cph',
 			 'name'     => 'currency',

Update of /cvsroot/tutos/tutos/templates/classic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19880/templates/classic

Modified Files:
      Tag: BRANCH-2-0
	timetrack_new.tpl 
Log Message:
* DEBUG: task_ins returns always to task_show
* DEBUG: added control of volume_todo field from timetrack
* templates for ACL management, overview then menu integration to come


Index: timetrack_new.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/timetrack_new.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- timetrack_new.tpl	29 Jun 2004 16:07:02 -0000	1.1.2.1
+++ timetrack_new.tpl	27 Sep 2004 16:41:53 -0000	1.1.2.2
@@ -66,6 +66,21 @@
 
 <tr>
 <td class="desc">
+  <label for="{volume_todo.name}">{$volume_todo.label}</label>
+  <font color="red">(*)</font>
+</td>
+<td>
+  <input size="10" maxlength="10" 
+         name="{$volume_todo.name}" value="{$volume_todo.value}">{$hours}
+</td>
+
+<td colspan="2">
+  <i>{$volume_todo.label}&nbsp;: {$volume_todo.value} {$hours}</i>
+</td>
+</tr>
+
+<tr>
+<td class="desc">
   <label for="{$currency.id}">{$currency.label}</label>
 </td>
 <td>

Update of /cvsroot/tutos/tutos/php/localization
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19880/php/localization

Modified Files:
      Tag: BRANCH-2-0
	fr.p3 
Log Message:
* DEBUG: task_ins returns always to task_show
* DEBUG: added control of volume_todo field from timetrack
* templates for ACL management, overview then menu integration to come


Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.40.2.10
retrieving revision 1.40.2.11
diff -u -r1.40.2.10 -r1.40.2.11
--- fr.p3	13 Sep 2004 16:07:55 -0000	1.40.2.10
+++ fr.p3	27 Sep 2004 16:41:53 -0000	1.40.2.11
@@ -375,17 +375,17 @@
 $lang['ACLsee']          = "Voir permissions";
 $lang['ACLmod']          = "Changer permissions";
 $lang['ACLread']         = "Voir";
-$lang['ACLuse']          = "use";
+$lang['ACLuse']          = "Utiliser";
 $lang['ACLmodify']       = "Modifer";
 $lang['ACLdelete']       = "Supprimer";
 $lang['ACLreadI']        = "Les utilisateurs/groupes ci-dessus auront le droit de voir %s";
-$lang['ACLuseI']         = "above users/teams will be allowed to use '%s'";
+$lang['ACLuseI']         = "Les utilisateurs/groupes ci-dessus auront le droit d'utiliser %s";
 $lang['ACLmodI']         = "Les utilisateurs/groupes ci-dessus auront le droit de modifier %s";
 $lang['ACLdelI']         = "Les utilisateurs/groupes ci-dessus auront le droit de supprimer %s";
 $lang['ACLOverview']     = "Aperçu des permissions";
 $lang['ACLOverviewI']    = "Voir toutes les permissions";
-$lang['ACLKeepOld']      = "Seuleument augmentation des permissions. Garde les permissions existentes";
-$lang['ACLRecursive']    = "Change permissions for all sub-objects, recursively";
+$lang['ACLKeepOld']      = "Ne changer les permissions que si les nouvelles sont supérieures aux anciennes.";
+$lang['ACLRecursive']    = "Modifier les permissions de tous les sous-objets, récursivement.";
 $lang['Feature']         = "Fonctionnalité";
 
 # Tasks

Update of /cvsroot/tutos/tutos/php
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1684

Modified Files:
	database.pinc 
Log Message:
bugfix 1025814

Index: database.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/database.pinc,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- database.pinc	21 Sep 2004 08:31:36 -0000	1.51
+++ database.pinc	27 Sep 2004 11:32:25 -0000	1.52
@@ -180,7 +180,7 @@
         $obj->alias = $tutos[dbalias][$id];
       }
       if ( isset($tutos[dbhome][$id]) ) {
-        $objdthis->home = $tutos[dbhome][$id];
+        $obj->home = $tutos[dbhome][$id];
       }
       $obj->host = $tutos[dbhost][$id];
       $obj->port = $tutos[dbport][$id];
@@ -582,4 +582,4 @@
                 );
   }
 }
-?>
\ No newline at end of file
+?>