';
diff --git a/htdocs/comm/propal/index.php b/htdocs/comm/propal/index.php
index b67b6fe9276..428e561f4fe 100644
--- a/htdocs/comm/propal/index.php
+++ b/htdocs/comm/propal/index.php
@@ -115,7 +115,7 @@ if ($resql)
}
$db->free($resql);
- print '';
+ print '';
print '| '.$langs->trans("Statistics").' - '.$langs->trans("Proposals").' | '."\n";
$var=true;
$listofstatus=array(0,1,2,3,4);
diff --git a/htdocs/commande/index.php b/htdocs/commande/index.php
index 7c6f2d52211..7957803a5d5 100644
--- a/htdocs/commande/index.php
+++ b/htdocs/commande/index.php
@@ -115,7 +115,7 @@ if ($resql)
$i++;
}
$db->free($resql);
- print '';
+ print '';
print '| '.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").' | '."\n";
$listofstatus=array(0,1,2,3,3,-1);
$bool=false;
diff --git a/htdocs/contrat/index.php b/htdocs/contrat/index.php
index 84e8ae88431..56cdbe90ca3 100644
--- a/htdocs/contrat/index.php
+++ b/htdocs/contrat/index.php
@@ -177,7 +177,7 @@ else
}
-print '';
+print '';
print '| '.$langs->trans("Statistics").' - '.$langs->trans("Services").' | '."\n";
$var=true;
$listofstatus=array(0,4,4,5); $bool=false;
diff --git a/htdocs/fourn/commande/index.php b/htdocs/fourn/commande/index.php
index 0943e76c3a5..60b9b65e8e8 100644
--- a/htdocs/fourn/commande/index.php
+++ b/htdocs/fourn/commande/index.php
@@ -114,7 +114,7 @@ if ($resql)
}
$db->free($resql);
- print '';
+ print '';
print '| '.$langs->trans("Statistics").' - '.$langs->trans("SuppliersOrders").' | ';
print "\n";
foreach (array(0,1,2,3,4,5,6) as $statut)
diff --git a/htdocs/includes/jquery/plugins/datatables/css/jquery.dataTables.css b/htdocs/includes/jquery/plugins/datatables/css/jquery.dataTables.css
index 7da7faec899..b257b33bee5 100644
--- a/htdocs/includes/jquery/plugins/datatables/css/jquery.dataTables.css
+++ b/htdocs/includes/jquery/plugins/datatables/css/jquery.dataTables.css
@@ -154,7 +154,7 @@ table.dataTable tr.even td.sorting_3 { background-color: #F9F9FF; }
margin: 0 3px;
cursor: pointer;
*cursor: hand;
- color: #333 !important;
+ /* DOL_LDR CHANGE color: #333 !important; */
}
.paging_full_numbers a.paginate_button {
diff --git a/htdocs/public/test/test_arrays.php b/htdocs/public/test/test_arrays.php
index dcf966eb475..9f0cec70e62 100644
--- a/htdocs/public/test/test_arrays.php
+++ b/htdocs/public/test/test_arrays.php
@@ -66,8 +66,8 @@ else
This page is a sample of page using tables. It is designed to make test with
- css (add parameter &theme=newtheme to test another theme or edit css of current theme)
-- jmobile (add parameter dol_use_jmobile=1&dol_optimize_smallscreen=1 to enable view with jmobile)
-- no javascript / usage for bind people (add parameter nojs=1 to force disable javascript)
+- jmobile (add parameter ">dol_use_jmobile=1&dol_optimize_smallscreen=1 to enable view with jmobile)
+- no javascript / usage for bind people (add parameter ">nojs=1 to force disable javascript)
- dataTables
- tablednd
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index fe66380d986..b03cb62eef0 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -1,9 +1,9 @@
- * Copyright (C) 2004-2014 Laurent Destailleur
+ * Copyright (C) 2004-2015 Laurent Destailleur
* Copyright (C) 2005-2012 Regis Houssin
- * Copyright (C) 2014 Charles-Fr Benke
- * Copyright (C) 2015 Jean-François Ferry
+ * Copyright (C) 2014 Charles-Fr Benke
+ * Copyright (C) 2015 Jean-François Ferry
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -135,7 +135,7 @@ if ($result)
}
else dol_print_error($db);
-print ''."\n";
+print ''."\n";
print '| '.$langs->trans("Statistics").' |
|---|
';
if (! empty($conf->use_javascript_ajax) && ((round($third['prospect'])?1:0)+(round($third['customer'])?1:0)+(round($third['supplier'])?1:0)+(round($third['other'])?1:0) >= 2))
{
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index a07538b124b..f8ead18d96d 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1975,6 +1975,9 @@ div.pagination li.pagination span {
color: #000;
text-decoration: none;
}
+div.pagination li.pagination span.inactive {
+ cursor: default;
+}
dol_use_jmobile)) { ?>
div.pagination li a,
div.pagination li span {
@@ -2058,7 +2061,7 @@ div.pagination li.paginationafterarrows {
}
*/
-
+/* Set the color for hover lines */
.odd:hover, .impair:hover, .even:hover, .pair:hover, .even:hover, .pair:hover, table.dataTable tr.even:hover, table.dataTable tr.odd:hover
{
0) { ?>
@@ -2070,7 +2073,6 @@ div.pagination li.paginationafterarrows {
.odd, .impair, .nohover .odd:hover, .nohover .impair:hover, tr.odd td.nohover, tr.impair td.nohover {
font-family: ;
- border: 0px;
margin-bottom: 1px;
color: #202020;
min-height: 18px; /* seems to not be used */
@@ -2083,15 +2085,21 @@ div.pagination li.paginationafterarrows {
.even, .pair, .nohover .even:hover, .nohover .pair:hover, tr.even td.nohover, tr.pair td.nohover {
font-family: ;
- border: 0px;
margin-bottom: 1px;
color: #202020;
background-color: #f9f9f9;
}
+
table.dataTable tr.odd {
background-color: #f9f9f9 !important;
}
+
+/* For no hover style */
+table.nohover tr.impair, table.nohover tr.pair, table.nohover tr.impair td, table.nohover tr.pair td {
+ background-color: #ffffff !important;
+}
+
table.dataTable td {
padding: 5px 2px 5px 3px !important;
}
@@ -3146,6 +3154,7 @@ div.dolEventError h1, div.dolEventError h2 {
/* ============================================================================== */
/* Datatable */
/* ============================================================================== */
+
table.dataTable tr.odd td.sorting_1, table.dataTable tr.even td.sorting_1 {
background: none !important;
}
@@ -3153,6 +3162,14 @@ table.dataTable tr.odd td.sorting_1, table.dataTable tr.even td.sorting_1 {
.sorting_desc { background: url('') no-repeat center right !important; }
.sorting_asc_disabled { background: url('') no-repeat center right !important; }
.sorting_desc_disabled { background: url('') no-repeat center right !important; }
+.dataTables_paginate {
+ margin-top: 8px;
+}
+.paginate_button_disabled {
+ opacity: 1 !important;
+ color: #888 !important;
+ cursor: default !important;
+}
.paginate_disabled_previous:hover, .paginate_enabled_previous:hover, .paginate_disabled_next:hover, .paginate_enabled_next:hover
{
font-weight: normal;
@@ -3161,10 +3178,36 @@ table.dataTable tr.odd td.sorting_1, table.dataTable tr.even td.sorting_1 {
{
text-decoration: underline !important;
}
+.paginate_active
+{
+ text-decoration: underline !important;
+}
.paginate_button
{
font-weight: normal !important;
+ text-decoration: none !important;
}
+.paging_full_numbers {
+ height: inherit !important;
+}
+.paging_full_numbers a.paginate_active:hover, .paging_full_numbers a.paginate_button:hover {
+ background-color: #DDD !important;
+}
+.paging_full_numbers, .paging_full_numbers a.paginate_active, .paging_full_numbers a.paginate_button {
+ background-color: #FFF !important;
+ border-radius: inherit !important;
+}
+.paging_full_numbers a.paginate_button_disabled:hover {
+ background-color: #FFF !important;
+}
+.paginate_button, .paginate_active {
+ border: 1px solid #ddd !important;
+ padding: 6px 12px !important;
+ margin-left: -1px !important;
+ line-height: 1.42857143 !important;
+ margin: 0 0 !important;
+}
+
/* For jquery plugin combobox */
/* Disable this. It breaks wrapping of boxes
.ui-corner-all { white-space: nowrap; } */
|