diff --git a/htdocs/accountancy/customer/index.php b/htdocs/accountancy/customer/index.php
index aedaeda0e5b..8b88d8f396b 100644
--- a/htdocs/accountancy/customer/index.php
+++ b/htdocs/accountancy/customer/index.php
@@ -32,11 +32,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
require_once DOL_DOCUMENT_ROOT . '/compta/facture/class/facture.class.php';
// Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("main");
-$langs->load("accountancy");
+$langs->loadLangs(array("compta","bills","other","main","accountancy"));
// Security check
if (empty($conf->accounting->enabled)) {
@@ -129,6 +125,7 @@ llxHeader('', $langs->trans("CustomersVentilation"));
$textprevyear = '' . img_previous() . '';
$textnextyear = ' ' . img_next() . '';
+
print load_fiche_titre($langs->trans("CustomersVentilation") . " " . $textprevyear . " " . $langs->trans("Year") . " " . $year_start . " " . $textnextyear, '', 'title_accountancy');
// Clean database
@@ -160,8 +157,8 @@ $y = $year_current;
$buttonbind = '' . $langs->trans("ValidateHistory") . '';
-
-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
+print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+//print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
print '
';
print '
';
@@ -236,7 +233,8 @@ print '';
print '
';
-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
+print_barre_liste($langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+//print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
print '';
print '
';
@@ -315,7 +313,8 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
print '
';
print '
';
- print_fiche_titre($langs->trans("OtherInfo"), '', '');
+ print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+ //print_fiche_titre($langs->trans("OtherInfo"), '', '');
print '';
print '
';
diff --git a/htdocs/accountancy/expensereport/index.php b/htdocs/accountancy/expensereport/index.php
index cec7fbdced4..989024fa853 100644
--- a/htdocs/accountancy/expensereport/index.php
+++ b/htdocs/accountancy/expensereport/index.php
@@ -30,11 +30,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
require_once DOL_DOCUMENT_ROOT . '/expensereport/class/expensereport.class.php';
// Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("main");
-$langs->load("accountancy");
+$langs->loadLangs(array("compta","bills","other","main","accountancy"));
// Security check
if (empty($conf->accounting->enabled)) {
@@ -158,7 +154,8 @@ $y = $year_current;
$buttonbind = '' . $langs->trans("ValidateHistory") . '';
-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
+print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+//print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
print '';
print '
';
@@ -227,7 +224,9 @@ print '';
print '
';
-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
+
+print_barre_liste($langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+//print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
print '';
@@ -302,7 +301,8 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
print '
';
print '
';
- print_fiche_titre($langs->trans("OtherInfo"), '', '');
+ print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+ //print_fiche_titre($langs->trans("OtherInfo"), '', '');
print '
';
print '
';
diff --git a/htdocs/accountancy/supplier/index.php b/htdocs/accountancy/supplier/index.php
index e9935fc8d78..1bba9a941e0 100644
--- a/htdocs/accountancy/supplier/index.php
+++ b/htdocs/accountancy/supplier/index.php
@@ -30,11 +30,7 @@ require_once DOL_DOCUMENT_ROOT . '/core/lib/accounting.lib.php';
require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
// Langs
-$langs->load("compta");
-$langs->load("bills");
-$langs->load("other");
-$langs->load("main");
-$langs->load("accountancy");
+$langs->loadLangs(array("compta","bills","other","main","accountancy"));
// Security check
if (empty($conf->accounting->enabled)) {
@@ -158,7 +154,8 @@ $y = $year_current;
$buttonbind = '' . $langs->trans("ValidateHistory") . '';
-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
+print_barre_liste($langs->trans("OverviewOfAmountOfLinesNotBound"), '', '', '', '', '', '', -1, '', '', 0, $buttonbind, '', 0, 1, 1);
+//print_fiche_titre($langs->trans("OverviewOfAmountOfLinesNotBound"), $buttonbind, '');
print '';
print '
';
@@ -228,7 +225,8 @@ print '';
print '
';
-print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
+print_barre_liste($langs->trans("OverviewOfAmountOfLinesBound"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+//print_fiche_titre($langs->trans("OverviewOfAmountOfLinesBound"), '', '');
print '';
print '
';
@@ -301,7 +299,8 @@ if ($conf->global->MAIN_FEATURES_LEVEL > 0) // This part of code looks strange.
print '
';
print '
';
- print_fiche_titre($langs->trans("OtherInfo"), '', '');
+ print_barre_liste($langs->trans("OtherInfo"), '', '', '', '', '', '', -1, '', '', 0, '', '', 0, 1, 1);
+ //print_fiche_titre($langs->trans("OtherInfo"), '', '');
print '';
print '
';
diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php
index 8845d0bc8d7..aefd80a4412 100644
--- a/htdocs/compta/facture/list.php
+++ b/htdocs/compta/facture/list.php
@@ -535,8 +535,8 @@ if ($resql)
}
$param='&socid='.$socid;
- if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.$contextpage;
- if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.$limit;
+ if (! empty($contextpage) && $contextpage != $_SERVER["PHP_SELF"]) $param.='&contextpage='.urlencode($contextpage);
+ if ($limit > 0 && $limit != $conf->liste_limit) $param.='&limit='.urlencode($limit);
if ($sall) $param.='&sall='.urlencode($sall);
if ($search_day) $param.='&search_day='.urlencode($search_day);
if ($search_month) $param.='&search_month='.urlencode($search_month);
diff --git a/htdocs/theme/common/dolistore.jpg b/htdocs/theme/common/dolistore.jpg
deleted file mode 100644
index 65a2d6ffae1..00000000000
Binary files a/htdocs/theme/common/dolistore.jpg and /dev/null differ
diff --git a/htdocs/theme/eldy/img/menus/chart.png b/htdocs/theme/eldy/img/menus/chart.png
deleted file mode 100644
index 6efce90a788..00000000000
Binary files a/htdocs/theme/eldy/img/menus/chart.png and /dev/null differ
diff --git a/htdocs/theme/eldy/img/menus/holiday_over.png b/htdocs/theme/eldy/img/menus/holiday_over.png
new file mode 100644
index 00000000000..493974477f3
Binary files /dev/null and b/htdocs/theme/eldy/img/menus/holiday_over.png differ
diff --git a/htdocs/theme/eldy/img/menus/money_over.png b/htdocs/theme/eldy/img/menus/money_over.png
index 9a501e762d0..82b864a83d7 100644
Binary files a/htdocs/theme/eldy/img/menus/money_over.png and b/htdocs/theme/eldy/img/menus/money_over.png differ
diff --git a/htdocs/theme/eldy/img/menus_black/ticketsup_over.png b/htdocs/theme/eldy/img/menus_black/ticketsup_over.png
new file mode 100644
index 00000000000..3ec332075e6
Binary files /dev/null and b/htdocs/theme/eldy/img/menus_black/ticketsup_over.png differ
diff --git a/htdocs/theme/eldy/img/title_accountancy.png b/htdocs/theme/eldy/img/title_accountancy.png
index 6e7c2a412c6..fba1c91e05b 100644
Binary files a/htdocs/theme/eldy/img/title_accountancy.png and b/htdocs/theme/eldy/img/title_accountancy.png differ
diff --git a/htdocs/theme/eldy/img/title_agenda.png b/htdocs/theme/eldy/img/title_agenda.png
index eb4c8d2bea2..93c5a814bc3 100644
Binary files a/htdocs/theme/eldy/img/title_agenda.png and b/htdocs/theme/eldy/img/title_agenda.png differ
diff --git a/htdocs/theme/eldy/img/title_bank.png b/htdocs/theme/eldy/img/title_bank.png
index 034a8d0c5e4..c916e89d8f6 100644
Binary files a/htdocs/theme/eldy/img/title_bank.png and b/htdocs/theme/eldy/img/title_bank.png differ
diff --git a/htdocs/theme/eldy/img/title_commercial.png b/htdocs/theme/eldy/img/title_commercial.png
index 46394177698..6671810c5de 100644
Binary files a/htdocs/theme/eldy/img/title_commercial.png and b/htdocs/theme/eldy/img/title_commercial.png differ
diff --git a/htdocs/theme/eldy/img/title_companies.png b/htdocs/theme/eldy/img/title_companies.png
index b2539dba849..ca172c460ac 100644
Binary files a/htdocs/theme/eldy/img/title_companies.png and b/htdocs/theme/eldy/img/title_companies.png differ
diff --git a/htdocs/theme/eldy/img/title_generic.png b/htdocs/theme/eldy/img/title_generic.png
index ae224327549..a44830798aa 100644
Binary files a/htdocs/theme/eldy/img/title_generic.png and b/htdocs/theme/eldy/img/title_generic.png differ
diff --git a/htdocs/theme/eldy/img/title_home.png b/htdocs/theme/eldy/img/title_home.png
index e9273e727f5..505d18ab403 100644
Binary files a/htdocs/theme/eldy/img/title_home.png and b/htdocs/theme/eldy/img/title_home.png differ
diff --git a/htdocs/theme/eldy/img/title_products.png b/htdocs/theme/eldy/img/title_products.png
index d3c5b125bbe..100edf445f1 100644
Binary files a/htdocs/theme/eldy/img/title_products.png and b/htdocs/theme/eldy/img/title_products.png differ
diff --git a/htdocs/theme/eldy/img/title_project.png b/htdocs/theme/eldy/img/title_project.png
index 05d8ea630b8..bec7144c109 100644
Binary files a/htdocs/theme/eldy/img/title_project.png and b/htdocs/theme/eldy/img/title_project.png differ
diff --git a/htdocs/theme/eldy/img/title_setup.png b/htdocs/theme/eldy/img/title_setup.png
index d7548d28709..fa4ff3aded1 100644
Binary files a/htdocs/theme/eldy/img/title_setup.png and b/htdocs/theme/eldy/img/title_setup.png differ
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 11ecfca262e..e1bb49ae46e 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1571,7 +1571,6 @@ div.tmenuleft
margin-top: 0px;
dol_optimize_smallscreen)) { ?>
width: 5px;
- /* background: url() 0 -6px no-repeat; */
height: 26px;
@@ -1633,76 +1632,76 @@ div.mainmenu.menu {
div.mainmenu.home{
- background-image: url();
+ background-image: url();
background-position-x: center;
}
div.mainmenu.billing {
- background-image: url();
+ background-image: url();
}
div.mainmenu.accountancy {
- background-image: url();
+ background-image: url();
}
div.mainmenu.agenda {
- background-image: url();
+ background-image: url();
}
div.mainmenu.bank {
- background-image: url();
+ background-image: url();
}
div.mainmenu.cashdesk {
- background-image: url();
+ background-image: url();
}
div.mainmenu.companies {
- background-image: url();
+ background-image: url();
}
div.mainmenu.commercial {
- background-image: url();
+ background-image: url();
}
div.mainmenu.ecm {
- background-image: url();
+ background-image: url();
}
div.mainmenu.externalsite {
- background-image: url();
+ background-image: url();
}
div.mainmenu.ftp {
- background-image: url();
+ background-image: url();
}
div.mainmenu.hrm {
- background-image: url();
+ background-image: url();
}
div.mainmenu.members {
- background-image: url();
+ background-image: url();
}
div.mainmenu.products {
- background-image: url();
+ background-image: url();
}
div.mainmenu.project {
- background-image: url();
+ background-image: url();
}
div.mainmenu.ticketsup {
- background-image: url();
+ background-image: url();
}
div.mainmenu.tools {
- background-image: url();
+ background-image: url();
}
div.mainmenu.website {
- background-image: url();
+ background-image: url();
}
file->dol_document_root as $dirroot)
{
- if (file_exists($dirroot."/".$val."/img/".$val.".png"))
+ if (file_exists($dirroot."/".$val."/img/".$val."_over.png"))
{
- $url=dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
+ $url=dol_buildpath('/'.$val.'/img/'.$val.'_over.png', 1);
$found=1;
break;
}
@@ -1749,7 +1748,7 @@ foreach($mainmenuusedarray as $val)
// Img file not found
if (! $found)
{
- $url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic.".png",1);
+ $url=dol_buildpath($path.'/theme/'.$theme.'/img/menus/generic'.$generic."_over.png",1);
$found=1;
if ($generic < 4) $generic++;
print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
@@ -2678,7 +2677,7 @@ div.refidpadding {
div.refid {
font-weight: bold;
color: #625;
- font-size: 160%;
+ font-size: 1.2em;
}
div.refidno {
padding-top: 3px;
@@ -3525,7 +3524,6 @@ div#card-errors {
.ui-dialog-titlebar {
}
.ui-dialog-content {
- font-size: !important;
}
@@ -4034,7 +4032,6 @@ A.none, A.none:active, A.none:visited, A.none:hover {
}
.ui-widget {
font-family:;
- font-size:;
}
/* .ui-button { margin-left: -2px; browser->name)?'padding-top: 1px;':''); ?> } */
.ui-button { margin-left: -2px; }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index e97e4a3bee1..86646fe2c78 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1580,17 +1580,6 @@ li.tmenu, li.tmenusel {
margin: 0px 0px 0px 0px;
font-weight: normal;
}
-li.tmenusel, li.tmenu:hover {
-/*
- background-image: -o-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
- background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.5) 0%, rgba(250,250,250,0) 100%) !important;
- background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0) 100%) !important;
- background-image: -ms-linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
- background-image: linear-gradient(bottom, rgba(250,250,250,0.3) 0%, rgba(0,0,0,0.3) 100%) !important;
- background: rgb();
-*/
- /* background: url() 50% 0 repeat-x !important; Nicer but problem when menu wrap on 2 lines */
-}
li.tmenusel, li.tmenu:hover {
opacity: .50; /* show only a slight shadow */
}
@@ -1606,7 +1595,6 @@ div.tmenuleft
height: px;
- /* background: url() 0 -6px no-repeat; */
}
div.tmenucenter