Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Working on finishing of look

Browse Source
This commit is contained in:
Laurent Destailleur
2015-05-22 14:28:02 +02:00
parent 97ba2cf0e9
commit 4319cd63a3
9 changed files with 58 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/adherents/index.php
View File

@@ -157,7 +157,7 @@ print "</table></form>";
if ($conf->use_javascript_ajax)
{
print '<br>';
print '<table class="noborder" width="100%">';
print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").'</td></tr>';
print '<tr '.$bc[0].'><td align="center" colspan="2">';

2
htdocs/comm/propal/index.php
View File

@@ -115,7 +115,7 @@ if ($resql)
}
$db->free($resql);
print '<table class="noborder" width="100%">';
print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Proposals").'</td></tr>'."\n";
$var=true;
$listofstatus=array(0,1,2,3,4);

2
htdocs/commande/index.php
View File

@@ -115,7 +115,7 @@ if ($resql)
$i++;
}
$db->free($resql);
print '<table class="noborder" width="100%">';
print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("CustomersOrders").'</td></tr>'."\n";
$listofstatus=array(0,1,2,3,3,-1);
$bool=false;

2
htdocs/contrat/index.php
View File

@@ -177,7 +177,7 @@ else
}
print '<table class="noborder" width="100%">';
print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("Services").'</td></tr>'."\n";
$var=true;
$listofstatus=array(0,4,4,5); $bool=false;

2
htdocs/fourn/commande/index.php
View File

@@ -114,7 +114,7 @@ if ($resql)
}
$db->free($resql);
print '<table class="noborder" width="100%">';
print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre"><td colspan="2">'.$langs->trans("Statistics").' - '.$langs->trans("SuppliersOrders").'</td></tr>';
print "</tr>\n";
foreach (array(0,1,2,3,4,5,6) as $statut)

2
htdocs/includes/jquery/plugins/datatables/css/jquery.dataTables.css
View File

@@ -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 {

4
htdocs/public/test/test_arrays.php
View File

@@ -66,8 +66,8 @@ else
<h1>
This page is a sample of page using tables. It is designed to make test with<br>
- css (add parameter &theme=newtheme to test another theme or edit css of current theme)<br>
- jmobile (add parameter dol_use_jmobile=1&dol_optimize_smallscreen=1 to enable view with jmobile)<br>
- no javascript / usage for bind people (add parameter nojs=1 to force disable javascript)<br>
- jmobile (add parameter <a href="<?php echo $_SERVER["PHP_SELF"].'?dol_use_jmobile=1&dol_optimize_smallscreen=1'; ?>">dol_use_jmobile=1&dol_optimize_smallscreen=1</a> to enable view with jmobile)<br>
- no javascript / usage for bind people (add parameter <a href="<?php echo $_SERVER["PHP_SELF"].'?nojs=1'; ?>">nojs=1</a> to force disable javascript)<br>
- dataTables<br>
- tablednd<br>
</h1>

4
htdocs/societe/index.php
View File

@@ -1,6 +1,6 @@
<?php
/* Copyright (C) 2001-2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2014 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2012 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2014 Charles-Fr Benke <charles.fr@benke.fr>
* Copyright (C) 2015 Jean-François Ferry <jfefe@aternatik.fr>
@@ -135,7 +135,7 @@ if ($result)
}
else dol_print_error($db);
print '<table class="noborder" width="100%">'."\n";
print '<table class="noborder nohover" width="100%">'."\n";
print '<tr class="liste_titre"><th colspan="2">'.$langs->trans("Statistics").'</th></tr>';
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))
{

49
htdocs/theme/eldy/style.css.php
View File

@@ -1975,6 +1975,9 @@ div.pagination li.pagination span {
color: #000;
text-decoration: none;
}
div.pagination li.pagination span.inactive {
cursor: default;
}
<?php if (empty($conf->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
{
<?php if ($colorbacklinepairhover) { if ($colorbacklinepairhover > 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: <?php print $fontlist ?>;
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: <?php print $fontlist ?>;
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('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png',1); ?>') no-repeat center right !important; }
.sorting_asc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled.png',1); ?>') no-repeat center right !important; }
.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled.png',1); ?>') 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; } */