tutos-commits Mailing List for TUTOS

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

Modified Files:
      Tag: BRANCH-2-0
	control 
Log Message:
debian standard version is now 3.6.1


Index: control
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/control,v
retrieving revision 1.8.2.6
retrieving revision 1.8.2.7
diff -u -r1.8.2.6 -r1.8.2.7
--- control	30 May 2005 14:17:58 -0000	1.8.2.6
+++ control	30 May 2005 14:26:11 -0000	1.8.2.7
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Dimitri Fontaine <dfo...@cv...>
 Build-Depends-Indep: debhelper (>= 4.1.16)
-Standards-Version: 3.6.0
+Standards-Version: 3.6.1
 Uploaders: Igor Genibel <ige...@de...>
 
 Package: tutos2

Update of /cvsroot/tutos/tutos/debian/po
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12517/debian/po

Added Files:
      Tag: BRANCH-2-0
	cs.po 
Log Message:
cs tutos debian templates translation

--- NEW FILE: cs.po ---
#
#    Translators, if you are not familiar with the PO format, gettext
#    documentation is worth reading, especially sections dedicated to
#    this format, e.g. by running:
#         info -n '(gettext)PO Files'
#         info -n '(gettext)Header Entry'
#
#    Some information specific to po-debconf are available at
#            /usr/share/doc/po-debconf/README-trans
#         or http://www.debian.org/intl/l10n/po-debconf/README-trans
#
#    Developers do not need to manually edit POT or PO files.
#
msgid ""
msgstr ""
"Project-Id-Version: tutos2\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2003-07-04 12:48+0200\n"
"PO-Revision-Date: 2005-05-12 17:13+0200\n"
"Last-Translator: Miroslav Kure <ku...@de...>\n"
"Language-Team: Czech <deb...@li...>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#. Description
#: ../tutos.templates:5
msgid "What is the webserver ?"
msgstr "Webový server"

#. Description
#: ../tutos.templates:5
msgid "What kind of web server you want TUTOS to use ?"
msgstr "Který webový server chcete používat se systémem TUTOS?"

#. Description
#: ../tutos.templates:12
msgid "What is the SGBD to use with TUTOS ?"
msgstr "Databázový server pro TUTOS"

#. Description
#: ../tutos.templates:12
msgid ""
"TUTOS can work with either mysql or postgresql, you have to chosse which one "
"you want to use."
msgstr ""
"TUTOS umí pracovat s databázovými systémy MySQL a PostgreSQL. Vyberte si, "
"který z nich chcete používat."

#. Description
#: ../tutos.templates:12
msgid "You may have then to install the one chosen here."
msgstr "Zvolený databázový server byste již měli mít nainstalovaný."

#. Description
#: ../tutos.templates:21
msgid "What is the hostname where will run the TUTOS SGBD ?"
msgstr "Jméno počítače, na kterém běží databázový server pro TUTOS?"

#. Description
#: ../tutos.templates:21
msgid ""
"In order to configure TUTOS, you need to enter the hostname where the TUTOS "
"SGBD backend will run."
msgstr ""
"Abyste mohli TUTOS nastavit, musíte zadat jméno počítače, na kterém poběží "
"databázový server."

#. Description
#: ../tutos.templates:28
msgid "What is the username of the SGBD administrator ?"
msgstr "Uživatelské jméno správce databáze"

#. Description
#: ../tutos.templates:28
msgid ""
"You need to enter the username  of  SGBD  administrator  in  order  to "
"create the TUTOS database."
msgstr ""
"Zadejte uživatelské jméno správce databáze. To je potřeba pro vytvoření "
"databáze TUTOSu."

#. Description
#: ../tutos.templates:34
msgid "What is the TUTOS SGBD admin (DBA) password ?"
msgstr "Heslo správce databáze?"

#. Description
#: ../tutos.templates:40
msgid "Confirm the DBA password"
msgstr "Potvrďte administrátorské heslo k databázi"

#. Description
#: ../tutos.templates:45
msgid "Error"
msgstr "Chyba"

#. Description
#: ../tutos.templates:45
msgid ""
"The password and the confirm password  provided  mismatch.  You  should "
"reenter the passwords !"
msgstr "Zadané heslo a jeho potvrzení nesouhlasí. Zadejte je prosím znovu."

#. Description
#: ../tutos.templates:52
msgid "What is the username of the SGBD user ?"
msgstr "Uživatelské jméno databázového uživatele"

#. Description
#: ../tutos.templates:52
msgid ""
"You need to enter the username of SGBD user in order to create the TUTOS "
"database."
msgstr "Zadejte uživatelské jméno databázového uživatele, pod kterým se "
"vytvoří databáze TUTOSu."

#. Description
#: ../tutos.templates:58
msgid "What is the TUTOS SGBD user password ?"
msgstr "Heslo databázového uživatele"

#. Description
#: ../tutos.templates:58
msgid ""
"We need to know the postgresql or mysql admin password in order to create "
"the database and its schema."
msgstr ""
"Aby se mohla vytvořit databáze a její schéma, musíte zadat administrátorské "
"heslo k databázi PostgreSQL nebo MySQL."

#. Description
#: ../tutos.templates:64
msgid "Please confirm the TUTOS SGBD user password"
msgstr "Potvrďte uživatelské heslo k databázi"

#. Description
#: ../tutos.templates:64
msgid "You have to confirm the password in order to continue the process"
msgstr "Abyste mohli pokračovat v instalaci, musíte potvrdit heslo."

#. Description
#: ../tutos.templates:69
msgid "Warning - Tutos is not configured"
msgstr "Varování - Tutos není nastaven"

#. Description
#: ../tutos.templates:69
msgid ""
"Please note you have not completed the tutos configuration. To be able to "
"complete it later, please just type"
msgstr ""
"Vemte prosím na vědomí, že jste ještě nastavení tutosu nedokončili. "
"Dokončit jej můžete později příkazem"

#. Description
#: ../tutos.templates:69
msgid "dpkg-reconfigure tutos"
msgstr "dpkg-reconfigure tutos"

#. Description
#: ../tutos.templates:77
msgid "Warning - Tutos database tables need to be created"
msgstr "Varování - Je potřeba vytvořit databázové tabulky Tutosu"

#. Description
#: ../tutos.templates:77
msgid ""
"The tutos install script will take care about the database creation, but the "
"tables it must contains are to be created with a PHP script. Please launch "
"it right after the install."
msgstr ""
"Instalační skript tutosu vytvoří databázi, avšak databázové tabulky se "
"vytváří samostatným PHP skriptem. Hned po instalaci jej prosím spusťte "
"z:"

#. Description
#: ../tutos.templates:77
msgid "http://localhost/tutos/php/scheme.php"
msgstr "http://localhost/tutos/php/scheme.php"

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

Modified Files:
      Tag: BRANCH-2-0
	changelog control tutos2.templates 
Removed Files:
      Tag: BRANCH-2-0
	doc-base 
Log Message:
Preparing a new debian package


