tutos-commits Mailing List for TUTOS

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

Modified Files:
      Tag: BRANCH-1-2
	user.pinc 
Log Message:
fix

Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.135.2.6
retrieving revision 1.135.2.7
diff -u -r1.135.2.6 -r1.135.2.7
--- user.pinc	24 Nov 2004 19:29:21 -0000	1.135.2.6
+++ user.pinc	28 Dec 2004 07:42:10 -0000	1.135.2.7
@@ -430,6 +430,8 @@
    * array, then in $users.
    */
   function selectOption($pre, &$parts, &$people, &$teams) {
+    global $lang;
+
     $o = getObject($this->dbconn,$pre);
     if ( $o == -1 ) {
     }
@@ -973,4 +975,4 @@
     echo $r;
   }
 }
-?>
\ No newline at end of file
+?>

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

Modified Files:
      Tag: BRANCH-2-0
	watchlist.pinc 
Log Message:
forgot an $url setting


Index: watchlist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist.pinc,v
retrieving revision 1.40.2.2
retrieving revision 1.40.2.3
diff -u -r1.40.2.2 -r1.40.2.3
--- watchlist.pinc	17 Dec 2004 15:00:31 -0000	1.40.2.2
+++ watchlist.pinc	17 Dec 2004 15:12:24 -0000	1.40.2.3
@@ -369,7 +369,9 @@
     # Inform all watchers
     #
     watchlist::obj_read($obj);
-    $url = getBaseURL(true) . $obj->getUrl();
+    // $url = getBaseURL(true) . $obj->getUrl();
+
+    $url = getBaseURL(true).$tutos['base']."/php/".$parent->getUrl();
 
     foreach ($obj->list[usewatchlist] as $i => $f) {
       $body = "";

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

Modified Files:
      Tag: BRANCH-2-0
	style.css 
Log Message:
* CSS fixing.
  some parts of the new layout are now fixed, such as the title bar and
  the default menu bar

* Watchlist
  the overview page has now its template in tutos2, and watchlinks are
  back in the menus
  mass update still don't work, i may not have time to handle it before
  my christmas hollidays, begining tonight ;)

Happy new year!


Index: style.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- style.css	15 Dec 2004 17:42:48 -0000	1.1.2.18
+++ style.css	17 Dec 2004 15:00:27 -0000	1.1.2.19
@@ -448,25 +448,29 @@
  * CSS positionning of elements
  */
 div.header {
-  /* position:          fixed; */
-  background-color:  #cfcfbb;
-  padding:           2px;
-  vertical-align:    middle;
-  width:             99%;
-  height:            2em;
+  position:          fixed;
   top:               0px;
+  width:             100%;
+  height:            30px;
 
+  /* let the default menu height */
+  margin-bottom:     30px;
+
+  background-color:  #cfcfbb;
+  padding:           0px;
+  vertical-align:    middle;
   z-index: 2;
 }
 
 div.header table {
-  width: 99%;
+  width: 100%;
+  vertical-align: top;
 }
 
 div.header td.title {
   text-align:  center;
   width:       90%;
-  font-size:   1.4em;
+  font-size:   14pt;
   font-weight: bold;
 }
 
@@ -481,7 +485,7 @@
   position:       fixed;
   padding:        2px;
   vertical-align: middle;
-  width:          99%;
+  width:          100%;
   height:         1em;
   bottom:         10px;
   text-align:     left;
@@ -489,7 +493,7 @@
 
 div.content {
   position:     absolute;
-  top:          3.2em;
+  top:          50px;
   width:        75%;
   margin:       10px 10px 10px 210px;
   padding-left: 15px;
@@ -510,42 +514,58 @@
  */
 
 /* Special attention is given to default menu */
-ul.menu#default {
-  position:       absolute;
-  top:            2em;
-  width:          99%;
+div.menu#default {
+  position:       fixed;
+  top:            30px;
+  width:          100%;
   height:         1.5em;
   margin:         0px 0px 0px 0px;
-  padding-top:    0.2em;
-  padding-bottom: 0.2em;
   border:         none;
   display:        table;
 
   z-index:        2;
 }
 
+ul.menu#default {
+  display:        table;
+  padding-top:    0.2em;
+  padding-bottom: 0.2em;
+  margin-top: 0px;
+}
+
 ul.menu#default li {
   display:  table-cell;
   position: relative;
-  padding:  0px;
+  padding:  0px 30px 0px 0px;
   margin:   0px;
   width:    auto;
   white-space: nowrap;
 }
 
 /* then normal menu elements */
-ul.menu { 
-  margin:  0px 0px 0px 5px;
-  padding: 0px;
+div.menu {
   width:   200px;
-
-  margin-top: 2em;
+  margin:  10px 0px 0px 5px;
+  background-color: #cfcfbb;
   border: 1px dashed purple;
+}
 
+ul.menu { 
+  margin:  0px;
+  padding: 0px;
   list-style-type: none;
-  background-color: #cfcfbb;
 }
 
+div.first {
+  margin-top: 60px;
+}
+
+/*
+ul.first {
+  margin-top: 60px;
+}
+*/
+
 ul.menu > li {
   text-align:    left;
   margin-bottom: 3px;

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

Modified Files:
      Tag: BRANCH-2-0
	cal_week.tpl menu.tpl mytutos.tpl product_show.tpl 
	task_new.tpl task_show.tpl 
Log Message:
* CSS fixing.
  some parts of the new layout are now fixed, such as the title bar and
  the default menu bar

* Watchlist
  the overview page has now its template in tutos2, and watchlinks are
  back in the menus
  mass update still don't work, i may not have time to handle it before
  my christmas hollidays, begining tonight ;)

Happy new year!


Index: cal_week.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/cal_week.tpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- cal_week.tpl	23 Sep 2004 16:35:40 -0000	1.1.2.2
+++ cal_week.tpl	17 Dec 2004 15:00:31 -0000	1.1.2.3
@@ -5,9 +5,9 @@
 
 <tr>
  <th colspan="2">
-<a class="nodeco" href="{$lastw_href}" title="{$lastw_label}"><img border="0" src="{$base}/html/classic/{$lastw_img}"></a>
+<a class="nodeco" href="{$lastw_href}" title="{$lastw_label}"><img border="0" src="{$base}/html/classic/{$lastw_img}.png"></a>
 &nbsp;{$calendar} &nbsp;
-<a class="nodeco" href="{$nextw_href}" title="{$nextw_label}"><img border="0" src="{$base}/html/classic/{$nextw_img}"></a>
+<a class="nodeco" href="{$nextw_href}" title="{$nextw_label}"><img border="0" src="{$base}/html/classic/{$nextw_img}.png"></a>
  </th>
 </tr>
 

Index: menu.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/menu.tpl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- menu.tpl	14 Dec 2004 17:59:12 -0000	1.1.2.8
+++ menu.tpl	17 Dec 2004 15:00:31 -0000	1.1.2.9
@@ -17,10 +17,16 @@
 *}
 
 <!-- Menu {$category} -->
-<ul id="{$category}" class="menu">
+{if $first}
+<div id="{$category}" class="menu first">
+  <ul id="{$category}" class="menu first">
+{else}
+<div id="{$category}" class="menu">
+  <ul id="{$category}" class="menu">
+{/if}
 
 {if $category != "default"}
- <li class="title">{$category}</li>
+   <li class="title">{$category}</li>
 {/if}
 
 {foreach from=$menu item=m}
@@ -36,4 +42,5 @@
     </li>
   {/if}
 {/foreach}
-</ul>
+  </ul>
+</div
\ No newline at end of file

Index: mytutos.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/mytutos.tpl,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- mytutos.tpl	15 Dec 2004 17:43:09 -0000	1.1.2.16
+++ mytutos.tpl	17 Dec 2004 15:00:32 -0000	1.1.2.17
@@ -75,7 +75,7 @@
        <td>
         <a href="{$bugs[b].link}" title="{$bugs[b].title}">{$bugs[b].label}</a>
        </td>
-       <td>{$bugs[b].plink}</td>
+       <td style="white-space: nowrap;">{$bugs[b].plink}</td>
        <td>
  <span class="bugstate{$bugs[b].state.value}">{$bugs[b].state.label}</span>
        </td>

Index: product_show.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/product_show.tpl,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- product_show.tpl	30 Sep 2004 17:09:34 -0000	1.1.2.9
+++ product_show.tpl	17 Dec 2004 15:00:32 -0000	1.1.2.10
@@ -132,7 +132,9 @@
 <td valign="top">
 
 {if $tasklist.value != ""}
-  {include file="classic/tasklist.tpl" task_overview=True}
+  {include file="classic/tasklist.tpl"
+           task_overview=True
+           style="margin-left: 0px;"}
 {/if}
 
 </td>

Index: task_new.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_new.tpl,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- task_new.tpl	4 Oct 2004 13:56:36 -0000	1.1.2.10
+++ task_new.tpl	17 Dec 2004 15:00:32 -0000	1.1.2.11
@@ -26,7 +26,7 @@
 <input type="hidden" name="volume_todo" value="{$volume_todo.value}">
 {/if}
 
-<table class="summary">
+<table class="summary" style="margin-left: 0px;">
 <thead>
 <tr>
   <th colspan="4" width="100%">{$title}</th>

Index: task_show.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_show.tpl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- task_show.tpl	30 Sep 2004 17:09:34 -0000	1.1.2.6
+++ task_show.tpl	17 Dec 2004 15:00:32 -0000	1.1.2.7
@@ -12,7 +12,7 @@
 <tr>
 <td colspan="2" align="center">
 
-<table class="summary" cellspacing="0">
+<table class="summary" cellspacing="0" style="margin-left: 0px;">
 <thead>
 <tr>
   <th class="desc" colspan="4">

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

Modified Files:
      Tag: BRANCH-2-0
	layout.pinc 
Log Message:
* CSS fixing.
  some parts of the new layout are now fixed, such as the title bar and
  the default menu bar

* Watchlist
  the overview page has now its template in tutos2, and watchlinks are
  back in the menus
  mass update still don't work, i may not have time to handle it before
  my christmas hollidays, begining tonight ;)

Happy new year!


Index: layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/Attic/layout.pinc,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- layout.pinc	15 Dec 2004 17:43:08 -0000	1.1.2.12
+++ layout.pinc	17 Dec 2004 15:00:31 -0000	1.1.2.13
@@ -390,6 +390,9 @@
    * print the $class category menu
    */
   function menuprint($class, $img = true) {
+    // We want to know if this menu is the first one
+    $this->first_menu = ! isset($this->first_menu);
+
     $n = 0;
     $menu = array();
 
@@ -404,6 +407,7 @@
     if( $n > 0 ) {
       $cat = (isset($lang[$class]) ? $lang[$class] : $class);
 
+      $this->assign('first', $this->first_menu);
       $this->assign('img', $img);
       $this->assign('menu', $menu);
       $this->assign('category', $cat);
@@ -480,7 +484,7 @@
 	// $this->menuprint("search",   false);
 
 	// $this->menuprint("support", false);
-	// $this->menuprint("module",  false);
+	// $this->menuprint("module",  true);
 	// $this->menuprint("admin",   false);
 
 	// $this->menuprint("url", false);

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

Modified Files:
      Tag: BRANCH-2-0
	watchlist.pinc watchlist_overview.php 
Log Message:
* CSS fixing.
  some parts of the new layout are now fixed, such as the title bar and
  the default menu bar

* Watchlist
  the overview page has now its template in tutos2, and watchlinks are
  back in the menus
  mass update still don't work, i may not have time to handle it before
  my christmas hollidays, begining tonight ;)

Happy new year!


Index: watchlist.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist.pinc,v
retrieving revision 1.40.2.1
retrieving revision 1.40.2.2
diff -u -r1.40.2.1 -r1.40.2.2
--- watchlist.pinc	14 Apr 2004 17:39:23 -0000	1.40.2.1
+++ watchlist.pinc	17 Dec 2004 15:00:31 -0000	1.40.2.2
@@ -193,6 +193,7 @@
     $r->free();
     return;
   }
+
   /**
    * create a link where a object can be added or deleted from a watchlist
    */
