diff --git a/htdocs/comm/action/card.php b/htdocs/comm/action/card.php index 4ca75ade9b9..9734602c41d 100644 --- a/htdocs/comm/action/card.php +++ b/htdocs/comm/action/card.php @@ -937,7 +937,7 @@ if ($id > 0) print ''; // Ref - print ''; + print ''; // Type of event if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) @@ -951,7 +951,7 @@ if ($id > 0) print 'global->AGENDA_USE_EVENT_TYPE)?' class="fieldrequired"':'').'>'.$langs->trans("Title").''; // Full day event - print ''; + print ''; // Date start print ''; + print ''; print ''; diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index c894647bb29..29191fce68a 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -360,6 +360,7 @@ $showextcals=$listofextcals; if (! empty($conf->use_javascript_ajax)) // If javascript on { + $s.=''."\n"; $s.='' . "\n"; // Local calendar - $s.='
' . $langs->trans("LocalAgenda").'  
'; + $s.='
' . $langs->trans("LocalAgenda").'  
'; // External calendars if (is_array($showextcals) && count($showextcals) > 0) diff --git a/htdocs/comm/action/listactions.php b/htdocs/comm/action/listactions.php index ed8227a1cb8..cfb3bc92333 100644 --- a/htdocs/comm/action/listactions.php +++ b/htdocs/comm/action/listactions.php @@ -306,10 +306,11 @@ if ($resql) if (! empty($conf->global->AGENDA_USE_EVENT_TYPE)) print_liste_field_titre($langs->trans("Type"),$_SERVER["PHP_SELF"],"c.libelle",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateStart"),$_SERVER["PHP_SELF"],"a.datep",$param,'','align="center"',$sortfield,$sortorder); print_liste_field_titre($langs->trans("DateEnd"),$_SERVER["PHP_SELF"],"a.datep2",$param,'','align="center"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Company"),$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield,$sortorder); + print_liste_field_titre($langs->trans("ThirdParty"),$_SERVER["PHP_SELF"],"s.nom",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Contact"),$_SERVER["PHP_SELF"],"a.fk_contact",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("ActionsOwnedBy"),$_SERVER["PHP_SELF"],"",$param,"","",$sortfield,$sortorder); print_liste_field_titre($langs->trans("Status"),$_SERVER["PHP_SELF"],"a.percent",$param,"",'align="right"',$sortfield,$sortorder); + print_liste_field_titre(""); print "\n"; print ''; @@ -329,9 +330,12 @@ if ($resql) print ''; //print ''; print ''; - print ''; + print ''; + // Action column + print ''; print "\n"; $contactstatic = new Contact($db); @@ -371,7 +375,7 @@ if ($resql) { $labeltype=$obj->type_code; if (! empty($arraylist[$labeltype])) $labeltype=$arraylist[$labeltype]; - print ''; + print ''; } // Start date @@ -397,7 +401,7 @@ if ($resql) $societestatic->id=$obj->socid; $societestatic->client=$obj->client; $societestatic->name=$obj->societe; - print $societestatic->getNomUrl(1,'',10); + print $societestatic->getNomUrl(1,'',28); } else print ' '; print ''; @@ -409,7 +413,7 @@ if ($resql) $contactstatic->lastname=$obj->lastname; $contactstatic->firstname=$obj->firstname; $contactstatic->id=$obj->fk_contact; - print $contactstatic->getNomUrl(1,'',10); + print $contactstatic->getNomUrl(1,'',28); } else { @@ -430,6 +434,8 @@ if ($resql) // Status/Percent print ''; + print ''; + print "\n"; $i++; } diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index fa24935316e..033c67839f0 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -420,7 +420,7 @@ if ($filtert > 0 || $usergroup > 0) $sql.= ' ORDER BY fk_user_action, datep'; //fk_user_action //print $sql; -dol_syslog("comm/action/index.php", LOG_DEBUG); +dol_syslog("comm/action/peruser.php", LOG_DEBUG); $resql=$db->query($sql); if ($resql) { @@ -703,7 +703,9 @@ foreach ($usernames as $username) { $var = ! $var; echo ""; - echo ''; + echo ''; $tmpday = $sav; // Lopp on each day of week diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index bfd9314f945..919a72c5ec5 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -65,7 +65,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh print '
'; if (! empty($conf->browser->phone)) print '
'; - else print '
'.$langs->trans("Ref").''.$object->id.'
'.$langs->trans("Ref").''.$object->id.'
'.$langs->trans("EventOnFullDay").'fulldayevent?' checked':'').'>
'.$langs->trans("EventOnFullDay").'fulldayevent?' checked':'').'>
'.$langs->trans("DateActionStart").''; @@ -1090,7 +1090,7 @@ if ($id > 0) // Thirdparty - Contact if ($conf->societe->enabled) { - print '
'.$langs->trans("ActionOnCompany").'
'.$langs->trans("ActionOnCompany").''; print '
'; $events=array(); @@ -1115,7 +1115,7 @@ if ($id > 0) $langs->load("projects"); - print '
'.$langs->trans("Project").''; + print '
'.$langs->trans("Project").''; $numprojet=$formproject->select_projects($object->socid, $object->fk_project, 'projectid'); if ($numprojet==0) { @@ -1125,7 +1125,7 @@ if ($id > 0) } // Priority - print '
'.$langs->trans("Priority").''; + print '
'.$langs->trans("Priority").''; print ''; print '
'; - print ''; - print ''; + $searchpitco=$form->showFilterAndCheckAddButtons(0); + print $searchpitco; + print '
'.dol_trunc($labeltype,24).''.dol_trunc($labeltype,28).''.$actionstatic->LibStatut($obj->percent,6).'
' . $username->getNomUrl(1). ''; + print $username->getNomUrl(-1,'',0,0,24,1,''); + print '
'; + else print '
'; print ''; @@ -74,7 +74,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh print ''; print ''; - - // Status - print ''; - print ''; } if (! empty($conf->societe->enabled) && $user->rights->societe->lire) @@ -128,6 +120,17 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh print ''; } + if ($canedit) + { + // Status + print ''; + print ''; + } + if ($canedit && $action == 'show_peruser') { // Filter on hours diff --git a/htdocs/core/tpl/contacts.tpl.php b/htdocs/core/tpl/contacts.tpl.php index 88169314211..b3eaeeec503 100644 --- a/htdocs/core/tpl/contacts.tpl.php +++ b/htdocs/core/tpl/contacts.tpl.php @@ -54,7 +54,9 @@ $userstatic=new User($db);
- +
trans("Nature"); ?>
trans("ThirdParty"); ?>
@@ -132,10 +134,12 @@ $userstatic=new User($db);
- + - +
trans("Nature"); ?>
trans("ThirdParty"); ?>
trans("Users").'/'.$langs->trans("Contacts"); ?>
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 21e8fcd8cac..ca27d42c995 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -582,6 +582,7 @@ div.myavailability { .maxwidth400 { max-width: 400px; } .maxwidth500 { max-width: 500px; } .minheight20 { min-height: 20px; } +.minheight40 { min-height: 40px; } .titlefield { width: 25%; } .titlefieldcreate { width: 20%; } @@ -2204,7 +2205,7 @@ table.liste, table.noborder, table.formdoc, div.noborder { -webkit-border-radius: 0.2em; border-radius: 0.2em;*/ } -#tablelines tr.liste_titre td, tr.liste_titre.trnoborder td { +#tablelines tr.liste_titre td, form.formnoborder div, tr.liste_titre.trnoborder td { border-top-width: 1px; border-top-color: rgb(); border-top-style: solid; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 63b42726382..5cb3995c6ba 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -580,6 +580,7 @@ div.myavailability { .maxwidth400 { max-width: 400px; } .maxwidth500 { max-width: 500px; } .minheight20 { min-height: 20px; } +.minheight40 { min-height: 40px; } .titlefield { width: 30%; } .titlefieldcreate { width: 20%; } @@ -2074,7 +2075,7 @@ table.liste, table.noborder, table.formdoc, div.noborder { -webkit-border-radius: 0.1em; border-radius: 0.1em; } -#tablelines tr.liste_titre td, tr.liste_titre.trnoborder td { +#tablelines tr.liste_titre td, form.formnoborder, tr.liste_titre.trnoborder td { border-top-width: 1px; border-top-color: rgb(); border-top-style: solid;
'; print $langs->trans("ActionsToDoBy").'   '; - print ''; + print ''; print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth300'); if (empty($conf->dol_optimize_smallscreen)) print '   '.$langs->trans("or") . ' '.$langs->trans("ToUserOfGroup").'   '; print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit); @@ -95,14 +95,6 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh } print $formactions->select_type_actions($actioncode, "actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:0), 0, $multiselect); print '
'; - print $langs->trans("Status"); - print '  '; - $formactions->form_select_status_action('formaction',$status,1,'status',1,2); - print '
'; + print $langs->trans("Status"); + print '  '; + $formactions->form_select_status_action('formaction',$status,1,'status',1,2); + print '