diff --git a/htdocs/core/class/html.form.class.php b/htdocs/core/class/html.form.class.php index dc47dec5c41..1366435f144 100644 --- a/htdocs/core/class/html.form.class.php +++ b/htdocs/core/class/html.form.class.php @@ -4740,7 +4740,7 @@ class Form // Year if ($emptydate || $set_time == -1) { - $retstring.=''; + $retstring.=''; } else { @@ -4885,7 +4885,7 @@ class Form * @param string $prefix Prefix for input fields * @param int $iSecond Default preselected duration (number of seconds or '') * @param int $disabled Disable the combo box - * @param string $typehour If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a combo + * @param string $typehour If 'select' then input hour and input min is a combo, if 'text' input hour is in text and input min is a text * @param integer $minunderhours If 1, show minutes selection under the hours * @param int $nooutput Do not output html string but return it * @return string|null @@ -4923,12 +4923,13 @@ class Form } elseif ($typehour=='text') { - $retstring.=''; + $retstring.=''; } else return 'BadValueForParameterTypeHour'; - $retstring.=' '.$langs->trans('HourShort'); - + if ($typehour!='text') $retstring.=' '.$langs->trans('HourShort'); + else $retstring.=':'; + // Minutes if ($minunderhours) $retstring.='
'; else $retstring.=" "; @@ -4946,10 +4947,12 @@ class Form } elseif ($typehour=='text') { - $retstring.=''; + $retstring.=''; } - $retstring.=' '.$langs->trans('MinuteShort'); - $retstring.=" "; + + if ($typehour!='text') $retstring.=' '.$langs->trans('MinuteShort'); + + //$retstring.=" "; if (! empty($nooutput)) return $retstring; diff --git a/htdocs/core/class/html.formprojet.class.php b/htdocs/core/class/html.formprojet.class.php index 0a6837ecb53..ea77904f5cf 100644 --- a/htdocs/core/class/html.formprojet.class.php +++ b/htdocs/core/class/html.formprojet.class.php @@ -352,7 +352,7 @@ class FormProjets } if (empty($option_only)) { - $out.= ''; } if (!empty($show_empty)) { $out.= ''; diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 173aee8ce26..054ab579194 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -919,7 +919,6 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$ $tableCell.=''; print $tableCell; } - dol_syslog("yyy"); print ''; if ((! $lines[$i]->public) && $disabledproject) print $form->textwithpicto('',$langs->trans("YouAreNotContactOfProject")); diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index 692c5ecfad4..a65ffdd64e2 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -323,7 +323,7 @@ $nav.=" ".dol_print_date(dol_mktime(0,0,0,$month,$day,$y $nav.=''.img_next($langs->trans("Next"))."\n"; $nav.="   (".$langs->trans("Today").")"; $nav.='
'.$form->select_date(-1,'',0,0,2,"addtime",1,0,1).' '; -$nav.=' '; +$nav.=' '; $picto='calendarweek'; @@ -338,9 +338,10 @@ print ''; print ''; $head=project_timesheet_prepare_head($mode); -dol_fiche_head($head, 'inputperday', '', 0, 'task'); +dol_fiche_head($head, 'inputperday', '', -1, 'task'); // Show description of content +print '
'; if ($mine) print $langs->trans("MyTasksDesc").($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'
'; else { @@ -355,6 +356,7 @@ else { print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'
'; } +print '
'; dol_fiche_end(); @@ -389,7 +391,7 @@ dol_fiche_end(); //print ''; //print ''; -print '
'.$nav.'
'; // We move this before the assign to components so, the default submit button is not the assign to. +print '
'.$nav.'
'; // We move this before the assign to components so, the default submit button is not the assign to. print '
'; print $langs->trans("AssignTaskToMe").'
'; diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index e1c71a98ba7..5847e91d46c 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -334,9 +334,10 @@ print ''; print ''; $head=project_timesheet_prepare_head($mode); -dol_fiche_head($head, 'inputperweek', '', 0, 'task'); +dol_fiche_head($head, 'inputperweek', '', -1, 'task'); // Show description of content +print '
'; if ($mine) print $langs->trans("MyTasksDesc").($onlyopenedproject?' '.$langs->trans("OnlyOpenedProject"):'').'
'; else { @@ -351,6 +352,7 @@ else { print $langs->trans("AllTaskVisibleButEditIfYouAreAssigned").'
'; } +print '
'; dol_fiche_end(); @@ -384,7 +386,7 @@ dol_fiche_end(); //print ''; //print ''; -print '
'.$nav.'
'; // We move this before the assign to components so, the default submit button is not the assign to. +print '
'.$nav.'
'; // We move this before the assign to components so, the default submit button is not the assign to. print '
'; print $langs->trans("AssignTaskToMe").'
'; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 90aebd7d908..3d6e8868bec 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -761,8 +761,8 @@ div.fiche>form>div.div-table-responsive { min-width: 20px; min-height: 1.4em; line-height: 1.4em; - padding: .4em .1em; - border: 1px solid #BBB; + /* padding: .4em .1em; */ + /* border-bottom: 1px solid #BBB; */ /* max-width: inherit; why this ? */ } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 6bca9f1751e..aae0fd7f677 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -771,8 +771,8 @@ div.fiche>form>div.div-table-responsive { min-width: 20px; min-height: 1.4em; line-height: 1.4em; - padding: .4em .1em; - border: 1px solid #BBB; + /* padding: .4em .1em; */ + /* border-bottom: 1px solid #BBB; */ /* max-width: inherit; why this */ }