Index: changelog
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/changelog,v
retrieving revision 1.10.2.8
retrieving revision 1.10.2.9
diff -u -r1.10.2.8 -r1.10.2.9
--- changelog	13 Apr 2005 15:36:36 -0000	1.10.2.8
+++ changelog	30 May 2005 14:17:56 -0000	1.10.2.9
@@ -1,3 +1,13 @@
+tutos2 (2.0.20050530-1) unstable; urgency=low
+
+  * New modules file (document upload) and url
+  * New CSS with 'real' menus
+  * Drop MySQL dependancy (Closes: #304613)
+  * Reworked debian templates (Closes: 305437)
+  * Removed doc-base debian file (Closes: 305491)
+
+ -- Dimitri Fontaine <dfo...@cv...>  Mon, 30 May 2005 15:43:58 +0200
+
 tutos2 (2.0.20050413-1) unstable; urgency=low
 
   * Declared tutos2 conflicts with tutos (Closes: #304393)

Index: control
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/control,v
retrieving revision 1.8.2.5
retrieving revision 1.8.2.6
diff -u -r1.8.2.5 -r1.8.2.6
--- control	13 Apr 2005 15:36:08 -0000	1.8.2.5
+++ control	30 May 2005 14:17:58 -0000	1.8.2.6
@@ -8,7 +8,7 @@
 
 Package: tutos2
 Architecture: all
-Depends: debconf, apache | apache2, libapache-mod-php4 | libapache2-mod-php4, php4-pgsql | php4-mysql, wwwconfig-common, smarty, libphp-jpgraph
+Depends: debconf, apache | apache2, libapache-mod-php4 | libapache2-mod-php4, php4-pgsql, wwwconfig-common, smarty, libphp-jpgraph
 Conflicts: tutos
 Recommends: postgresql, logrotate
 Suggests: php4-imap, php4-ldap

Index: tutos2.templates
===================================================================
RCS file: /cvsroot/tutos/tutos/debian/Attic/tutos2.templates,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- tutos2.templates	10 Feb 2005 17:12:34 -0000	1.1.2.1
+++ tutos2.templates	30 May 2005 14:17:58 -0000	1.1.2.2
@@ -18,12 +18,19 @@
 _Description: What is the username of the SGBD administrator ?
  You need to enter the username  of  SGBD  administrator  in  order  to
  create the TUTOS database.
+.
+ By default, PostgreSQL admin name is 'postgres'. If you don't know
+ what to type here, leave the default value.
 
 Template: tutos2/dba_password
 Type: password
 _Description: What is the TUTOS SGBD admin (DBA) password ?
- We need to know the postgresql or mysql admin password in order to create
- the database and its schema.
+ We need to know the postgresql or mysql admin password in order to
+ create the database and its schema.
+.
+ If you've just installed PostgreSQL or never set the password,
+ please note the default password is empty (leave this field and
+ the next blanck).
 
 Template: tutos2/dba_confirm
 Type: password
@@ -42,12 +49,20 @@
 _Description: What is the username of the SGBD user ?
  You need to enter the username of SGBD user in order to create the TUTOS
  database.
+.
+ Once again, if don't have setup anything particular, you'll want to
+ leave the default value.
+ The user you enter here has to be a valid system user, and he has to be
+ able to create a PostgreSQL database.
 
 Template: tutos2/dbu_password
 Type: password
 _Description: What is the TUTOS SGBD user password ?
- We need to know the postgresql or mysql admin password in order to create
- the database and its schema.
+ We need to know the PostgreSQL tutos user password in order to
+ create the database and its schema.
+.
+ By default, you don't have to set any password here, so if you don't
+ know what is your setup, just leave this field and the next blank.
 
 Template: tutos2/dbu_confirm
 Type: password

--- doc-base DELETED ---

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

Modified Files:
      Tag: BRANCH-2-0
	cal_week.tpl 
Log Message:
Preparing a new debian package


Index: cal_week.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/cal_week.tpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- cal_week.tpl	27 May 2005 13:48:51 -0000	1.1.2.5
+++ cal_week.tpl	30 May 2005 14:17:59 -0000	1.1.2.6
@@ -47,8 +47,6 @@
 
     {foreach from=$d.apps item=a}
 
-    {$a.type}
-
     {if $a.type == "task"}
     <tr>
      <td class="task{$a.class}">

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

Modified Files:
      Tag: BRANCH-2-0
	menu.tpl task_overview_legend.tpl 
Log Message:
* ok, so my direction had some other ideas about what a nice menu is ;)


Index: menu.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/menu.tpl,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -u -r1.1.2.14 -r1.1.2.15
--- menu.tpl	26 May 2005 15:12:51 -0000	1.1.2.14
+++ menu.tpl	27 May 2005 15:34:30 -0000	1.1.2.15
@@ -48,6 +48,14 @@
 </div>
 
 {else}
+  {if $first_menu}
+  <li class="title">
+   <img alt="{$menu_categories.title.icon}" 
+        src="{$base}/html/classic/{$menu_categories.title.icon}.png">
+   {$menu_categories.title.label}
+  </li>
+  {/if}
+
   <li class="sub">
    <img alt="{$menu_categories.$category.icon}" 
         src="{$base}/html/classic/{$menu_categories.$category.icon}.png">

Index: task_overview_legend.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/task_overview_legend.tpl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- task_overview_legend.tpl	3 Mar 2005 13:48:14 -0000	1.1.2.2
+++ task_overview_legend.tpl	27 May 2005 15:34:30 -0000	1.1.2.3
@@ -1,7 +1,7 @@
 {* Task Overview legend  *}
 {* $Id$ *}
 
-<table width="100%" cellspacing="0">
+<table class="legend" cellspacing="0">
 <thead>
 <tr>
   <th><b>{$TaskState}</b></th>

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

Modified Files:
      Tag: BRANCH-2-0
	layout.pinc 
Log Message:
* ok, so my direction had some other ideas about what a nice menu is ;)


Index: layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/Attic/layout.pinc,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -u -r1.1.2.28 -r1.1.2.29
--- layout.pinc	27 May 2005 13:48:51 -0000	1.1.2.28
+++ layout.pinc	27 May 2005 15:34:29 -0000	1.1.2.29
@@ -111,7 +111,11 @@
 
     // Set some labels and icons for menu entries
     $this->menu_categories =
-      array('obj' =>
+      array('title' => 
+	    array('label' => $lang['menu']['module'],
+		  'icon'  => 'blank'),
+
+	    'obj' =>
 	    array('label' => 'obj',
 		  'icon'  => 'blank'),
 
@@ -491,6 +495,10 @@
    * print the $class category menu
    */
   function menuprint($class, $img = true) {
+    global $firt_menu;
+
+    $firt_menu = ! isset($firt_menu);
+    $this->assign('first_menu', $firt_menu);
     $this->assign('menu_categories', $this->menu_categories);
 
     $n = 0;

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

Modified Files:
      Tag: BRANCH-2-0
	style.css 
Log Message:
* ok, so my direction had some other ideas about what a nice menu is ;)


Index: style.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v
retrieving revision 1.1.2.35
retrieving revision 1.1.2.36
diff -u -r1.1.2.35 -r1.1.2.36
--- style.css	27 May 2005 14:12:51 -0000	1.1.2.35
+++ style.css	27 May 2005 15:34:29 -0000	1.1.2.36
@@ -517,8 +517,19 @@
 div.legend {
   position:     fixed;
   bottom:       2em;
-  margin-left:  5px;
   width:        200px;
+
+  z-index:      6;
+}
+
+table.legend {
+  width: 100%;
+  border-left:      1px solid black;
+}
+
+table.legend thead th {
+  background-color: #cfcfbb;
+  border-bottom:    1px solid black;
 }
 
 /**
@@ -527,21 +538,26 @@
 
 #menubox {
   position:     fixed;
-  top:          5em;
+  top:          3em;
   padding-left: 0px;
   width:        200px;
+  height:       100%;
+
+  background-color: #dedebb;
+  border-left:      1px solid black;
 }
 
 /* Special attention is given to default menu */
 #default {
   position:       fixed;
-  top:            3em;
+  top:            2em;
   width:          100%;
   height:         1.5em;
   margin:         0px;
   border:         none;
   display:        table;
   z-index:        5;
+  font-size:      9pt;
 }
 
 #default ul.menu {
@@ -608,19 +624,17 @@
   padding-left: 0px;
   width:        200px;
   background:   #dedebb;
+  padding-top:  3em;
 
   /* with a font-size smaller than 9pt, firefox step the li output */
   font-size:    9pt;
-
-  border-left: 1px solid black;
 }
 
 #menu li {
   list-style-type: none;
