diff --git a/dev/skeletons/skeleton_page.php b/dev/skeletons/skeleton_page.php
index 7b62506639015744a93addd4f4b0082a6075498d..aab1a965eb625ae0a6f45659f8a4cc0a62a5ed2c 100644
--- a/dev/skeletons/skeleton_page.php
+++ b/dev/skeletons/skeleton_page.php
@@ -43,6 +43,7 @@ if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@includ
if (! $res && file_exists("../../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../../dolibarr/htdocs/main.inc.php'; // Used on dev env only
if (! $res) die("Include of main fails");
// Change this following line to use the correct relative path from htdocs
+include_once(DOL_DOCUMENT_ROOT.'/core/class/formcompany.class.php');
dol_include_once('/module/class/skeleton_class.class.php');
// Load traductions files requiredby by page
@@ -60,6 +61,14 @@ if ($user->societe_id > 0)
//accessforbidden();
}
+// Load object if id or ref is provided as parameter
+$object=new Skeleton_Class($db);
+if (($id > 0 || ! empty($ref)) && $action != 'add')
+{
+ $result=$object->fetch($id,$ref);
+ if ($result < 0) dol_print_error($db);
+}
+
/*******************************************************************
@@ -72,7 +81,6 @@ if ($action == 'add')
{
$error=0;
- $object=new Skeleton_Class($db);
/* object_prop_getpost_prop */
$object->prop1=GETPOST("field1");
$object->prop2=GETPOST("field2");
@@ -122,7 +130,7 @@ $form=new Form($db);
// Put here content of your page
-// Example 1 : Adding jquery code
+// Example : Adding jquery code
print '<script type="text/javascript" language="javascript">
jQuery(document).ready(function() {
function init_myfunc()
@@ -138,13 +146,8 @@ jQuery(document).ready(function() {
</script>';
-// Example 2 : Adding links to objects
-// The class must extends CommonObject class to have this method available
-//$somethingshown=$object->showLinkedObjectBlock();
-
-
-// Example 3 : List of data
-if ($action == 'list')
+// Part to show a list
+if ($action == 'list' || empty($id))
{
$sql = "SELECT";
$sql.= " t.rowid,";
@@ -191,6 +194,69 @@ if ($action == 'list')
+// Part to edit record
+if ($id && $action == 'edit')
+{
+ dol_fiche_head();
+
+ print '<form method="POST" action="'.$_SERVER["PHP_SELF"].'">';
+ print '<input type="hidden" name="action" value="add">';
+
+
+ print '<br>';
+
+ print '<center><input type="submit" class="button" name="add" value="'.$langs->trans("Create").'"></center>';
+
+ print '</form>';
+
+ dol_fiche_end();
+}
+
+
+
+// Part to show record
+if ($id && (empty($action) || $action == 'view'))
+{
+ dol_fiche_head();
+
+
+
+ dol_fiche_end();
+
+
+ // Buttons
+ print '<div class="tabsAction">'."\n";
+ $parameters=array();
+ $reshook=$hookmanager->executeHooks('addMoreActionsButtons',$parameters,$object,$action); // Note that $action and $object may have been modified by hook
+ if (empty($reshook))
+ {
+ if ($user->rights->mymodule->write)
+ {
+ print '<div class="inline-block divButAction"><a class="butAction" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=edit">'.$langs->trans("Modify").'</a></div>'."\n";
+ }
+
+ if ($user->rights->mymodule->delete)
+ {
+ if ($conf->use_javascript_ajax && empty($conf->dol_use_jmobile)) // We can't use preloaded confirm form with jmobile
+ {
+ print '<div class="inline-block divButAction"><span id="action-delete" class="butActionDelete">'.$langs->trans('Delete').'</span></div>'."\n";
+ }
+ else
+ {
+ print '<div class="inline-block divButAction"><a class="butActionDelete" href="'.$_SERVER["PHP_SELF"].'?id='.$object->id.'&action=delete">'.$langs->trans('Delete').'</a></div>'."\n";
+ }
+ }
+ }
+ print '</div>'."\n";
+
+
+ // Example 2 : Adding links to objects
+ // The class must extends CommonObject class to have this method available
+ //$somethingshown=$object->showLinkedObjectBlock();
+
+}
+
+
// End of page
llxFooter();
$db->close();
diff --git a/htdocs/.gitignore b/htdocs/.gitignore
index a4ebd2bb7c79648746d92c1e5cb4810f206a74ff..8ba0a69acb3ac479b64b07d86a98bc2abc99a9ce 100644
--- a/htdocs/.gitignore
+++ b/htdocs/.gitignore
@@ -2,6 +2,7 @@
/custom*
/extensions*
/nltechno*
+/anco*
/bootstrap*
/google*
/multicompany*
diff --git a/htdocs/core/boxes/box_project.php b/htdocs/core/boxes/box_project.php
index fab476c0c95b3cb13e4bb253c8ad8def1ade5355..62ed89dd65be27afaf97da1b02a8b687d140e799 100644
--- a/htdocs/core/boxes/box_project.php
+++ b/htdocs/core/boxes/box_project.php
@@ -77,10 +77,8 @@ class box_project extends ModeleBoxes
{
$sql = "SELECT p.rowid, p.ref, p.title, p.fk_statut ";
- $sql.= " FROM (".MAIN_DB_PREFIX."societe as s,".MAIN_DB_PREFIX."projet as p";
- $sql.= ")";
- $sql.= " WHERE p.fk_soc = s.rowid";
- $sql.= " AND s.entity = ".$conf->entity;
+ $sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
+ $sql.= " WHERE p.entity = ".$conf->entity;
$sql.= " AND p.fk_statut = 1"; // Seulement les projets ouverts
$sql.= " ORDER BY p.datec DESC";
$sql.= $db->plimit($max, 0);
@@ -107,16 +105,16 @@ class box_project extends ModeleBoxes
);
$sql ="SELECT count(*) as nb, sum(progress) as totprogress";
- $sql.=" FROM ".MAIN_DB_PREFIX."projet_task as pt, ".MAIN_DB_PREFIX."projet as p";
- $sql.=" WHERE pt.fk_projet = p.rowid";
- $sql.=" AND p.entity = ".$conf->entity;
+ $sql.=" FROM ".MAIN_DB_PREFIX."projet as p LEFT JOIN ".MAIN_DB_PREFIX."projet_task as pt on pt.fk_projet = p.rowid";
+ $sql.=" WHERE p.entity = ".$conf->entity;
+
$resultTask = $db->query($sql);
if ($resultTask)
{
$objTask = $db->fetch_object($resultTask);
$this->info_box_contents[$i][3] = array('td' => 'align="right"', 'text' => number_format($objTask->nb, 0, ',', ' ')." ".$langs->trans("Tasks"));
if ($objTask->nb > 0 )
- $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => number_format(($objTask->totprogress/$objTask->nb), 0, ',', ' ')." % ".$langs->trans("Progress"));
+ $this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => number_format(($objTask->totprogress/$objTask->nb), 0, ',', ' ')."%");
else
$this->info_box_contents[$i][4] = array('td' => 'align="right"', 'text' => "N/A ");
$totalnbTask += $objTask->nb;
@@ -134,10 +132,11 @@ class box_project extends ModeleBoxes
// Add the sum à the bottom of the boxes
- $this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'colspan=2 align="left" ', 'text' => $langs->trans("Total")." ".$textHead);
- $this->info_box_contents[$i][1] = array('td' => 'align="right" ', 'text' => number_format($num, 0, ',', ' ')." ".$langs->trans("Projects"));
- $this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => number_format($totalnbTask, 0, ',', ' ')." ".$langs->trans("Tasks"));
- $this->info_box_contents[$i][4] = array('td' => 'colspan=2', 'text' => "");
+ $this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="left" ', 'text' => $langs->trans("Total")." ".$textHead);
+ $this->info_box_contents[$i][1] = array('td' => '', 'text' => "");
+ $this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => number_format($num, 0, ',', ' ')." ".$langs->trans("Projects"));
+ $this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => number_format($totalnbTask, 0, ',', ' ')." ".$langs->trans("Tasks"));
+ $this->info_box_contents[$i][4] = array('td' => '', 'text' => "");
}
diff --git a/htdocs/core/boxes/box_task.php b/htdocs/core/boxes/box_task.php
index 3f2e5f05c16ac58d99ba8c2f0f91b553b79a19dd..c15bc9831ce1deaec40c7f76e1234af25cb767be 100644
--- a/htdocs/core/boxes/box_task.php
+++ b/htdocs/core/boxes/box_task.php
@@ -120,12 +120,13 @@ class box_task extends ModeleBoxes
// Add the sum à the bottom of the boxes
- $this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'colspan=2 align="left" ', 'text' => $langs->trans("Total")." ".$textHead);
- $this->info_box_contents[$i][1] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')." ".$langs->trans("Tasks"));
- $this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
- $this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
- $this->info_box_contents[$i][4] = array('td' => 'colspan=2', 'text' => "");
-
+ $this->info_box_contents[$i][0] = array('tr' => 'class="liste_total"', 'td' => 'align="left" ', 'text' => $langs->trans("Total")." ".$textHead);
+ $this->info_box_contents[$i][1] = array('td' => '', 'text' => "");
+ $this->info_box_contents[$i][2] = array('td' => 'align="right" ', 'text' => number_format($totalnb, 0, ',', ' ')." ".$langs->trans("Tasks"));
+ $this->info_box_contents[$i][3] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totalplannedtot,'all',25200,5));
+ $this->info_box_contents[$i][4] = array('td' => 'align="right" ', 'text' => ConvertSecondToTime($totaldurationtot,'all',25200,5));
+ $this->info_box_contents[$i][5] = array('td' => '', 'text' => "");
+
}
/**
diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index d322dd201dfeed8367beac79de870b0388724fa2..3306d38f214d8ee13a7ffeef6704639c07e16df4 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -47,6 +47,8 @@ abstract class CommonObject
public $array_options=array();
+ public $thirdparty;
+
public $linkedObjectsIds; // Loaded by ->fetchObjectLinked
public $linkedObjects; // Loaded by ->fetchObjectLinked
@@ -596,10 +598,10 @@ abstract class CommonObject
{
global $conf;
- if (empty($this->socid) && empty($this->fk_soc)) return 0;
+ if (empty($this->socid) && empty($this->fk_soc) && empty($this->fk_thirdparty)) return 0;
$thirdparty = new Societe($this->db);
- $result=$thirdparty->fetch(isset($this->socid)?$this->socid:$this->fk_soc);
+ $result=$thirdparty->fetch(isset($this->socid)?$this->socid:(isset($this->fk_soc)?$this->fk_soc:$this->fk_thirdparty));
$this->client = $thirdparty; // deprecated
$this->thirdparty = $thirdparty;
diff --git a/htdocs/core/tpl/notes.tpl.php b/htdocs/core/tpl/notes.tpl.php
index 0cce9a3e3b476f2e7a20018bac049ff91d87743f..66b310da69d8887d40f632737fc8402558517ad1 100644
--- a/htdocs/core/tpl/notes.tpl.php
+++ b/htdocs/core/tpl/notes.tpl.php
@@ -22,6 +22,7 @@ $note_public = 'note_public';
$note_private = 'note_private';
$colwidth=(isset($colwidth)?$colwidth:25);
+
$permission=(isset($permission)?$permission:(isset($user->rights->$module->creer)?$user->rights->$module->creer:0)); // If already defined by caller page
$moreparam=(isset($moreparam)?$moreparam:'');
$value_public=$object->note_public;
@@ -59,8 +60,9 @@ elseif ($module == 'contact') { $permission=$user->rights->societe->creer;}
elseif ($module == 'shipping') { $permission=$user->rights->expedition->creer;}
//else dol_print_error('','Bad value '.$module.' for param module');
-if (! empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata='ckeditor:dolibarr_notes:100%:200::1:12:100';
+if (! empty($conf->global->FCKEDITOR_ENABLE_SOCIETE)) $typeofdata='ckeditor:dolibarr_notes:100%:200::1:12:100'; // Rem: This var is for all notes, not only thirdparties note.
else $typeofdata='textarea:12:100';
+
?>
<!-- BEGIN PHP TEMPLATE NOTES -->
diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php
index 7b7441ba570a05953ebf933d505cbeaf99879eff..100dd4dfb51cdce0ca84bf272ac310cd400563a6 100644
--- a/htdocs/projet/class/project.class.php
+++ b/htdocs/projet/class/project.class.php
@@ -741,7 +741,7 @@ class Project extends CommonObject
*
* @param int $withpicto 0=Pas de picto, 1=Inclut le picto dans le lien, 2=Picto seul
* @param string $option Variant ('', 'nolink')
- * @param int $addlabel 0=Default, 1=Add label into string
+ * @param int $addlabel 0=Default, 1=Add label into string, >1=Add first chars into string
* @return string Chaine avec URL
*/
function getNomUrl($withpicto=0, $option='', $addlabel=0)
@@ -773,7 +773,7 @@ class Project extends CommonObject
if ($withpicto) $result.=($lien . img_object($label, $picto) . $lienfin);
if ($withpicto && $withpicto != 2) $result.=' ';
- if ($withpicto != 2) $result.=$lien . $this->ref . $lienfin . (($addlabel && $this->title) ? ' - ' . $this->title : '');
+ if ($withpicto != 2) $result.=$lien . $this->ref . $lienfin . (($addlabel && $this->title) ? ' - ' . dol_trunc($this->title, ($addlabel > 1 ? $addlabel : 0)) : '');
return $result;
}
diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php
index 7ea2a0af1e91beedd90c92f4b18b4108cd08616d..9622f4fa480a401a1747a7c2154ca08b0a94e015 100644
--- a/htdocs/projet/index.php
+++ b/htdocs/projet/index.php
@@ -156,7 +156,7 @@ print '</div></div></div>';
// Tasks for all resources of all opened projects and time spent for each task/resource
print '<div class="fichecenter">';
-$sql = "SELECT p.title, p.rowid as projectid, t.label, t.rowid as taskid, u.rowid as userid, t.planned_workload, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent";
+$sql = "SELECT p.ref, p.title, p.rowid as projectid, t.label, t.rowid as taskid, u.rowid as userid, t.planned_workload, t.dateo, t.datee, SUM(tasktime.task_duration) as timespent";
$sql.= " FROM ".MAIN_DB_PREFIX."projet as p";
$sql.= " LEFT JOIN ".MAIN_DB_PREFIX."societe as s on p.fk_soc = s.rowid";
$sql.= " INNER JOIN ".MAIN_DB_PREFIX."projet_task as t on t.fk_projet = p.rowid";
@@ -216,7 +216,13 @@ if ( $resql )
print "<tr ".$bc[$var].">";
print '<td>'.$username.'</td>';
- print '<td><a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$obj->projectid.'">'.$obj->title.'</a></td>';
+ print '<td>';
+ $projectstatic->id=$obj->projectid;
+ $projectstatic->ref=$obj->ref;
+ $projectstatic->title=$obj->title;
+ print $projectstatic->getNomUrl(1,'',16);
+ //print '<a href="'.DOL_URL_ROOT.'/projet/fiche.php?id='.$obj->projectid.'">'.$obj->title.'</a>';
+ print '</td>';
print '<td><a href="'.DOL_URL_ROOT.'/projet/tasks/task.php?id='.$obj->taskid.'&withproject=1">'.$obj->label.'</a></td>';
print '<td>'.dol_print_date($db->jdate($obj->dateo)).'</td>';
print '<td>'.dol_print_date($db->jdate($obj->datee)).'</td>';
diff --git a/htdocs/societe/index.php b/htdocs/societe/index.php
index 766e44cf9a74c5959d5265c922085f5f7ab28ad3..dad3c5cb5e033ccf1c7bf4d593f3b99d46b36f1d 100644
--- a/htdocs/societe/index.php
+++ b/htdocs/societe/index.php
@@ -64,19 +64,19 @@ print '<form method="post" action="'.DOL_URL_ROOT.'/societe/societe.php">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<table class="noborder nohover" width="100%">';
print '<tr class="liste_titre">';
-print '<td colspan="3">'.$langs->trans("Search").'</td></tr>';
+print '<th colspan="3">'.$langs->trans("Search").'</th></tr>';
print "<tr ".$bc[false]."><td>";
print '<label for="search_nom_only">'.$langs->trans("Name").'</label>:</td><td><input class="flat" type="text" size="14" name="search_nom_only" id="search_nom_only"></td>';
print '<td rowspan="'.$rowspan.'"><input type="submit" class="button" value="'.$langs->trans("Search").'"></td></tr>';
if (! empty($conf->barcode->enabled))
{
- print "<tr ".$bc[false]."><td>";
+ print "<tr ".$bc[false]."><td ".$bc[false].">";
print '<label for="sbarcode">'.$langs->trans("BarCode").'</label>:</td><td><input class="flat" type="text" size="14" name="sbarcode" id="sbarcode"></td>';
//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
print '</tr>';
}
-print "<tr ".$bc[false]."><td>";
-print '<label for="search_all">'.$langs->trans("Other").'</label>:</td><td><input class="flat" type="text" size="14" name="search_all" id="search_all"></td>';
+print "<tr ".$bc[false]."><td ".$bc[false].">";
+print '<label for="search_all">'.$langs->trans("Other").'</label>:</td><td '.$bc[false].'><input class="flat" type="text" size="14" name="search_all" id="search_all"></td>';
//print '<td><input type="submit" class="button" value="'.$langs->trans("Search").'"></td>';
print '</tr>';
@@ -121,7 +121,7 @@ print '<table class="noborder" width="100%">';
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))
{
- print '<tr><td align="center">';
+ print '<tr><td align="center" colspan="2">';
$dataseries=array();
if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_PROSPECTS_STATS)) $dataseries[]=array('label'=>$langs->trans("Prospects"),'data'=>round($third['prospect']));
if (! empty($conf->societe->enabled) && empty($conf->global->SOCIETE_DISABLE_CUSTOMERS_STATS)) $dataseries[]=array('label'=>$langs->trans("Customers"),'data'=>round($third['customer']));
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 759e9bbdadcfb05f629ae5a98ef9319cdacfd1e1..c260a1ff1610c49030fd7771341e834c7bb3d113 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -125,12 +125,12 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
//$conf->global->THEME_ELDY_BACKBODY='#ffffff url('.$img_head.') 0 0 no-repeat;';
$conf->global->THEME_ELDY_BACKBODY='#fcfcfc;';
- $conf->global->THEME_ELDY_LINEIMPAIR1='242,242,242';
- $conf->global->THEME_ELDY_LINEIMPAIR2='248,248,248';
- $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252';
- $conf->global->THEME_ELDY_LINEPAIR1='255,255,255';
- $conf->global->THEME_ELDY_LINEPAIR2='255,255,255';
+ $conf->global->THEME_ELDY_LINEPAIR1='242,242,242';
+ $conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
$conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
+ $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
+ $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
+ $conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252';
$conf->global->THEME_ELDY_TEXT='50,50,130';
if ($dol_use_jmobile)
{
@@ -1720,6 +1720,86 @@ table.liste td {
.tagtr, .table-border-row { display: table-row; }
.tagtd, .table-border-col, .table-key-border-col, .table-val-border-col { display: table-cell; }
+
+/* Prepare to remove class pair - impair
+.noborder > tbody > tr:nth-child(even) td {
+ background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+ background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+ background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+ background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+ background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
+ font-family: <?php print $fontlist ?>;
+ border: 0px;
+ margin-bottom: 1px;
+ color: #202020;
+ min-height: 18px;
+}
+
+.noborder > tbody > tr:nth-child(odd) td {
+ background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+ background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+ background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+ background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+ background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
+ font-family: <?php print $fontlist ?>;
+ border: 0px;
+ margin-bottom: 1px;
+ color: #202020;
+}
+*/
+
+.impair:hover {
+<?php if ($colorbacklineimpairhover) { if ($usecss3) { ?>
+ background: rgb(<?php echo $colorbacklineimpairhover; ?>);
+<?php } else { ?>
+ background: #fafafa;
+<?php } } ?>
+ border: 0px;
+}
+
+.impair, .nohover .impair:hover, tr.impair td.nohover {
+<?php if ($usecss3) { ?>
+ background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%) !important;
+ background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%) !important;
+ background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%) !important;
+ background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%) !important;
+ background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%) !important;
+<?php } else { ?>
+ background: #eaeaea !important;
+<?php } ?>
+ font-family: <?php print $fontlist ?>;
+ border: 0px;
+ margin-bottom: 1px;
+ color: #202020;
+ min-height: 18px; /* seems to not be used */
+}
+
+td.nohover, .pair:hover {
+<?php if ($colorbacklinepairhover) { if ($usecss3) { ?>
+ background: rgb(<?php echo $colorbacklinepairhover; ?>) !important;
+<?php } else { ?>
+ background: #fafafa !important;
+<?php } }?>
+ border: 0px;
+}
+
+.pair, .nohover .pair:hover, tr.pair td.nohover {
+<?php if ($usecss3) { ?>
+ background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%) !important;
+ background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%) !important;
+ background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%) !important;
+ background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%) !important;
+ background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%) !important;
+<?php } else { ?>
+ background: #ffffff !important;
+<?php } ?>
+ font-family: <?php print $fontlist ?>;
+ border: 0px;
+ margin-bottom: 1px;
+ color: #202020;
+}
+
+
tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable.tr
{
height: 26px !important;
@@ -1772,66 +1852,16 @@ input.liste_titre {
border: 0px;
}
-tr.liste_total, form.liste_total {
+.noborder tr.liste_total, .noborder tr.liste_total td, tr.liste_total, form.liste_total {
background: #F0F0F0;
}
-tr.liste_total td, form.liste_total div {
+.noborder tr.liste_total td, tr.liste_total td, form.liste_total div {
border-top: 1px solid #DDDDDD;
color: #332266;
font-weight: normal;
white-space: nowrap;
}
-.impair:hover {
-<?php if ($colorbacklineimpairhover) { if ($usecss3) { ?>
- background: rgb(<?php echo $colorbacklineimpairhover; ?>);
-<?php } else { ?>
- background: #fafafa;
-<?php } } ?>
- border: 0px;
-}
-
-.impair, .nohover .impair:hover, tr.impair td.nohover {
-<?php if ($usecss3) { ?>
- background: linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
- background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
- background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
- background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
- background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklineimpair1; ?>) 85%, rgb(<?php echo $colorbacklineimpair2; ?>) 100%);
-<?php } else { ?>
- background: #eaeaea;
-<?php } ?>
- font-family: <?php print $fontlist ?>;
- border: 0px;
- margin-bottom: 1px;
- color: #202020;
- min-height: 18px; /* seems to not be used */
-}
-
-.pair:hover {
-<?php if ($colorbacklinepairhover) { if ($usecss3) { ?>
- background: rgb(<?php echo $colorbacklinepairhover; ?>);
-<?php } else { ?>
- background: #fafafa;
-<?php } }?>
- border: 0px;
-}
-
-.pair, .nohover .pair:hover, tr.pair td.nohover {
-<?php if ($usecss3) { ?>
- background: linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
- background: -o-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
- background: -moz-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
- background: -webkit-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
- background: -ms-linear-gradient(bottom, rgb(<?php echo $colorbacklinepair1; ?>) 85%, rgb(<?php echo $colorbacklinepair2; ?>) 100%);
-<?php } else { ?>
- background: #ffffff;
-<?php } ?>
- font-family: <?php print $fontlist ?>;
- border: 0px;
- margin-bottom: 1px;
- color: #202020;
-}
.tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair {
background: none;