@@ -207,22 +208,33 @@
     if ( ! $user->feature_ok(usewatchlist,PERM_NEW) ) return;
 
     watchlist::obj_read($obj);
-    # BACKJUMP
-    $gotourl = "&gotourl=".urlencode($_SERVER['REQUEST_URI']);
 
+    // BACKJUMP
+    $gotourl = "&gotourl=".urlencode($_SERVER['REQUEST_URI']);
 
     if ( isset($obj->list[usewatchlist][$user->id]) ) {
-      $x = array( url => "watchlist/watchlist_del.php?id=". $obj->id ."&adr=". $user->id .$gotourl,
-                  text => ($text == "" ? $lang['WatchDel'] : $text),
-                  info => sprintf($lang['WatchDelI'],$obj->getFullName()),
-                  category => array("watchlist","del","module")
+      $url =
+	 "watchlist/watchlist_del.php?id=".
+	 $obj->id ."&adr=". $user->id .$gotourl;
+
+      $x = array('url'   => $url,
+		 'image' => 'watchlist',
+                 'text'  => ($text == "" ? $lang['WatchDel'] : $text),
+                 'info'  => sprintf($lang['WatchDelI'],$obj->getFullName()),
+                 'category' => array("watchlist","del","module")
                 );
       return $x;
-    } else {
-      $x = array( url => "watchlist/watchlist_ins.php?id=". $obj->id ."&adr=". $user->id .$gotourl,
-                  text => ($text == "" ? $lang['WatchAdd'] : $text),
-                  info => sprintf($lang['WatchAddI'],$obj->getFullName()),
-                  category => array("watchlist","ins","module")
+    }
+    else {
+      $url =
+	 "watchlist/watchlist_ins.php?id=".
+	 $obj->id ."&adr=". $user->id .$gotourl;
+
+      $x = array('url'   => $url,
+		 'image' => 'watchlist',
+                 'text'  => ($text == "" ? $lang['WatchAdd'] : $text),
+                 'info'  => sprintf($lang['WatchAddI'],$obj->getFullName()),
+                 'category' => array("watchlist","ins","module","obj")
                 );
       return $x;
     }
@@ -318,11 +330,15 @@
 
     watchlist::obj_read($parent);
 
-    if ( !isset($parent->list[usewatchlist]) or count($parent->list[usewatchlist]) == 0 )
+    if ( !isset($parent->list[usewatchlist])
+	 or count($parent->list[usewatchlist]) == 0 )
       return;
 
-    #$url = getBaseURL(true) . $parent->getUrl();  //no proper url was generated
-    $url = $tutos[baseurl][$_SESSION['dbnr']] . $parent->getUrl();
+    //no proper url was generated
+    //$url = getBaseURL(true) . $parent->getUrl();
+    //$url = $tutos[baseurl][$_SESSION['dbnr']] . $parent->getUrl();
+
+    $url = getBaseURL(true).$tutos['base']."/php/".$parent->getUrl();
 
     foreach ($parent->list[usewatchlist] as $i => $f) {
       $body = "";

Index: watchlist_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist_overview.php,v
retrieving revision 1.23.2.1
retrieving revision 1.23.2.2
diff -u -r1.23.2.1 -r1.23.2.2
--- watchlist_overview.php	15 Dec 2004 17:43:08 -0000	1.23.2.1
+++ watchlist_overview.php	17 Dec 2004 15:00:31 -0000	1.23.2.2
@@ -70,48 +70,11 @@
      if( $tutos[massupdate] ) $cols++;
 
      $this->assign('cols', $cols);
+     $this->assign('innercols', $cols - 2);
      $this->assign('title', $title);
      $this->assign('massupdate', $tutos[massupdate]);
-
      $this->assign('headers', $headers);
 
-
-     /*
-     echo $this->actionformStart("watchlist_overview.php");
-     echo $this->OverviewTableStart();
-     echo "<thead>\n";
-     if ( $this->id != -1 ) {
-       $cols = 3 + $tutos[massupdate];
-       echo "<tr>\n";
-       echo " <th colspan=\"". $cols ."\">". $lang[$this->obj->getType()] ." ". menulink($this->obj->getUrl(),$this->obj->getFullName()) ."</th>\n";
-       echo "</tr>\n";
-     } else if ( $this->adr != -1 ) {
-       $cols = 4 + $tutos[massupdate];
-       echo "<tr>\n";
-       echo " <th colspan=\"". $cols ."\">". $lang['Watcher'] ." ". menulink($this->obj->getUrl(),$this->obj->getFullName()) ."</th>\n";
-       echo "</tr>\n";
-     } else {
-       $cols = 5 + $tutos[massupdate];
-	 }
-     echo "<tr>\n";
-     if ( $this->id == -1 ) {
-       echo $this->orderHeader("","Typ",$this->link2);
-       echo $this->orderHeader("","ID",$this->link2);
-     }
-     if ( $this->adr == -1 ) {
-       echo $this->orderHeader("adr_id",$lang['Watcher'],$this->link2);
-     }
-     echo $this->orderHeader("creation",$lang['created'],$this->link2);
-     echo $this->orderHeader("lastcall",$lang['WatchLastCall'],$this->link2);
-     if ( $tutos[massupdate] == 1 ) {
-       echo "  <th nowrap><input type=\"checkbox\" name=\"checkit\" "CheckAll2();\"></th>\n";
-     } else {
-       echo $this->orderHeader("","&nbsp;",$this->link2);
-	 }
-     echo "</tr>\n";
-     echo "</thead>\n";
-     */
-
      if ( $this->start == -1 ) {
        $a = $n - $tutos[maxshow];
        $end = $n;
@@ -122,6 +85,9 @@
        $end = $this->start + $tutos[maxshow];
      }
 
+     // Navigation bar
+     $this->assign_navbar($a, $end, $n, $this->filter);
+
      $watchlist = array();
 
      $line = 0;
@@ -141,78 +107,44 @@
 				 'title' => $lang['HistoryDeleted'],
 				 'link'  => "history_show.php?id=".$oid);
 
-	   /*
-           echo " <td nowrap align=\"right\">ID:". $oid ."</td>\n";
-           echo " <td nowrap align=\"right\"><i>". makelink("history_show.php?id=".$oid,$lang['HistoryDeleted']) ."</i></td>\n";
-	   */
            $remove = true;
          }
 	 else {
 	   $entry['type']   = $lang[$obj->getType()];
-	   $entry['obj'] = array('label' => $obj->getFullName(),
+	   $entry['obj'] = array('id'    => $oid,
+				 'label' => $obj->getFullName(),
 				 'title' => $obj->getFullName(),
 				 'link'  => $obj->getUrl());
 
-	   /*
-           echo " <td nowrap align=\"right\">". $lang[$obj->getType()] ."</td>\n";
-           echo " <td nowrap align=\"right\">". $obj->getLink() ."</td>\n";
-	   */
          }
        }
        if ( $this->adr == -1 ) {
          // echo " <td nowrap align=\"right\">";
          if ( $aobj == -1 ) {
 	   $entry['adr'] = array('label' => $lang['HistoryDeleted'],
-				     'title' => $lang['HistoryDeleted'],
-				     'link'  => "history_show.php?id=".$aid);
-	   /*
-           echo "<i>". makelink("history_show.php?id=".$aid,$lang['HistoryDeleted']) ."</i>";
-	   */
+				 'title' => $lang['HistoryDeleted'],
+				 'link'  => "history_show.php?id=".$aid);
            $remove = true;
          }
 	 else {
-	   $entry['adr'] = array('label' => $aobj->getFullName(),
+	   $entry['adr'] = array('id'    => $aid,
+				 'label' => $aobj->getFullName(),
 				 'title' => $aobj->getFullName(),
 				 'link'  => $aobj->getUrl());
          }
-         // echo "</td>\n"; 
        }
        $creation = $r->getDateTime($a, "creation");
        $lastcall = $r->getDateTime($a, "lastcall");
        $entry['creation'] = $creation->getDateTime();
        $entry['lastcall'] = $lastcall->getDateTime();
+
        $entry['remove']   = $remove;
+       $entry['check']    = !$remove
+	  && (($this->user->id == $aid) || (($obj != -1 ) && $obj->mod_ok()));
 
-       /*
-       echo " <td align=\"center\">\n";
-       if ( $tutos[massupdate] == 1 ) {
-         if ( !$remove && (($this->user->id == $aid) || (($obj != -1 ) && $obj->mod_ok() )) ) {
-           echo "<input name=\"mark[]\" type=\"checkbox\" value=\"". $oid .",". $aid ."\">\n";
-         }
-	 else if ( $remove) {
-           echo "removed";
-           $wl->remove($oid,$aid);
-	 }
-	 else {
-           echo "-";
-	 }
-       }
-       else {
-         if ( !$remove && (($this->user->id == $aid) || (($obj != -1 ) && $obj->mod_ok() )) ) {
-           $url = confirmlink("watchlist/watchlist_del.php?id=". $oid ."&adr=". $aid ."&gotourl=". $this->link1 ,$lang['Delete'],$lang['WatchDel']);
-           echo $url ;
-         }
-	 else if ( $remove) {
-           echo "removed";
-           $wl->remove($oid,$aid);
-         }
-	 else {
-           echo "-";
-         }
+       if ( $remove) {
+	 $wl->remove($oid,$aid);
        }
-       echo "</td>\n";
-       echo $this->OverviewRowEnd($line++);
-       */
        $watchlist[] = $entry;
 
        $a++;
@@ -220,22 +152,14 @@
      // $this->debug($watchlist);
      $this->assign('watchlist', $watchlist);
 
-     /*
-     echo $this->list_navigation($this->link1,$cols,$this->start,$a,$n);
-     if ( $tutos[massupdate] == 1 ) {
-       echo $this->UpdateRowStart($cols-1);
-       echo sprintf($lang['withmarked'],"");
-       echo "<select name=\"action\">\n";
-       echo " <option value=\"-1\" selected>". $lang['ActionNil'] ."</option>\n";
-       echo " <option value=\"-2\">". $lang['WatchDel'] ."</option>\n";
-       echo "</select>\n";
-       echo $this->UpdateRowEnd(2);
-	 }
-     echo $this->OverviewTableEnd();
-     echo $this->actionformEnd("watchlist_overview.php");
-     $r->free();
-
-     */
+     // Mass update bug solver
+     $actions[] = array();
+     $actions[-1] = $lang['ActionNil'];
+     $actions[-2] = $lang['WatchDel'];
+ 
+     $this->assign("actions", $actions);
+     $this->assign('Enter',   $lang['Enter']);
+     $this->assign('withmarked', sprintf($lang['withmarked'], $lang['entry']));
 
      $this->template("watchlist/watchlist_overview");
    }
@@ -320,6 +244,8 @@
 
      $this->assign('id', $this->id);
      $this->assign('adr', $this->adr);
+     $this->assign('xf', $_GET['xf']);
+     $this->assign('xo', $_GET['xo']);
 
      check_dbacl( $this->q, $this->user->id, "obj_id");
 

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

Modified Files:
      Tag: BRANCH-2-0
	watchlist_overview.tpl 
Log Message:
* CSS fixing.
  some parts of the new layout are now fixed, such as the title bar and
  the default menu bar

* Watchlist
  the overview page has now its template in tutos2, and watchlinks are
  back in the menus
  mass update still don't work, i may not have time to handle it before
  my christmas hollidays, begining tonight ;)

Happy new year!


Index: watchlist_overview.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/watchlist/Attic/watchlist_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
--- watchlist_overview.tpl	15 Dec 2004 17:43:10 -0000	1.1.2.1
+++ watchlist_overview.tpl	17 Dec 2004 15:00:32 -0000	1.1.2.2
@@ -5,18 +5,23 @@
 {include file="classic/js/mass_update.tpl"}
 <form name="actionform" method="GET" action="{$action}">
 