-  padding-bottom:  .5em;
 
   /* avoiding move effects on :hover */
-  border-bottom: 1px solid #dedebb; /* #cfcfbb; */
+  border-bottom: 1px solid #dedebb;
 }
 
 #menu ul {
@@ -628,14 +642,13 @@
 }
 
 #menu li:hover > ul {
-  background-color: #dedebb;
+  background-color: #dedebb; /* #EEEEC9; /*#E7E7C3; */
   display:          block;
   padding-left:     0px;
   width:            200px;
 
   position:         absolute;
-  left:             35px;
-  margin-top:       .51em;
+  left:             135px;
   z-index:          5;
 
   text-align:       left;
@@ -649,8 +662,7 @@
 
 #menu li.sub:hover {
   background-color: #cfcfbb;
-  width:            235px;
-  text-align:       right;
+  width:            336px; /* 200 + 135 + 1 */
   font-weight:      bold;
   border-bottom:    1px solid black;
 }
@@ -688,10 +700,10 @@
   font-size:    9pt;
 
   list-style-type: none;
-  border-left:     1px solid black;  
+  /* border-left:     1px solid black;  */

 }
 
-#obj li.title {
+#menu li.title, #obj li.title {
   background-color: #cfcfbb;
   text-align:       right;
   font-weight:      bold;

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

Modified Files:
      Tag: BRANCH-2-0
	en.p3 fr.p3 
Log Message:
* ok, so my direction had some other ideas about what a nice menu is ;)


Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/en.p3,v
retrieving revision 1.47.2.11
retrieving revision 1.47.2.12
diff -u -r1.47.2.11 -r1.47.2.12
--- en.p3	20 May 2005 15:17:45 -0000	1.47.2.11
+++ en.p3	27 May 2005 15:34:29 -0000	1.47.2.12
@@ -733,6 +733,7 @@
 $lang['FeatureOff']              = "Feature globally disabled";
 
 # Menu category entries
+$lang['menu']['module']    = 'Modules';
 $lang['menu']['task']      = 'Task';
 $lang['menu']['timetrack'] = 'Timetrack';
 $lang['menu']['obj']       = 'This Object';

Index: fr.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/localization/fr.p3,v
retrieving revision 1.40.2.26
retrieving revision 1.40.2.27
diff -u -r1.40.2.26 -r1.40.2.27
--- fr.p3	25 May 2005 14:48:00 -0000	1.40.2.26
+++ fr.p3	27 May 2005 15:34:29 -0000	1.40.2.27
@@ -730,6 +730,7 @@
 $lang['FeatureOff']              = "Toutes fonctionnalités désactivées";
 
 # Menu category entries
+$lang['menu']['module']    = "Modules";
 $lang['menu']['task']      = "Tâches";
 $lang['menu']['timetrack'] = "Journal d'activités";
 $lang['menu']['obj']       = "Object affiché";

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

Modified Files:
      Tag: BRANCH-2-0
	style.css 
Log Message:
* DEBUG: CSS menu focus problem with firefox
* remove some debug infos from cal_week template


Index: style.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v
retrieving revision 1.1.2.34
retrieving revision 1.1.2.35
diff -u -r1.1.2.34 -r1.1.2.35
--- style.css	26 May 2005 15:12:49 -0000	1.1.2.34
+++ style.css	27 May 2005 14:12:51 -0000	1.1.2.35
@@ -635,7 +635,7 @@
 
   position:         absolute;
   left:             35px;
-  margin-top:       .6em;
+  margin-top:       .51em;
   z-index:          5;
 
   text-align:       left;

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

Modified Files:
      Tag: BRANCH-2-0
	cal_week.tpl mytutos.tpl 
Log Message:
* DEBUG: ongoing task where no more displayed on mytutos
* appointments will come later, you can create some, they won't be
  displayed on calendars as of now


Index: cal_week.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/cal_week.tpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- cal_week.tpl	25 May 2005 16:17:56 -0000	1.1.2.4
+++ cal_week.tpl	27 May 2005 13:48:51 -0000	1.1.2.5
@@ -42,17 +42,43 @@
     <span class="dinfo">{$d.dinfo}</span>
     {/if}
 
-    {* Display the appointments for current day *}
+    {* Display the tasks and appointments for current day *}
     <table class="formatted" cellspacing="0" cellpadding="0" width="100%">
 
     {foreach from=$d.apps item=a}
-      <tr>
-       <td class="data">
-        <a href="{$base}/{$a.link}">{$a.start}&nbsp;&mdash;&nbsp;{$a.end}</a>
-       </td>
-      </tr>
-      <tr><td style="text-align: right; font-style: italic;">{$a.loc}</td></tr>
-      <tr><td style="border-bottom: 1px solid black;">{$a.desc}</td></tr>
+
+    {$a.type}
+
+    {if $a.type == "task"}
+    <tr>
+     <td class="task{$a.class}">
+      <a href="{$base}/php/{$a.link}" title="{$a.title}">{$a.name}</a>
+     </td>
+    </tr>
+    <tr>
+     <td class="task{$a.class}" align="right">
+      {$a.desc}
+     </td>
+    </tr>
+
+    {elseif $a.type == "appointment"}
+    <tr>
+     <td class="data">
+      <a href="{$base}/php/{$a.link}">
+       {$a.start}&nbsp;&mdash;&nbsp;{$a.end}
+      </a>
+     </td>
+    </tr>
+    <tr>
+     <td style="text-align: right; font-style: italic;">
+       {$a.loc}
+     </td>
+    </tr>
+    <tr>
+     <td>{$a.desc}</td>
+    </tr>
+    {/if}
+
     {foreachelse}
       <tr><td>&nbsp;</td></tr>
     {/foreach}

Index: mytutos.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/mytutos.tpl,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -r1.1.2.18 -r1.1.2.19
--- mytutos.tpl	2 Mar 2005 10:29:46 -0000	1.1.2.18
+++ mytutos.tpl	27 May 2005 13:48:51 -0000	1.1.2.19
@@ -10,7 +10,7 @@
 
 <thead>
 <tr>
-<th colspan="2">{$title}</th>
+<th colspan="2" style="font-weight: bold;">{$title}</th>
 </tr>
 </thead>
 

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

Modified Files:
      Tag: BRANCH-2-0
	calendar.p3 mytutos.php 
Log Message:
* DEBUG: ongoing task where no more displayed on mytutos
* appointments will come later, you can create some, they won't be
  displayed on calendars as of now


Index: calendar.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Attic/calendar.p3,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- calendar.p3	26 May 2005 15:12:50 -0000	1.1.2.8
+++ calendar.p3	27 May 2005 13:48:51 -0000	1.1.2.9
@@ -151,16 +151,28 @@
       // Show appointments or task
       // $cur_day['formatted'][] = $adr->callist[$idx]->formatted();
 
-      /*
-      $cur_day['apps'][] = 
-	array('start' => $adr->callist[$idx]->start->getTime(),
-	      'end'   => $adr->callist[$idx]->end->getTime(),
-	      'loc'   => $adr->callist[$idx]->getLocation(),
-	      'desc'  => $adr->callist[$idx]->descr,
-	      'link'  => $adr->callist[$idx]->getUrl()
-	      );
-      */
+      switch( $adr->callist[$idx]->getType() ) {
+      case 'task':
+	$app =
+	  array('type'  => 'task',
+		'class' => $adr->callist[$idx]->state,
+		'desc'  => $adr->callist[$idx]->desc,
+		'name'  => $adr->callist[$idx]->getFullName(),
+		'title' => $adr->callist[$idx]->getFullName());
+	break;
 
+      case 'appointment':
+	$app =
+	  array('type'  => 'appointment',
+		'desc'  => $adr->callist[$idx]->descr,
+		'loc'   => $adr->callist[$idx]->getLocation(),
+		'start' => $adr->callist[$idx]->start->getTime(),
+		'end'   => $adr->callist[$idx]->end->getTime());
+	break;
+      }
+      $app['link'] = $adr->callist[$idx]->getUrl();
+
+      $cur_day['apps'][] = $app;
     }
 
     $day++;

