diff --git a/htdocs/index.php b/htdocs/index.php index 04e91b5110d..54b818954d4 100644 --- a/htdocs/index.php +++ b/htdocs/index.php @@ -294,7 +294,7 @@ if (empty($user->societe_id)) $text=$langs->trans($titres[$key]); print ''; print '
'; - print img_object("",$icons[$key]).' '.$text.'
'; + print ''.img_object("",$icons[$key]).' '.$text.'
'; print ''.$board->nb[$val].''; print '
'; print '
'; diff --git a/htdocs/projet/activity/perday.php b/htdocs/projet/activity/perday.php index f41d585a6b8..ddcae068381 100644 --- a/htdocs/projet/activity/perday.php +++ b/htdocs/projet/activity/perday.php @@ -87,8 +87,10 @@ if (GETPOST('submitdateselect')) } -if ($action == 'assign') +if ($action == 'addtime' && GETPOST('assigntask')) { + $action = 'assigntask'; + if ($taskid > 0) { $result = $object->fetch($taskid, $ref); @@ -322,7 +324,24 @@ print "\n"; */ -print '
'.$nav.'
'; +// Add a new project/task +//print '
'; +//print '
'; +//print ''; +//print ''; +//print ''; +//print ''; +//print ''; +print '
'; +print $langs->trans("AssignTaskToMe").'
'; +$formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, 1, 1); +print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0); +print ''; +//print ''; +print '
'; + +print '
'.$nav.'
'; +print '
'; print ''; @@ -369,21 +388,6 @@ print "});"; print ''; -// Add a new project/task -print '
'; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print $langs->trans("AssignTaskToMe").'
'; -$formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, 1, 1); -print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0); -print ''; -print ''; - - llxFooter(); $db->close(); diff --git a/htdocs/projet/activity/perweek.php b/htdocs/projet/activity/perweek.php index cc31d1090f8..13bfa001630 100644 --- a/htdocs/projet/activity/perweek.php +++ b/htdocs/projet/activity/perweek.php @@ -100,8 +100,10 @@ if (GETPOST('submitdateselect')) $action = ''; } -if ($action == 'assign') +if ($action == 'addtime' && GETPOST('assigntask')) { + $action = 'assigntask'; + if ($taskid > 0) { $result = $object->fetch($taskid, $ref); @@ -298,7 +300,24 @@ print "\n"; */ -print '
'.$nav.'
'; +// Add a new project/task +//print '
'; +//print ''; +//print ''; +//print ''; +//print ''; +//print ''; +//print ''; +print '
'; +print $langs->trans("AssignTaskToMe").'
'; +$formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, 1, 1); +print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0); +print ''; +//print ''; +print '
'; + +print '
'.$nav.'
'; +print '
'; print '
'; @@ -378,22 +397,6 @@ print "});"; print ''; -// Add a new project/task -print '
'; -print ''; -print ''; -print ''; -print ''; -print ''; -print ''; -print $langs->trans("AssignTaskToMe").'
'; -$formproject->selectTasks($socid?$socid:-1, $taskid, 'taskid', 32, 0, 1, 1); -print $formcompany->selectTypeContact($object, '', 'type','internal','rowid', 0); -print ''; -print ''; - - - llxFooter(); $db->close(); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 82027cd613b..ccb3f01d293 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -2547,6 +2547,10 @@ div.tabBar .noborder { background-color: #; } +span.boxstatstext { + opacity: 0.8; + line-height: 18px; +} span.boxstatsindicator { font-size: 110%; font-weight: normal; diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 29f2294bd54..782eb0d66a2 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -2374,6 +2374,10 @@ div.tabBar .noborder { background-color: #; } +span.boxstatstext { + opacity: 0.8; + line-height: 18px; +} span.boxstatsindicator { font-size: 110%; font-weight: normal;