-<table class="overview" cellpadding="4" cellspacing="0">
+<table class="overview" cellpadding="4" cellspacing="0"
+       style="margin-left: 0px;">
 <thead>
 <tr>
 {foreach from=$headers item=h}
  <th>
   {if $h.name != "" }
    {include file="mklink.tpl"
-            label_src="$base/html/classic/down.png" label_alt="down"
+            label_src_ok="$base/html/classic/down.png"
+            label_src_ko="$base/html/classic/no-down.png"
+	    label_alt="down" current_xf=$xf current_xo=$xo
 	    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"
+            label_src_ok="$base/html/classic/up.png"
+            label_src_ko="$base/html/classic/no-up.png"
+	    label_alt="up" current_xf=$xf current_xo=$xo
 	    search=$search start=$astart xf=$h.name xo=2}
   {else}
     {$h.label}
@@ -29,10 +34,21 @@
 </tr>
 </thead>
 
+<tfoot>
+<tr>
+  <td align="center" colspan="{$innercols}">
+   {include file="classic/navbar.tpl"}
+  </td>
+  <td align="right" colspan="2">
+    {$astart} - {$aend} /&nbsp;{$nb}
+  </td>
+</tr>
+</tfoot>
+
 <tbody>
 {foreach from=$watchlist item=w}
 <tr>
-  {if $id == -1 and $w.type != ""}
+  {if $w.type == ""}
   <td>{$w.id}</td>
   {else}
   <td>{$w.type}</td>
@@ -42,18 +58,41 @@
    <a href="{$base}/php/{$w.obj.link}"
      title="{$w.obj.title}">{$w.obj.label}</a>
   </td>
+  
+  {if $w.adr != ""}
   <td>
     <a href="{$base}/php/{$w.adr.link}"
       title="{$w.adr.title}">{$w.adr.label}</a>
   </td>
-  <td class="data">{$w.creation}</td>
-  <td class="data">{$w.lastcall}</td>
+  {/if}
 
-  <td>&nbsp;</td>
+  <td class="data" style="white-space: nowrap;">{$w.creation}</td>
+  <td class="data" style="white-space: nowrap;">{$w.lastcall}</td>
+
+  <td>
+  {if $w.check}
+    <input name="mark[]" type="checkbox" value="{$w.obj.id},{$w.adr.id}">
+  {elseif $w.remove}
+    removed
+  {else}
+    -
+  {/if}
+  </td>
 </tr>
 {/foreach}
 </tbody>
 
 </table>
 
+<table class="summary">
+<tr>
+ <td align="right">{$withmarked}</td>
+ <td>
+ {html_options name="action" options=$actions}
+ </td>
+ <td><input type="submit" value="{$Enter}"></td>
+</tr>
+</table>
+
+
 <!-- watchlist overview stop -->

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

Modified Files:
      Tag: BRANCH-2-0
	webelements.p3 
Log Message:
* CSS fixing.
  some parts of the new layout are now fixed, such as the title bar and
  the default menu bar

* Watchlist
  the overview page has now its template in tutos2, and watchlinks are
  back in the menus
  mass update still don't work, i may not have time to handle it before
  my christmas hollidays, begining tonight ;)

Happy new year!


Index: webelements.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/webelements.p3,v
retrieving revision 1.243.2.6
retrieving revision 1.243.2.7
diff -u -r1.243.2.6 -r1.243.2.7
--- webelements.p3	30 Nov 2004 18:26:33 -0000	1.243.2.6
+++ webelements.p3	17 Dec 2004 15:00:28 -0000	1.243.2.7
@@ -315,7 +315,8 @@
 }
 /**
  * return the baseurl
- * useconfig = true will use the $tutos[baseurl] config variable to determine the baseurl
+ * useconfig = true will use the $tutos[baseurl] config variable to
+ *             determine the baseurl
  *             this will be used for urls in mails and other output
  * the string will end with a /
  */

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

Modified Files:
      Tag: BRANCH-2-0
	res_cal.php task_overview.php 
Log Message:
* watchlist module turn
* some CSS improvements, in order to have this all css layout
  legend looks better, task_overview and res_cal now have their own
* template editing to better fit in the new CSS layout

As sayed previously, IE is not a browser I wan't to target.


Index: res_cal.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/res_cal.php,v
retrieving revision 1.30.2.10
retrieving revision 1.30.2.11
diff -u -r1.30.2.10 -r1.30.2.11
--- res_cal.php	28 Sep 2004 16:20:07 -0000	1.30.2.10
+++ res_cal.php	15 Dec 2004 17:43:05 -0000	1.30.2.11
@@ -361,6 +361,23 @@
    }
 
    /**
+    * Provide a task state legend
+    */
+   function legend() {
+     global $lang;
+
+     $this->assign("legend", $lang['legend']);
+     $this->assign("TaskState", $lang['TaskState']);
+
+     foreach( $lang['TaskStates'] as $i => $f ) {
+       $states[$i] = $f;
+     }
+     $this->assign('states', $states);
+
+     $this->template('task_overview_legend');
+   }
+
+   /**
     * navigate
     */
    Function navigate() {

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.62.2.12
retrieving revision 1.62.2.13
diff -u -r1.62.2.12 -r1.62.2.13
--- task_overview.php	5 Oct 2004 13:32:46 -0000	1.62.2.12
+++ task_overview.php	15 Dec 2004 17:43:07 -0000	1.62.2.13
@@ -211,13 +211,6 @@
    }
 
    /**
-    * navigate
-    */
-   Function navigate() {
-     $this->menuprint('task');
-   }
-
-   /**
     * action
     */
    Function action() {
@@ -358,6 +351,29 @@
      }
    }
 
+   /**
+    * Provide a task state legend
+    */
+   function legend() {
+     global $lang;
+
+     $this->assign("legend", $lang['legend']);
+     $this->assign("TaskState", $lang['TaskState']);
+
+     foreach( $lang['TaskStates'] as $i => $f ) {
+       $states[$i] = $f;
+     }
+     $this->assign('states', $states);
+
+     $this->template('task_overview_legend');
+   }
+
+   /**
+    * navigate
+    */
+   Function navigate() {
+     $this->menuprint('task');
+   }
 
    /**
     * prepare

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

Modified Files:
      Tag: BRANCH-2-0
	watchlist_overview.php 
Log Message:
* watchlist module turn
* some CSS improvements, in order to have this all css layout
  legend looks better, task_overview and res_cal now have their own
* template editing to better fit in the new CSS layout

As sayed previously, IE is not a browser I wan't to target.


Index: watchlist_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/watchlist/watchlist_overview.php,v
retrieving revision 1.23
retrieving revision 1.23.2.1
diff -u -r1.23 -r1.23.2.1
--- watchlist_overview.php	22 Jan 2004 20:56:49 -0000	1.23
+++ watchlist_overview.php	15 Dec 2004 17:43:08 -0000	1.23.2.1
@@ -11,11 +11,12 @@
  include_once 'webelements.p3';
  include_once 'permission.p3';
 
+ include_once 'layout/layout.pinc';
+
  /* Check if user is allowed to use it */
  check_user();
  loadmodules("watchlist","overview");
  loadmodule("watchlist");
- loadlayout();
 
  /**
   * show a overview of watchers
@@ -35,7 +36,47 @@
        $r->free();
        return;
      }
- 
+
+     $this->assign("action", "watchlist_overview.php");
+
+     if( $this->id != -1 ) {
+       $cols  = 3;
+       $title = $lang[$this->obj->getType()];
+     }
+     else if( $this->adr != -1 ) {
+       $cols  = 4;
+       $title = $lang['Watcher'];
+     }
+     else {
+       $cols = 5;
+     }
+
+     /**
+      * Set headers
+      */ 
+     $headers = array();
+
+     if( $this->id == -1 ) {
+       $headers[] = array('label' => "Typ");
+       $headers[] = array('label' => "ID");
+     }
+     if( $this->adr == -1 ) {
+       $headers[] = array('name' => 'adr_id', 'label' => $lang['Watcher']);
+     }
+     $headers[] = array('name' => 'creation', 'label' => $lang['created']);
+     $headers[] = array('name' => 'lastcall',
+			'label' => $lang['WatchLastCall']);
+
+     if( $tutos[massupdate] ) $cols++;
+
+     $this->assign('cols', $cols);
+     $this->assign('title', $title);
+     $this->assign('massupdate', $tutos[massupdate]);
+
+     $this->assign('headers', $headers);
+
+
+     /*
      echo $this->actionformStart("watchlist_overview.php");
      echo $this->OverviewTableStart();
      echo "<thead>\n";
@@ -69,16 +110,20 @@
 	 }
      echo "</tr>\n";
      echo "</thead>\n";
+     */
 
      if ( $this->start == -1 ) {
        $a = $n - $tutos[maxshow];
        $end = $n;
        $this->start = $a;
-     } else {
+     }
+     else {
        $a = $this->start;
        $end = $this->start + $tutos[maxshow];
      }
 
+     $watchlist = array();
+
      $line = 0;
      while ( ($a < $n) && ($a < $end) ) {
        $oid = $r->get($a, "obj_id");
@@ -87,60 +132,95 @@
        $aobj = getObject($this->dbconn,$aid);
 
        $remove = false;
-       echo $this->OverviewRowStart($line);
+       $entry = array();
+
        if ( $this->id == -1 ) {
          if ( $obj == -1 ) {
+	   $entry['id'] = $oid;
+	   $entry['obj'] = array('label' => $lang['HistoryDeleted'],
+				 'title' => $lang['HistoryDeleted'],
+				 'link'  => "history_show.php?id=".$oid);
+
+	   /*
            echo " <td nowrap align=\"right\">ID:". $oid ."</td>\n";
            echo " <td nowrap align=\"right\"><i>". makelink("history_show.php?id=".$oid,$lang['HistoryDeleted']) ."</i></td>\n";
+	   */
            $remove = true;
-         } else {
+         }
+	 else {
+	   $entry['type']   = $lang[$obj->getType()];
+	   $entry['obj'] = array('label' => $obj->getFullName(),
+				 'title' => $obj->getFullName(),
+				 'link'  => $obj->getUrl());
+
+	   /*
            echo " <td nowrap align=\"right\">". $lang[$obj->getType()] ."</td>\n";
            echo " <td nowrap align=\"right\">". $obj->getLink() ."</td>\n";
+	   */
          }
        }
        if ( $this->adr == -1 ) {
-         echo " <td nowrap align=\"right\">";
+         // echo " <td nowrap align=\"right\">";
          if ( $aobj == -1 ) {
+	   $entry['adr'] = array('label' => $lang['HistoryDeleted'],
+				     'title' => $lang['HistoryDeleted'],
+				     'link'  => "history_show.php?id=".$aid);
+	   /*
            echo "<i>". makelink("history_show.php?id=".$aid,$lang['HistoryDeleted']) ."</i>";
+	   */
            $remove = true;
-         } else {
-           echo $aobj->getLink();
          }
-         echo "</td>\n"; 
+	 else {
+	   $entry['adr'] = array('label' => $aobj->getFullName(),
+				 'title' => $aobj->getFullName(),
+				 'link'  => $aobj->getUrl());
+         }
+         // echo "</td>\n"; 
        }
-       $d = $r->getDateTime($a, "creation");
-       echo " <td nowrap align=\"right\">". $d->getDateTime() ."&nbsp;</td>\n";
-       $d = $r->getDateTime($a, "lastcall");
-       echo " <td nowrap align=\"right\">". $d->getDateTime() ."&nbsp;</td>\n";
+       $creation = $r->getDateTime($a, "creation");
+       $lastcall = $r->getDateTime($a, "lastcall");
+       $entry['creation'] = $creation->getDateTime();
+       $entry['lastcall'] = $lastcall->getDateTime();
+       $entry['remove']   = $remove;
 
- 
+       /*
        echo " <td align=\"center\">\n";
        if ( $tutos[massupdate] == 1 ) {
          if ( !$remove && (($this->user->id == $aid) || (($obj != -1 ) && $obj->mod_ok() )) ) {
            echo "<input name=\"mark[]\" type=\"checkbox\" value=\"". $oid .",". $aid ."\">\n";
-         } else if ( $remove) {
+         }
+	 else if ( $remove) {
            echo "removed";
            $wl->remove($oid,$aid);
-		 } else {
+	 }
+	 else {
            echo "-";
-		 }
-	   } else {
+	 }
+       }
+       else {
          if ( !$remove && (($this->user->id == $aid) || (($obj != -1 ) && $obj->mod_ok() )) ) {
            $url = confirmlink("watchlist/watchlist_del.php?id=". $oid ."&adr=". $aid ."&gotourl=". $this->link1 ,$lang['Delete'],$lang['WatchDel']);
            echo $url ;
-         } else if ( $remove) {
+         }
+	 else if ( $remove) {
            echo "removed";
            $wl->remove($oid,$aid);
-         } else {
+         }
+	 else {
            echo "-";
          }
-	   }
+       }
        echo "</td>\n";
        echo $this->OverviewRowEnd($line++);
+       */
+       $watchlist[] = $entry;
 
        $a++;
      }
