From 6520ed7a089f9574341650211e9884a96dbce362 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 13 Oct 2015 14:09:14 +0200 Subject: [PATCH] Use css not bold title. Add missing badge (count of draft records) on draft list. --- htdocs/comm/index.php | 18 ++++++++++-------- htdocs/core/lib/project.lib.php | 21 +++++++++++---------- htdocs/theme/eldy/style.css.php | 10 +++++----- htdocs/theme/md/style.css.php | 4 ++-- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 37e4ee61ced..9e9c0235861 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -172,12 +172,13 @@ if (! empty($conf->propal->enabled) && $user->rights->propal->lire) $resql=$db->query($sql); if ($resql) { - print ''; - print ''; - print ''; - $total = 0; $num = $db->num_rows($resql); + + print '
'.$langs->trans("ProposalsDraft").'
'; + print ''; + print ''; + if ($num > 0) { $i = 0; @@ -246,12 +247,13 @@ if (! empty($conf->commande->enabled) && $user->rights->commande->lire) $resql = $db->query($sql); if ($resql) { - print '
'.$langs->trans("ProposalsDraft").' '.$num.'
'; - print ''; - print ''; - $total = 0; $num = $db->num_rows($resql); + + print '
'.$langs->trans("DraftOrders").'
'; + print ''; + print ''; + if ($num) { $i = 0; diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index 89d658fa01a..3fb5a87e433 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -896,16 +896,6 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks= if (strcmp($statut, '') && $statut >= 0) $title=$langs->trans("Projects").' '.$langs->trans($projectstatic->statuts_long[$statut]); print '
'.$langs->trans("DraftOrders").' '.$num.'
'; - print ''; - print_liste_field_titre($title,"index.php","","","","",$sortfield,$sortorder); - if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) - { - print_liste_field_titre($langs->trans("OpportunityAmount"),"","","","",'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("OpportunityStatus"),"","","","",'align="right"',$sortfield,$sortorder); - } - if (empty($conf->global->PROJECT_HIDE_TASKS)) print_liste_field_titre($langs->trans("Tasks"),"","","","",'align="right"',$sortfield,$sortorder); - print_liste_field_titre($langs->trans("Status"),"","","","",'align="right"',$sortfield,$sortorder); - print "\n"; $sql = "SELECT p.rowid as projectid, p.ref, p.title, p.fk_user_creat, p.public, p.fk_statut as status, p.fk_opp_status as opp_status, p.opp_amount, COUNT(DISTINCT t.rowid) as nb"; // We use DISTINCT here because line can be doubled if task has 2 links to same user $sql.= " FROM ".MAIN_DB_PREFIX."projet as p"; @@ -962,6 +952,17 @@ function print_projecttasks_array($db, $form, $socid, $projectsListId, $mytasks= $num = $db->num_rows($resql); $i = 0; + print ''; + print_liste_field_titre($title.' '.$num.'',$_SERVER["PHP_SELF"],"","","","",$sortfield,$sortorder); + if (! empty($conf->global->PROJECT_USE_OPPORTUNITIES)) + { + print_liste_field_titre($langs->trans("OpportunityAmount"),"","","","",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("OpportunityStatus"),"","","","",'align="right"',$sortfield,$sortorder); + } + if (empty($conf->global->PROJECT_HIDE_TASKS)) print_liste_field_titre($langs->trans("Tasks"),"","","","",'align="right"',$sortfield,$sortorder); + print_liste_field_titre($langs->trans("Status"),"","","","",'align="right"',$sortfield,$sortorder); + print "\n"; + while ($i < $num) { $objp = $db->fetch_object($resql); diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 5f9d0e4bb15..6243abebc9c 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -453,8 +453,8 @@ div.divsearchfield { float: ; margin-: 12px; margin-: 2px; - margin-top: 3px; - margin-bottom: 3px; + margin-top: 4px; + margin-bottom: 4px; padding-left: 2px; } div.confirmmessage { @@ -2357,7 +2357,7 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.list background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%); background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%); - font-weight: bold; + font-weight: normal; color: #; font-family: ; @@ -2371,7 +2371,7 @@ tr.liste_titre th, th.liste_titre, form.liste_titre div, div.liste_titre tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div, div.liste_titre { font-family: ; - font-weight: bold; + font-weight: normal; vertical-align: middle; } tr.liste_titre th a, th.liste_titre a, tr.liste_titre td a, td.liste_titre a, form.liste_titre div a, div.liste_titre a { @@ -2487,7 +2487,7 @@ tr.box_titre { color: #; font-family: , sans-serif; - font-weight: bold; + /*font-weight: normal;*/ border-bottom: 1px solid #FDFFFF; white-space: nowrap; } diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php index 81b15ae7ec5..ee745437234 100644 --- a/htdocs/theme/md/style.css.php +++ b/htdocs/theme/md/style.css.php @@ -458,8 +458,8 @@ div.divsearchfield { float: ; margin-: 12px; margin-: 2px; - margin-top: 3px; - margin-bottom: 3px; + margin-top: 4px; + margin-bottom: 4px; padding-left: 2px; } div.confirmmessage {