Index: mytutos.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/mytutos.php,v
retrieving revision 1.84.2.23
retrieving revision 1.84.2.24
diff -u -r1.84.2.23 -r1.84.2.24
--- mytutos.php	20 May 2005 15:17:44 -0000	1.84.2.23
+++ mytutos.php	27 May 2005 13:48:51 -0000	1.84.2.24
@@ -44,6 +44,7 @@
 	* This assign vars to our $layout->smarty object.
 	*/
        $weeks = cal_week($this->adr, $this->t);
+       // $this->debug($weeks);
        $this->assign('weeks', $weeks);
 
        $this->assign('last_week', $weeks[0]['last']);

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

Modified Files:
      Tag: BRANCH-2-0
	layout.pinc 
Log Message:
* DEBUG: ongoing task where no more displayed on mytutos
* appointments will come later, you can create some, they won't be
  displayed on calendars as of now


Index: layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/Attic/layout.pinc,v
retrieving revision 1.1.2.27
retrieving revision 1.1.2.28
diff -u -r1.1.2.27 -r1.1.2.28
--- layout.pinc	26 May 2005 15:12:51 -0000	1.1.2.27
+++ layout.pinc	27 May 2005 13:48:51 -0000	1.1.2.28
@@ -52,7 +52,7 @@
     $this->s_template  = "classic";
 
     $this->smarty = new Smarty;
-    //$this->smarty->debugging = True;
+    // $this->smarty->debugging = True;
 
     // Those values should be editable in the config file
     // The compile_dir as to be writtable for the www-data user.

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

Modified Files:
      Tag: BRANCH-2-0
	mtable.pinc 
Log Message:
* DEBUG: ongoing task where no more displayed on mytutos
* appointments will come later, you can create some, they won't be
  displayed on calendars as of now


Index: mtable.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/mtable.pinc,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -r1.2.2.4 -r1.2.2.5
--- mtable.pinc	13 Dec 2004 17:29:14 -0000	1.2.2.4
+++ mtable.pinc	27 May 2005 13:48:51 -0000	1.2.2.5
@@ -13,7 +13,7 @@
   Desc => "TUTOS bugs",
   "id"          => array(type => "ID_TYPE",             constraints => "PK",  Desc => "Object ID"),
   "name"        => array(type => "VARCHAR", size => 30, constraints => "",    Desc => "Bug Display Name"),
-  "short"       => array(type => "VARCHAR", size => 40, constraints => "",    Desc => "short description"),
+  "short"       => array(type => "VARCHAR", size => 100, constraints => "",    Desc => "short description"),
   "product_id"  => array(type => "ID_TYPE", constraints => "NN",  Desc => "object with bug"),
   "solvedate"   => array(type => "TS_TYPE", constraints => "", Desc => "solve date"),
   "creator"     => array(type => "ID_TYPE",     constraints => "",    Desc => "creator ID"),

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

Modified Files:
	minical.php 
Log Message:
now we can add forms before form with minical


Index: minical.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/minical.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- minical.php	3 Apr 2005 18:31:53 -0000	1.21
+++ minical.php	27 May 2005 09:35:49 -0000	1.22
@@ -50,7 +50,11 @@
 
 echo "<script language='JavaScript'>\n";
 echo " function closeandaway (d, m, y) { \n";
-echo "  var x = opener.document.forms[0]; \n";
+echo "  var i;\n";
+echo "  for(i=0;;i++) {\n";
+echo "   if(opener.document.forms[i].". $f ."_d != null) break;\n";
+echo "  }\n";
+echo "  var x = opener.document.forms[i]; \n";
 echo "  \n";
 echo "  x.". $f ."_d.selectedIndex = d-1; \n";
 echo "  x.". $f ."_m.selectedIndex = m-1; \n";

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

Modified Files:
      Tag: BRANCH-2-0
	buglist.tpl menu.tpl menu_start.tpl menu_stop.tpl 
	timetrack_new.tpl 
Added Files:
      Tag: BRANCH-2-0
	app_show.tpl menu_elements.tpl 
Log Message:
* yet another menu reworking, with html modification and CSS
  improvements (no more CSS3 selectors)
* some corrections and code reading


--- NEW FILE: app_show.tpl ---
{* Appointment show TUTOS template *}
{* $Id: app_show.tpl,v 1.1.2.1 2005/05/26 15:12:51 tapoueh Exp $ *}

<!-- app_show start -->

<table class="summary">
<thead>
<tr>
 <th colspan="4">{$title}</th>
</tr>
</thead>

<tbody>
<tr>
 <td class="desc">{$creator.label}</td>
 <td>
  <a href="{$creator.link}" title="{$creator.title}">{$creator.name}</a>
 </td>

 <td class="desc">{$creation.label}</td>
 <td>{$creation.value}</td>
</tr>

</tbody>
</table>

<!-- app_show stop -->
--- NEW FILE: menu_elements.tpl ---
{* Display menu elements *}
{* $Id: menu_elements.tpl,v 1.1.2.1 2005/05/26 15:12:51 tapoueh Exp $ *}