+     // $this->debug($watchlist);
+     $this->assign('watchlist', $watchlist);
 
+     /*
      echo $this->list_navigation($this->link1,$cols,$this->start,$a,$n);
      if ( $tutos[massupdate] == 1 ) {
        echo $this->UpdateRowStart($cols-1);
@@ -154,7 +234,13 @@
      echo $this->OverviewTableEnd();
      echo $this->actionformEnd("watchlist_overview.php");
      $r->free();
+
+     */
+
+     $this->template("watchlist/watchlist_overview");
    }
+
+
    /**
     * action
     */
@@ -188,11 +274,13 @@
        $this->dbconn->Commit("WORK");
      }
    }
+
    /**
     * navigate
     */
    Function navigate() {
    }
+
    /**
     * prepare
     */
@@ -230,6 +318,9 @@
        }
      }
 
+     $this->assign('id', $this->id);
+     $this->assign('adr', $this->adr);
+
      check_dbacl( $this->q, $this->user->id, "obj_id");
 
      # sorting

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

Modified Files:
      Tag: BRANCH-2-0
	layout.pinc 
Log Message:
* watchlist module turn
* some CSS improvements, in order to have this all css layout
  legend looks better, task_overview and res_cal now have their own
* template editing to better fit in the new CSS layout

As sayed previously, IE is not a browser I wan't to target.


Index: layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/Attic/layout.pinc,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- layout.pinc	1 Dec 2004 17:57:44 -0000	1.1.2.11
+++ layout.pinc	15 Dec 2004 17:43:08 -0000	1.1.2.12
@@ -446,6 +446,13 @@
 
     $this->template("layout_start");
 
+    // Just before menus, we provide the legend
+    if( $with_legend ) {
+      $this->template("legend_start");
+      $this->legend();
+      $this->template("legend_stop");
+    }
+
     // Now the menus
 
     if( $this->withmenu ) {
@@ -488,13 +495,6 @@
       $this->template('no_menu');
     }
 
-    // Just after the menu, we provide the legend
-    if( $with_legend ) {
-      $this->template("legend_start");
-      $this->legend();
-      $this->template("legend_stop");
-    }
-
     // the remaining parts are put into an table field
     if ($msg != "") {
       $this->error($msg);

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

Modified Files:
      Tag: BRANCH-2-0
	style.css 
Log Message:
* watchlist module turn
* some CSS improvements, in order to have this all css layout
  legend looks better, task_overview and res_cal now have their own
* template editing to better fit in the new CSS layout

As sayed previously, IE is not a browser I wan't to target.


Index: style.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -u -r1.1.2.17 -r1.1.2.18
--- style.css	14 Dec 2004 17:59:11 -0000	1.1.2.17
+++ style.css	15 Dec 2004 17:42:48 -0000	1.1.2.18
@@ -448,6 +448,7 @@
  * CSS positionning of elements
  */
 div.header {
+  /* position:          fixed; */
   background-color:  #cfcfbb;
   padding:           2px;
   vertical-align:    middle;
@@ -455,7 +456,7 @@
   height:            2em;
   top:               0px;
 
-  /* border-bottom: 1px solid #cfcfbb; */
+  z-index: 2;
 }
 
 div.header table {
@@ -483,19 +484,27 @@
   width:          99%;
   height:         1em;
   bottom:         10px;
-  z-index:        2;
   text-align:     left;
 }
 
 div.content {
   position:     absolute;
-  top:          4.5em;
+  top:          3.2em;
+  width:        75%;
   margin:       10px 10px 10px 210px;
   padding-left: 15px;
   /* border:       2px solid red; */
   z-index:      1;
 }
 
+div.legend {
+  position:     fixed;
+  bottom:       2em;
+  margin-left:  5px;
+  width:        200px;
+  border:       1px dashed purple;
+}
+
 /**
  * menu
  */
@@ -511,6 +520,8 @@
   padding-bottom: 0.2em;
   border:         none;
   display:        table;
+
+  z-index:        2;
 }
 
 ul.menu#default li {
@@ -519,10 +530,11 @@
   padding:  0px;
   margin:   0px;
   width:    auto;
+  white-space: nowrap;
 }
 
 /* then normal menu elements */
