Some change into css. Tabs background are now white so main content is
black on white (better contrast). Fix editfieldval for date.
This commit is contained in:
Laurent Destailleur
parent
125c821bc4
commit
60a56da370
@ -261,7 +261,8 @@ x.y.z+dfsgw
|
||||
|
||||
Note: If there was errors solved manually after get-orig-sources.sh, you may need to make a git commit
|
||||
|
||||
* Add an entry into debian/changelog
|
||||
* Fix debian/* files used to build package.
|
||||
Add an entry into debian/changelog
|
||||
> dch -v x.y.z+dfsgw-v "My comment" will add entry.
|
||||
For example: dch -v x.y.z+dfsgw-1 "New upstream release." for a new version (x.y.z = version, w start from 1 and increaed for each new import)
|
||||
Then modify changelog to replace "version" or "unstable" with "UNRELEASED".
|
||||
@ -269,7 +270,7 @@ Then check/modify also the user/date signature:
|
||||
- Date must have format reported by "date -R"
|
||||
- Name and email must match value into debian/control file (Entry added here is used by next step).
|
||||
|
||||
* We try to build package
|
||||
* Try to build package
|
||||
> rm -fr ../build-area; git-buildpackage -us -uc
|
||||
|
||||
Note: You can use git-buildpackage -us -uc --git-ignore-new if you want to test build with uncommited file
|
||||
|
||||
@ -371,7 +371,7 @@ if ($action == 'edit' || $action == 'updateedit')
|
||||
print '<tr'.dol_bc($var,'hideonsmartphone').'><td><label for="logo">'.$langs->trans("Logo").' (png,jpg)</label></td><td>';
|
||||
print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
|
||||
print '<input type="file" class="flat" name="logo" id="logo" size="50">';
|
||||
print '</td><td valign="middle" align="right">';
|
||||
print '</td><td class="nocellnopadd" valign="middle" align="right">';
|
||||
if (! empty($mysoc->logo_mini))
|
||||
{
|
||||
print '<a href="'.$_SERVER["PHP_SELF"].'?action=removelogo">'.img_delete($langs->trans("Delete")).'</a>';
|
||||
@ -756,7 +756,7 @@ else
|
||||
|
||||
print '<table width="100%" class="nobordernopadding"><tr class="nocellnopadd"><td valign="middle" class="nocellnopadd">';
|
||||
print $mysoc->logo;
|
||||
print '</td><td valign="center" align="right">';
|
||||
print '</td><td class="nocellnopadd" valign="center" align="right">';
|
||||
|
||||
// On propose la generation de la vignette si elle n'existe pas
|
||||
if (!is_file($conf->mycompany->dir_output.'/logos/thumbs/'.$mysoc->logo_mini) && preg_match('/(\.jpg|\.jpeg|\.png)$/i',$mysoc->logo))
|
||||
|
||||
@ -64,6 +64,7 @@ $id = GETPOST('id', 'int');
|
||||
$ref = GETPOST('ref', 'alpha');
|
||||
$socid = GETPOST('socid', 'int');
|
||||
$action = GETPOST('action', 'alpha');
|
||||
$cancel = GETPOST('cancel', 'alpha');
|
||||
$origin = GETPOST('origin', 'alpha');
|
||||
$originid = GETPOST('originid', 'int');
|
||||
$confirm = GETPOST('confirm', 'alpha');
|
||||
@ -113,6 +114,8 @@ if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'e
|
||||
|
||||
if (empty($reshook))
|
||||
{
|
||||
if ($cancel) $action = '';
|
||||
|
||||
include DOL_DOCUMENT_ROOT . '/core/actions_setnotes.inc.php'; // Must be include, not includ_once
|
||||
|
||||
// Action clone object
|
||||
@ -232,7 +235,7 @@ if (empty($reshook))
|
||||
}
|
||||
else if ($action == 'setdate_livraison' && $user->rights->propal->creer)
|
||||
{
|
||||
$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['liv_month'], $_POST['liv_day'], $_POST['liv_year']));
|
||||
$result = $object->set_date_livraison($user, dol_mktime(12, 0, 0, $_POST['date_livraisonmonth'], $_POST['date_livraisonday'], $_POST['date_livraisonyear']));
|
||||
if ($result < 0)
|
||||
dol_print_error($db, $object->error);
|
||||
}
|
||||
@ -256,7 +259,7 @@ if (empty($reshook))
|
||||
$object->fetch_thirdparty();
|
||||
|
||||
$datep = dol_mktime(12, 0, 0, GETPOST('remonth'), GETPOST('reday'), GETPOST('reyear'));
|
||||
$date_delivery = dol_mktime(12, 0, 0, GETPOST('liv_month'), GETPOST('liv_day'), GETPOST('liv_year'));
|
||||
$date_delivery = dol_mktime(12, 0, 0, GETPOST('date_livraisonmonth'), GETPOST('date_livraisonday'), GETPOST('date_livraisonyear'));
|
||||
$duration = GETPOST('duree_validite');
|
||||
|
||||
if (empty($datep)) {
|
||||
@ -1437,9 +1440,9 @@ if ($action == 'create')
|
||||
$syear = date("Y", $tmpdte);
|
||||
$smonth = date("m", $tmpdte);
|
||||
$sday = date("d", $tmpdte);
|
||||
$form->select_date($syear."-".$smonth."-".$sday, 'liv_', '', '', '', "addprop");
|
||||
$form->select_date($syear."-".$smonth."-".$sday, 'date_livraison', '', '', '', "addprop");
|
||||
} else {
|
||||
$form->select_date(-1, 'liv_', '', '', '', "addprop", 1, 1);
|
||||
$form->select_date(-1, 'date_livraison', '', '', '', "addprop", 1, 1);
|
||||
}
|
||||
print '</td></tr>';
|
||||
|
||||
@ -1860,23 +1863,9 @@ if ($action == 'create')
|
||||
// Delivery date
|
||||
$langs->load('deliveries');
|
||||
print '<tr><td>';
|
||||
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
||||
print $langs->trans('DeliveryDate');
|
||||
print '</td>';
|
||||
if ($action != 'editdate_livraison' && ! empty($object->brouillon))
|
||||
print '<td align="right"><a href="' . $_SERVER["PHP_SELF"] . '?action=editdate_livraison&id=' . $object->id . '">' . img_edit($langs->transnoentitiesnoconv('SetDeliveryDate'), 1) . '</a></td>';
|
||||
print '</tr></table>';
|
||||
print $form->editfieldkey($langs->trans('DeliveryDate'), 'date_livraison', $object->date_livraison, $object, $user->rights->propal->creer);
|
||||
print '</td><td colspan="3">';
|
||||
if ($action == 'editdate_livraison') {
|
||||
print '<form name="editdate_livraison" action="' . $_SERVER["PHP_SELF"] . '?id=' . $object->id . '" method="post">';
|
||||
print '<input type="hidden" name="token" value="' . $_SESSION ['newtoken'] . '">';
|
||||
print '<input type="hidden" name="action" value="setdate_livraison">';
|
||||
$form->select_date($object->date_livraison, 'liv_', '', '', '', "editdate_livraison");
|
||||
print '<input type="submit" class="button" value="' . $langs->trans('Modify') . '">';
|
||||
print '</form>';
|
||||
} else {
|
||||
print dol_print_date($object->date_livraison, 'daytext');
|
||||
}
|
||||
print $form->editfieldval($langs->trans('DeliveryDate'), 'date_livraison', $object->date_livraison, $object, $user->rights->propal->creer, 'day');
|
||||
print '</td>';
|
||||
print '</tr>';
|
||||
|
||||
|
||||
@ -74,7 +74,7 @@ class Form
|
||||
* Output key field for an editable field
|
||||
*
|
||||
* @param string $text Text of label or key to translate
|
||||
* @param string $htmlname Name of select field
|
||||
* @param string $htmlname Name of select field ('edit' prefix will be added)
|
||||
* @param string $preselected Name of Value to show/edit (not used in this function)
|
||||
* @param object $object Object
|
||||
* @param boolean $perm Permission to allow button to edit parameter
|
||||
@ -167,11 +167,11 @@ class Form
|
||||
}
|
||||
else if ($typeofdata == 'day' || $typeofdata == 'datepicker')
|
||||
{
|
||||
$ret.=$this->form_date($_SERVER['PHP_SELF'].'?id='.$object->id,$value,$htmlname);
|
||||
$ret.=$this->select_date($value,$htmlname,0,0,1,'form'.$htmlname,1,0,1);
|
||||
}
|
||||
else if ($typeofdata == 'datehourpicker')
|
||||
else if ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker')
|
||||
{
|
||||
$ret.=$this->form_date($_SERVER['PHP_SELF'].'?id='.$object->id,$value,$htmlname,1,1);
|
||||
$ret.=$this->select_date($value,$htmlname,1,1,1,'form'.$htmlname,1,0,1);
|
||||
}
|
||||
else if (preg_match('/^select;/',$typeofdata))
|
||||
{
|
||||
@ -191,14 +191,14 @@ class Form
|
||||
$ret.=$doleditor->Create(1);
|
||||
}
|
||||
$ret.='</td>';
|
||||
if ($typeofdata != 'day' && $typeofdata != 'datepicker' && $typeofdata != 'datehourpicker')
|
||||
{
|
||||
//if ($typeofdata != 'day' && $typeofdata != 'dayhour' && $typeofdata != 'datepicker' && $typeofdata != 'datehourpicker')
|
||||
//{
|
||||
$ret.='<td align="left">';
|
||||
$ret.='<input type="submit" class="button" name="modify" value="'.$langs->trans("Modify").'">';
|
||||
if (preg_match('/ckeditor|textarea/',$typeofdata)) $ret.='<br>'."\n";
|
||||
$ret.='<input type="submit" class="button" name="cancel" value="'.$langs->trans("Cancel").'">';
|
||||
$ret.='</td>';
|
||||
}
|
||||
//}
|
||||
$ret.='</tr></table>'."\n";
|
||||
$ret.='</form>'."\n";
|
||||
}
|
||||
@ -208,7 +208,7 @@ class Form
|
||||
elseif ($typeofdata == 'amount') $ret.=($value != '' ? price($value,'',$langs,0,-1,-1,$conf->currency) : '');
|
||||
elseif (preg_match('/^text/',$typeofdata) || preg_match('/^note/',$typeofdata)) $ret.=dol_htmlentitiesbr($value);
|
||||
elseif ($typeofdata == 'day' || $typeofdata == 'datepicker') $ret.=dol_print_date($value,'day');
|
||||
elseif ($typeofdata == 'datehourpicker') $ret.=dol_print_date($value,'dayhour');
|
||||
elseif ($typeofdata == 'dayhour' || $typeofdata == 'datehourpicker') $ret.=dol_print_date($value,'dayhour');
|
||||
else if (preg_match('/^select;/',$typeofdata))
|
||||
{
|
||||
$arraydata=explode(',',preg_replace('/^select;/','',$typeofdata));
|
||||
@ -1332,7 +1332,7 @@ class Form
|
||||
$nodatarole=($comboenhancement?' data-role="none"':'');
|
||||
}
|
||||
|
||||
$out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').$nodatarole.'>';
|
||||
$out.= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').$nodatarole.'>';
|
||||
if ($show_empty) $out.= '<option value="-1"'.((empty($selected) || $selected==-1)?' selected="selected"':'').'> </option>'."\n";
|
||||
if ($show_every) $out.= '<option value="-2"'.(($selected==-2)?' selected="selected"':'').'>-- '.$langs->trans("Everybody").' --</option>'."\n";
|
||||
|
||||
@ -3475,32 +3475,32 @@ class Form
|
||||
* @return void
|
||||
* @see select_date
|
||||
*/
|
||||
function form_date($page, $selected, $htmlname, $displayhour=0, $displaymin=0)
|
||||
function form_date($page, $selected, $htmlname, $displayhour=0, $displaymin=0, $noouput=0)
|
||||
{
|
||||
global $langs;
|
||||
|
||||
$ret='';
|
||||
|
||||
if ($htmlname != "none")
|
||||
{
|
||||
print '<form method="post" action="'.$page.'" name="form'.$htmlname.'">';
|
||||
print '<input type="hidden" name="action" value="set'.$htmlname.'">';
|
||||
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
print '<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
|
||||
print '<tr><td>';
|
||||
print $this->select_date($selected,$htmlname,$displayhour,$displaymin,1,'form'.$htmlname);
|
||||
print '</td>';
|
||||
print '<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
|
||||
print '</tr></table></form>';
|
||||
$ret.='<form method="post" action="'.$page.'" name="form'.$htmlname.'">';
|
||||
$ret.='<input type="hidden" name="action" value="set'.$htmlname.'">';
|
||||
$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
$ret.='<table class="nobordernopadding" cellpadding="0" cellspacing="0">';
|
||||
$ret.='<tr><td>';
|
||||
$ret.=$this->select_date($selected,$htmlname,$displayhour,$displaymin,1,'form'.$htmlname);
|
||||
$ret.='</td>';
|
||||
$ret.='<td align="left"><input type="submit" class="button" value="'.$langs->trans("Modify").'"></td>';
|
||||
$ret.='</tr></table></form>';
|
||||
}
|
||||
else
|
||||
{
|
||||
if ($selected)
|
||||
{
|
||||
$this->load_cache_types_paiements();
|
||||
print $this->cache_types_paiements[$selected]['label'];
|
||||
} else {
|
||||
print " ";
|
||||
}
|
||||
if ($displayhour) $ret.=dol_print_date($selected,'dayhour');
|
||||
else $ret.=dol_print_date($selected,'day');
|
||||
}
|
||||
|
||||
if (empty($noouput)) print $ret;
|
||||
return $ret;
|
||||
}
|
||||
|
||||
|
||||
@ -4776,7 +4776,7 @@ class Form
|
||||
$nodatarole=($comboenhancement?' data-role="none"':'');
|
||||
}
|
||||
|
||||
$out.= '<select class="flat" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').$nodatarole.'>';
|
||||
$out.= '<select class="flat minwidth200" id="'.$htmlname.'" name="'.$htmlname.'"'.($disabled?' disabled="disabled"':'').$nodatarole.'>';
|
||||
|
||||
$num = $this->db->num_rows($resql);
|
||||
$i = 0;
|
||||
|
||||
@ -64,16 +64,16 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
|
||||
print '<div class="fichecenter">';
|
||||
|
||||
if (! empty($conf->browser->phone)) print '<div class="fichehalfleft">';
|
||||
else print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap">';
|
||||
else print '<table class="nobordernopadding" width="100%"><tr><td class="nowrap borderright">';
|
||||
|
||||
print '<table class="nobordernopadding">';
|
||||
|
||||
if ($canedit)
|
||||
{
|
||||
print '<tr>';
|
||||
print '<td class="nowrap" style="padding-bottom: 2px;">';
|
||||
print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
|
||||
print $langs->trans("ActionsToDoBy").' ';
|
||||
print '</td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px;">';
|
||||
print '</td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px; padding-right: 4px;">';
|
||||
print $form->select_dolusers($filtert, 'usertodo', 1, '', ! $canedit);
|
||||
if (empty($conf->dol_optimize_smallscreen)) print ' '.$langs->trans("or") . ' '.$langs->trans("Group").' ';
|
||||
print $form->select_dolgroups($usergroupid, 'usergroup', 1, '', ! $canedit);
|
||||
@ -83,16 +83,16 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
|
||||
$formactions=new FormActions($db);
|
||||
|
||||
print '<tr>';
|
||||
print '<td class="nowrap" style="padding-bottom: 2px;">';
|
||||
print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
|
||||
print $langs->trans("Type");
|
||||
print ' </td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px;">';
|
||||
print ' </td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px; padding-right: 4px;">';
|
||||
print $formactions->select_type_actions($actioncode, "actioncode", '', (empty($conf->global->AGENDA_USE_EVENT_TYPE) ? 1 : 0));
|
||||
print '</td></tr>';
|
||||
|
||||
print '<tr>';
|
||||
print '<td class="nowrap" style="padding-bottom: 2px;">';
|
||||
print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
|
||||
print $langs->trans("Status");
|
||||
print ' </td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px;">';
|
||||
print ' </td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px; padding-right: 4px;">';
|
||||
$formactions->form_select_status_action('formaction',$status,1,'status',1,2);
|
||||
print '</td></tr>';
|
||||
}
|
||||
@ -100,7 +100,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
|
||||
if (! empty($conf->societe->enabled) && $user->rights->societe->lire)
|
||||
{
|
||||
print '<tr>';
|
||||
print '<td class="nowrap" style="padding-bottom: 2px;">';
|
||||
print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">';
|
||||
print $langs->trans("ThirdParty").' ';
|
||||
print '</td><td class="nowrap maxwidthonsmartphone" style="padding-bottom: 2px;">';
|
||||
print $form->select_thirdparty($socid, 'socid');
|
||||
@ -124,7 +124,7 @@ function print_actions_filter($form, $canedit, $status, $year, $month, $day, $sh
|
||||
{
|
||||
// Filter on hours
|
||||
print '<tr>';
|
||||
print '<td class="nowrap" style="padding-bottom: 2px;">'.$langs->trans("WorkingTimeRange").'</td>';
|
||||
print '<td class="nowrap" style="padding-bottom: 2px; padding-right: 4px;">'.$langs->trans("WorkingTimeRange").'</td>';
|
||||
print "<td class='nowrap maxwidthonsmartphone'>";
|
||||
print '<input type="number" class="short" name="begin_h" value="'.$begin_h.'" min="0" max="23">';
|
||||
if (empty($conf->dol_use_jmobile)) print ' - ';
|
||||
|
||||
@ -51,7 +51,7 @@ MemberIsInCategories=This member owns to following members tags/categories
|
||||
ContactIsInCategories=This contact owns to following contacts tags/categories
|
||||
ProductHasNoCategory=This product/service is not in any tags/categories
|
||||
SupplierHasNoCategory=This supplier is not in any tags/categories
|
||||
CompanyHasNoCategory=This company is not in any tags/categories
|
||||
CompanyHasNoCategory=This thirdparty is not in any tags/categories
|
||||
MemberHasNoCategory=This member is not in any tags/categories
|
||||
ContactHasNoCategory=This contact is not in any tags/categories
|
||||
ClassifyInCategory=Classify in tag/category
|
||||
@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
|
||||
CatCusList=List of customer/prospect tags/categories
|
||||
CatProdList=List of products tags/categories
|
||||
CatMemberList=List of members tags/categories
|
||||
CatContactList=List of contact tags/categories and contact
|
||||
CatContactList=List of contact tags/categories
|
||||
CatSupLinks=Links between suppliers and tags/categories
|
||||
CatCusLinks=Links between customers/prospects and tags/categories
|
||||
CatProdLinks=Links between products/services and tags/categories
|
||||
|
||||
@ -51,7 +51,7 @@ MemberIsInCategories=This member is linked to following members tags/categories
|
||||
ContactIsInCategories=This contact is linked to following contacts tags/categories
|
||||
ProductHasNoCategory=This product/service is not in any tags/categories
|
||||
SupplierHasNoCategory=This supplier is not in any tags/categories
|
||||
CompanyHasNoCategory=This company is not in any tags/categories
|
||||
CompanyHasNoCategory=This thirdparty is not in any tags/categories
|
||||
MemberHasNoCategory=This member is not in any tags/categories
|
||||
ContactHasNoCategory=This contact is not in any tags/categories
|
||||
ClassifyInCategory=Add to tag/category
|
||||
@ -94,7 +94,7 @@ CatSupList=List of supplier tags/categories
|
||||
CatCusList=List of customer/prospect tags/categories
|
||||
CatProdList=List of products tags/categories
|
||||
CatMemberList=List of members tags/categories
|
||||
CatContactList=List of contact tags/categories and contact
|
||||
CatContactList=List of contact tags/categories
|
||||
CatSupLinks=Links between suppliers and tags/categories
|
||||
CatCusLinks=Links between customers/prospects and tags/categories
|
||||
CatProdLinks=Links between products/services and tags/categories
|
||||
|
||||
@ -97,7 +97,7 @@ $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='255,255,255'; // line impair
|
||||
@ -106,7 +106,7 @@ $colorbacklineimpairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+roun
|
||||
$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='#f9f9f9';
|
||||
$colorbackbody='#f3f3f3';
|
||||
$colortext='40,40,40';
|
||||
$fontsize='12';
|
||||
$fontsizesmaller='11';
|
||||
@ -121,10 +121,10 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
|
||||
$conf->global->THEME_ELDY_VERMENU_BACK2='240,240,240';
|
||||
$conf->global->THEME_ELDY_BACKTITLE1='140,160,185'; // title of arrays
|
||||
$conf->global->THEME_ELDY_BACKTITLE2='230,230,230';
|
||||
$conf->global->THEME_ELDY_BACKTABCARD1='255,255,255';
|
||||
$conf->global->THEME_ELDY_BACKTABCARD2='210,210,210'; // card
|
||||
$conf->global->THEME_ELDY_BACKTABCARD1='234,234,234';
|
||||
$conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
|
||||
$conf->global->THEME_ELDY_BACKBODY='#f9f9f9;';
|
||||
$conf->global->THEME_ELDY_BACKBODY='#f3f3f3;';
|
||||
$conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
|
||||
$conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
|
||||
$conf->global->THEME_ELDY_LINEIMPAIRHOVER='238,246,252';
|
||||
@ -168,10 +168,6 @@ if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->
|
||||
$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
|
||||
$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2));
|
||||
|
||||
// Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
|
||||
$colorbacktabcard1=join(',',colorStringToArray($colorbacktabcard1));
|
||||
$colorbacktabcard2=join(',',colorStringToArray($colorbacktabcard2));
|
||||
|
||||
// Set text color to black or white
|
||||
$tmppart=explode(',',$colorbackhmenu1);
|
||||
$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '')+(! empty($tmppart[2]) ? $tmppart[2] : '')+(! empty($tmppart[3]) ? $tmppart[3] : '');
|
||||
@ -188,7 +184,7 @@ else { $colortexttitle='444'; $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'; }
|
||||
else { $colortextbacktab='444'; }
|
||||
else { $colortextbacktab='111'; }
|
||||
|
||||
|
||||
$usecss3=true;
|
||||
@ -552,6 +548,7 @@ margin : 0px auto;
|
||||
|
||||
#pictotitle {
|
||||
margin-right: 8px;
|
||||
margin-bottom: 4px;
|
||||
}
|
||||
|
||||
|
||||
@ -1010,7 +1007,7 @@ div.vmenu, td.vmenu {
|
||||
<?php } ?>
|
||||
}
|
||||
|
||||
.menu_contenu { padding-top: 1px; }
|
||||
.menu_contenu { padding-top: 3px; padding-top: 2px; }
|
||||
#menu_contenu_logo { padding-right: 4px; }
|
||||
|
||||
a.vmenu:link, a.vmenu:visited, a.vmenu:hover, a.vmenu:active { font-size:<?php print $fontsize ?>px; font-family: <?php print $fontlist ?>; text-align: <?php print $left; ?>; font-weight: bold; }
|
||||
@ -1407,11 +1404,12 @@ div.tabBar {
|
||||
-moz-border-radius:6px;
|
||||
-webkit-border-radius: 6px;
|
||||
border-radius: 6px;
|
||||
border-right: 1px solid #BBB;
|
||||
border-bottom: 1px solid #BBB;
|
||||
border-left: 1px solid #BBB;
|
||||
border-top: 1px solid #CCC;
|
||||
border-right: 1px solid #AAA;
|
||||
border-bottom: 1px solid #AAA;
|
||||
border-left: 1px solid #AAA;
|
||||
border-top: 1px solid #BBB;
|
||||
width: auto;
|
||||
/*
|
||||
<?php if ($usecss3) { ?>
|
||||
background-image: -o-linear-gradient(bottom, rgba(<?php echo $colorbacktabcard1; ?>, 0.5) 25%, rgba(<?php echo $colorbacktabcard2; ?>, 0.5) 100%);
|
||||
background-image: -moz-linear-gradient(bottom, rgba(<?php echo $colorbacktabcard1; ?>, 0.5) 25%, rgba(<?php echo $colorbacktabcard2; ?>, 0.5) 100%);
|
||||
@ -1421,6 +1419,8 @@ div.tabBar {
|
||||
<?php } else { ?>
|
||||
background: rgb(<?php echo $colorbacktabcard1; ?>);
|
||||
<?php } ?>
|
||||
*/
|
||||
background: rgb(<?php echo $colorbacktabcard1; ?>);
|
||||
<?php if (empty($dol_optimize_smallscreen)) { ?>
|
||||
-moz-box-shadow: 3px 3px 4px #DDD;
|
||||
-webkit-box-shadow: 3px 3px 4px #DDD;
|
||||
@ -1452,7 +1452,6 @@ a.tabTitle {
|
||||
a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
|
||||
font-family: <?php print $fontlist ?>;
|
||||
padding: 5px 12px 5px;
|
||||
/* padding: 3px 6px 2px 6px;*/
|
||||
margin: 0em 0.2em;
|
||||
text-decoration: none;
|
||||
white-space: nowrap;
|
||||
@ -1461,15 +1460,19 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
|
||||
-webkit-border-radius:6px 6px 0px 0px;
|
||||
border-radius:6px 6px 0px 0px;
|
||||
|
||||
/*
|
||||
-moz-box-shadow: 0 -1px 4px rgba(0,0,0,.1);
|
||||
-webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1);
|
||||
box-shadow: 0 -1px 4px rgba(0,0,0,.1);
|
||||
*/
|
||||
|
||||
border-bottom: none;
|
||||
/*
|
||||
border-right: 1px solid #BBB;
|
||||
border-left: 1px solid #BBB;
|
||||
border-top: 1px solid #CCC;
|
||||
|
||||
*/
|
||||
/*
|
||||
<?php if ($usecss3) { ?>
|
||||
background-image: -o-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 35%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
|
||||
background-image: -moz-linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 35%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
|
||||
@ -1478,28 +1481,40 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
|
||||
background-image: linear-gradient(bottom, rgb(<?php echo $colorbackvmenu1; ?>) 35%, rgb(<?php echo $colorbackvmenu2; ?>) 100%);
|
||||
<?php } ?>
|
||||
background-image: none !important;
|
||||
*/
|
||||
background: rgb(<?php echo $colorbackvmenu2; ?>);
|
||||
|
||||
border-right: 1px solid #BBB;
|
||||
border-left: 1px solid #BBB;
|
||||
border-top: 1px solid #CCC;
|
||||
margin: 0 0.2em 0 0.2em !important;
|
||||
color: #444;
|
||||
}
|
||||
|
||||
.tabactive {
|
||||
/*
|
||||
<?php if ($usecss3) { ?>
|
||||
/* border-bottom: 1px solid rgb(<?php echo $colorbacktabactive; ?>) !important; */
|
||||
background: rgba(<?php echo $colorbacktabcard2; ?>, 0.5) url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x;
|
||||
<?php } else { ?>
|
||||
background: rgb(<?php echo $colorbacktabactive; ?>) url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x;
|
||||
<?php } ?>
|
||||
*/
|
||||
/*background-image: none !important; */
|
||||
color: #<?php echo $colortextbacktab; ?>;
|
||||
color: #<?php echo $colortextbacktab; ?> !important;
|
||||
background: rgb(<?php echo $colorbacktabcard1; ?>) !important;
|
||||
-moz-box-shadow: 0 -1px 4px rgba(0,0,0,.1);
|
||||
-webkit-box-shadow: 0 -1px 4px rgba(0,0,0,.1);
|
||||
box-shadow: 0 -1px 4px rgba(0,0,0,.1);
|
||||
margin-bottom: 0 0.2em 0 0.2em !important;
|
||||
border-right: 1px solid #AAA !important;
|
||||
border-left: 1px solid #AAA !important;
|
||||
border-top: 1px solid #BBB !important;
|
||||
}
|
||||
a.tab:hover
|
||||
{
|
||||
background: rgba(<?php echo $colorbacktabcard1; ?>, 0.5) url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/nav-overlay3.png',1); ?>) 50% 0 repeat-x;
|
||||
color: #<?php echo $colortextbacktab; ?>;
|
||||
}
|
||||
a.tab:link, a.tab:visited
|
||||
{
|
||||
/* color: #888; */
|
||||
/* font-weight: normal !important; */
|
||||
}
|
||||
a.tabimage {
|
||||
color: #434956;
|
||||
font-family: <?php print $fontlist ?>;
|
||||
@ -1693,6 +1708,10 @@ End bootstrap */
|
||||
margin: 0px !important;
|
||||
padding: 0px !important;
|
||||
}
|
||||
tr.nocellnopadd td.nobordernopadding, tr.nocellnopadd td.nocellnopadd
|
||||
{
|
||||
border: 0px;
|
||||
}
|
||||
|
||||
.notopnoleft {
|
||||
border-collapse: collapse;
|
||||
@ -1720,6 +1739,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;
|
||||
@ -1753,11 +1779,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;
|
||||
@ -1798,10 +1819,21 @@ table.nobordernopadding tr {
|
||||
border: 0px !important;
|
||||
padding: 0px 0px !important;
|
||||
}
|
||||
table.nobordernopadding td {
|
||||
border: 0px !important;
|
||||
padding: 0px 0px !important;
|
||||
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 */
|
||||
|
||||
@ -1921,10 +1953,13 @@ table.liste td {
|
||||
|
||||
background-color: #f9f9f9;
|
||||
}
|
||||
tr.pair td, tr.impair td {
|
||||
tr.pair td, tr.impair td, form.impair div.tagtd, form.pair div.tagtd {
|
||||
padding: 5px 2px;
|
||||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
tr.pair td .nobordernopadding tr td, tr.impair td .nobordernopadding tr td {
|
||||
border-bottom: 0px !important;
|
||||
}
|
||||
div.liste_titre .tagtd {
|
||||
vertical-align: middle;
|
||||
}
|
||||
@ -1952,11 +1987,14 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.list
|
||||
border-bottom: 1px solid #FDFFFF;
|
||||
text-align: <?php echo $left; ?>;
|
||||
}
|
||||
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: <?php print $fontlist ?>;
|
||||
font-weight: bold;
|
||||
border-bottom: 1px solid #FDFFFF;
|
||||
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user