From 9592fdb3fc97831f07cd8a1d58cd5f132ffaed99 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 9 Jul 2020 11:55:16 +0200 Subject: [PATCH] CSS --- htdocs/comm/action/index.php | 4 +- htdocs/comm/action/list.php | 4 +- htdocs/comm/action/peruser.php | 4 +- htdocs/core/lib/agenda.lib.php | 125 ++++++++++++++++++------------- htdocs/langs/en_US/agenda.lang | 2 +- htdocs/theme/eldy/global.inc.php | 2 +- 6 files changed, 82 insertions(+), 59 deletions(-) diff --git a/htdocs/comm/action/index.php b/htdocs/comm/action/index.php index 2bb04714591..0e4221ad273 100644 --- a/htdocs/comm/action/index.php +++ b/htdocs/comm/action/index.php @@ -1174,9 +1174,9 @@ if (empty($action) || $action == 'show_month') // View by month $newparam = preg_replace('/showbirthday_=/i', 'showbirthday=', $newparam); // Restore correct parameter $newparam .= '&viewcal=1'; - print '
'; + print '
'; print_actions_filter($form, $canedit, $status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid); - print '
'; + print '
'; print '
'; print ''; diff --git a/htdocs/comm/action/list.php b/htdocs/comm/action/list.php index ee06b9d19f1..f24467b8c59 100644 --- a/htdocs/comm/action/list.php +++ b/htdocs/comm/action/list.php @@ -547,9 +547,9 @@ if ($resql) $i = 0; - print '
'; + print '
'; print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid); - print '
'; + print '
'; print '
'; print '
'."\n"; diff --git a/htdocs/comm/action/peruser.php b/htdocs/comm/action/peruser.php index 39693dfa21a..f080b988164 100644 --- a/htdocs/comm/action/peruser.php +++ b/htdocs/comm/action/peruser.php @@ -445,9 +445,9 @@ $s = $newtitle; print $s; -print '
'; +print '
'; print_actions_filter($form, $canedit, $search_status, $year, $month, $day, $showbirthday, 0, $filtert, 0, $pid, $socid, $action, -1, $actioncode, $usergroup, '', $resourceid); -print '
'; +print '
'; diff --git a/htdocs/core/lib/agenda.lib.php b/htdocs/core/lib/agenda.lib.php index a67a2a1e445..5d3bfe7a52f 100644 --- a/htdocs/core/lib/agenda.lib.php +++ b/htdocs/core/lib/agenda.lib.php @@ -66,41 +66,48 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh print ''; print ''; - print '
'; + //print '
'; - if ($conf->browser->layout == 'phone') print '
'; - else print '
'; + //if ($conf->browser->layout == 'phone') print ''; + //else print ''; /* if ($conf->browser->layout == 'phone') print '
'; @@ -208,9 +231,9 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh if ($conf->browser->layout == 'phone') print '
'; else print ''; */ - if ($conf->browser->layout != 'phone') print '
'; + //if ($conf->browser->layout == 'phone') print '
'; + //else print '
'; - print ''; + //print '
'; if ($canedit) { + print '
'; // Type - print '
'; - print ''; + //print ''; + //print ''; + print ''; // Assigned to - print ''; - print ''; + //print ''; + //print ''; + print ''; if ($conf->resource->enabled) { @@ -108,25 +115,29 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh $formresource = new FormResource($db); // Resource - print ''; - print ''; + //print ''; + //print ''; + print ''; } } if (!empty($conf->societe->enabled) && $user->rights->societe->lire) { - print ''; - print ''; + //print ''; + //print ''; + print ''; } if (!empty($conf->projet->enabled) && $user->rights->projet->lire) @@ -134,34 +145,41 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh require_once DOL_DOCUMENT_ROOT.'/core/class/html.formprojet.class.php'; $formproject = new FormProjets($db); - print ''; - print ''; + //print ''; + //print ''; + print ''; } if ($canedit && !preg_match('/list/', $_SERVER["PHP_SELF"])) { // Status - print ''; - print ''; + //print ''; + //print ''; + print ''; } if ($canedit && $action == 'show_peruser') { + print '
'; // Filter on hours - print '
'; - print ''; - print "'; + //print ''; + //print "'; + //print ''; + print ''; // Filter on days - print ''; - print ''; - print "'; + //print ''; + //print "'; + //print ''; + print ''; } // Hooks $parameters = array('canedit'=>$canedit, 'pid'=>$pid, 'socid'=>$socid); $reshook = $hookmanager->executeHooks('searchAgendaFrom', $parameters, $object, $action); // Note that $action and $object may have been - print '
'; - print $langs->trans("Type"); - print ''; + //print '
'; + print ''; + print ''.$langs->trans("Type").''; + //print ''; $multiselect = 0; if (!empty($conf->global->MAIN_ENABLE_MULTISELECT_TYPE)) // We use an option here because it adds bugs when used on agenda page "peruser" and "list" { $multiselect = (!empty($conf->global->AGENDA_USE_EVENT_TYPE)); } - print ''; print $formactions->select_type_actions($actioncode, "search_actioncode", $excludetype, (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : -1), 0, $multiselect, 0, 'maxwidth500'); - print '
'; - print $langs->trans("ActionsToDoBy").'   '; - print ''; + print '
'; + //print '
'; print img_picto('', 'user', 'class="fawidth30 inline-block"'); + print ''.$langs->trans("ActionsToDoBy").''; + //print ''; print $form->select_dolusers($filtert, 'search_filtert', 1, '', !$canedit, '', '', 0, 0, 0, '', 0, '', 'maxwidth500'); - if (empty($conf->dol_optimize_smallscreen)) print '   '.$langs->trans("or").' '.$langs->trans("ToUserOfGroup").'   '; - else print '
'; + print ''; + print '
'; + //if (empty($conf->dol_optimize_smallscreen)) print ' '.$langs->trans("ToUserOfGroup").'   '; + //else print '
'; print img_picto('', 'object_group', 'class="fawidth30 inline-block"'); + print ''.$langs->trans("ToUserOfGroup").''; print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', !$canedit, '', '', '0', false, 'maxwidth500'); - print '
'; - print $langs->trans("Resource"); - print ''; - print img_picto('', 'object_resource', 'class="fawidth30 inline-block"'); + print '
'; + //print '
'; + print img_picto('', 'object_resource', 'class="fawidth30 inline-block"'); + print ''.$langs->trans("Resource").''; + //print ''; print $formresource->select_resource_list($resourceid, "search_resourceid", '', 1, 0, 0, null, '', 2, 0, 'maxwidth500'); - print '
'; - print $langs->trans("ThirdParty").'   '; - print ''; + print '
'; + //print '
'; print img_picto('', 'company', 'class="fawidth30 inline-block"'); + print ''.$langs->trans("ThirdParty").''; + //print ''; print $form->select_company($socid, 'search_socid', '', ' ', 0, 0, null, 0, 'minwidth100 maxwidth500'); - print '
'; - print $langs->trans("Project").'   '; - print ''; + print '
'; + //print '
'; print img_picto('', 'project', 'class="fawidth30 inline-block"'); + print ''.$langs->trans("Project").''; + //print ''; print $formproject->select_projects($socid ? $socid : -1, $pid, 'search_projectid', 0, 0, 1, 0, 0, 0, 0, '', 1, 0, 'maxwidth500'); - print '
'; - print $langs->trans("Status"); - print '  '; + print '
'; + //print '
'; print img_picto('', 'setup', 'class="fawidth30 inline-block"'); + print ''.$langs->trans("Status").''; + //print ''; $formactions->form_select_status_action('formaction', $status, 1, 'search_status', 1, 2, 'minwidth100'); - print '
'.$langs->trans("VisibleTimeRange").'"; + //print '
'; print img_picto('', 'clock', 'class="fawidth30 inline-block"'); + print ''.$langs->trans("VisibleTimeRange").''; + //print '"; print "\n".'
'; print ''; if (empty($conf->dol_use_jmobile)) print ' - '; @@ -169,30 +187,35 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh print ''; if (empty($conf->dol_use_jmobile)) print ' '.$langs->trans("H"); print '
'; - print '
'.$langs->trans("VisibleDaysRange").'"; + print '
'; + //print '
'; print img_picto('', 'clock', 'class="fawidth30 inline-block"'); + print ''.$langs->trans("VisibleDaysRange").''; + //print '"; print "\n".'
'; print ''; if (empty($conf->dol_use_jmobile)) print ' - '; else print '
'; print ''; print '
'; - print '
'; + //print '
'; - if ($conf->browser->layout == 'phone') print '
'; - else print '
'; + //if ($conf->browser->layout != 'phone') print ''; - print '
'; // Close fichecenter + //print ''; // Close fichecenter print '
'; //print ''; diff --git a/htdocs/langs/en_US/agenda.lang b/htdocs/langs/en_US/agenda.lang index 857539d3fb3..976b3f7acf2 100644 --- a/htdocs/langs/en_US/agenda.lang +++ b/htdocs/langs/en_US/agenda.lang @@ -14,7 +14,7 @@ EventsNb=Number of events ListOfActions=List of events EventReports=Event reports Location=Location -ToUserOfGroup=To any user in group +ToUserOfGroup=Event assigned to any user in group EventOnFullDay=Event on all day(s) MenuToDoActions=All incomplete events MenuDoneActions=All terminated events diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 85b223783cc..5f28b191fea 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -4432,7 +4432,7 @@ table.cal_month td:last-child { border-right: 0px; } .cal_today_peruser_impair { background: #F8F8F0; } .peruser_busy { } .peruser_notbusy { opacity: 0.5; } -table.cal_event { border: none; border-collapse: collapse; margin-bottom: 1px; min-height: 20px; filter: saturate(0.8); } +table.cal_event { border: none; border-collapse: collapse; margin-bottom: 1px; min-height: 20px; filter: saturate(0.8); border-radius: 3px; } table.cal_event td { border: none; padding-: 2px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } table.cal_event td.cal_event { padding: 4px 4px !important; } table.cal_event td.cal_event_right { padding: 4px 4px !important; }