{*
Array
(
    [url]   => mytutos.php
    [image] => image_name
    [text]  => Super User
    [info]  => Page personnelle de Super User
    [category] => Array
        (
            [0] => mytutos
            [1] => overview
            [2] => default
        )
*}

{foreach from=$menu item=m}
    <li>
  {if img == True and $m.image != ""}
      <img src="{$base}/html/classic/{$m.image}.png"  alt="{$m.image}">
  {else}
      <img src="{$base}/html/classic/blank.png" alt="blank">
  {/if}
      <a href="{$base}/php/{$m.url}" title="{$m.info}">{$m.text}</a>
   </li>
{/foreach}

Index: buglist.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/buglist.tpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- buglist.tpl	20 May 2005 15:17:46 -0000	1.1.2.5
+++ buglist.tpl	26 May 2005 15:12:51 -0000	1.1.2.6
@@ -30,7 +30,7 @@
 {foreach from=$modules.bugtracking.summary item=b}
 <tr>
   <td><img alt="bugs" src="{$base}/html/classic/bugs.png"></td>
-  <td>
+  <td style="white-space: nowrap;">
   {strip}
   <a href="{$base}/php/{$b.link}" title="{$b.desc}">
     <span class="bugstate{$b.value}">{$b.label}</span>

Index: menu.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/menu.tpl,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- menu.tpl	25 May 2005 15:09:56 -0000	1.1.2.13
+++ menu.tpl	26 May 2005 15:12:51 -0000	1.1.2.14
@@ -18,40 +18,43 @@
 
 <!-- Menu {$category} -->
 
-{* default *}
-{if $category == "default"}
-</ul>
+{* obj and default are special cases *}
+{* and obj is to be outputed before default *}
 
-<div id="default">
- <ul class="menu">
-{/if}
+{if $category == "obj"}
+</ul>
 
-{if $category != "default"}
- <li class="sub">
+ <ul id="obj">
+  <li class="title">
    <img alt="{$menu_categories.$category.icon}" 
         src="{$base}/html/classic/{$menu_categories.$category.icon}.png">
    {$menu_categories.$category.label}
-{/if}
+  </li>
 
-{if $category != "default"}
-  <ul id="{$category}" class="menu">
-{/if}
+  {include file="classic/menu_elements.tpl" menu=$menu}
+ </ul>
 
-{foreach from=$menu item=m}
-    <li>
-  {if img == True and $m.image != ""}
-      <img src="{$base}/html/classic/{$m.image}.png"  alt="{$m.image}">
-  {else}
-      <img src="{$base}/html/classic/blank.png" alt="blank">
-  {/if}
-      <a href="{$base}/php/{$m.url}" title="{$m.info}">{$m.text}</a>
-   </li>
-{/foreach}
+{elseif $category == "default"}
+ {* default menu is generated after modules menus *}
 
- </ul>
+{if $menu_categories.obj.n == 0}
+</ul>
+{/if}
 
-{if $category == "default"}
+<div id="default">
+ <ul class="menu">
+  {include file="classic/menu_elements.tpl" menu=$menu}
+ </ul>
 </div>
+
 {else}
- </li>
+  <li class="sub">
+   <img alt="{$menu_categories.$category.icon}" 
+        src="{$base}/html/classic/{$menu_categories.$category.icon}.png">
+   {$menu_categories.$category.label}
+
+   <ul id="{$category}" class="menu">
+    {include file="classic/menu_elements.tpl" menu=$menu}
+   </ul>
+  </li>
 {/if}
\ No newline at end of file

Index: menu_start.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/menu_start.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_start.tpl	20 May 2005 15:17:46 -0000	1.1.2.7
+++ menu_start.tpl	26 May 2005 15:12:51 -0000	1.1.2.8
@@ -1,4 +1,6 @@
 {* Before writting menu *}
 {* $Id$ *}
 
+<div id="menubox">
+
 <ul id="menu">
\ 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.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- menu_stop.tpl	14 Dec 2004 17:59:12 -0000	1.1.2.5
+++ menu_stop.tpl	26 May 2005 15:12:51 -0000	1.1.2.6
@@ -1,4 +1,6 @@
 {* Closing the menu enclosing element *}
 {* $Id$ *}
 
+</div>
+
 <div class="content">
\ No newline at end of file

Index: timetrack_new.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/timetrack_new.tpl,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- timetrack_new.tpl	9 Mar 2005 16:28:19 -0000	1.1.2.6
+++ timetrack_new.tpl	26 May 2005 15:12:51 -0000	1.1.2.7
@@ -10,19 +10,28 @@
 <input id="id" type="hidden" name="id" value="{$id}">
 <input id="lid" type="hidden" name="lid" value="{$lid}">
 
-<table class="single"> 
+<table class="summary" style="margin-left: 0px;"> 
+<thead>
 <tr>
-<td class="desc" valign="top">{$ref.label}</td>
-<td colspan="3">
- <a href="{$ref.link}" title="{$ref.title}">{$ref.value}</a>
+<th  colspan="4" class="desc" valign="top">
+{strip}
+<i>{$ref.label}</i>
 {if $parents != ""}
+&nbsp;
 {foreach name=parents from=$parents.parents item=p}
- -> {$p.type} <a href="{$p.link}" title="{$p.title}">{$p.label}</a>
+ {if not $smarty.foreach.parents.first}»{/if}
+ &nbsp;
+ {$p.type}
+ &nbsp;
+ <a href="{$p.link}" title="{$p.title}">{$p.label}</a>
 {/foreach}
 {/if}
-</td>
+{/strip}
+</th>
 </tr>
+</thead>
 
+<tbody>
 <tr>
 <td class="desc">
  <label for="{$worker.name}">{$worker.label}</label>
@@ -125,9 +134,15 @@
   <textarea rows="25" cols="80" name="{$desc.name}">{$desc.value}</textarea>
 </td>
 </tr>
+</tbody>
 </table>
 
-<table cellspacing="10">
+<table class="summary">
+<thead>
+ <tr><th colspan="4">{$FldsRequired}</th></tr>
+</thead>
+
+<tbody>
 <tr>
  <td class="desc">
    <label for="OK">{$InputOk}</label>
@@ -144,7 +159,9 @@
           value="{$Reset}" title="{$Reset}">
  </td>
 </tr>
+</tbody>
 </table>
+
 </form>
 
 <script type="text/javascript" language="JavaScript">

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

Modified Files:
      Tag: BRANCH-2-0
	acl_clean.php ldap_getdata.php 
Log Message:
* yet another menu reworking, with html modification and CSS
  improvements (no more CSS3 selectors)
* some corrections and code reading


Index: acl_clean.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/Attic/acl_clean.php,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- acl_clean.php	30 Jul 2004 13:30:17 -0000	1.1.2.2
+++ acl_clean.php	26 May 2005 15:12:50 -0000	1.1.2.3
@@ -225,7 +225,11 @@
   }
 
   function navigate() {
-    $this->menuprint("acl_clean");
+    global $lang;
+
+    $this->menu_categories['obj'] =
+      array('label' => $lang['AclDetail'],
+	    'icon'  => 'acls');
   }
 
   function prepare() {
@@ -254,7 +258,7 @@
 		 'text'  => $action,
 		 'info'  => $action,
 		 'image' => $action,
-		 'category' => array("acl_clean")
+		 'category' => array("obj")
 		 );
       $this->addMenu($x);
     }

