diff --git a/htdocs/admin/agenda_xcal.php b/htdocs/admin/agenda_xcal.php index 4a19849b96478cbc6e34f48c3898897271f14f1d..1c9be6fef5c0e724167e28337af8c0cea5b3ee75 100644 --- a/htdocs/admin/agenda_xcal.php +++ b/htdocs/admin/agenda_xcal.php @@ -121,6 +121,13 @@ $message.=$langs->trans("WebCalUrlForVCalExport",'ical',$urlical); $message.='<br>'; $urlrss='<a href="'.DOL_URL_ROOT.'/comm/action/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'...').'" target="_blank">'.$urlwithouturlroot.DOL_URL_ROOT.'/comm/action/agendaexport.php?format=rss&exportkey='.($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY?urlencode($conf->global->MAIN_AGENDA_XCAL_EXPORTKEY):'KEYNOTDEFINED').'</a>'; $message.=$langs->trans("WebCalUrlForVCalExport",'rss',$urlrss); +$message.='<br>'; +$message.='<br>'; +$message.=$langs->trans("AgendaUrlOptions1",$user->login,$user->login).'<br>'; +$message.=$langs->trans("AgendaUrlOptions2",$user->login,$user->login).'<br>'; +$message.=$langs->trans("AgendaUrlOptions3",$user->login,$user->login).'<br>'; +$message.=$langs->trans("AgendaUrlOptions4",$user->login,$user->login).'<br>'; +$message.=$langs->trans("AgendaUrlOptions5",$user->login,$user->login); print info_admin($message); $db->close(); diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 865d789ed7204f36003ffe9a34f52cc7b85969a7..ed1498ba72c00fdd419f28ffb9cd65584c6111e5 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -164,10 +164,10 @@ if ($canedit) print $form->select_users($filtera,'userasked',1,'',!$canedit); print '</td>'; print '<td rowspan="3" align="center" valign="middle" nowrap="nowrap">'; - print img_picto($langs->trans("ViewList"),'object_list').' <input type="submit" class="button" name="viewlist" value="'.$langs->trans("ViewList").'" '.($canedit?'':'disabled="true"') .'>'; + print img_picto($langs->trans("ViewList"),'object_list').' <input type="submit" class="button" name="viewlist" value="'.$langs->trans("ViewList").'">'; print '<br>'; print '<br>'; - print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'" '.($canedit?'':'disabled="true"') .'>'; + print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'" disabled="true">'; print '</td>'; print '</tr>'; diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index c3fda3701b512ee326cafbc5d62a148bead6a8ff..126ca63cf26410c63e0ede3dc1ce6cefb1ba8dbc 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -200,10 +200,10 @@ if ($resql) print $form->select_users($filtera,'userasked',1,'',!$canedit); print '</td>'; print '<td rowspan="3" align="center" valign="middle">'; - print img_picto($langs->trans("ViewList"),'object_list').' <input type="submit" class="button" name="viewlist" value="'.$langs->trans("ViewList").'" '.($canedit?'':'disabled="true"') .'>'; + print img_picto($langs->trans("ViewList"),'object_list').' <input type="submit" class="button" name="viewlist" value="'.$langs->trans("ViewList").'" disabled="true">'; print '<br>'; print '<br>'; - print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'" '.($canedit?'':'disabled="true"') .'>'; + print img_picto($langs->trans("ViewCal"),'object_calendar').' <input type="submit" class="button" name="viewcal" value="'.$langs->trans("ViewCal").'">'; print '</td>'; print '</tr>'; diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index e9925458a37e186327e673b4b1bfaef8e62e9a92..1e8db697af524a9e8a8c36a0ee065555b6ef5909 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -36,3 +36,8 @@ DateActionDoneStart = Real start date DateActionDoneEnd = Real end date DateActionStart = Start date DateActionEnd = End date +AgendaUrlOptions1=You can also add following parameters to filter output: +AgendaUrlOptions2=<b>login=%s</b> to restrict output to actions created by, affected to or done by user <b>%s</b>. +AgendaUrlOptions3=<b>logina=%s</b> to restrict output to actions created by user <b>%s</b>. +AgendaUrlOptions4=<b>logint=%s</b> to restrict output to actions affected to user <b>%s</b>. +AgendaUrlOptions5=<b>logind=%s</b> to restrict output to actions done by user <b>%s</b>. diff --git a/htdocs/langs/fr_FR/agenda.lang b/htdocs/langs/fr_FR/agenda.lang index 14d5d69f7de3f32eee1783b031b7dfb36937faa6..d023ba8976304d002ef3809cc79d7fbbd3797869 100644 --- a/htdocs/langs/fr_FR/agenda.lang +++ b/htdocs/langs/fr_FR/agenda.lang @@ -36,3 +36,8 @@ DateActionDoneStart=Date d DateActionDoneEnd=Date fin r�alisation r�elle DateActionStart=Date d�but DateActionEnd=Date fin +AgendaUrlOptions1=Vous pouvez aussi ajouter les param�tres suivant pour filtrer les r�ponses: +AgendaUrlOptions2=<b>login=%s</b> pour limiter l'export aux actions cr�es, affect�es ou r�alis�es par l'utilisateur <b>%s</b>. +AgendaUrlOptions3=<b>logina=%s</b> pour limiter l'export aux actions cr�es par l'utilisateur <b>%s</b>. +AgendaUrlOptions4=<b>logint=%s</b> pour limiter l'export aux actions affect�es � l'utilisateur <b>%s</b>. +AgendaUrlOptions5=<b>logind=%s</b> pour limiter l'export aux actions r�alis�es par l'utilisateur <b>%s</b>.