From 6d95de48c20054f9540f00c0d57be8a29997b84a Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 14 May 2015 20:49:22 +0200 Subject: [PATCH] Css fixes --- htdocs/adherents/card_subscriptions.php | 14 ++++++++------ htdocs/categories/photos.php | 4 ++-- htdocs/categories/viewcat.php | 6 ++++-- htdocs/projet/card.php | 2 +- htdocs/projet/element.php | 2 +- htdocs/theme/eldy/style.css.php | 11 ++++++++--- 6 files changed, 24 insertions(+), 15 deletions(-) diff --git a/htdocs/adherents/card_subscriptions.php b/htdocs/adherents/card_subscriptions.php index 3aedb6fe50c..3761b75f384 100644 --- a/htdocs/adherents/card_subscriptions.php +++ b/htdocs/adherents/card_subscriptions.php @@ -547,7 +547,7 @@ $now=dol_now(); llxHeader('',$langs->trans("Subscriptions"),'EN:Module_Foundations|FR:Module_Adhérents|ES:Módulo_Miembros'); -if ($rowid) +if ($rowid > 0) { $res=$object->fetch($rowid); if ($res < 0) { dol_print_error($db,$object->error); exit; } @@ -556,8 +556,6 @@ if ($rowid) $head = member_prepare_head($object); - dol_fiche_head($head, 'subscription', $langs->trans("Member"), 0, 'user'); - $rowspan=10; if (empty($conf->global->ADHERENT_LOGIN_NOT_REQUIRED)) $rowspan++; if (! empty($conf->societe->enabled)) $rowspan++; @@ -565,6 +563,9 @@ if ($rowid) print '
'; print ''; print ''; + + dol_fiche_head($head, 'subscription', $langs->trans("Member"), 0, 'user'); + print ''; $linkback = ''.$langs->trans("BackToList").''; @@ -696,10 +697,11 @@ if ($rowid) print ''; print "
\n"; - print '
'; dol_fiche_end(); + print ''; + dol_htmloutput_errors($errmsg,$errmsgs); @@ -1008,7 +1010,7 @@ if ($rowid) { $prodtmp=new Product($db); $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS); - print '. '.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(0)); + print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product } print '
'; } @@ -1033,7 +1035,7 @@ if ($rowid) { $prodtmp=new Product($db); $prodtmp->fetch($conf->global->ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS); - print '. '.$langs->trans("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(0)); + print '. '.$langs->transnoentitiesnoconv("ADHERENT_PRODUCT_ID_FOR_SUBSCRIPTIONS", $prodtmp->getNomUrl(1)); // must use noentitiesnoconv to avoid to encode html into getNomUrl of product } print '
'; } diff --git a/htdocs/categories/photos.php b/htdocs/categories/photos.php index 36a44f4bdda..59be328c55e 100644 --- a/htdocs/categories/photos.php +++ b/htdocs/categories/photos.php @@ -1,6 +1,6 @@ - * Copyright (C) 2004-2010 Laurent Destailleur + * Copyright (C) 2004-2015 Laurent Destailleur * Copyright (C) 2005 Eric Seigne * Copyright (C) 2005-2012 Regis Houssin * Copyright (C) 2014 Jean-François Ferry @@ -128,7 +128,7 @@ if ($object->id) // Description print ''; print $langs->trans("Description").''; - print nl2br($object->description); + print dol_htmlentitiesbr($object->description); print ''; // Visibility diff --git a/htdocs/categories/viewcat.php b/htdocs/categories/viewcat.php index 927474a5e44..198ac73cd2a 100644 --- a/htdocs/categories/viewcat.php +++ b/htdocs/categories/viewcat.php @@ -166,6 +166,7 @@ elseif ($type == 4) $title=$langs->trans("ContactCategoriesShort"); else $title=$langs->trans("Category"); $head = categories_prepare_head($object,$type); + dol_fiche_head($head, 'card', $title, 0, 'category'); @@ -194,7 +195,7 @@ print ''; // Description print ''; print $langs->trans("Description").''; -print nl2br($object->description); +print dol_htmlentitiesbr($object->description); print ''; $reshook=$hookmanager->executeHooks('formObjectOptions',$parameters,$object,$action); // Note that $action and $object may have been modified by hook @@ -205,12 +206,13 @@ if (empty($reshook) && ! empty($extrafields->attribute_label)) print ''; -print ''; +dol_fiche_end(); /* * Boutons actions */ + print "
\n"; if ($user->rights->categorie->creer) diff --git a/htdocs/projet/card.php b/htdocs/projet/card.php index 3c4884e2bbf..dc4b1f69bdb 100644 --- a/htdocs/projet/card.php +++ b/htdocs/projet/card.php @@ -679,7 +679,7 @@ else print ''; // Description - print ''.$langs->trans("Description").''; + print ''.$langs->trans("Description").''; print nl2br($object->description); print ''; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index f63c36ffc9e..a56de8ec84b 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -609,7 +609,7 @@ $langs->load("bills"); $langs->load("orders"); $langs->load("proposals"); $langs->load("margins"); -print_fiche_titre($langs->trans("Profit"),''); +print_fiche_titre($langs->trans("Profit"),'','title_accountancy'); print ''; print ''; print ''; diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index f375c8ed78e..3914a8d11f8 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1680,8 +1680,11 @@ table.border, table.dataTable, .table-border, .table-border-col, .table-key-bord .border tbody tr, .border tbody tr td { height: 20px; } -div.tabBar table.border tr, div.tabBar table.border tr td { - height: 28px; +div.tabBar table.border tr, div.tabBar table.border tr td, div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar div.border .table-val-border-col { + height: 24px; +} +div.tabBar div.border .table-border-row, div.tabBar div.border .table-key-border-col, div.tabBar .table-val-border-col { + vertical-align: middle; } div.tabBar .tdtop { vertical-align: top; @@ -1860,7 +1863,9 @@ table.liste td { background: #ffffff; } - +#GanttChartDIV { + background: #ffffff; +} .even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover { font-family: ;
'.$langs->trans("Element").'