Index: ldap_getdata.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/admin/Attic/ldap_getdata.php,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ldap_getdata.php	2 Mar 2005 10:29:44 -0000	1.1.2.4
+++ ldap_getdata.php	26 May 2005 15:12:50 -0000	1.1.2.5
@@ -342,28 +342,30 @@
   function navigate() {
     global $tutos, $lang, $current_user;
 
+    $this->menu_categories['obj'] =
+      array('label' => 'LDAP user import',
+	    'icon'  => 'users');
+
     $x = array('url'   => "admin/ldap_getdata.php?action=show",
 	       'text'  => "View data",
 	       'image' => 'search',
-	       'category' => array("ldap")
+	       'category' => array("obj")
 	       );
     $this->addMenu($x);
 
     $x = array('url'   => "admin/ldap_getdata.php?action=insert",
 	       'text'  => "Insert data",
 	       'image' => 'new',
-	       'category' => array("ldap")
+	       'category' => array("obj")
 	       );
     $this->addMenu($x);
 
     $x = array('url'   => "admin/ldap_getdata.php?action=update",
 	       'text'  => "Update data",
 	       'image' => 'modify',
-	       'category' => array("ldap")
+	       'category' => array("obj")
 	       );
     $this->addMenu($x);
-
-    $this->menuprint('ldap');
   }
 
   function info() {

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

Modified Files:
      Tag: BRANCH-2-0
	bug.pinc 
Log Message:
* yet another menu reworking, with html modification and CSS
  improvements (no more CSS3 selectors)
* some corrections and code reading


Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.13.2.28
retrieving revision 1.13.2.29
diff -u -r1.13.2.28 -r1.13.2.29
--- bug.pinc	25 May 2005 15:28:24 -0000	1.13.2.28
+++ bug.pinc	26 May 2005 15:12:50 -0000	1.13.2.29
@@ -304,8 +304,6 @@
   }
 
   function obj_read(&$obj) {
-    error_log('bugdata::obj_read '.$obj->id.' '.count($obj->bughist));
-
     if ( $obj == -1 ) return; 
     if (! is_object($obj) ) return;
 
@@ -323,8 +321,6 @@
     $result = $obj->dbconn->Exec($q);
     $n = $result->numrows();
 
-    error_log('bugdata::obj_read '.$n);
-
     $obj->bughist = array();
 
     for($a=0; $a < $n; $a++ ) {

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

Modified Files:
      Tag: BRANCH-2-0
	address_overview.php calendar.p3 task_gantt.php task_new.php 
	task_overview.php 
Log Message:
* yet another menu reworking, with html modification and CSS
  improvements (no more CSS3 selectors)
* some corrections and code reading


Index: address_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/address_overview.php,v
retrieving revision 1.42.2.3
retrieving revision 1.42.2.4
diff -u -r1.42.2.3 -r1.42.2.4
--- address_overview.php	29 Sep 2004 16:23:53 -0000	1.42.2.3
+++ address_overview.php	26 May 2005 15:12:49 -0000	1.42.2.4
@@ -110,12 +110,11 @@
     * navigate
     */
    Function navigate() {
-     # menu
+     global $lang;
 
-     // This entry is already present in the default (main) menu
-     $x = tutos_address::getSelectLink($this->user,$lang['Search']);
-     $x[category][] = "obj";
-     // $this->addMenu($x);
+     $this->menu_categories['obj'] =
+       array('label' => $lang['Address'],
+	     'icon'  => 'addresses');
 
      if ( $this->user->feature_ok(useaddressbook,PERM_NEW) ) {
        $x = array('url'   => "address_new.php",

Index: calendar.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Attic/calendar.p3,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- calendar.p3	25 May 2005 16:17:55 -0000	1.1.2.7
+++ calendar.p3	26 May 2005 15:12:50 -0000	1.1.2.8
@@ -151,6 +151,7 @@
       // Show appointments or task
       // $cur_day['formatted'][] = $adr->callist[$idx]->formatted();
 
+      /*
       $cur_day['apps'][] = 
 	array('start' => $adr->callist[$idx]->start->getTime(),
 	      'end'   => $adr->callist[$idx]->end->getTime(),
@@ -158,6 +159,7 @@
 	      'desc'  => $adr->callist[$idx]->descr,
 	      'link'  => $adr->callist[$idx]->getUrl()
 	      );
+      */
 
     }
 

Index: task_gantt.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_gantt.php,v
retrieving revision 1.14.2.4
retrieving revision 1.14.2.5
diff -u -r1.14.2.4 -r1.14.2.5
--- task_gantt.php	25 Mar 2005 16:53:58 -0000	1.14.2.4
+++ task_gantt.php	26 May 2005 15:12:50 -0000	1.14.2.5
@@ -36,9 +36,20 @@
     * navigate
     */
    Function navigate() {
-     global $lang;
+     global $tutos, $lang;
 
-     $this->menuprint("task", true);
+     $this->menu_categories['obj'] =
+       array('label' => $lang['Task'],
+	     'icon'  => 'task');
+
+     $x = array('url'   => 
+		"task_overview.php?".$this->get_task_filter('url'), 
+		'text'  => $lang['TaskOverview'], 
+		'image' => 'task_overview',
+		'info'  => $lang['TaskOverview'], 
+		'category' => array('obj', 'task', 'task_gantt'));
+
+     $this->addMenu($x);
    }
 
    /**
@@ -90,13 +101,6 @@
          $_SESSION['tasksearchto'] = $this->end->getYYYYMMDD();
        }
      }
-
-     $this->addMenu(array('url'   => 
-			  "task_overview.php?".$this->get_task_filter('url'), 
-			  'text'  => $lang['TaskOverview'], 
-			  'image' => 'task_overview',
-			  'info'  => $lang['TaskOverview'], 
-			  'category' => array('task', 'task_gantt')));
    }
  }
 

Index: task_new.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_new.php,v
retrieving revision 1.57.2.17
retrieving revision 1.57.2.18
diff -u -r1.57.2.17 -r1.57.2.18
--- task_new.php	20 May 2005 15:17:44 -0000	1.57.2.17
+++ task_new.php	26 May 2005 15:12:50 -0000	1.57.2.18
@@ -199,11 +199,26 @@
     * navigate
     */
    Function navigate() {
-     global $lang;
+     global $lang, $tutos;
 
      $this->menu_categories['obj'] =
        array('label' => $lang['Tasks'],
 	     'icon'  => 'task');
+
+     // menu
+     if ( ($this->obj->id > 0) && $this->obj->del_ok() ) {
+       $x = array('url'   => $this->obj->getDelURL(),
+                  'text'  => $lang['Delete'],
+		  'image' => 'delete',
+                  'info' => sprintf($lang['TaskDelete'],
+				    $this->obj->getFullname()),
+                  'category' => array("task","del","obj"),
+                  'confirm' => true
+                 );
+       $this->addMenu($x);
+     }
+
+     // add_module_newlinks($this, $this->obj);
    }
 
    /**
@@ -273,20 +288,6 @@
        $this->stop = true ;
      }
 
-     # menu
-     if ( ($this->obj->id > 0) && $this->obj->del_ok() ) {
-       $x = array('url'   => $this->obj->getDelURL(),
-                  'text'  => $lang['Delete'],
-		  'image' => 'delete',
-                  'info' => sprintf($lang['TaskDelete'],
-				    $this->obj->getFullname()),
-                  'category' => array("task","del","obj"),
-                  'confirm' => true
-                 );
-       $this->addMenu($x);
-     }
-     add_module_newlinks($this,$this->obj);
-
      web_StackStartLayout($this, "task_new.php",
 			  "task_new.php?".$_SERVER['QUERY_STRING']);     
    }

Index: task_overview.php
===================================================================
RCS file: /cvsroot/tutos/tutos/php/task_overview.php,v
retrieving revision 1.62.2.21
retrieving revision 1.62.2.22
diff -u -r1.62.2.21 -r1.62.2.22
--- task_overview.php	12 Apr 2005 10:29:57 -0000	1.62.2.21
+++ task_overview.php	26 May 2005 15:12:50 -0000	1.62.2.22
@@ -432,7 +432,34 @@
     * navigate
     */
    Function navigate() {
-     $this->menuprint('task');
+     global $tutos, $lang;
+
+     $this->menu_categories['obj'] =
+       array('label' => $lang['Task'],
+	     'icon'  => 'task');
+
+     if( $tutos[usejpgraph] ) {
+       $x = array('url'   =>
+		  "task_gantt.php?". $this->get_task_filter('url'),
+                  'text'  => $lang['TaskGantt'],
+		  'image' => 'gantt',
+                  'info'  => $lang['TaskGantt'],
+                  'category' => array("obj", "task", "view")
+                 );
+       $this->addMenu($x);
+     }
+
+     if( $this->parent != -1  && ($this->name == "")
+	 && $this->parent->getType() !=  "address" ) {
+       $x = array('url'  => "task_overview.php?id=".$this->parent->id, 
+                  'info' => sprintf($lang['TaskOverviewInfo'],
+				    $this->parent->getFullName()),
+                  'category' => array("obj", "task","view")
+		  );
+
+       $x['text'] = $lang['TaskOverview'];
+       $this->addMenu($x);
+     }
    }
 
    /**
@@ -532,44 +559,6 @@
      // $this->debug($this->start);
      // $this->debug($this->end);
 
-     // menu
-
-     // The PNG Gantt functionality, using JpGraph Tools, to be installed
-     if( $tutos[usejpgraph] ) {
-       $x = array('url'   => "task_gantt.php?". $this->get_task_filter('url'),
-                  'text'  => $lang['TaskGantt'],
-		  'image' => 'gantt',
-                  'info'  => $lang['TaskGantt'],
-                  'category' => array("task","view")
-                 );
-       $this->addMenu($x);
-     }
-
-     if( $this->parent != -1  && ($this->name == "")
-	 && $this->parent->getType() !=  "address" ) {
-       $x = array('url'  => "task_overview.php?id=".$this->parent->id, 
-                  'info' => sprintf($lang['TaskOverviewInfo'],
-				    $this->parent->getFullName()),
-                  'category' => array("task","view")
-		  );
-
-       $x['text'] = $lang['TaskOverview'];
-       $this->addMenu($x);
-
-       $x['text'] = $lang['TaskOverview'] ."++";
-       $x['url'] = "task_overview.php?id=".$this->parent->id;
-       switch( $this->parent->getType() ) {
-       case "user":
-       case "team":
-         $x[url] .= "&fld=product";
-         break;
-       default:
-         $x[url] .= "&fld=worker";
-         break;
-       }
-       $this->addMenu($x);
-     }
-
      web_StackStartLayout($this,
               "task_overview.php?id=".$this->parent->id,
               "task_overview.php?".$_SERVER['QUERY_STRING']);

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

Modified Files:
      Tag: BRANCH-2-0
	en.p3 
Log Message:
* yet another menu reworking, with html modification and CSS
  improvements (no more CSS3 selectors)
* some corrections and code reading


Index: en.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/file/en.p3,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -r1.4.2.2 -r1.4.2.3
--- en.p3	20 May 2005 15:17:45 -0000	1.4.2.2
+++ en.p3	26 May 2005 15:12:51 -0000	1.4.2.3
@@ -54,7 +54,7 @@
 $lang['File_Err001']     = "Temporary file %s missing. Maybe too big";
 
 $lang['perm'][usedocmanagement]  = "use docmanagement";
-$lang['file']  = &$lang['File']
+$lang['file']  = &$lang['File'];
 
 $lang['menu']['file'] = 'Files';
 ?>

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

Modified Files:
      Tag: BRANCH-2-0
	layout.pinc 
Log Message:
* yet another menu reworking, with html modification and CSS
  improvements (no more CSS3 selectors)
* some corrections and code reading


Index: layout.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/layout/Attic/layout.pinc,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- layout.pinc	24 May 2005 14:48:32 -0000	1.1.2.26
+++ layout.pinc	26 May 2005 15:12:51 -0000	1.1.2.27
@@ -114,6 +114,10 @@
       array('obj' =>
 	    array('label' => 'obj',
 		  'icon'  => 'blank'),
+
+	    'admin' =>
+	    array('label' => $lang['AdminShow'],
+		  'icon'  => 'admin'),
 	    
 	    'task' =>
 	    array('label' => $lang['menu']['task'],
@@ -306,6 +310,10 @@
     $this->addMenu($x);
 
 
+    /**
+     * This menu is not ready to be included
+     */
+    /*
     $x = array( 'url'   => "admin_show.php",
                 'image' => 'admin',
                 'info'  => $lang['UserAdmin'],
@@ -320,6 +328,7 @@
       $x['text'] = $lang['UserAdmin'] ." (DEMO)";
       $this->addMenu($x);
     }
+    */
 
     /**
      * Some admin menu entries
@@ -495,6 +504,10 @@
 	$menu[$n++] = $m;
       }
     }
+    // This allows us to manage empty menus
+    // specifically to close some html elements in templates
+    $this->menu_categories[$class]['n'] = $n;
+
     if( $n > 0 ) {
       $cat = (isset($lang[$class]) ? $lang[$class] : $class);
 
@@ -559,13 +572,14 @@
       if ( $this->nomenu == false ) {
 	// include specific page menus
 	$this->navigate();
-	$this->menuprint("obj",  true);
-
 	$this->menuprint("admin", true);
+	$this->menuprint("obj",  true);
       }
 
       // The default menu is always the last on output
       $this->menuprint("default", true);
+
+      $this->assign('menu_categories', $this->menu_categories);
       $this->template("menu_stop");
     }
     else {

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

Added Files:
      Tag: BRANCH-2-0
	bug_show_mail.tpl history_mail.tpl 
Log Message:
* yet another menu reworking, with html modification and CSS
  improvements (no more CSS3 selectors)
* some corrections and code reading


--- NEW FILE: bug_show_mail.tpl ---
{* BugTracking Show TUTOS template, to be sent by mail *}
{* $Id: bug_show_mail.tpl,v 1.1.2.1 2005/05/26 15:12:51 tapoueh Exp $ *}

<table class="summary">
<thead>
<tr>
 <th colspan="4">{$title}</th>
</tr>
</thead>

<tbody>
<tr>
<td class="desc" valign="top">{$creator.label}</td>
<td class="data" style="white-space: nowrap;">
  <a href="{$creator.link}" title="{$creator.title}">{$creator.value}</a>
</td>

<td class="desc" valign="top">{$creation.label}</td>
<td colspan="1" class="data" style="white-space: nowrap;">
 {$creation.value}
</td>
</tr>

<tr>
<td class="desc" valign="top">{$id.label}</td>
<td colspan="3" class="data">{$id.value}</td>
</tr>

<tr>
<td class="desc" valign="top">{$solver.label}</td>
<td class="data" style="white-space: nowrap;">
{if $solver.link == ""}
  {$solver.value}
{else}
  <a href="{$solver.link}" title="{$solver.title}">{$solver.value}</a>
{/if}
</td>

<td class="desc" valign="top">{$solved.label}</td>
<td class="data" style="white-space: nowrap;">{$solved.value}</td>
</tr>

<tr>
<td class="desc" valign="top">{$parent.label}</td>
{if $parent.link == ""}
<td colspan="3" class="data">{$parent.value}</td>
{else}
<td colspan="3" class="data">
  <a href="{$parent.link}" title="{$parent.title}">{$parent.value}</a>
</td>
{/if}
</tr>

<tr>
<td class="desc" valign="top">{$state.label}</td>
<td class="data">
  <span class="bugstate{$state.value.label}">{$state.value.value}</span>
</td>

<td class="desc" valign="top">{$class.label}</td>
<td class="data">
  <span class="bugclass{$class.value.label}">{$class.value.value}</span>
</tr>

<tr>
<td class="desc" valign="top">{$desc.label}</td>
<td colspan="3" class="data">{$desc.value}</td>
</tr>

{if $timetrack != ""}
<tr>
<td class="desc" valign="top">{$timetrack.label}</td>
<td class="pre" colspan="3">
<a href="{$timetrack.link}" title="{$timetrack.title}">{$timetrack.value}</a>
</td>
</tr>
{/if}
</td>
</tr>

</tbody>
</table>

{include file="classic/bugtracking/history_mail.tpl" bid=$bid history=$history}

<!-- bug_show stop -->
--- NEW FILE: history_mail.tpl ---
{* to be included from bug_show_mail template *}
{* $Id: history_mail.tpl,v 1.1.2.1 2005/05/26 15:12:51 tapoueh Exp $ *}

{if count($history.value) > 0}

<table class="overview">
<thead>
 <tr>
  <th colspan="2" align="center">{$history.label}</th>
 </tr>
 <tr>
  <th>{$Date}&nbsp;/ {$BugCreator}</th>
  <th>Changes</th>
 </tr>
</thead>

<tbody>
{foreach from=$history.value item=h}
<tr>

<td valign="top" style="white-space: nowrap;">
 {$h.creation}
 <br>
 <a href="{$base}/php/{$h.creator.link}"
   title="{$h.creator.title}">{$h.creator.label}</a>
 ({$h.volume}&nbsp;h)
</td>

<td valign="top">
 {if $h.diff != "null"}
  <table cellspacing="5" cellpadding="5">
  <tbody>
   {if $h.diff.state != ""}
    <tr>
      <td class="desc">{$BugState}</td>
      <td>
       <span class="bugstate{$h.diff.state.value}">
         {$h.diff.state.label}
       </span>
      </td>
      <td>-&gt;</td>
      <td>
       <span class="bugstate{$h.state.value}">{$h.state.label}</span>
      </td>
    </tr>
    {/if}

    {if $h.diff.class != ""} 
    <tr>
      <td class="desc">{$BugClass}</td>
      <td>
       <span class="bugclass{$h.diff.class.value}">
         {$h.diff.class.label}
       </span>
      </td>
      <td>-&gt;</td>
      <td>
       <span class="bugclass{$h.class.value}">{$h.class.label}</span>
      </td>
    </tr>
    {/if}

    {if $h.diff.solver != ""}
    <tr>
      <td class="desc">{$BugAssignedTo}</td>
      <td class="data">
       <a href="{$base}/php/{$h.diff.solver.link}"
         title="{$h.diff.solver.title}">{$h.diff.solver.label}</a>
      </td>
      <td>-&gt;</td>
      <td class="data">
       <a href="{$base}/php/{$h.solver.link}"
         title="{$h.solver.title}">{$h.solver.label}</a>
      </td>
    </tr>
    {/if}
  </tbody>
  </table>
 {/if}
<pre>
{$h.desc|wordwrap:80:"\n":true|linkalize}
</pre>
</td>

</tr>
{/foreach}

</tbody>
</table>
{/if}

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

Modified Files:
      Tag: BRANCH-2-0
	style.css 
Log Message:
* yet another menu reworking, with html modification and CSS
  improvements (no more CSS3 selectors)
* some corrections and code reading


Index: style.css
===================================================================
RCS file: /cvsroot/tutos/tutos/html/classic/Attic/style.css,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -u -r1.1.2.33 -r1.1.2.34
--- style.css	25 May 2005 15:09:55 -0000	1.1.2.33
+++ style.css	26 May 2005 15:12:49 -0000	1.1.2.34
@@ -525,6 +525,13 @@
  * menu
  */
 
+#menubox {
+  position:     fixed;
+  top:          5em;
+  padding-left: 0px;
+  width:        200px;
+}
+
 /* Special attention is given to default menu */
 #default {
   position:       fixed;
@@ -581,7 +588,7 @@
   border-bottom:    1px solid black;
 }
 
-li img {
+ul img {
   float: left;
   clear: left;
 
@@ -590,21 +597,22 @@
 }
 
 
-/* then menu elements
+/**
+ * Menu elements
  *
  * menu effect is obtained via the Eric Meyer trick
  *  http://meyerweb.com/eric/css/edge/menus/demo.html
  */
 
 #menu {
-  position:     fixed;
-  padding-top:  6em;
   padding-left: 0px;
   width:        200px;
   background:   #dedebb;
 
   /* with a font-size smaller than 9pt, firefox step the li output */
   font-size:    9pt;
+
+  border-left: 1px solid black;
 }
 
 #menu li {
@@ -633,8 +641,6 @@
   text-align:       left;
 
   border-left:   1px solid black;
-  border-right:  1px solid black;
-  border-bottom: 1px solid black;
 }
 
 #menu li:hover > ul li {
@@ -646,11 +652,7 @@
   width:            235px;
   text-align:       right;
   font-weight:      bold;
-
-  border-top:      1px solid black;
-  border-left:     1px solid black;
-  border-right:    1px solid black;
-  /* border-bottom:   1px solid black; */
+  border-bottom:    1px solid black;
 }
 
 #menu ul li {
