diff --git a/htdocs/admin/facture.php b/htdocs/admin/facture.php index 10f6cffc18a..2dca4821727 100644 --- a/htdocs/admin/facture.php +++ b/htdocs/admin/facture.php @@ -294,7 +294,6 @@ $form=new Form($db); $linkback=''.$langs->trans("BackToModuleList").''; print_fiche_titre($langs->trans("BillsSetup"),$linkback,'title_setup'); -print '
'; $head = invoice_admin_prepare_head(); dol_fiche_head($head, 'general', $langs->trans("Invoices"), 0, 'invoice'); diff --git a/htdocs/langs/en_US/products.lang b/htdocs/langs/en_US/products.lang index 8ad095f4169..9ceef0033c0 100644 --- a/htdocs/langs/en_US/products.lang +++ b/htdocs/langs/en_US/products.lang @@ -131,7 +131,7 @@ ProductToAddSearch=Search product to add AddDel=Add/Delete Quantity=Quantity NoMatchFound=No match found -ProductAssociationList=List of related products/services: name of product/service (quantity affected) +ProductAssociationList=List of products/services that are component of this virtual product/package ProductParentList=List of package products/services with this product as a component ErrorAssociationIsFatherOfThis=One of selected product is parent with current product DeleteProduct=Delete a product/service diff --git a/htdocs/product/card.php b/htdocs/product/card.php index f7da56da39c..21c12e6d31d 100644 --- a/htdocs/product/card.php +++ b/htdocs/product/card.php @@ -1712,14 +1712,15 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) if (is_array($otherprop) && count($otherprop)) { $var=!$var; - $html .= ''; + $html .= ''; $html .= $langs->trans("AddToDraftProposals").''; $html .= $form->selectarray("propalid", $otherprop, 0, 1); $html .= ''; } else { - $html .= ""; + $html .= ''; + $html .= $langs->trans("AddToDraftProposals").''; $html .= $langs->trans("NoDraftProposals"); $html .= ''; } @@ -1737,14 +1738,15 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) if (is_array($othercom) && count($othercom)) { $var=!$var; - $html .= ''; + $html .= ''; $html .= $langs->trans("AddToDraftOrders").''; $html .= $form->selectarray("commandeid", $othercom, 0, 1); $html .= ''; } else { - $html .= ""; + $html .= ''; + $html .= $langs->trans("AddToDraftOrders").''; $html .= $langs->trans("NoDraftOrders"); $html .= ''; } @@ -1762,14 +1764,15 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) if (is_array($otherinvoice) && count($otherinvoice)) { $var=!$var; - $html .= ''; + $html .= ''; $html .= $langs->trans("AddToDraftInvoices").''; $html .= $form->selectarray("factureid", $otherinvoice, 0, 1); $html .= ''; } else { - $html .= ""; + $html .= ''; + $html .= $langs->trans("AddToDraftInvoices").''; $html .= $langs->trans("NoDraftInvoices"); $html .= ''; } @@ -1784,7 +1787,7 @@ if ($object->id && ($action == '' || $action == 'view') && $object->status) print load_fiche_titre($langs->trans("Add"),'',''); - $html .= ''.$langs->trans("Quantity").' '; + $html .= ''.$langs->trans("Quantity").' '; $html .= ''.$langs->trans("ReductionShort").'(%) '; $html .= ''; $html .= ''; diff --git a/htdocs/product/class/product.class.php b/htdocs/product/class/product.class.php index bfb1a660b55..c1046af1216 100755 --- a/htdocs/product/class/product.class.php +++ b/htdocs/product/class/product.class.php @@ -2815,16 +2815,16 @@ class Product extends CommonObject /** * Return all Father products fo current product * - * @return array prod + * @return array Array of product * @see getParent */ function getFather() { - $sql = "SELECT p.label as label,p.rowid,pa.fk_product_pere as id,p.fk_product_type"; + $sql = "SELECT p.rowid, p.label as label, p.ref as ref, pa.fk_product_pere as id, p.fk_product_type, pa.qty, pa.incdec"; $sql.= " FROM ".MAIN_DB_PREFIX."product_association as pa,"; $sql.= " ".MAIN_DB_PREFIX."product as p"; $sql.= " WHERE p.rowid = pa.fk_product_pere"; - $sql.= " AND pa.fk_product_fils=".$this->id; + $sql.= " AND pa.fk_product_fils = ".$this->id; $res = $this->db->query($sql); if ($res) @@ -2832,8 +2832,11 @@ class Product extends CommonObject $prods = array (); while ($record = $this->db->fetch_array($res)) { - $prods[$record['id']]['id'] = $record['rowid']; - $prods[$record['id']]['label'] = $this->db->escape($record['label']); + $prods[$record['id']]['id'] = $record['rowid']; + $prods[$record['id']]['ref'] = $record['ref']; + $prods[$record['id']]['label'] = $record['label']; + $prods[$record['id']]['qty'] = $record['qty']; + $prods[$record['id']]['incdec'] = $record['incdec']; $prods[$record['id']]['fk_product_type'] = $record['fk_product_type']; } return $prods; @@ -2854,7 +2857,7 @@ class Product extends CommonObject */ function getParent() { - $sql = "SELECT p.label as label,p.rowid,pa.fk_product_pere as id,p.fk_product_type"; + $sql = "SELECT p.rowid, p.label as label, p.ref as ref, pa.fk_product_pere as id, p.fk_product_type, pa.qty"; $sql.= " FROM ".MAIN_DB_PREFIX."product_association as pa,"; $sql.= " ".MAIN_DB_PREFIX."product as p"; $sql.= " WHERE p.rowid = pa.fk_product_pere"; @@ -3409,7 +3412,7 @@ class Product extends CommonObject function is_photo_available($sdir) { include_once DOL_DOCUMENT_ROOT .'/core/lib/files.lib.php'; - + global $conf; $dir = $sdir; diff --git a/htdocs/product/composition/card.php b/htdocs/product/composition/card.php index 773d08fae72..0a427741919 100644 --- a/htdocs/product/composition/card.php +++ b/htdocs/product/composition/card.php @@ -255,37 +255,59 @@ if ($id > 0 || ! empty($ref)) // Number of parent virtual products - print $form->textwithpicto($langs->trans("ParentProductsNumber").': '.count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct')); + //print $form->textwithpicto($langs->trans("ParentProductsNumber").': '.count($prodsfather), $langs->trans('IfZeroItIsNotUsedByVirtualProduct')); - if (count($prodsfather) > 0) - { - print $langs->trans("ProductParentList").'
'; - print ''; - foreach($prodsfather as $value) + //if (count($prodsfather) > 0) + //{ + print_fiche_titre($langs->trans("ProductParentList"),'','').'
'; + print '
'; + print ''; + print ''; + print ''; + print ''; + print ''; + if (count($prodsfather) > 0) + { + $class='pair'; + + foreach($prodsfather as $value) + { + $idprod= $value["id"]; + $productstatic->id=$idprod;// $value["id"]; + $productstatic->type=$value["fk_product_type"]; + $productstatic->ref=$value['ref']; + $productstatic->label=$value['label']; + + $class=($class=='impair')?'pair':'impair'; + print ''; + + print ''; + print ''; + print ''; + print ''; + } + } + else { - $idprod= $value["id"]; - $productstatic->id=$idprod;// $value["id"]; - $productstatic->type=$value["fk_product_type"]; - $productstatic->ref=$value['label']; print ''; - print ''; + print ''; print ''; } print '
'.$langs->trans('ParentProduct').''.$langs->trans('Label').''.$langs->trans('Qty').'
'.$productstatic->getNomUrl(1,'composition').''.$productstatic->label.''.$value['qty'].'
'.$productstatic->getNomUrl(1,'composition').''.$langs->trans("None").'
'; - } + //} print '
'."\n"; // Number of subproducts - print $form->textwithpicto($langs->trans("AssociatedProductsNumber").': '.(empty($conf->global->PRODUCT_SHOW_SUB_SUB_PRODUCTS)?$nbofsubproducts:$nbofsubsubproducts), $langs->trans('IfZeroItIsNotAVirtualProduct')); + //print $form->textwithpicto($langs->trans("AssociatedProductsNumber").': '.(empty($conf->global->PRODUCT_SHOW_SUB_SUB_PRODUCTS)?$nbofsubproducts:$nbofsubsubproducts), $langs->trans('IfZeroItIsNotAVirtualProduct')); // List of subproducts - if (count($prods_arbo) > 0) - { + //if (count($prods_arbo) > 0) + //{ $atleastonenotdefined=0; - print $langs->trans("ProductAssociationList").'
'; + print_fiche_titre($langs->trans("ProductAssociationList"),'','').'
'; print '
'; print ''; @@ -302,6 +324,8 @@ if ($id > 0 || ! empty($ref)) print ''.$langs->trans('ComposedProductIncDecStock').''; print ''."\n"; + $class='pair'; + foreach($prods_arbo as $value) { $productstatic->id=$value['id']; @@ -409,7 +433,7 @@ if ($id > 0 || ! empty($ref)) }*/ print '
'; - } + //} // Form with product to add if ((empty($action) || $action == 'view' || $action == 'edit' || $action == 'search' || $action == 're-edit') && ($user->rights->produit->creer || $user->rights->service->creer)) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 5a490f5aef5..cc9cda220d6 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -172,15 +172,15 @@ $colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2)); $tmppart=explode(',',$colorbackhmenu1); $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); if ($tmpval <= 360) $colortextbackhmenu='FFF'; -else $colortextbackhmenu='444'; +else $colortextbackhmenu='222'; $tmppart=explode(',',$colorbackvmenu1); $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); if ($tmpval <= 360) { $colortextbackvmenu='FFF'; } -else { $colortextbackvmenu='444'; } +else { $colortextbackvmenu='222'; } $tmppart=explode(',',$colorbacktitle1); $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); if ($tmpval <= 360) { $colortexttitle='FFF'; $colorshadowtitle='888'; } -else { $colortexttitle='444'; $colorshadowtitle='FFF'; } +else { $colortexttitle='222'; $colorshadowtitle='FFF'; } $tmppart=explode(',',$colorbacktabcard1); $tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : ''); if ($tmpval <= 340) { $colortextbacktab='FFF'; } diff --git a/htdocs/theme/md_exp/img/sort_asc.png b/htdocs/theme/md_exp/img/sort_asc.png index e327d952fa4..aca0f6eb77a 100644 Binary files a/htdocs/theme/md_exp/img/sort_asc.png and b/htdocs/theme/md_exp/img/sort_asc.png differ diff --git a/htdocs/theme/md_exp/img/sort_asc_disabled.png b/htdocs/theme/md_exp/img/sort_asc_disabled.png index e327d952fa4..d87652c2cc3 100644 Binary files a/htdocs/theme/md_exp/img/sort_asc_disabled.png and b/htdocs/theme/md_exp/img/sort_asc_disabled.png differ diff --git a/htdocs/theme/md_exp/img/sort_desc.png b/htdocs/theme/md_exp/img/sort_desc.png index db99fd9ad47..57c1ad0fcb4 100644 Binary files a/htdocs/theme/md_exp/img/sort_desc.png and b/htdocs/theme/md_exp/img/sort_desc.png differ diff --git a/htdocs/theme/md_exp/style.css.php b/htdocs/theme/md_exp/style.css.php index 4b8ebe8d178..739f26ce1de 100644 --- a/htdocs/theme/md_exp/style.css.php +++ b/htdocs/theme/md_exp/style.css.php @@ -97,14 +97,14 @@ $colorbackvmenu1b=($colred+5).','.($colgreen+6).','.($colblue+7); // vmen $colorbackvmenu2=($colred-15).','.($colgreen-15).','.($colblue-15); $colorbacktitle1=($colred-5).','.($colgreen-5).','.($colblue-5); // title of array $colorbacktitle2=($colred-15).','.($colgreen-15).','.($colblue-15); -$colorbacktabcard1=($colred+15).','.($colgreen+16).','.($colblue+17); // card +$colorbacktabcard1='255,255,255'; // card $colorbacktabcard2=($colred-15).','.($colgreen-15).','.($colblue-15); $colorbacktabactive=($colred-15).','.($colgreen-15).','.($colblue-15); -$colorbacklineimpair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line impair -$colorbacklineimpair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line impair -$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line impair -$colorbacklinepair1='255,255,255'; // line pair -$colorbacklinepair2='255,255,255'; // line pair +$colorbacklineimpair1='255,255,255'; // line impair +$colorbacklineimpair2='255,255,255'; // line impair +$colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line impair +$colorbacklinepair1=(244+round($isred/3)).','.(244+round($isgreen/3)).','.(244+round($isblue/3)); // line pair +$colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+round($isblue/3)); // line pair $colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line pair $colorbackbody='#f0f0f0'; $colortext='40,40,40'; @@ -115,9 +115,7 @@ $fontsizesmaller='11'; if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) { // 90A4AE, 607D8B, 455A64, 37474F - //$conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474f')); // topmenu #607D8B $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474F')); // topmenu #607D8B - //$conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('000')); // topmenu #607D8B $conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236'; $conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu $conf->global->THEME_ELDY_VERMENU_BACK1b='230,232,232'; // vmenu (not menu) @@ -135,12 +133,6 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) $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) - { - $conf->global->THEME_ELDY_BACKTABCARD1='245,245,245'; // topmenu - $conf->global->THEME_ELDY_BACKTABCARD2='245,245,245'; - $conf->global->THEME_ELDY_BACKTABACTIVE='245,245,245'; - } } $colorbackhmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1); @@ -198,11 +190,6 @@ if ($tmpval <= 340) { $colortextbacktab='FFF'; } else { $colortextbacktab='111'; } -$usecss3=true; -if ($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10) $usecss3=false; -elseif ($conf->browser->name == 'iceweasel') $usecss3=false; -elseif ($conf->browser->name == 'epiphany') $usecss3=false; - print '/*'."\n"; print 'colred='.$colred.' colgreen='.$colgreen.' colblue='.$colblue."\n"; print 'isred='.$isred.' isgreen='.$isgreen.' isblue='.$isblue."\n"; @@ -212,7 +199,6 @@ print 'colorbacklineimpairhover='.$colorbacklineimpairhover."\n"; print 'colorbacklinepair1='.$colorbacklinepair1."\n"; print 'colorbacklinepair2='.$colorbacklinepair2."\n"; print 'colorbacklinepairhover='.$colorbacklinepairhover."\n"; -print 'usecss3='.$usecss3."\n"; print 'dol_hide_topmenu='.$dol_hide_topmenu."\n"; print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n"; print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n"; @@ -260,7 +246,7 @@ textarea.cke_source:focus box-shadow: none; } -input, input.flat, textarea, textarea.flat, form.flat select, select.flat { +input, input.flat, textarea, textarea.flat, form.flat select select, select.flat, .dataTables_length label select { font-size: px; font-family: ; background: #FDFDFD; @@ -613,6 +599,11 @@ display : table; margin : 0px auto; } +#pictotitle { + margin-right: 8px; + margin-bottom: 4px; +} + /* ============================================================================== */ /* Menu top et 1ere ligne tableau */ @@ -631,17 +622,12 @@ div#tmenu_tooltip { /* padding-: 100px; */ background: ; /*box-shadow: 0 0 6px rgba(0, 0, 0, .4) !important;*/ - background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(128,128,128,.3) 100%); background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(128,128,128,.3)) ); - - background-image: rgb(); - border-bottom: 1px solid #CCC; - } @@ -702,19 +688,12 @@ ul.tmenu { /* t r b l */ ul.tmenu li { background: rgb(); - - /* background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) ); - */ - - background-image: rgb(); - border-bottom: 1px solid #CCC; - } li.tmenu, li.tmenusel { @@ -1078,6 +1057,7 @@ div.vmenu, td.vmenu { } .menu_contenu { padding-top: 4px; padding-bottom: 3px;} +#menu_contenu_logo { padding-right: 4px; } a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { font-size:px; font-family: ; text-align: ; font-weight: bold; } font.vmenudisabled { font-size:px; font-family: ; text-align: ; font-weight: bold; color: #93a5aa; } @@ -1102,28 +1082,6 @@ div.blockvmenupair, div.blockvmenuimpair, div.blockvmenubookmarks padding-top: 3px; padding-bottom: 3px; margin: 1px 0px 8px 0px; -/* - - - background-image: -o-linear-gradient(bottom, rgb() 0px, rgb() 3px); - background-image: -moz-linear-gradient(bottom, rgb() 0px, rgb() 3px); - background-image: -webkit-linear-gradient(right, rgb() 0px, rgb() 3px); - background-image: -ms-linear-gradient(bottom, rgb() 0px, rgb() 3px); - background-image: linear-gradient(bottom, rgb() 0px, rgb() 3px); - - - background-position:top; - background-repeat:repeat-x; - - border-left: 1px solid #AAA; - border-right: 1px solid #BBB; - border-bottom: 1px solid #BBB; - border-top: 1px solid #BBB; - border-radius: 5px; - -moz-border-radius: 5px; - -moz-box-shadow: 3px 3px 4px #DDD; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD;*/ padding-bottom: 10px; border-bottom: 1px solid #DDD; @@ -1140,26 +1098,6 @@ div.blockvmenusearch padding-top: 3px; padding-bottom: 3px; margin: 1px 0px 8px 0px; -/* - background: #E3E6E8; - - background-image: -o-linear-gradient(bottom, rgb() 90%, rgb() 100%); - background-image: -moz-linear-gradient(bottom, rgb() 90%, rgb() 100%); - background-image: -webkit-linear-gradient(bottom, rgb() 90%, rgb() 100%); - background-image: -ms-linear-gradient(bottom, rgb() 90%, rgb() 100%); - background-image: linear-gradient(bottom, rgb() 90%, rgb() 100%); - - - border-left: 1px solid #AAA; - border-right: 1px solid #CCC; - border-bottom: 1px solid #CCC; - border-top: 1px solid #CCC; - border-radius: 5px; - -moz-border-radius: 5px; - -moz-box-shadow: 3px 3px 4px #DDD; - -webkit-box-shadow: 3px 3px 4px #DDD; - box-shadow: 3px 3px 4px #DDD; -*/ padding-bottom: 10px; border-bottom: 1px solid #DDD; @@ -1229,13 +1167,12 @@ td.photo { /* ============================================================================== */ .largebutton { - background-image: -o-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; background-image: -moz-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; background-image: -webkit-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; background-image: -ms-linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; background-image: linear-gradient(bottom, rgba(200,200,200,0.1) 0%, rgba(255,255,255,0.3) 120%) !important; - + background: #FFF; background-repeat: repeat-x !important; border: 1px solid #CCC !important; @@ -1485,23 +1422,14 @@ div.tabBar { border-left: 1px solid #BBB; border-top: 1px solid #CCC; width: auto; - + background: rgb(); - /* - background-image: -o-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); - background-image: -moz-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); - background-image: -webkit-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); - background-image: -ms-linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); - background-image: linear-gradient(bottom, rgba(, 0.5) 25%, rgba(, 0.5) 100%); - */ - - background: rgb(); - - + + -moz-box-shadow: 3px 3px 4px #DDD; -webkit-box-shadow: 3px 3px 4px #DDD; box-shadow: 3px 3px 4px #DDD; - + } div.tabsAction { @@ -1547,16 +1475,6 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { border-top: 1px solid #D8D8D8; */ - /* - - background: rgb(); - /*background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%); - background-image: -moz-linear-gradient(bottom, rgb() 35%, rgb() 100%); - background-image: -webkit-linear-gradient(bottom, rgb() 35%, rgb() 100%); - background-image: -ms-linear-gradient(bottom, rgb() 35%, rgb() 100%); - background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%);*/ - - */ background-image: none !important; } @@ -1573,14 +1491,7 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active { -webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1); box-shadow: 0 -1px 4px rgba(0,0,0,.1); - background: rgb() !important; -/* border-bottom: 1px solid rgb() !important; - background: rgba(, 0.5) url() 50% 0 repeat-x; */ - - background: rgb() url() 50% 0 repeat-x; - - /*background-image: none !important; */ color: #; } a.tab:hover @@ -1789,6 +1700,10 @@ End bootstrap */ margin: 0px !important; padding: 0px !important; } +tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd +{ + border: 0px; +} .notopnoleft { border-collapse: collapse; @@ -1816,6 +1731,13 @@ table.border, table.dataTable, .table-border, .table-border-col, .table-key-bord padding: 1px 2px 1px 3px; /* t r b l */ } +.border tbody tr, .border tbody tr td { + height: 20px; +} +div.tabBar table.border tr { + height: 20px; +} + table.border td, div.border div div.tagtd { padding: 2px 2px 2px 2px; border: 1px solid #D0D0D0; @@ -1849,11 +1771,6 @@ table.noborder, table.formdoc, div.noborder { border-right-color: #CCC; border-right-style: solid; -/* - border-bottom-width: 1px; - border-bottom-color: #BBBBBB; - border-bottom-style: solid; -*/ border-left-width: 1px; border-left-color: #CCC; border-left-style: solid; @@ -1892,11 +1809,21 @@ table.nobordernopadding { } table.nobordernopadding tr { border: 0px !important; - padding: 0px 0px; + padding: 0px 0px !important; } -table.nobordernopadding td { - border: 0px !important; - padding: 0px 0px; +table.nobordernopadding tr td { + border: 0px; + padding: 0 3px 0 0 !important; +} +table.border tr td table.nobordernopadding tr td { + padding-top: 0px; + padding-bottom: 0px; +} +td.borderright { + border: none; /* to erase value for table.nobordernopadding td */ + border-right-width: 1px !important; + border-right-color: #BBB !important; + border-right-style: solid !important; } /* For lists */ @@ -1963,62 +1890,47 @@ table.liste td { */ .impair:hover, td.nohover { - + 0) { ?> background: rgb(); - background: #fafafa; + background: rgba(0, 0, 0, 0.05) !important; - border: 0px; } -.impair, .nohover .impair:hover, tr.impair td.nohover { - - background: linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - - background: #eaeaea; - +.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 */ -} - -.pair:hover { - - background: rgb(); - - background: #fafafa; - - border: 0px; -} - -.pair, .nohover .pair:hover, tr.pair td.nohover { -/* - - background: linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%) !important; - + background: #ffffff; - -*/ +} + +.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; } -tr.pair td, tr.impair td { - padding: 4px; +table.dataTable tr.odd { + background-color: #f9f9f9 !important; +} +table.dataTable td { + padding: 5px 2px 5px 3px !important; +} +tr.even td, tr.pair td, tr.odd td, tr.impair td, form.odd div.tagtd, form.impair div.tagtd, form.pair div.tagtd, div.impair div.tagtd, div.pair div.tagtd, div.liste_titre div.tagtd { + padding: 5px 2px 5px 3px; border-bottom: 1px solid #ddd; } +tr.even td .nobordernopadding tr td, tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td, tr.odd td .nobordernopadding tr td { + border-bottom: 0px !important; +} +td.nobottom, td.nobottom { + border-bottom: 0px !important; +} div.liste_titre .tagtd { vertical-align: middle; } @@ -2033,26 +1945,27 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.list { background: rgb(); background-repeat: repeat-x; - - /* - background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); + + background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); - */ font-weight: bold; - + color: #; font-family: ; border-bottom: 1px solid #FDFFFF; text-align: ; } +tr.liste_titre th, th.liste_titre, form.liste_titre div, div.liste_titre +{ + border-bottom: 1px solid #FDFFFF; +} tr.liste_titre th, th.liste_titre, tr.liste_titre td, td.liste_titre, form.liste_titre div, div.liste_titre { font-family: ; font-weight: bold; - border-bottom: 1px solid #FDFFFF; text-shadow: 1px 0px 1px #; vertical-align: middle; } @@ -2092,7 +2005,11 @@ input.liste_titre { .tableforservicepart1 .impair, .tableforservicepart1 .pair, .tableforservicepart2 .impair, .tableforservicepart2 .pair { - background: none; + //background: none; + background: #FFF; +} +.tableforservicepart1 tbody tr td, .tableforservicepart2 tbody tr td { + border-bottom: none; } .margintable td { @@ -2117,18 +2034,6 @@ div.tabBar .noborder { * Boxes */ -.tdboxstats { - - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - background: linear-gradient(bottom, rgb() 85%, rgb() 120%) !important; - - background: #ffffff !important; - -} - .boxstats { margin: 3px; @@ -2160,16 +2065,6 @@ tr.box_titre { height: 26px !important; background: rgb(); background-repeat: repeat-x; - - /* - background-image: linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); - background-image: -o-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); - background-image: -moz-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); - background-image: -webkit-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); - background-image: -ms-linear-gradient(top, rgba(255,255,255,.3) 0%, rgba(0,0,0,.3) 100%); - background-image: -webkit-gradient( linear, left top, left bottom, color-stop(0, rgba(255,255,255,.3)), color-stop(1, rgba(0,0,0,.3)) ); - */ - color: #; text-shadow: 1px 0px 1px #; font-family: , sans-serif; @@ -2183,28 +2078,21 @@ tr.box_titre td.boxclose { } tr.box_impair { - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: linear-gradient(bottom, rgb() 85%, rgb() 100%); - - background: #eaeaea; - font-family: ; } tr.box_pair { - background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%); background: linear-gradient(bottom, rgb() 85%, rgb() 100%); - - background: #ffffff; - + font-family: ; background-color: #f9f9f9; @@ -2581,6 +2469,8 @@ table.cal_event { border: none; border-collapse: collapse; margin-bottom: 1px min-height: 20px; } table.cal_event td { border: none; padding-: 2px; padding-: 2px; padding-top: 0px; padding-bottom: 0px; } +table.cal_event td.cal_event { padding: 4px 4px !important; } +table.cal_event td.cal_event_right { padding: 4px 4px !important; } ul.cal_event { padding-right: 2px; padding-top: 1px; border: none; list-style-type: none; margin: 0 auto; padding-left: 0px; padding-start: 0px; -khtml-padding-start: 0px; -o-padding-start: 0px; -moz-padding-start: 0px; -webkit-padding-start: 0px; } li.cal_event { border: none; list-style-type: none; } .cal_event a:link { color: #111111; font-size: 11px; font-weight: normal !important; } @@ -3115,10 +3005,23 @@ a span.select2-chosen .select2-container .select2-choice { background-image: none; } +.select2-choices .select2-search-choice { + border: 1px solid #aaa !important; +} .select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit { background: #FFFFFF; } +.select2-container-multi.select2-container-disabled .select2-choices { + background-color: #FFFFFF; + background-image: none; + border: none; + cursor: default; +} +.select2-container-multi .select2-choices .select2-search-choice { + margin-top: 2px; + margin-bottom: 2px; +} /* ============================================================================== */ @@ -3244,14 +3147,14 @@ ul.ulmenu { border: 1px solid #5f5f7a !important; background: rgb(); background-repeat: repeat-x; - + background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%); font-weight: bold; - + color: # !important; } .alilevel0 {