-ul.menu, div.legend { 
+ul.menu { 
   margin:  0px 0px 0px 5px;
   padding: 0px;
   width:   200px;
@@ -588,8 +600,7 @@
 table.summary { 
   border: 1px solid black;
   padding: 0px;
-  margin-top: 10px;
-  margin-bottom: 10px;
+  margin: 5px 20% 10px 20%;
 }
 
 table.summary th, table.summary td {
@@ -628,8 +639,7 @@
 table.overview {
   border: 1px solid black;
   padding: 0px;
-  margin-top: 10px;
-  margin-bottom: 10px;
+  margin: 5px auto 10px 10%;
 }
 
 table.overview thead th {

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

Modified Files:
      Tag: BRANCH-2-0
	layout_stop.tpl mytutos.tpl res_cal.tpl task_overview.tpl 
Added Files:
      Tag: BRANCH-2-0
	res_cal_legend.tpl task_overview_legend.tpl 
Log Message:
* watchlist module turn
* some CSS improvements, in order to have this all css layout
  legend looks better, task_overview and res_cal now have their own
* template editing to better fit in the new CSS layout

As sayed previously, IE is not a browser I wan't to target.


--- NEW FILE: res_cal_legend.tpl ---
{* Ressource usage Overview legend  *}
{* $Id: res_cal_legend.tpl,v 1.1.2.1 2004/12/15 17:43:10 tapoueh Exp $ *}

<table width="100%">
<thead>
<tr> <th>{$TaskState}</th> </tr>
</thead>

<tbody>
{foreach from=$states key=s item=v}
<tr>
  <td class="task{$s}">{$v}</td>
</tr>
{/foreach}
</tbody>
</table>


--- NEW FILE: task_overview_legend.tpl ---
{* Task Overview legend  *}
{* $Id: task_overview_legend.tpl,v 1.1.2.1 2004/12/15 17:43:10 tapoueh Exp $ *}

<table width="100%">
<thead>
<tr> <th>{$TaskState}</th> </tr>
</thead>

<tbody>
{foreach from=$states key=s item=v}
<tr>
  <td class="task{$s}">{$v}</td>
</tr>
{/foreach}
</tbody>
</table>


Index: layout_stop.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/layout_stop.tpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- layout_stop.tpl	14 Dec 2004 17:59:12 -0000	1.1.2.5
+++ layout_stop.tpl	15 Dec 2004 17:43:09 -0000	1.1.2.6
@@ -6,7 +6,7 @@
 
 <div class="footer">
 {strip}
-   <a id="tutosversion"  class="nodeco" href="{$copyright}"
+   <a id="tutosversion"  class="nodeco" href="{$copyright}" 
     title="TUTOS {$version} {$memory} cacheinfo {$cache_count}/{$cache_hits}">
    <acronym title="The Ultimative team organization software">TUTOS</acronym>
    {$version}

Index: mytutos.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/mytutos.tpl,v
retrieving revision 1.1.2.15
retrieving revision 1.1.2.16
diff -u -r1.1.2.15 -r1.1.2.16
--- mytutos.tpl	13 Dec 2004 17:29:14 -0000	1.1.2.15
+++ mytutos.tpl	15 Dec 2004 17:43:09 -0000	1.1.2.16
@@ -2,6 +2,7 @@
 {* $Id$ *}
 
 <table class="single" border="0" cellpadding="2" cellspacing="0">
+<!-- <table class="single" style="margin-left: 10px; margin-right: 0px"> -->
 <colgroup>
  <col witdh="50%">
  <col witdh="50%">
@@ -22,7 +23,8 @@
 <!-- product list -->
 <tr>
  <td valign="top">
-   <table class="overview" width="100%">
+   <table class="overview" style="width: 100%; margin-left: 0px;">
+   <thead>
      <tr>
        <th colspan="3">
          <img src="{$base}/html/classic/projects.png"><b>{$ProductP}</b>
@@ -33,22 +35,28 @@
        <th>{$ProdFunc}</th>
        <th>{$ProdCreationS}</th>
      </tr>
+   </thead>
+   <tbody>
      {section name=p loop=$products}
      <tr>
-       <td><a href="product_show.php?id={$products[p].id}">{$products[p].name}</a></td>
+       <td>
+        <a href="product_show.php?id={$products[p].id}">{$products[p].name}</a>
+       </td>
        <td>{$products[p].func}</td>
        <td>{$products[p].created}</td>
      </tr>
      {sectionelse}
      <tr> <td colspan="3">&nbsp;</td> </tr>
      {/section}
-  </table>
+   </tbody>
+   </table>
  </td>
 
 {* Now we print out the bug list *}
 <!-- bug list -->
  <td valign="top">
-   <table class="overview" width="100%">
+   <table class="overview" style="width: 100%; margin-left: 0px;">
+   <thead>
      <tr>
        <th colspan="4">
          <img src="{$base}/html/classic/bugs.png"><b>{$Bugs}</b>
@@ -60,10 +68,12 @@
        <th>{$BugState}</th>
        <th>{$BugClass}</th>
      </tr>
+   </thead>
+   <tbody>
      {section name=b loop=$bugs}
      <tr>
        <td>
-         <a href="{$bugs[b].link}" title="{$bugs[b].title}">{$bugs[b].label}</a>
+        <a href="{$bugs[b].link}" title="{$bugs[b].title}">{$bugs[b].label}</a>
        </td>
        <td>{$bugs[b].plink}</td>
        <td>
@@ -76,6 +86,7 @@
      {sectionelse}
      <tr> <td colspan="4">&nbsp;</td> </tr>
      {/section}
+   </tbody>
    </table>
  </td>
 </tr>

Index: res_cal.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/res_cal.tpl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- res_cal.tpl	28 Sep 2004 16:20:07 -0000	1.1.2.6
+++ res_cal.tpl	15 Dec 2004 17:43:09 -0000	1.1.2.7
@@ -5,7 +5,7 @@
 
 {$start} - {$end}
 
-<table class="overview">
+<table class="overview" style="margin-left: 0px;">
 <thead>
 <tr>
   <th rowspan="2">{$AdrName}</th>

Index: task_overview.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_overview.tpl,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- task_overview.tpl	5 Oct 2004 13:32:47 -0000	1.1.2.13
+++ task_overview.tpl	15 Dec 2004 17:43:10 -0000	1.1.2.14
@@ -8,22 +8,6 @@
 <form name="actionform" method="get" action="{$form_action}">
 <input type="hidden" name="id" value="{$id}">
 
-{* Adding a legend  *}
-<table id="legend" class="summary">
-<thead>
-<tr>
- <th colspan="4">{$TaskState}</th>
-</tr>
-</thead>
-<tbody>
-<tr>
-{foreach from=$states key=s item=v}
-  <td class="task{$s}">{$v}</td>
-{/foreach}
-</tr>
-</tbody>
-</table>
-
 <table id="summary" class="summary">
 <thead>
 <tr>
@@ -60,7 +44,8 @@
 </tbody>
 </table>
 
-<table class="overview" cellpadding="0" cellspacing="0" width="100%">
+<table class="overview" cellpadding="0" cellspacing="0" width="100%"
+       style="margin-left: 0px;">
 <colgroup>
  <col span="3">
  <col align="char" char="/">

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

Added Files:
      Tag: BRANCH-2-0
	watchlist_overview.tpl 
Log Message:
* watchlist module turn
* some CSS improvements, in order to have this all css layout
  legend looks better, task_overview and res_cal now have their own
* template editing to better fit in the new CSS layout

As sayed previously, IE is not a browser I wan't to target.


--- NEW FILE: watchlist_overview.tpl ---
{* Watchlist Overview *}
{* $Id: watchlist_overview.tpl,v 1.1.2.1 2004/12/15 17:43:10 tapoueh Exp $ *}

<!-- watchlist overview start -->
{include file="classic/js/mass_update.tpl"}
<form name="actionform" method="GET" action="{$action}">

<table class="overview" cellpadding="4" cellspacing="0">
<thead>
<tr>
{foreach from=$headers 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}
{if $massupdate}
<th><input type="checkbox" name="checkit" ></th>
{/if}
</tr>
</thead>

<tbody>
{foreach from=$watchlist item=w}
<tr>
  {if $id == -1 and $w.type != ""}
  <td>{$w.id}</td>
  {else}
  <td>{$w.type}</td>
  {/if}

  <td>
   <a href="{$base}/php/{$w.obj.link}"
     title="{$w.obj.title}">{$w.obj.label}</a>
  </td>
  <td>
    <a href="{$base}/php/{$w.adr.link}"
      title="{$w.adr.title}">{$w.adr.label}</a>
  </td>
  <td class="data">{$w.creation}</td>
  <td class="data">{$w.lastcall}</td>

  <td>&nbsp;</td>
</tr>
{/foreach}
</tbody>

</table>

<!-- watchlist overview stop -->

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

Log Message:
Directory /cvsroot/tutos/tutos/templates/classic/watchlist added to the repository
--> Using per-directory sticky tag `BRANCH-2-0'

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

Modified Files:
      Tag: BRANCH-2-0
	layout_start.tpl layout_stop.tpl legend_start.tpl 
	legend_stop.tpl menu.tpl menu_start.tpl menu_stop.tpl 
	no_menu.tpl 
Log Message:
* Some more new bug management debug (now in production here)
* Getting rid of html table layout, CSS now does some positionning
  Should break things on IE
  If tutos 2 IE compatibility is a must-have for you, please consider
  writting a dedicated template set (this is easy enough)


Index: layout_start.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/layout_start.tpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- layout_start.tpl	3 May 2004 16:01:26 -0000	1.1.2.4
+++ layout_start.tpl	14 Dec 2004 17:59:12 -0000	1.1.2.5
@@ -2,23 +2,12 @@
 {* $Id$ *}
 
 <!-- layout_start -->
- <table id="maintable" cellspacing="0" valign="top" cols="3" width="100%">
-  <tr>
-   <td class="headline" valign="middle" align="center">
-     <b><i>{$date}</i></b>
-   </td>
-
-   <td nowrap width="90%" height="30px" align="center" class="pagetitle">
-     {$title}
-   </td>
-
-   <td align="right" valign="top" class="pagetitle">
-   {if logolink != "none"}
-   <a target="url" href="{$logolink}"><img id="logo" src="{$logo}" alt="LOGO" align="middle"></a>
-   {else}
-   <img id="logo" src="{$logo}" alt="LOGO" align="middle">
-   {/if}
-   </td>
-  </tr>
+<div class="header">
+<table>
+<tr>
+ <td class="date">{$date}  </td>
+ <td class="title">{$title}</td>
+</table>
+</div>
 
 <!-- end of layout_start -->

Index: layout_stop.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/layout_stop.tpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- layout_stop.tpl	5 Oct 2004 20:19:10 -0000	1.1.2.4
+++ layout_stop.tpl	14 Dec 2004 17:59:12 -0000	1.1.2.5
@@ -2,23 +2,21 @@
 {* $Id$ *}
 
 <!-- layout_stop -->
-   </td>
-  </tr>
-  <tr>
-   <td colspan="3" align="right" height="30px">
+</div>
 
-   <a id="tutosversion"  class="nodeco" href="{$copyright}" title="TUTOS {$version} {$memory} cacheinfo {$cache_count}/{$cache_hits} ">
-   <font size="-2"><i><b>
+<div class="footer">
+{strip}
+   <a id="tutosversion"  class="nodeco" href="{$copyright}"
+    title="TUTOS {$version} {$memory} cacheinfo {$cache_count}/{$cache_hits}">
    <acronym title="The Ultimative team organization software">TUTOS</acronym>
    {$version}
-   </b></i></font>
-   </a>&nbsp;
-
-   {* Add a link to TUTOS-2 bugtracking, for user to have a
-   bugtracking direct access *}
+   </a>
+{/strip}
+&nbsp;
+   <!-- Add a link to TUTOS-2 bugtracking, for user to have a
+   bugtracking direct access -->
    <a href="{$base}/php/bugtracking/bug_new.php?pid=4833"
       title="{$bug}"><img src="{$base}/html/classic/bugs.png" alt="bug"></a>
-   </td>
-  </tr>
- </table>
+</div>
+
 <!-- end of layout_stop -->

Index: legend_start.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/legend_start.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- legend_start.tpl	1 Dec 2004 17:57:44 -0000	1.1.2.1
+++ legend_start.tpl	14 Dec 2004 17:59:12 -0000	1.1.2.2
@@ -2,10 +2,5 @@
 {* $Id$ *}
 
 <!-- legend start -->
-{* first some space separator *}
-<tr>
- <td style="height: 3em;">&nbsp;</td>
-</tr>
 
-<tr>
-<td>
+<div class="legend">
\ No newline at end of file

Index: legend_stop.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/legend_stop.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- legend_stop.tpl	1 Dec 2004 17:57:44 -0000	1.1.2.1
+++ legend_stop.tpl	14 Dec 2004 17:59:12 -0000	1.1.2.2
@@ -3,9 +3,4 @@
 
 <!-- legend stop -->
 
-</td>
-</tr>
-
-  </table>
-  <!-- Here we will insert the data -->
-  <td align="center" colspan="3" valign="top">
+</div>
\ No newline at end of file

Index: menu.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/menu.tpl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- menu.tpl	10 May 2004 16:18:41 -0000	1.1.2.7
+++ menu.tpl	14 Dec 2004 17:59:12 -0000	1.1.2.8
@@ -4,10 +4,10 @@
 {*
 Array
 (
-    [url] => mytutos.php
-    [63] => <img border="0" class="menu,icon_menu" src="../html/blue/menu.gif" alt="">
-    [text] => Super User
-    [info] => Page personnelle de Super User
+    [url]   => mytutos.php
+    [image] => image_name
+    [text]  => Super User
+    [info]  => Page personnelle de Super User
     [category] => Array
         (
             [0] => mytutos
@@ -17,12 +17,12 @@
 *}
 
 <!-- Menu {$category} -->
-<tr>
- <th>{$category}</th>
-</tr>
-<tr>
- <td>
-   <ul id="{$category}" class="menu">
+<ul id="{$category}" class="menu">
+
+{if $category != "default"}
+ <li class="title">{$category}</li>
+{/if}
+
 {foreach from=$menu item=m}
   {if img == True and $m.image != ""}
     <li>
@@ -36,6 +36,4 @@
     </li>
   {/if}
 {/foreach}
-   </ul>
- </td>
-</tr>
\ No newline at end of file
+</ul>

Index: menu_start.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/menu_start.tpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- menu_start.tpl	1 Dec 2004 17:57:46 -0000	1.1.2.5
+++ menu_start.tpl	14 Dec 2004 17:59:12 -0000	1.1.2.6
@@ -1,10 +1,4 @@
 {* Before writting menu *}
 {* $Id$ *}
 
-  <tr>
-   <td valign="top">
-    <table width="200">
-    <tr>
-    <td valign="top">
-    <table class="menu" width="200" bgcolor="#cfcfbb">
-  
\ No newline at end of file
+{* Using CSS layout, no extra (html positionning) code is needed *}
\ No newline at end of file

Index: menu_stop.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/menu_stop.tpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- menu_stop.tpl	1 Dec 2004 17:57:46 -0000	1.1.2.4
+++ menu_stop.tpl	14 Dec 2004 17:59:12 -0000	1.1.2.5
@@ -1,13 +1,4 @@
 {* Closing the menu enclosing element *}
 {* $Id$ *}
 
-    </table>
-  </td>
-  </tr>
-
-{if not $with_legend}
-  </table>
-
-  <!-- Here we will insert the data -->
-  <td align="center" colspan="3" valign="top">
-{/if}
\ No newline at end of file
+<div class="content">
\ No newline at end of file

Index: no_menu.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/no_menu.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- no_menu.tpl	6 Jul 2004 08:47:48 -0000	1.1.2.1
+++ no_menu.tpl	14 Dec 2004 17:59:12 -0000	1.1.2.2
@@ -4,5 +4,4 @@
 *}
 {* $Id$ *}
 
-  <td align="center" colspan="3" valign="top">
-
+<div class="content">
\ No newline at end of file

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

Modified Files:
      Tag: BRANCH-2-0
	bug.pinc bug_overview.php 
Log Message:
* Some more new bug management debug (now in production here)
* Getting rid of html table layout, CSS now does some positionning
  Should break things on IE
  If tutos 2 IE compatibility is a must-have for you, please consider
  writting a dedicated template set (this is easy enough)


Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.13.2.15
retrieving revision 1.13.2.16
diff -u -r1.13.2.15 -r1.13.2.16
--- bug.pinc	13 Dec 2004 17:29:13 -0000	1.13.2.15
+++ bug.pinc	14 Dec 2004 17:59:11 -0000	1.13.2.16
@@ -204,6 +204,7 @@
     $tt->worker   = $this->creator;
     $tt->creator  = $this->creator;
     $tt->creation = isset($this->creation) ? $this->creation : $now;
+    $tt->wday     = isset($this->creation) ? $this->creation : $now;
     $tt->link_id  = $this->bugid;
     $tt->ref      = $this;
     $tt->volume   = $this->volume;
@@ -1147,7 +1148,8 @@
 
     $result = array();
 
-    while ( ($a < $n) and ($a < 2* $tutos[maxshort]) ) {
+    // while ( ($a < $n) and ($a < 2* $tutos[maxshort]) ) {
+    while( ($a < $n) ) {
       $f = new bug($user->dbconn);
       $f->read_result($res,$a);
 

Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.8.2.21
retrieving revision 1.8.2.22
diff -u -r1.8.2.21 -r1.8.2.22
--- bug_overview.php	13 Dec 2004 17:29:13 -0000	1.8.2.21
+++ bug_overview.php	14 Dec 2004 17:59:12 -0000	1.8.2.22
@@ -634,8 +634,7 @@
 	"  (SELECT DISTINCT ON (bugid) bugid, ".
 	"        c.creation, c.class, c.state, c.solver, c.tt_id ".
 	"   FROM bugchanges c ".
-	"   ORDER BY bugid, c.creation DESC) h".
-	"  JOIN timetrack tt ON tt.id = h.tt_id ".
+	"   ORDER BY bugid, c.creation DESC, c.id DESC) h".
 	"  JOIN bugs b ON b.id = h.bugid ";
     
 

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

Modified Files:
      Tag: BRANCH-2-0
	style.css 
Log Message:
* Some more new bug management debug (now in production here)
* Getting rid of html table layout, CSS now does some positionning
  Should break things on IE
  If tutos 2 IE compatibility is a must-have for you, please consider
  writting a dedicated template set (this is easy enough)


Index: style.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v
retrieving revision 1.1.2.16
retrieving revision 1.1.2.17
diff -u -r1.1.2.16 -r1.1.2.17
--- style.css	9 Dec 2004 17:43:22 -0000	1.1.2.16
+++ style.css	14 Dec 2004 17:59:11 -0000	1.1.2.17
@@ -444,22 +444,114 @@
 	border: 0;
 }
 
-ul.menu { 
-  list-style-type: none;
-  margin: 0px;
+/**
+ * CSS positionning of elements
+ */
+div.header {
+  background-color:  #cfcfbb;
+  padding:           2px;
+  vertical-align:    middle;
+  width:             99%;
+  height:            2em;
+  top:               0px;
+
+  /* border-bottom: 1px solid #cfcfbb; */
+}
+
+div.header table {
+  width: 99%;
+}
+
+div.header td.title {
+  text-align:  center;
+  width:       90%;
+  font-size:   1.4em;
+  font-weight: bold;
+}
+
+div.header td.date {
+  text-align:  center;
+  font-style:  italic;
+  font-weight: bold;
+  white-space: nowrap;
+}
+
+div.footer {
+  position:       fixed;
+  padding:        2px;
+  vertical-align: middle;
+  width:          99%;
+  height:         1em;
+  bottom:         10px;
+  z-index:        2;
+  text-align:     left;
+}
+
+div.content {
+  position:     absolute;
+  top:          4.5em;
+  margin:       10px 10px 10px 210px;
+  padding-left: 15px;
+  /* border:       2px solid red; */
+  z-index:      1;
+}
+
+/**
+ * menu
+ */
+
+/* Special attention is given to default menu */
+ul.menu#default {
+  position:       absolute;
+  top:            2em;
+  width:          99%;
+  height:         1.5em;
+  margin:         0px 0px 0px 0px;
+  padding-top:    0.2em;
+  padding-bottom: 0.2em;
+  border:         none;
+  display:        table;
+}
+
+ul.menu#default li {
+  display:  table-cell;
+  position: relative;
+  padding:  0px;
+  margin:   0px;
+  width:    auto;
+}
+
+/* then normal menu elements */
+ul.menu, div.legend { 
+  margin:  0px 0px 0px 5px;
   padding: 0px;
+  width:   200px;
+
+  margin-top: 2em;
+  border: 1px dashed purple;
+
+  list-style-type: none;
+  background-color: #cfcfbb;
 }
 
 ul.menu > li {
-  text-align:  left;
+  text-align:    left;
   margin-bottom: 3px;
-  padding:     1px;
+  padding:       1px;
 }
 
 ul.menu > li:hover { 
   background-color: #efefef;
 }
 
+ul.menu > li.title {
+  text-align: center;
+  background-color: #dedebb;
+}
+
+ul.menu > li.title:hover {
+}
+
 ul.menu > li > a { 
   display: block;
   border-bottom: none;

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

Modified Files:
      Tag: BRANCH-2-0
	bug_overview.tpl 
Log Message:
* Some more debug, sql requests and information reading...
* migration.php seems to do good stuff, module seems to be reaching
  production state.


Index: bug_overview.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/bugtracking/Attic/bug_overview.tpl,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- bug_overview.tpl	10 Dec 2004 15:41:38 -0000	1.1.2.13
+++ bug_overview.tpl	13 Dec 2004 17:29:14 -0000	1.1.2.14
@@ -80,7 +80,7 @@
  </td>
 
  <td class="data">
-  <span class="bugstate{$bugs[b].class.value}">{$bugs[b].class.label}</span>
+  <span class="bugclass{$bugs[b].class.value}">{$bugs[b].class.label}</span>
  </td>
 
  <td><a href="{$base}/php/{$bugs[b].creator.link}"

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

Modified Files:
      Tag: BRANCH-2-0
	mytutos.tpl 
Log Message:
* Some more debug, sql requests and information reading...
* migration.php seems to do good stuff, module seems to be reaching
  production state.


Index: mytutos.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/mytutos.tpl,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- mytutos.tpl	21 Sep 2004 16:06:39 -0000	1.1.2.14
+++ mytutos.tpl	13 Dec 2004 17:29:14 -0000	1.1.2.15
@@ -57,8 +57,8 @@
      <tr>
        <th>{$BugID}</th>
        <th>{$BugReference}</th>
-       <th>{$BugClass}</th>
        <th>{$BugState}</th>
+       <th>{$BugClass}</th>
      </tr>
      {section name=b loop=$bugs}
      <tr>
@@ -66,8 +66,12 @@
          <a href="{$bugs[b].link}" title="{$bugs[b].title}">{$bugs[b].label}</a>
        </td>
        <td>{$bugs[b].plink}</td>
-       <td>{$bugs[b].class}</td>
-       <td>{$bugs[b].state}</td>
+       <td>
+ <span class="bugstate{$bugs[b].state.value}">{$bugs[b].state.label}</span>
+       </td>
+       <td>
+ <span class="bugclass{$bugs[b].class.value}">{$bugs[b].class.label}</span>
+       </td>
      </tr>
      {sectionelse}
      <tr> <td colspan="4">&nbsp;</td> </tr>

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

Modified Files:
      Tag: BRANCH-2-0
	bug.pinc bug_new.php bug_overview.php migration.php 
	mtable.pinc 
Log Message:
* Some more debug, sql requests and information reading...
* migration.php seems to do good stuff, module seems to be reaching
  production state.


Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.13.2.14
retrieving revision 1.13.2.15
diff -u -r1.13.2.14 -r1.13.2.15
--- bug.pinc	10 Dec 2004 17:11:39 -0000	1.13.2.14
+++ bug.pinc	13 Dec 2004 17:29:13 -0000	1.13.2.15
@@ -191,6 +191,7 @@
     $q->addFV("bugid",$this->bugid,"INT");
     $q->addFV("state",$this->state,"INT");
     $q->addFV("class",$this->class,"INT");
+    $q->addFV("solver",$this->solver->id,"");
     $q->addFV("creation",$this->creation,"DATETIME");
 
     /**
@@ -315,12 +316,11 @@
     }
     */
 
-    $q = "SELECT h.*, ".
-       "tt.creator, tt.adr_id as solver, tt.volume, tt.description ".
+    $q = "SELECT h.*, tt.creator, tt.volume, tt.description ".
        "FROM ". $obj->tablename3 ." h, timetrack tt ".
        "WHERE h.bugid = ". $obj->id .
        " AND tt.id = h.tt_id ".
-       "ORDER BY h.creation DESC";
+       "ORDER BY h.id, h.creation DESC";
 
     $result = $obj->dbconn->Exec($q);
     $n = $result->numrows();
@@ -388,13 +388,6 @@
     
     $this->creator   = getObject($this->dbconn,$r->get($pos, "creator"));
     $this->creation  = $r->getDateTime($pos, "creation");
-
-    /**
-     * For compatibility (wanting to not rewritte all the code) we
-     * read the solver and store it in a bug object, even if it is not
-     * stored on the bug table
-     */
-    $this->solver    = getObject($this->dbconn,$r->get($pos, "solver"));
     $this->solvedate = $r->getDateTime($pos, "solvedate");
 
     parent::read_result($r,$pos);
@@ -407,12 +400,16 @@
   function read_bugHistory ( ) {
     bugdata::obj_read($this);
 
-    // Then assign last state, class, solver... to this bug
-    // for compatibility
+    /**
+     * Current bug state, class and solver are to be found on the last
+     * bughistory element.
+     */
+    $nh   = count($this->bughist);
+    $last = $nh - 1;
 
-    $this->state  = $this->bughist[0]->state;
-    $this->class  = $this->bughist[0]->class;
-    $this->solver = $this->bughist[0]->solver;
+    $this->state  = $this->bughist[$last]->state;
+    $this->class  = $this->bughist[$last]->class;
+    $this->solver = $this->bughist[$last]->solver;
   }
 
   /**
@@ -687,10 +684,7 @@
     $q->setTable($this->tablename);
     $q->addFV("name", $this->name,"STRING",$table['bug']['name'][size]);
     $q->addFV("short",$this->short,"STRING",$table['bug']['short'][size]);
-
     $q->addFV("solvedate",$this->solvedate,"DATETIME");
-    // $q->addFV("solver",$this->solver,"OBJ");
-
     $q->addFV("product_id",$this->parent,"OBJ");
 
     if ( $this->id < 0) {
@@ -699,7 +693,8 @@
         // Get an new bug ID
         $this->id = $this->newid;
         $q->addFV("id",$this->id,"");
-      } else {
+      }
+      else {
         $this->id = $q->addFV("id",-1,"NEXTID");
 
         // Defaut Access Control inherit from parent
@@ -723,6 +718,7 @@
 
       $query = $q->getInsert();
     }
+    // $this->id > 0 :: bug editing
     else {
       $q->addWC("id",$this->id,"");
       $query = $q->getUpdate();
@@ -750,6 +746,7 @@
       }
 
       // Save the additional desc
+      /*
       if ($this->newdesc != "") {
         $bd = new bugdata($this->dbconn);
         $bd->bugid = $this->id;
@@ -764,81 +761,85 @@
         // add the new bugdesc to the list
         $this->bughist[] = &$bd;
       }
+      */
     }
 
     /**
      * Send a mail
      */
+    if( $tutos[mailmode] != 0 ) {
+      $mail = new mail($current_user);
+      $mail->setFrom($current_user);
+      $mail->addHeader("Sensitivity","Company-Confidential");
+      $body = "";
     
-    $mail = new mail($current_user);
-    $mail->setFrom($current_user);
-    $mail->addHeader("Sensitivity","Company-Confidential");
-    $body = "";
-    
-    $bugmailtxt = "";
+      $bugmailtxt = "";
 
 
-    // Prepare the mail
-    if ( $this->id < 0) {
-      $mail->setSubject(sprintf($lang['EmailNewBug'],
-				$this->parent->getFullName()));
-      $mail->addHeader("X-PRIORITY","1");
-      $mail->addHeader("priority","urgent");
+      // Prepare the mail
+      if ( $this->id < 0) {
+	$mail->setSubject(sprintf($lang['EmailNewBug'],
+				  $this->parent->getFullName()));
+	$mail->addHeader("X-PRIORITY","1");
+	$mail->addHeader("priority","urgent");
     
-    }
-    else {
-      $mail->setSubject(sprintf($lang['EmailChangesBug'],
-				$this->getFullName()).
-			" ".$this->parent->getFullName() );
-    }
-    $bugmailtxt = "bug_new.proto";
+      }
+      else {
+	$mail->setSubject(sprintf($lang['EmailChangesBug'],
+				  $this->getFullName()).
+			  " ".$this->parent->getFullName() );
+      }
+      $bugmailtxt = "bug_new.proto";
 
-    // Prepare the mail list
-    if ( $this->parent->getType() == "product" ) {
-      $this->parent->readroles();
-      foreach($tutos['bugnew_prod_mail'] as $r) {
-	if ( count($this->parent->role[$r]) > 0 ) {
-	  foreach($this->parent->role[$r] as $i => $o) {
-	    $ml[$o->id] = $o;
+      // Prepare the mail list
+      if ( $this->parent->getType() == "product" ) {
+	$this->parent->readroles();
+	foreach($tutos['bugnew_prod_mail'] as $r) {
+	  if ( count($this->parent->role[$r]) > 0 ) {
+	    foreach($this->parent->role[$r] as $i => $o) {
+	      $ml[$o->id] = $o;
+	    }
 	  }
 	}
       }
-    }
 
-    // solver and creator will be ingformed automatically
-    $ml[$this->solver->id] = $this->solver;
-    $ml[$this->creator->id] = $this->creator;
+      // solver and creator will be ingformed automatically
+      $ml[$this->solver->id] = $this->solver;
+      $ml[$this->creator->id] = $this->creator;
     
-    $this->ml = $ml;
-    foreach($ml as $i => $f) {
-      if( ! is_object($f) || ! is_callable($f, 'getFullName') )
-	continue;
-
-      $mail->resetBody();
-      $mail->resetTo();
-      $mail->addTo($ml[$i]);
-      $body = "";
-
-      if ( ! findMailTemplate($bugmailtxt,$ml[$i],$body) ) {
-	$msg .= sprintf($lang['Err0037'],$mail->subject,$body) ."<br>\n";
-	continue;
-      }
-
-      if ( count($this->modified) > 0 ) {
-	$this->make_mail_body($body,$ml[$i]);
+      $this->ml = $ml;
+      foreach($ml as $i => $f) {
+	if( ! is_object($f) || ! is_callable($f, 'getFullName') )
+	  continue;
+
+	$mail->resetBody();
+	$mail->resetTo();
+	$mail->addTo($ml[$i]);
+	$body = "";
+
+	if ( ! findMailTemplate($bugmailtxt,$ml[$i],$body) ) {
+	  $msg .= sprintf($lang['Err0037'],$mail->subject,$body) ."<br>\n";
+	  continue;
+	}
 
-	$mail->addBody($body,"text/plain",
-		       $lang['BugsDetail'],"",$ml[$i]->lg['content_encoding']);
+	if ( count($this->modified) > 0 ) {
+	  $this->make_mail_body($body,$ml[$i]);
 
-	$mail->addBody($mail->HtmlStart().
-		       $this->getBugHistory(false).
-		       $mail->HtmlEnd(),"text/html", $lang['BugHistory']);
+	  $mail->addBody($body,"text/plain",
+			 $lang['BugsDetail'],"",
+			 $ml[$i]->lg['content_encoding']);
+
+	  $mail->addBody($mail->HtmlStart().
+			 $this->getBugHistory(false).
+			 $mail->HtmlEnd(),"text/html", $lang['BugHistory']);
 
-	if ( ! isset ($this->newid) ) {
-	  $msg .= $mail->send() ."--<br>";
+	  if ( ! isset ($this->newid) ) {
+	    $msg .= $mail->send() ."--<br>";
+	  }
 	}
       }
     }
+
     // Make the DB access
     $r = $this->dbconn->Exec($query);
     $msg .= parent::save();
@@ -1120,7 +1121,21 @@
       return;
     }
 
-    $q = "SELECT * from ". $user->dbconn->prefix ."bugs b where (creator = ". $user->id ." or ". $user->id ." in (select t.adr_id from timetrack t, bugchanges c where t.id = c.tt_id and c.bugid = b.id and c.state <> ". BUG_STATE_CLOSED." and c.state <> ". BUG_STATE_SOLVED .")) order by creation DESC";
+    $q = 
+       " SELECT b.*, h.* ".
+       " FROM ".
+       "  (SELECT DISTINCT ON (bugid) bugid, ".
+       "        c.creation, c.class, c.state, c.solver ".
+       "   FROM bugchanges c ".
+       "   ORDER BY bugid, c.creation DESC) h".
+       "  JOIN bugs b ON b.id = h.bugid ".
+       " WHERE ".
+       " (creator = ". $user->id ." OR ".$user->id ." in ".
+       "(SELECT adr_id FROM timetrack tt, bugchanges c ".
+       " WHERE tt.id = c.tt_id AND c.bugid = b.id))".
+       " AND h.state not in (".BUG_STATE_CLOSED.", ".BUG_STATE_SOLVED.") ".
+       "ORDER BY b.creation DESC";
+    
     $res = $user->dbconn->Exec($q);
     $n = $res->numrows();
     $a = 0;
@@ -1135,13 +1150,22 @@
     while ( ($a < $n) and ($a < 2* $tutos[maxshort]) ) {
       $f = new bug($user->dbconn);
       $f->read_result($res,$a);
+
+      $state = $res->get($a, "state");
+      $class = $res->get($a, "class");
+
       if ( $f->see_ok() ) {
 	$result[] = array('label' => $f->short,
 			  'link'  => $f->getUrl(),
-			  'title' => sprintf($lang['BugShow'], $f->getFullName()),
+			  'title' => sprintf($lang['BugShow'],
+					     $f->getFullName()),
 			  'plink' => $f->parent->getLink(),
-			  'class' => $f->getClass(),
-			  'state' => $f->getState());
+			  'state' =>
+			  array('value' => $state,
+				'label' => $lang['BugStates'][$state]),
+			  'class' =>
+			  array('value' => $class,
+				'label' => $lang['BugClasses'][$class]));
       }
       $a++;
       unset($f);
@@ -1158,13 +1182,16 @@
     global $lang;
 
     $diff_to_check = array('class', 'state', 'solver');
-     $hist_count = count($this->bughist);
-     $previous = null;
+    $hist_count    = count($this->bughist);
+    $previous      = null;
 
     $history  = array();
 
-    for( $i = $hist_count - 1; $i >= 0 ; $i--) {
-      $h = &$this->bughist[$i];
+    // for( $i = $hist_count - 1; $i >= 0 ; $i--) {
+    // for( $i = 0; $i < $hist_count; $i++ ) {
+      // $h = &$this->bughist[$i];
+
+    foreach($this->bughist as $i => $h) {
       $diff = array();
 
       if( $previous == null ) {
@@ -1201,13 +1228,15 @@
 				 'title' => $tt->getFullName(),
 				 'link'  => $tt->getModUrl(),
 				 'image' => 'modify'),
-			   'class'    =>
-			   array('value' => $h->class,
-				 'label' => $lang['BugClasses'][$h->class]),
+
 			   'state'    =>
 			   array('value' => $h->state,
 				 'label' => $lang['BugStates'][$h->state]),
 
+			   'class'    =>
+			   array('value' => $h->class,
+				 'label' => $lang['BugClasses'][$h->class]),
+
 			   'desc'     => myentities($h->description),
 
 			   'volume'   => $h->volume,
@@ -1230,7 +1259,7 @@
     // PHP will keep the insert order, we want index order
 
     if( $reverse )
-      ksort($history);
+      $history = array_reverse($history);
 
     return $history;
   }

Index: bug_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_new.php,v
retrieving revision 1.5.2.10
retrieving revision 1.5.2.11
diff -u -r1.5.2.10 -r1.5.2.11
--- bug_new.php	9 Dec 2004 17:43:24 -0000	1.5.2.10
+++ bug_new.php	13 Dec 2004 17:29:13 -0000	1.5.2.11
@@ -65,12 +65,7 @@
      /**
       * Edit state, then class
       *  state is not editable on bug creation
-      *
-      * The default history order is last element first
-      * See bugdata:obj_read() select request (creation DESC)
       */
-     $nh = count($this->obj->bughist);
-
      if( $this->obj->id > 0 ) {
        $states = array();
        foreach($lang['BugStates'] as $i => $f)
@@ -80,7 +75,7 @@
 		     array('id'       => 'state',
 			   'label'    => $lang['BugState'],
 			   'options'  => $states,
-			   'selected' => $this->obj->bughist[0]->state));
+			   'selected' => $this->obj->state));
      }
      else {
        $this->assign('state',
@@ -97,7 +92,7 @@
        $classes[$i] = $f;
 
      if( $this->obj->id > 0 )
-       $class = $this->obj->bughist[0]->class;
+       $class = $this->obj->class;
      else
        $class = $this->new_hist->class;
 

Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.8.2.20
retrieving revision 1.8.2.21
diff -u -r1.8.2.20 -r1.8.2.21
--- bug_overview.php	10 Dec 2004 15:41:36 -0000	1.8.2.20
+++ bug_overview.php	13 Dec 2004 17:29:13 -0000	1.8.2.21
@@ -54,7 +54,7 @@
       * prepare function.
       */
      $headers = array();
-     $headers[] = array('name' => 'id',       'label' => $lang['BugID']);
+     $headers[] = array('name' => 'name',       'label' => $lang['BugID']);
      $headers[] = array('name' => 'b.creation', 'label' => $lang['Date']);
      $headers[] = array('label' => $lang['LastDate']);
      $headers[] = array('name' => 'ref', 'label' => $lang['BugReference']);
@@ -629,10 +629,10 @@
       * The joins are used in order to better use the indexes.
       */
      $q =
-	" SELECT b.*, h.*, tt.adr_id as solver ".
+	" SELECT b.*, h.* ".
 	" FROM ".
 	"  (SELECT DISTINCT ON (bugid) bugid, ".
-	"        c.creation, c.class, c.state, c.tt_id ".
+	"        c.creation, c.class, c.state, c.solver, c.tt_id ".
 	"   FROM bugchanges c ".
 	"   ORDER BY bugid, c.creation DESC) h".
 	"  JOIN timetrack tt ON tt.id = h.tt_id ".
@@ -781,21 +781,10 @@
      $this->assign('xo', $_GET['xo']);
 
      /*
-     echo "Q1:".$q1."<br>";
-     echo "Q2:".$q2."<br>";
-     echo "N1:".$n1."<br>";
-     echo "N2:".$n2."<br>";
+     echo "Q:".$q."<br>";
+     echo "N:".$n."<br>";
      */
 
-     if ( 0 == $n) {
-       $this->redirect = "bug_select.php?msg=". UrlEncode($lang['Err0048']);
-       return;
-     }
-     else if ( ($this->format == "html") && ($n == 1) ) {
-       $this->redirect =  "bug_show.php?id=".$this->blist[0]->id;
-       return;
-     }
-
      // Make a big array of all visible bugs
      $this->blist = array();
      $h = array();
@@ -823,6 +812,16 @@
        unset($b);
      }
 
+     if ( 0 == $n) {
+       $this->redirect = "bug_select.php?msg=". UrlEncode($lang['Err0048']);
+       return;
+     }
+     else if ( ($this->format == "html") && ($n == 1) ) {
+       $this->redirect =  "bug_show.php?id=".$this->blist[0]->id;
+       return;
+     }
+
+
      // menu
      $x = bug::getSelectLink($this->user,$lang['Search']);
      $x['category'][] = "obj";

Index: migration.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/Attic/migration.php,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- migration.php	1 Dec 2004 17:57:44 -0000	1.1.2.8
+++ migration.php	13 Dec 2004 17:29:13 -0000	1.1.2.9
@@ -535,7 +535,7 @@
        "SELECT    c.* ".
        "FROM      ".$t_bugs." b, ".$t_bugchanges." c ".
        "WHERE     b.id = ".$bugid." AND b.id = c.bugid ".
-       "ORDER BY  creation";
+       "ORDER BY  c.id, c.creation";
     $rh = $dbconn->Exec($qh);
     $nh = $rh->numrows();
 

Index: mtable.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/mtable.pinc,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -r1.2.2.3 -r1.2.2.4
--- mtable.pinc	9 Dec 2004 17:43:24 -0000	1.2.2.3
+++ mtable.pinc	13 Dec 2004 17:29:14 -0000	1.2.2.4
@@ -47,6 +47,7 @@
   "tt_id"       => array(type => "ID_TYPE", constraints => "NN",  Desc => "Timetrack entry ID"),
   "class"       => array(type => "ID_TYPE", constraints => "NN",  Desc => "class of bug"),
   "state"       => array(type => "ID_TYPE", constraints => "NN",  Desc => "state of bug"),
+  "solver"     => array(type => "ID_TYPE",     constraints => "",    Desc => "solver ID"),
   "creation"    => array(type => "TS_TYPE",     constraints => "",    Desc => "creation date")
 );
 $tableidx['bug31'] = array(

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

Modified Files:
	task.pinc user.pinc app_select.php 
Log Message:
various fixes

Index: task.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task.pinc,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- task.pinc	26 Oct 2004 07:50:06 -0000	1.160
+++ task.pinc	11 Dec 2004 08:03:51 -0000	1.161
@@ -50,11 +50,21 @@
   } else {
     $xx = $name;
   }
+  if ( $comp > 100.0 ) {
+    $over = true;
+  }
   if ($task->milestone == 1) {
     $bar = new MileStone($n, $xx, $end,sprintf("[%.0f %%]", $comp), 0.5);
   } else {
     $bar = new GanttBar($n, $xx, $start, $end,sprintf("[%.0f %%]", $comp), 0.5);
-    $bar->progress->Set($comp/100.0);
+    if ( $over ) {
+      $bar->progress->Set(1);
+      $bar->SetColor("red");
+      $bar->SetPattern(BAND_RDIAG, "red");
+      $bar->progress->SetPattern(BAND_RDIAG, "red"); 
+    } else {
+      $bar->progress->Set($comp/100.0);
+	}
   }
   if ($tutos[jpgraph_old] == 0) {
     $bar->SetCSIMTarget(addSessionKey($task->getUrl()),myentities($task->getFullName()));
@@ -120,6 +130,7 @@
   $graph->scale->week->SetStyle(WEEKSTYLE_FIRSTDAY);
   $graph->scale->month->SetStyle(MONTHSTYLE_LONGNAMEYEAR4);
   if (isset($graph->scale->actinfo)) {
+    $graph->scale->actinfo->SetFont($font, FS_NORMAL, 8);
     $graph->scale->actinfo->SetColTitles(array($lang['Task'] ." [". $lang['TaskWorker'] ."]",$lang['TaskVolumeFull'],$lang['TaskVolumeTodo'],$lang['TaskS_Start'],$lang['TaskS_End']));
   }
   /* TODO: we could use locale */
@@ -127,7 +138,7 @@
 
   // Change the scale font 
   $graph->scale->week->SetFont(FF_FONT0);
-  $graph->scale->year->SetFont(FF_ARIAL,FS_BOLD,12);
+  $graph->scale->year->SetFont($font,FS_BOLD,12);
 
   $count = 0;
   

Index: user.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/user.pinc,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- user.pinc	24 Nov 2004 18:17:54 -0000	1.141
+++ user.pinc	11 Dec 2004 08:03:52 -0000	1.142
@@ -177,7 +177,8 @@
     if ( strlen($rowiconsbefore) > 0 ) {
       $h = split(",",$rowiconsbefore);
       while( list ($i,$f) = @each ($h) ) {
-        $this->rowiconsbefore[strtolower($f)] = 1;
+        if ( $f != "" )
+          $this->rowiconsbefore[strtolower($f)] = 1;
       }
     }
     $rowiconsafter = StripSlashes($r->get($pos, "rowiconsafter"));
@@ -187,7 +188,8 @@
     if ( strlen($rowiconsafter) > 0 ) {
       $h = split(",",$rowiconsafter);
       while( list ($i,$f) = @each ($h) ) {
-        $this->rowiconsafter[strtolower($f)] = 1;
+        if ( $f != "" )
+          $this->rowiconsafter[strtolower($f)] = 1;
       }
     }
     $namedays = StripSlashes($r->get($pos, "namedays"));

Index: app_select.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/app_select.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- app_select.php	5 Feb 2004 17:07:11 -0000	1.19
+++ app_select.php	11 Dec 2004 08:03:52 -0000	1.20
@@ -25,7 +25,7 @@
    Function info() {
      global $lang,$tutos;
 
-     echo "<br><br><center>\n";
+     echo "<br /><br /><center>\n";
 
      echo "<form name=\"appsearch\" action=\"app_overview.php\" method=\"GET\">\n";
      DoubleTableStart();
@@ -68,7 +68,7 @@
        echo " <td colspan=\"2\">&nbsp;<select name=\"loc\">\n";
        echo " <option value=\"-1\">". $lang['all'] ."</option>\n";
        foreach ($lang['AppLoc'] as $i => $f ) {
-         echo "   <option VALUE=\"". $i ."\">". $lang['AppLoc'][$i] ."</option>\n";
+         echo "   <option value=\"". $i ."\">". $lang['AppLoc'][$i] ."</option>\n";
        }
        echo " </select></td>\n";
        echo "</tr><tr>\n";
@@ -78,7 +78,7 @@
 
      DoubleTableEnd();
      hiddenFormElements();
-	 echo $this->getHidden();
+     echo $this->getHidden();
      echo "</form>\n";
      echo "</center>\n";
      echo $this->setfocus("appsearch.name");

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

Modified Files:
      Tag: BRANCH-2-0
	bug.pinc 
Log Message:
* some « live » debug while migrating data here.

As the new system is now in production for us, I'll send a mail on that
as soon as possible on tutos-devel, with a simple how-to


Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.13.2.13
retrieving revision 1.13.2.14
diff -u -r1.13.2.13 -r1.13.2.14
--- bug.pinc	10 Dec 2004 15:41:35 -0000	1.13.2.13
+++ bug.pinc	10 Dec 2004 17:11:39 -0000	1.13.2.14
@@ -661,7 +661,7 @@
 
     $cc = "";
     foreach($this->ml as $i => $f) {
-      if ($f->id != $to->id) {
+      if ($f->id != $to->id && is_callable($f, 'getFullName') ) {
         $cc .= $f->getFullName() ."\n";
       }
     }
@@ -811,6 +811,9 @@
     
     $this->ml = $ml;
     foreach($ml as $i => $f) {
+      if( ! is_object($f) || ! is_callable($f, 'getFullName') )
+	continue;
+
       $mail->resetBody();
       $mail->resetTo();
       $mail->addTo($ml[$i]);

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

Modified Files:
      Tag: BRANCH-2-0
	bug.pinc bug_ins.php bug_overview.php 
Log Message:
* some more debug
* re integrate the send mail part of bug::save()
  this is to be rewritten allong with watchlist module, factorizing code
* template improvments for showing another arrow when a sort as been
  selected


Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.13.2.12
retrieving revision 1.13.2.13
diff -u -r1.13.2.12 -r1.13.2.13
--- bug.pinc	9 Dec 2004 17:43:23 -0000	1.13.2.12
+++ bug.pinc	10 Dec 2004 15:41:35 -0000	1.13.2.13
@@ -767,58 +767,48 @@
     }
 
     /**
-     * TEMP: skip the mailing
-     *
-     * TO BE REWRITTEN
+     * Send a mail
      */
     
-    /*
     $mail = new mail($current_user);
     $mail->setFrom($current_user);
     $mail->addHeader("Sensitivity","Company-Confidential");
     $body = "";
-
+    
     $bugmailtxt = "";
 
 
-      // Prepare the mail
-      $mail->setSubject(sprintf($lang['EmailNewBug'], $this->parent->getFullName()));
+    // Prepare the mail
+    if ( $this->id < 0) {
+      $mail->setSubject(sprintf($lang['EmailNewBug'],
+				$this->parent->getFullName()));
       $mail->addHeader("X-PRIORITY","1");
       $mail->addHeader("priority","urgent");
-
-      $bugmailtxt = "bug_new.proto";
-
-      // Prepare the mail list
-      if ( $this->parent->getType() == "product" ) {
-        $this->parent->readroles();
-        foreach($tutos['bugnew_prod_mail'] as $r) {
-          if ( count($this->parent->role[$r]) > 0 ) {
-            foreach($this->parent->role[$r] as $i => $o) {
-              $ml[$o->id] = $o;
-            }
-          }
-        }
-      }
-
-      $mail->setSubject(sprintf($lang['EmailChangesBug'], $this->getFullName()) ." ".  $this->parent->getFullName() );
-      $bugmailtxt = "bug_mod.proto";
-      // Prepare the mail list
-      if ( $this->parent->getType() == "product" ) {
-        $this->parent->readroles();
-        foreach($tutos['bugmod_prod_mail'] as $r) {
-          if ( count($this->parent->role[$r]) > 0 ) {
-            foreach($this->parent->role[$r] as $i => $o) {
-              $ml[$o->id] = $o;
-            }
-          }
-        }
+    
+    }
+    else {
+      $mail->setSubject(sprintf($lang['EmailChangesBug'],
+				$this->getFullName()).
+			" ".$this->parent->getFullName() );
+    }
+    $bugmailtxt = "bug_new.proto";
+
+    // Prepare the mail list
+    if ( $this->parent->getType() == "product" ) {
+      $this->parent->readroles();
+      foreach($tutos['bugnew_prod_mail'] as $r) {
+	if ( count($this->parent->role[$r]) > 0 ) {
+	  foreach($this->parent->role[$r] as $i => $o) {
+	    $ml[$o->id] = $o;
+	  }
+	}
       }
     }
 
     // solver and creator will be ingformed automatically
     $ml[$this->solver->id] = $this->solver;
     $ml[$this->creator->id] = $this->creator;
-
+    
     $this->ml = $ml;
     foreach($ml as $i => $f) {
       $mail->resetBody();
@@ -827,23 +817,26 @@
       $body = "";
 
       if ( ! findMailTemplate($bugmailtxt,$ml[$i],$body) ) {
-        $msg .= sprintf($lang['Err0037'],$mail->subject,$body) ."<br>\n";
-        continue;
+	$msg .= sprintf($lang['Err0037'],$mail->subject,$body) ."<br>\n";
+	continue;
       }
 
       if ( count($this->modified) > 0 ) {
-        $this->make_mail_body($body,$ml[$i]);
+	$this->make_mail_body($body,$ml[$i]);
 
-        $mail->addBody($body,"text/plain",$lang['BugsDetail'],"",$ml[$i]->lg['content_encoding']);
-        $mail->addBody($mail->HtmlStart(). $this->getBugHistory(false) .$mail->HtmlEnd(),"text/html" , $lang['BugHistory']);
-        if ( ! isset ($this->newid) ) {
-          $msg .= $mail->send() ."--<br>";
-        }
+	$mail->addBody($body,"text/plain",
+		       $lang['BugsDetail'],"",$ml[$i]->lg['content_encoding']);
+
+	$mail->addBody($mail->HtmlStart().
+		       $this->getBugHistory(false).
+		       $mail->HtmlEnd(),"text/html", $lang['BugHistory']);
+
+	if ( ! isset ($this->newid) ) {
+	  $msg .= $mail->send() ."--<br>";
+	}
       }
     }
-    */
-
-      // Make the DB access
+    // Make the DB access
     $r = $this->dbconn->Exec($query);
     $msg .= parent::save();
 

Index: bug_ins.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_ins.php,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- bug_ins.php	2 Dec 2004 17:31:02 -0000	1.7.2.2
+++ bug_ins.php	10 Dec 2004 15:41:36 -0000	1.7.2.3
@@ -143,6 +143,11 @@
  else
   $h->solver = $solver;
 
+// To be able to send the mail, we still need the solver in the bug
+// object itself
+ $b->solver = $h->solver;
+ $b->description = $h->description;
+
  $b->setName($name);
  $b->setShort($short);
 

Index: bug_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug_overview.php,v
retrieving revision 1.8.2.19
retrieving revision 1.8.2.20
diff -u -r1.8.2.19 -r1.8.2.20
--- bug_overview.php	9 Dec 2004 17:43:24 -0000	1.8.2.19
+++ bug_overview.php	10 Dec 2004 15:41:36 -0000	1.8.2.20
@@ -45,11 +45,17 @@
      $this->assign('massupdate', $tutos[massupdate]);
      $this->assign('filter ', $this->filter);
 
-     // Overview Table Header
-     // Don't provide name to avoid ordering option
+     /**
+      * Overview Table Header
+      * Don't provide name to avoid ordering option*
+      *
+      * If you provide a 'name' element, its value must be a valid SQL
+      * column. Please have a look at the request at the end of the
+      * prepare function.
+      */
      $headers = array();
      $headers[] = array('name' => 'id',       'label' => $lang['BugID']);
-     $headers[] = array('name' => 'creation', 'label' => $lang['Date']);
+     $headers[] = array('name' => 'b.creation', 'label' => $lang['Date']);
      $headers[] = array('label' => $lang['LastDate']);
      $headers[] = array('name' => 'ref', 'label' => $lang['BugReference']);
      $headers[] = array('name' => 'description', 'label' => $lang['BugShort']);

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

Modified Files:
      Tag: BRANCH-2-0
	mklink.tpl 
Log Message:
* some more debug
* re integrate the send mail part of bug::save()
  this is to be rewritten allong with watchlist module, factorizing code
* template improvments for showing another arrow when a sort as been
  selected


Index: mklink.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/Attic/mklink.tpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- mklink.tpl	29 Sep 2004 16:23:54 -0000	1.1.2.1
+++ mklink.tpl	10 Dec 2004 15:41:37 -0000	1.1.2.2
@@ -12,6 +12,15 @@
  * label:  text of the link, OR
  * label_src: image source
  * label_alt: image alternative
+ *
+ * If you wanna support non active icons (no-up and no-down for example),
+ * please provide label_src_ok and label_src_ko (matching $xo value).
+ * And affect current_xo to current $xo value, too.
+ *
+ * current_xf:  current ordered field
+ * current_xo:  current ordering value
+ * label_src_ok: image source if $current_xo != $xo
+ * label_src_ko: image source if $current_xo == $xo
  *}
 
 {strip}
@@ -25,10 +34,18 @@
 {if $xf}xf={$xf}&{/if}
 {if $xo}xo={$xo}{/if}">
 
+{if $label_src_ok != "" and $label_src_ko != ""}
+ {if $current_xf == $xf and $current_xo == $xo}
+  <img src="{$label_src_ko}" alt="{$label_alt}"> 
+ {else}
+  <img src="{$label_src_ok}" alt="{$label_alt}"> 
+ {/if}
+{else}
  {if $label_src != ""}
   <img src="{$label_src}" alt="{$label_alt}"> 
  {else}
   {$label}
  {/if}
+{/if}
 </a>
 {/strip}