lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look: Uniformisation affichage ecrans projets

Browse Source
This commit is contained in:
Laurent Destailleur 2006-06-03 16:50:58 +00:00
parent 9dc3634a61
commit 490e293947
10 changed files with 52 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
htdocs/projet/activity/index.php
View File

@ -1,6 +1,7 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2005-2006 Regis Houssin <regis.houssin@cap-networks.com> * Copyright (C) 2005-2006 Regis Houssin <regis.houssin@cap-networks.com>
* Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -18,14 +19,13 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
\file htdocs/projet/index.php \file htdocs/projet/activity/index.php
\ingroup projet \ingroup projet
\brief Page d'accueil du module projet \brief Page activite du module projet
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -45,10 +45,11 @@ llxHeader("",$langs->trans("Activity"));
$now = time(); $now = time();
print_titre($langs->trans("Activity")); print_fiche_titre($langs->trans("Activity"));
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
print '<tr><td width="30%" valign="top">'; print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td width="30%" valign="top" class="notopnoleft">';
/* /*
* *
@ -98,7 +99,7 @@ else
} }
print "</table>"; print "</table>";
print '</td><td width="70%" valign="top">'; print '</td><td width="70%" valign="top" class="notopnoleft">';
/* Affichage de la liste des projets du mois */ /* Affichage de la liste des projets du mois */
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';

18
htdocs/projet/activity/myactivity.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -17,14 +18,13 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
\file htdocs/projet/index.php \file htdocs/projet/activity/myactivity.php
\ingroup projet \ingroup projet
\brief Page d'accueil du module projet \brief Page activite perso du module projet
\version $Revision$ \version $Revision$
*/ */
require("./pre.inc.php"); require("./pre.inc.php");
@ -47,10 +47,10 @@ llxHeader("",$langs->trans("MyActivity"));
$now = time(); $now = time();
print_titre($langs->trans("MyActivity")); print_fiche_titre($langs->trans("MyActivity"));
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">'; print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td width="30%" valign="top">'; print '<tr><td width="30%" valign="top" class="notopnoleft">';
/* /*
* *
@ -192,7 +192,7 @@ print '<td align="center">'.$total.'</td>';
print "</tr>\n"; print "</tr>\n";
print "</table>"; print "</table>";
print '</td><td width="70%" valign="top">'; print '</td><td width="70%" valign="top" class="notopnoleft">';
/* Affichage de la liste des projets de la semaine */ /* Affichage de la liste des projets de la semaine */
print '<table class="noborder" width="100%">'; print '<table class="noborder" width="100%">';

5
htdocs/projet/commandes.php
View File