@@ -658,7 +660,7 @@
   padding: 0px;
 }
 
-#menu li a {
+#menu li a, #obj li a {
   display:      block;
   font-weight:  normal;
   border:       none;
@@ -670,51 +672,31 @@
   padding-bottom: 0em;
 }
 
-#menu li a:hover { 
+#menu li a:hover, #obj li a:hover { 
   background-color: #efefef;
   text-decoration:  none;
 }
 
 /**
- * The « obj » menu is deployed by default.
+ * The menu « obj » has to be visible
  */
-#menu li.sub:last-of-type {
-  background-color: #cfcfbb;
-  width:            235px;
-  text-align:       right;
-  font-weight:      bold;
-
-  border-top:      1px solid black;
-  border-left:     1px solid black;
-  border-right:    1px solid black;
-  /* border-bottom:   1px solid black; */
-}
-
-#menu li.sub #obj {
-  display:     block;
-}
-
-#menu li.sub:hover > #obj {
-  left: 0px;
-}
 
 #obj {
-  background-color: #dedebb;
-  display:          block;
-  padding-left:     0px;
-  width:            200px;
-
-  position:         absolute;
-  margin-left:      35px;
-  left:             0px;
-  margin-top:       .6em;
-  /* z-index:          5; */
+  padding-left: 0px;
+  width:        200px;
+  background:   #dedebb;
+  font-size:    9pt;
 
