From 2c2d17b10126a3f2a8b8b8c075bd59b8ce9e4953 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 9 Sep 2012 13:13:24 +0200 Subject: [PATCH] Fix: Try a fix to avoid having the hover on array that should not have it. --- htdocs/adherents/index.php | 12 +----------- htdocs/categories/index.php | 2 +- htdocs/comm/index.php | 4 ++-- htdocs/comm/mailing/index.php | 2 +- htdocs/comm/propal/index.php | 2 +- htdocs/comm/prospect/index.php | 2 +- htdocs/commande/index.php | 2 +- htdocs/compta/index.php | 8 ++++---- htdocs/contrat/index.php | 2 +- htdocs/expedition/index.php | 2 +- htdocs/fourn/commande/index.php | 2 +- htdocs/fourn/product/index.php | 6 +++--- htdocs/product/index.php | 8 ++++---- htdocs/product/stock/index.php | 6 +++--- htdocs/societe/index.php | 8 ++++---- htdocs/theme/auguria/style.css.php | 24 +++++++++++++----------- htdocs/theme/eldy/style.css.php | 17 ++++++++--------- 17 files changed, 50 insertions(+), 59 deletions(-) diff --git a/htdocs/adherents/index.php b/htdocs/adherents/index.php index 291367bd6ab..7593c814b31 100644 --- a/htdocs/adherents/index.php +++ b/htdocs/adherents/index.php @@ -127,7 +127,7 @@ print ''; print '
'; print ''; print ''; -print ''; +print '
'; print ''; print ''; print "\n"; @@ -179,16 +179,6 @@ if ($conf->use_javascript_ajax) $i++; } - /* - $dataseries=array(); - $dataseries[]=array('label'=>$langs->trans("MembersStatusToValid"),'data'=>(int) $dataval['draft']); - $dataseries[]=array('label'=>$langs->trans("MenuMembersNotUpToDate"),'data'=>(int) $dataval['notuptodate']); - $dataseries[]=array('label'=>$langs->trans("MenuMembersUpToDate"),'data'=>(int) $dataval['uptodate']); - $dataseries[]=array('label'=>$langs->trans("MembersStatusResiliated"),'data'=>(int) $dataval['resiliated']); - $data=array('series'=>$dataseries,'seriestype'=>array('bar','bar','bar','bar'),'xlabel'=>$datalabels); - dol_print_graph('stats2',300,180,$data,1,'barline'); - */ - $dataseries=array(); $dataseries[]=array('label'=>$langs->trans("MenuMembersNotUpToDate"),'data'=>round($SommeB)); $dataseries[]=array('label'=>$langs->trans("MenuMembersUpToDate"),'data'=>round($SommeC)); diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php index fcde9d3361f..b316673cdd9 100644 --- a/htdocs/categories/index.php +++ b/htdocs/categories/index.php @@ -67,7 +67,7 @@ print '
'.$langs->trans("SearchAMember").'
'; print ''; print ''; print ''; -print ''; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/comm/index.php b/htdocs/comm/index.php index 0a76606695e..b46d47c57da 100644 --- a/htdocs/comm/index.php +++ b/htdocs/comm/index.php @@ -102,7 +102,7 @@ if ($conf->propal->enabled && $user->rights->propal->lire) $var=false; print ''; print ''; - print '
'.$langs->trans("Search").'
'; + print '
'; print ''; print ''; print ''; @@ -121,7 +121,7 @@ if ($conf->contrat->enabled && $user->rights->contrat->lire) $var=false; print ''; print ''; - print '
'.$langs->trans("SearchAProposal").'
'.$langs->trans("Ref").':
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/comm/mailing/index.php b/htdocs/comm/mailing/index.php index 15c823aba57..482e75ebb34 100644 --- a/htdocs/comm/mailing/index.php +++ b/htdocs/comm/mailing/index.php @@ -51,7 +51,7 @@ print '
'.$langs->trans("SearchAContract").'
'.$langs->trans("Ref").':
'; $var=false; print ''; print ''; -print ''; +print '
'; print ''; print ''; diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php index a6c97c67bab..831970d2e14 100644 --- a/htdocs/comm/propal/index.php +++ b/htdocs/comm/propal/index.php @@ -62,7 +62,7 @@ print '
'.$langs->trans("SearchAMailing").'
'; print $langs->trans("Ref").':
'; * Search form */ $var=false; -print ''; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/comm/prospect/index.php b/htdocs/comm/prospect/index.php index 4c598a5871f..3280c456e4f 100644 --- a/htdocs/comm/prospect/index.php +++ b/htdocs/comm/prospect/index.php @@ -53,7 +53,7 @@ print '
'.$langs->trans("SearchPropal").'
'; if ($conf->propal->enabled) { $var=false; - print ''; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php index a6000d2a44e..0c7a40d2ac8 100644 --- a/htdocs/commande/index.php +++ b/htdocs/commande/index.php @@ -63,7 +63,7 @@ print '
'.$langs->trans("SearchAProposal").'
'; * Search form */ $var=false; -print ''; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/compta/index.php b/htdocs/compta/index.php index 8bcdf9c72ef..bf2c773265b 100644 --- a/htdocs/compta/index.php +++ b/htdocs/compta/index.php @@ -112,7 +112,7 @@ if ($conf->facture->enabled && $user->rights->facture->lire) { print ''; print ''; - print '
'.$langs->trans("SearchOrder").'
'; + print '
'; print ""; print ''; print "'; @@ -129,7 +129,7 @@ if ($conf->fournisseur->enabled && $user->rights->fournisseur->lire) { print ''; print ''; - print '
'.$langs->trans("SearchACustomerInvoice").'
".$langs->trans("Ref").':
'; + print '
'; print ''; print ""; print "'; @@ -146,7 +146,7 @@ if ($conf->don->enabled && $user->rights->don->lire) { print ''; print ''; - print '
'.$langs->trans("SearchASupplierInvoice").'
".$langs->trans("Ref").':
'; + print '
'; print ''; print ""; print "'; @@ -163,7 +163,7 @@ if ($conf->deplacement->enabled && $user->rights->deplacement->lire) { print ''; print ''; - print '
'.$langs->trans("SearchADonation").'
".$langs->trans("Ref").':
'; + print '
'; print ''; print ""; print "'; diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php index e3247a9e7a7..d7ffc7bd6b5 100644 --- a/htdocs/contrat/index.php +++ b/htdocs/contrat/index.php @@ -76,7 +76,7 @@ if (! empty($conf->contrat->enabled)) $var=false; print ''; print ''; - print '
'.$langs->trans("SearchATripAndExpense").'
".$langs->trans("Ref").':
'; + print '
'; print ''; print ''; print ''; diff --git a/htdocs/expedition/index.php b/htdocs/expedition/index.php index aa35c12d092..bb6c6dd9054 100644 --- a/htdocs/expedition/index.php +++ b/htdocs/expedition/index.php @@ -47,7 +47,7 @@ print '
'.$langs->trans("SearchAContract").'
'.$langs->trans("Ref").':
'; print '
'; $var=false; -print ''; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php index 739795a5ef6..5d31d8317d7 100755 --- a/htdocs/fourn/commande/index.php +++ b/htdocs/fourn/commande/index.php @@ -58,7 +58,7 @@ print '
'.$langs->trans("SearchASending").'
'; * Search form */ $var=false; -print ''; +print '
'; print ''; print ''; print ''; diff --git a/htdocs/fourn/product/index.php b/htdocs/fourn/product/index.php index bfee87d146d..05451b8b751 100644 --- a/htdocs/fourn/product/index.php +++ b/htdocs/fourn/product/index.php @@ -45,12 +45,12 @@ print '
'.$langs->trans("SearchOrder").'
'; */ print ''; print ''; -print ''; +print '
'; print "\n"; print ''; -print "'; -print "'; print "
'.$langs->trans("Search").'
"; +print "
"; print $langs->trans("Ref").' :
"; +print "
"; print $langs->trans("Label").' :

\n"; diff --git a/htdocs/product/index.php b/htdocs/product/index.php index d30303f91f7..1e873ef9d9a 100644 --- a/htdocs/product/index.php +++ b/htdocs/product/index.php @@ -77,20 +77,20 @@ $rowspan=2; if (! empty($conf->barcode->enabled)) $rowspan++; print '
'; print ''; -print ''; +print '
'; print ""; print ''; -print "'; print ''; if (! empty($conf->barcode->enabled)) { - print "'; //print ''; print ''; } -print "'; //print ''; print ''; diff --git a/htdocs/product/stock/index.php b/htdocs/product/stock/index.php index 4eca0b8c1b6..dc972bdbd24 100644 --- a/htdocs/product/stock/index.php +++ b/htdocs/product/stock/index.php @@ -50,12 +50,12 @@ print '
'.$langs->trans("Search").'
"; +print "
"; print $langs->trans("Ref").':
"; + print "
"; print $langs->trans("BarCode").':
"; +print "
"; print $langs->trans("Other").':
'; */ print ''; print ''; -print ''; +print '
'; print ""; print ''; -print "'; -print "'; +print "'; print "
'.$langs->trans("Search").'
"; +print "
"; print $langs->trans("Ref").':
".$langs->trans("Other").':
".$langs->trans("Other").':

"; $sql = "SELECT e.label, e.rowid, e.statut"; diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php index 410aba47aa1..fcc8a4f6efe 100644 --- a/htdocs/societe/index.php +++ b/htdocs/societe/index.php @@ -58,13 +58,13 @@ print '
'; $rowspan=2; print '
'; print ''; -print ''; +print '
'; print ''; -print ''; -print "'; +print "'; print ''; -print "'; //print ''; print ''; diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php index 7953f955730..391e9eaa0c7 100644 --- a/htdocs/theme/auguria/style.css.php +++ b/htdocs/theme/auguria/style.css.php @@ -1314,30 +1314,32 @@ font-weight: normal; white-space: nowrap; } -.impair { -/* background: #d0d4d7; */ -background: #F5F6F7; -font-family: ; -border: 0px; -} .impair:hover { background: #c0c4c7; border: 0px; } +.impair, table.nohover .impair:hover { +/* background: #d0d4d7; */ +background: #F5F6F7; +font-family: ; +border: 0px; +} -.pair { + +.pair:hover { +background: #c0c4c7; +border: 0px; +} + +.pair, table.nohover .pair:hover { /* background: #e6ebed; */ background: #FBFCFC; font-family: ; border: 0px; } -.pair:hover { -background: #c0c4c7; -border: 0px; -} /* Disable shadows */ diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 54ac71d9216..7d706c3c6d1 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1597,7 +1597,12 @@ tr.liste_total td { white-space: nowrap; } -.impair { +.impair:hover { + background: #c0c4c7; + border: 0px; +} + +.impair, table.nohover .impair:hover { background: linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); @@ -1613,13 +1618,12 @@ tr.liste_total td { color: #202020; } -.impair:hover { +.pair:hover { background: #c0c4c7; border: 0px; } - -.pair { +.pair, table.nohover .pair:hover { background: linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); @@ -1635,11 +1639,6 @@ tr.liste_total td { color: #202020; } -.pair:hover { - background: #c0c4c7; - border: 0px; -} - /* Disable shadows */ .noshadow {
'.$langs->trans("Search").'
"; +print ''.$langs->trans("Search").'
"; print $langs->trans("Name").':
"; +print "
"; print $langs->trans("Other").':