From 05aff969e547205cd4f5c342c37698a154ea1b72 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 20 Mar 2008 20:51:04 +0000
Subject: [PATCH] Look: Change in look of agenda module

---
 htdocs/comm/action/indexactions.php | 63 ++++++++++++++++++++---------
 htdocs/langs/en_US/agenda.lang      |  1 +
 htdocs/langs/fr_FR/agenda.lang      |  3 +-
 3 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/htdocs/comm/action/indexactions.php b/htdocs/comm/action/indexactions.php
index 4b44cd57b62..327322eeffa 100644
--- a/htdocs/comm/action/indexactions.php
+++ b/htdocs/comm/action/indexactions.php
@@ -96,27 +96,52 @@ print "</form></table><br>\n";
 $var=true;
 print '<form method="post" action="'.DOL_URL_ROOT.'/comm/action/listactions.php">';
 print '<table class="noborder" width="100%">';
-print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("Calendar").'</td></tr>';
-// All my actions
-$var=!$var;
-print '<tr '.$bc[$var].'><td><a href="'.DOL_URL_ROOT.'/comm/action/index.php?filtera='.$user->id.'&amp;filtert='.$user->id.'&amp;filterd='.$user->id.'">';
-print img_picto('','object_calendar').' '.$langs->trans("AllMyActions").'</a></td></tr>';
-// Actions i asked
-$var=!$var;
-print '<tr '.$bc[$var].'><td> &nbsp; &nbsp; &nbsp; <a href="'.DOL_URL_ROOT.'/comm/action/index.php?filtera='.$user->id.'">';
-print img_picto('','object_calendar').' '.$langs->trans("MyActionsAsked").'</a></td></tr>';
-// Actions affected to me
-$var=!$var;
-print '<tr '.$bc[$var].'><td> &nbsp; &nbsp; &nbsp; <a href="'.DOL_URL_ROOT.'/comm/action/index.php?filtert='.$user->id.'">';
-print img_picto('','object_calendar').' '.$langs->trans("MyActionsToDo").'</a></td></tr>';
-// Actions done by me
-$var=!$var;
-print '<tr '.$bc[$var].'><td> &nbsp; &nbsp; &nbsp; <a href="'.DOL_URL_ROOT.'/comm/action/index.php?filterd='.$user->id.'">';
-print img_picto('','object_calendar').' '.$langs->trans("MyActionsDone").'</a></td></tr>';
+print '<tr class="liste_titre"><td colspan="3">'.$langs->trans("ViewWithPredefinedFilters").'</td></tr>';
 // All actions of everybody
 $var=!$var;
-print '<tr '.$bc[$var].'><td><a href="'.DOL_URL_ROOT.'/comm/action/index.php">';
-print img_picto('','object_calendar').' '.$langs->trans("AllActions").'</a></td></tr>';
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("AllActions").'</td>';
+print '<td><a href="'.DOL_URL_ROOT.'/comm/action/listactions.php">';
+print img_picto($langs->trans("ViewList"),'object_list').'</a></td>';
+print '<td><a href="'.DOL_URL_ROOT.'/comm/action/index.php">';
+print img_picto($langs->trans("ViewCal"),'object_calendar').'</a></td>';
+print '</tr>';
+// All my actions
+$var=!$var;
+print '<tr '.$bc[$var].'><td>';
+print $langs->trans("AllMyActions").'</td>';
+print '<td><a href="'.DOL_URL_ROOT.'/comm/action/listactions.php?filter=mine">';
+print img_picto($langs->trans("ViewList"),'object_list').'</a></td>';
+print '<td><a href="'.DOL_URL_ROOT.'/comm/action/index.php?filter=mine">';
+print img_picto($langs->trans("ViewCal"),'object_calendar').'</a></td>';
+print '</tr>';
+// Actions i asked
+$var=!$var;
+print '<tr '.$bc[$var].'><td> &nbsp; &nbsp; &nbsp; ';
+print $langs->trans("MyActionsAsked").'</td>';
+print '<td><a href="'.DOL_URL_ROOT.'/comm/action/listactions.php?filtera='.$user->id.'">';
+print img_picto($langs->trans("ViewList"),'object_list').'</a></td>';
+print '<td><a href="'.DOL_URL_ROOT.'/comm/action/index.php?filtera='.$user->id.'">';
+print img_picto($langs->trans("ViewCal"),'object_calendar').'</a></td>';
+print '</tr>';
+// Actions affected to me
+$var=!$var;
+print '<tr '.$bc[$var].'><td> &nbsp; &nbsp; &nbsp; ';
+print $langs->trans("MyActionsToDo").'</td>';
+print '<td><a href="'.DOL_URL_ROOT.'/comm/action/listactions.php?filtert='.$user->id.'">';
+print img_picto($langs->trans("ViewList"),'object_list').'</a></td>';
+print '<td><a href="'.DOL_URL_ROOT.'/comm/action/index.php?filtert='.$user->id.'">';
+print img_picto($langs->trans("ViewCal"),'object_calendar').'</a></td>';
+print '</tr>';
+// Actions done by me
+$var=!$var;
+print '<tr '.$bc[$var].'><td> &nbsp; &nbsp; &nbsp; ';
+print $langs->trans("MyActionsDone").'</td>';
+print '<td><a href="'.DOL_URL_ROOT.'/comm/action/listactions.php?filterd='.$user->id.'">';
+print img_picto($langs->trans("ViewList"),'object_list').'</a></td>';
+print '<td><a href="'.DOL_URL_ROOT.'/comm/action/index.php?filterd='.$user->id.'">';
+print img_picto($langs->trans("ViewCal"),'object_calendar').'</a></td>';
+print '</tr>';
 print "</table></form><br>\n";
 
 
diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang
index 33016ff72cd..c1d46d81a4e 100644
--- a/htdocs/langs/en_US/agenda.lang
+++ b/htdocs/langs/en_US/agenda.lang
@@ -21,3 +21,4 @@ AllMyActions=All my actions/tasks
 AllActions=Toutes les actions/tasks
 ViewList=View list
 ViewCal=View calendar
+ViewWithPredefinedFilters=View with predefined filters
diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang
index d0c8f5eb6f0..720b9342d29 100644
--- a/htdocs/langs/fr_FR/agenda.lang
+++ b/htdocs/langs/fr_FR/agenda.lang
@@ -20,4 +20,5 @@ ActionsDoneBy=Actions r
 AllMyActions=Toutes mes actions/taches
 AllActions=Toutes les actions/taches
 ViewList=Voir liste
-ViewCal=Voir calendrier
\ No newline at end of file
+ViewCal=Voir calendrier
+ViewWithPredefinedFilters=Vues avec filtres prédéfinis
\ No newline at end of file