-  text-align:       left;
+  list-style-type: none;
+  border-left:     1px solid black;  
+}
 
-  border-left:     1px solid black;
-  border-right:    1px solid black;
-  border-bottom:   1px solid black;
+#obj li.title {
+  background-color: #cfcfbb;
+  text-align:       right;
+  font-weight:      bold;
+  padding-bottom:   .5em;
+  border-bottom:    1px solid black;
 }
 
 /* Menu is done, see other elements */

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

Modified Files:
      Tag: BRANCH-2-0
	cal_week.tpl 
Log Message:
* Some calendar integration (lot still to be done)


Index: cal_week.tpl
===================================================================
RCS file: /cvsroot/tutos/tutos/templates/classic/Attic/cal_week.tpl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- cal_week.tpl	17 Dec 2004 15:00:31 -0000	1.1.2.3
+++ cal_week.tpl	25 May 2005 16:17:56 -0000	1.1.2.4
@@ -42,13 +42,19 @@
     <span class="dinfo">{$d.dinfo}</span>
     {/if}
 
-    {* Display the tasks for current day *}
+    {* Display the appointments for current day *}
     <table class="formatted" cellspacing="0" cellpadding="0" width="100%">
-    {foreach from=$d.formatted item=t name=task}
-      <tr><td class="{$t.class}">{$t.link}</td></tr>
-      <tr><td class="{$t.class}" align="right">{$t.info}</td></tr>
+
+    {foreach from=$d.apps item=a}
+      <tr>
+       <td class="data">
+        <a href="{$base}/{$a.link}">{$a.start}&nbsp;&mdash;&nbsp;{$a.end}</a>
+       </td>
+      </tr>
+      <tr><td style="text-align: right; font-style: italic;">{$a.loc}</td></tr>
+      <tr><td style="border-bottom: 1px solid black;">{$a.desc}</td></tr>
     {foreachelse}
-     <tr rowspan="2"><td>&nbsp;</td></tr>
+      <tr><td>&nbsp;</td></tr>
     {/foreach}
     </table>
   </td>

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

Modified Files:
      Tag: BRANCH-2-0
	calendar.p3 
Log Message:
* Some calendar integration (lot still to be done)


Index: calendar.p3
===================================================================
RCS file: /cvsroot/tutos/tutos/php/Attic/calendar.p3,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- calendar.p3	17 May 2005 16:33:45 -0000	1.1.2.6
+++ calendar.p3	25 May 2005 16:17:55 -0000	1.1.2.7
@@ -154,7 +154,9 @@
       $cur_day['apps'][] = 
 	array('start' => $adr->callist[$idx]->start->getTime(),
 	      'end'   => $adr->callist[$idx]->end->getTime(),
-	      'loc'   => $adr->callist[$idx]->getLocation()
+	      'loc'   => $adr->callist[$idx]->getLocation(),
+	      'desc'  => $adr->callist[$idx]->descr,
+	      'link'  => $adr->callist[$idx]->getUrl()
 	      );
 
     }

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

Modified Files:
      Tag: BRANCH-2-0
	bug.pinc 
Log Message:
* DEBUG: could not create bug (redeclaration of the bug_show class)


Index: bug.pinc
===================================================================
RCS file: /cvsroot/tutos/tutos/php/bugtracking/bug.pinc,v
retrieving revision 1.13.2.27
retrieving revision 1.13.2.28
diff -u -r1.13.2.27 -r1.13.2.28
--- bug.pinc	25 May 2005 14:47:59 -0000	1.13.2.27
+++ bug.pinc	25 May 2005 15:28:24 -0000	1.13.2.28
@@ -878,7 +878,7 @@
        */
       $_GET['id']     = $this->id;
       $DO_NOT_DISPLAY = True;
-      include("bugtracking/bug_show.php");
+      include_once("bugtracking/bug_show.php");
       $l = new bug_show($current_user);
       $html = $l->display($withmenu = False, $output = False);