Skip to content

Commit

Permalink
Look: Uniformisation affichage ecrans projets
Browse files Browse the repository at this point in the history
  • Loading branch information
@eldy
eldy committed Jun 3, 2006
1 parent 9dc3634 commit 490e293
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 46 deletions.
19 changes: 10 additions & 9 deletions htdocs/projet/activity/index.php
View file
@@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2001-2005 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* 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
* it under the terms of the GNU General Public License as published by
Expand All @@ -18,14 +19,13 @@
*
* $Id$
* $Source$
*
*/

/**
\file htdocs/projet/index.php
\ingroup projet
\brief Page d'accueil du module projet
\version $Revision$
\file htdocs/projet/activity/index.php
\ingroup projet
\brief Page activite du module projet
\version $Revision$
*/

require("./pre.inc.php");
Expand All @@ -45,10 +45,11 @@

$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">';

/*
*
Expand Down Expand Up @@ -98,7 +99,7 @@
}
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 */
print '<table class="noborder" width="100%">';
Expand Down
18 changes: 9 additions & 9 deletions htdocs/projet/activity/myactivity.php
View file
@@ -1,5 +1,6 @@
<?php
/* 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
* it under the terms of the GNU General Public License as published by
Expand All @@ -17,14 +18,13 @@
*
* $Id$
* $Source$
*
*/

/**
\file htdocs/projet/index.php
\ingroup projet
\brief Page d'accueil du module projet
\version $Revision$
\file htdocs/projet/activity/myactivity.php
\ingroup projet
\brief Page activite perso du module projet
\version $Revision$
*/

require("./pre.inc.php");
Expand All @@ -47,10 +47,10 @@

$now = time();

print_titre($langs->trans("MyActivity"));
print_fiche_titre($langs->trans("MyActivity"));

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">';

/*
*
Expand Down Expand Up @@ -192,7 +192,7 @@
print "</tr>\n";
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 */
print '<table class="noborder" width="100%">';
Expand Down
5 changes: 4 additions & 1 deletion htdocs/projet/commandes.php
View file
Expand Up @@ -110,9 +110,12 @@
$projet->societe->fetch($projet->societe->id);

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("Label").'</td><td>'.$projet->title.'</td></tr>';

print '<tr><td>'.$langs->trans("Company").'</td><td>'.$projet->societe->getNomUrl(1).'</td></tr>';

print '</table>';

print '</div>';
Expand Down
5 changes: 4 additions & 1 deletion htdocs/projet/facture.php
View file
Expand Up @@ -111,9 +111,12 @@
$projet->societe->fetch($projet->societe->id);

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("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 '</div>';
Expand Down
7 changes: 2 additions & 5 deletions htdocs/projet/index.php
View file
@@ -1,6 +1,6 @@
<?php
/* 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>
*
* This program is free software; you can redistribute it and/or modify
Expand Down Expand Up @@ -33,10 +33,7 @@

if (!$user->rights->projet->lire) accessforbidden();

/*
* Sécurité accés client
*/

// Sécurité accés client
if ($user->societe_id > 0)
{
$socidp = $user->societe_id;
Expand Down
3 changes: 1 addition & 2 deletions htdocs/projet/liste.php
View file
Expand Up @@ -122,8 +122,7 @@
print '<td valign="right">';
print '<input type="text" class="flat" name="search_societe" value="'.$_GET["search_societe"].'">';
print '</td>';
print '<td align="center">';
print '<input class="button" type="submit" value="'.$langs->trans("Search").'">';
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 "</td>";
print "</tr>\n";

Expand Down
3 changes: 1 addition & 2 deletions htdocs/projet/propal.php
View file
Expand Up @@ -18,7 +18,6 @@
*
* $Id$
* $Source$
*
*/

/**
Expand Down Expand Up @@ -113,9 +112,9 @@
$projet->societe->fetch($projet->societe->id);

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("Label").'</td><td>'.$projet->title.'</td></tr>';
print '<tr><td>'.$langs->trans("Company").'</td><td>'.$projet->societe->getNomUrl(1).'</td></tr>';
print '</table>';

print '</div>';
Expand Down
9 changes: 6 additions & 3 deletions htdocs/projet/tasks/fiche.php
View file
Expand Up @@ -93,7 +93,7 @@
if ($actors[$lines[$i][2]] == 'admin')
{
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 $form->select_date('',$lines[$i][2],'','','',"addtime");
print '</td>';
Expand Down Expand Up @@ -265,7 +265,10 @@
print '<form method="POST" action="fiche.php?id='.$projet->id.'">';
print '<input type="hidden" name="action" value="createtask">';
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>';


Expand Down Expand Up @@ -332,7 +335,7 @@
print '<option value="0" selected="true">&nbsp;</option>';
PLineSelect($j, 0, $tasks, $level);
print '</select>&nbsp;';
print '<input type="submit" class="flat">';
print '<input type="submit" class="button" value="'.$langs->trans("Add").'">';
print '</td></tr>';

print '</table></form><br />';
Expand Down
20 changes: 9 additions & 11 deletions htdocs/projet/tasks/index.php
View file
@@ -1,6 +1,6 @@
<?php
/* 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>
*
* This program is free software; you can redistribute it and/or modify
Expand All @@ -19,23 +19,20 @@
*
* $Id$
* $Source$
*
*/

/**
\file htdocs/projet/index.php
\file htdocs/projet/tasks/index.php
\ingroup projet
\brief Page d'accueil du module projet
\brief Page des taches du module projet
\version $Revision$
*/

require("./pre.inc.php");

if (!$user->rights->projet->lire) accessforbidden();

/*
* Sécurité accés client
*/
// Sécurité accés client
if ($user->societe_id > 0)
{
$action = '';
Expand All @@ -44,10 +41,11 @@

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">';

/*
*
Expand Down Expand Up @@ -101,7 +99,7 @@
}
print "</table>";

print '</td><td width="70%">';
print '</td><td width="70%" valign="top" class="notopnoleft">';

/*
*
Expand Down
9 changes: 6 additions & 3 deletions htdocs/projet/tasks/task.php
View file
@@ -1,5 +1,6 @@
<?php
/* 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
* it under the terms of the GNU General Public License as published by
Expand All @@ -17,11 +18,10 @@
*
* $Id$
* $Source$
*
*/

/**
\file htdocs/projet/tasks/fiche.php
\file htdocs/projet/tasks/task.php
\ingroup projet
\brief Fiche tâches d'un projet
\version $Revision$
Expand Down Expand Up @@ -87,7 +87,10 @@
print '<form method="POST" action="fiche.php?id='.$projet->id.'">';
print '<input type="hidden" name="action" value="createtask">';
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 '<tr><td>'.$langs->trans("Task").'</td><td colspan="3">'.$task->title.'</td></tr>';

Expand Down

0 comments on commit 490e293

Please sign in to comment.