@ -110,9 +110,12 @@ dolibarr_fiche_head($head, $hselected, $langs->trans("Project").": ".$projet->re
$projet->societe->fetch($projet->societe->id); $projet->societe->fetch($projet->societe->id);
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td>'.$langs->trans("Company").'</td><td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$projet->societe->id.'">'.$projet->societe->nom.'</a></td></tr>';
print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>'; print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>';
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>'; print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>';
print '<tr><td>'.$langs->trans("Company").'</td><td>'.$projet->societe->getNomUrl(1).'</td></tr>';
print '</table>'; print '</table>';
print '</div>'; print '</div>';

5
htdocs/projet/facture.php
View File

@ -111,9 +111,12 @@ dolibarr_fiche_head($head, $hselected, $langs->trans("Project").": ".$projet->re
$projet->societe->fetch($projet->societe->id); $projet->societe->fetch($projet->societe->id);
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td>'.$langs->trans("Company").'</td><td><a href="'.DOL_URL_ROOT.'/compta/fiche.php?socid='.$projet->societe->id.'">'.$projet->societe->nom.'</a></td></tr>';
print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>'; print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>';
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>'; print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>';
print '<tr><td>'.$langs->trans("Company").'</td><td>'.$projet->societe->getNomUrl(1,'compta').'</td></tr>';
print '</table>'; print '</table>';
print '</div>'; print '</div>';

7
htdocs/projet/index.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2006 Regis Houssin <regis.houssin@cap-networks.com> * Copyright (C) 2005-2006 Regis Houssin <regis.houssin@cap-networks.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -33,10 +33,7 @@ $langs->load("projects");
if (!$user->rights->projet->lire) accessforbidden(); if (!$user->rights->projet->lire) accessforbidden();
/* // Sécurité accés client
* Sécurité accés client
*/
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$socidp = $user->societe_id; $socidp = $user->societe_id;

3
htdocs/projet/liste.php
View File

@ -122,8 +122,7 @@ if ($resql)
print '<td valign="right">'; print '<td valign="right">';
print '<input type="text" class="flat" name="search_societe" value="'.$_GET["search_societe"].'">'; print '<input type="text" class="flat" name="search_societe" value="'.$_GET["search_societe"].'">';
print '</td>'; print '</td>';
print '<td align="center">'; print '<td class="liste_titre" align="center"><input class="liste_titre" type="image" src="'.DOL_URL_ROOT.'/theme/'.$conf->theme.'/img/search.png" alt="'.$langs->trans("Search").'">';
print '<input class="button" type="submit" value="'.$langs->trans("Search").'">';
print "</td>"; print "</td>";
print "</tr>\n"; print "</tr>\n";

3
htdocs/projet/propal.php
View File

@ -18,7 +18,6 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
@ -113,9 +112,9 @@ $propales = array();
$projet->societe->fetch($projet->societe->id); $projet->societe->fetch($projet->societe->id);
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td>'.$langs->trans("Company").'</td><td><a href="'.DOL_URL_ROOT.'/comm/fiche.php?socid='.$projet->societe->id.'">'.$projet->societe->nom.'</a></td></tr>';
print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>'; print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>';
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>'; print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>';
print '<tr><td>'.$langs->trans("Company").'</td><td>'.$projet->societe->getNomUrl(1).'</td></tr>';
print '</table>'; print '</table>';
print '</div>'; print '</div>';

9
htdocs/projet/tasks/fiche.php
View File

@ -93,7 +93,7 @@ Function PLines(&$inc, $parent, $lines, &$level, $actors)
if ($actors[$lines[$i][2]] == 'admin') if ($actors[$lines[$i][2]] == 'admin')
{ {
print '<td><input size="4" type="text" class="flat" name="task'.$lines[$i][2].'" value="">'; print '<td><input size="4" type="text" class="flat" name="task'.$lines[$i][2].'" value="">';
print '&nbsp;<input type="submit" class="flat" value="'.$langs->trans("Save").'"></td>'; print '&nbsp;<input type="submit" class="button" value="'.$langs->trans("Save").'"></td>';
print "\n<td>"; print "\n<td>";
print $form->select_date('',$lines[$i][2],'','','',"addtime"); print $form->select_date('',$lines[$i][2],'','','',"addtime");
print '</td>'; print '</td>';
@ -265,7 +265,10 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer)
print '<form method="POST" action="fiche.php?id='.$projet->id.'">'; print '<form method="POST" action="fiche.php?id='.$projet->id.'">';
print '<input type="hidden" name="action" value="createtask">'; print '<input type="hidden" name="action" value="createtask">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td>'.$langs->trans("Project").'</td><td>'.$projet->title.'</td>';
print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>';
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>';
print '<td>'.$langs->trans("Company").'</td><td>'.$projet->societe->getNomUrl(1).'</td></tr>'; print '<td>'.$langs->trans("Company").'</td><td>'.$projet->societe->getNomUrl(1).'</td></tr>';
@ -332,7 +335,7 @@ if ($_GET["action"] == 'create' && $user->rights->projet->creer)
print '<option value="0" selected="true">&nbsp;</option>'; print '<option value="0" selected="true">&nbsp;</option>';
PLineSelect($j, 0, $tasks, $level); PLineSelect($j, 0, $tasks, $level);
print '</select>&nbsp;'; print '</select>&nbsp;';
print '<input type="submit" class="flat">'; print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
print '</td></tr>'; print '</td></tr>';
print '</table></form><br />'; print '</table></form><br />';

20
htdocs/projet/tasks/index.php
View File

@ -1,6 +1,6 @@
<?php <?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2005 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2006 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2006 Regis Houssin <regis.houssin@cap-networks.com> * Copyright (C) 2005-2006 Regis Houssin <regis.houssin@cap-networks.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -19,13 +19,12 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
\file htdocs/projet/index.php \file htdocs/projet/tasks/index.php
\ingroup projet \ingroup projet
\brief Page d'accueil du module projet \brief Page des taches du module projet
\version $Revision$ \version $Revision$
*/ */
@ -33,9 +32,7 @@ require("./pre.inc.php");
if (!$user->rights->projet->lire) accessforbidden(); if (!$user->rights->projet->lire) accessforbidden();
/* // Sécurité accés client
* Sécurité accés client
*/
if ($user->societe_id > 0) if ($user->societe_id > 0)
{ {
$action = ''; $action = '';
@ -44,10 +41,11 @@ if ($user->societe_id > 0)
llxHeader("",$langs->trans("Projects"),"Projet"); llxHeader("",$langs->trans("Projects"),"Projet");
print_titre($langs->trans("ProjectsArea")); print_fiche_titre($langs->trans("ProjectsArea"));
print '<table class="noborder" width="100%" cellspacing="0" cellpadding="4">';
print '<tr><td width="30%" valign="top">'; print '<table border="0" width="100%" class="notopnoleftnoright">';
print '<tr><td width="30%" valign="top" class="notopnoleft">';
/* /*
* *
@ -101,7 +99,7 @@ else
} }
print "</table>"; print "</table>";
print '</td><td width="70%">'; print '</td><td width="70%" valign="top" class="notopnoleft">';
/* /*
* *

9
htdocs/projet/tasks/task.php
View File

@ -1,5 +1,6 @@
<?php <?php
/* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2006 Laurent Destailleur <eldy@users.sourceforge.net>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -17,11 +18,10 @@
* *
* $Id$ * $Id$
* $Source$ * $Source$
*
*/ */
/** /**
\file htdocs/projet/tasks/fiche.php \file htdocs/projet/tasks/task.php
\ingroup projet \ingroup projet
\brief Fiche tâches d'un projet \brief Fiche tâches d'un projet
\version $Revision$ \version $Revision$
@ -87,7 +87,10 @@ if ($_GET["id"] > 0)
print '<form method="POST" action="fiche.php?id='.$projet->id.'">'; print '<form method="POST" action="fiche.php?id='.$projet->id.'">';
print '<input type="hidden" name="action" value="createtask">'; print '<input type="hidden" name="action" value="createtask">';
print '<table class="border" width="100%">'; print '<table class="border" width="100%">';
print '<tr><td>'.$langs->trans("Project").'</td><td>'.$projet->title.'</td>';
print '<tr><td>'.$langs->trans("Ref").'</td><td>'.$projet->ref.'</td></tr>';
print '<tr><td>'.$langs->trans("Label").'</td><td>'.$projet->title.'</td></tr>';
print '<td>'.$langs->trans("Company").'</td><td>'.$projet->societe->getNomUrl(1).'</td></tr>'; print '<td>'.$langs->trans("Company").'</td><td>'.$projet->societe->getNomUrl(1).'</td></tr>';
print '<tr><td>'.$langs->trans("Task").'</td><td colspan="3">'.$task->title.'</td></tr>'; print '<tr><td>'.$langs->trans("Task").'</td><td colspan="3">'.$task->title.'</td></tr>';