Merge remote-tracking branch 'upstream/develop' into ficheinter_rec
This commit is contained in:
Frédéric FRANCE
commit
146275f763
@ -73,7 +73,6 @@ $object->substitutionarrayfortest = $substitutionarray;
|
||||
// List of sending methods
|
||||
$listofmethods=array();
|
||||
$listofmethods['mail']='PHP mail function';
|
||||
//$listofmethods['simplemail']='Simplemail class';
|
||||
$listofmethods['smtps']='SMTP/SMTPS socket library';
|
||||
|
||||
|
||||
@ -896,17 +895,23 @@ else
|
||||
print '<table class="border centpercent tableforfield">';
|
||||
|
||||
// Description
|
||||
print '<tr><td class="titlefield">'.$form->editfieldkey("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string').'</td><td colspan="3">';
|
||||
print '<tr><td class="titlefield">';
|
||||
print $form->editfieldkey("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
|
||||
print '</td><td>';
|
||||
print $form->editfieldval("MailTitle", 'titre', $object->titre, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
|
||||
print '</td></tr>';
|
||||
|
||||
// From
|
||||
print '<tr><td>'.$form->editfieldkey("MailFrom", 'email_from', $object->email_from, $object, $user->rights->mailing->creer && $object->statut < 3, 'string').'</td><td colspan="3">';
|
||||
print '<tr><td>';
|
||||
print $form->editfieldkey("MailFrom", 'email_from', $object->email_from, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
|
||||
print '</td><td>';
|
||||
print $form->editfieldval("MailFrom", 'email_from', $object->email_from, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
|
||||
print '</td></tr>';
|
||||
|
||||
// Errors to
|
||||
print '<tr><td>'.$form->editfieldkey("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, $user->rights->mailing->creer && $object->statut < 3, 'string').'</td><td colspan="3">';
|
||||
print '<tr><td>';
|
||||
print $form->editfieldkey("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
|
||||
print '</td><td>';
|
||||
print $form->editfieldval("MailErrorsTo", 'email_errorsto', $object->email_errorsto, $object, $user->rights->mailing->creer && $object->statut < 3, 'string');
|
||||
print '</td></tr>';
|
||||
|
||||
@ -1117,7 +1122,7 @@ else
|
||||
$htmltext.='</i>';
|
||||
|
||||
// Print mail content
|
||||
print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto('<span class="hideonsmartphone">'.$langs->trans("AvailableVariables").'</span>', $htmltext, 1, 'help', '', 0, 2, 'emailsubstitionhelp'), 'generic');
|
||||
print load_fiche_titre($langs->trans("EMail"), $form->textwithpicto('<span class="opacitymedium hideonsmartphone">'.$langs->trans("AvailableVariables").'</span>', $htmltext, 1, 'helpclickable', '', 0, 2, 'emailsubstitionhelp'), 'generic');
|
||||
|
||||
dol_fiche_head('', '', '', -1);
|
||||
|
||||
|
||||
@ -136,7 +136,7 @@ class Form
|
||||
if (! empty($notabletag)) $ret.=' ';
|
||||
if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret.='</td>';
|
||||
if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret.='<td class="right">';
|
||||
if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret.='<a href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
|
||||
if ($htmlname && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret.='<a class="editfielda" href="'.$_SERVER["PHP_SELF"].'?action=edit'.$htmlname.'&'.$paramid.'='.$object->id.$moreparam.'">'.img_edit($langs->trans('Edit'), ($notabletag ? 0 : 1)).'</a>';
|
||||
if (! empty($notabletag) && $notabletag == 1) $ret.=' : ';
|
||||
if (! empty($notabletag) && $notabletag == 3) $ret.=' ';
|
||||
if (empty($notabletag) && GETPOST('action', 'aZ09') != 'edit'.$htmlname && $perm) $ret.='</td>';
|
||||
@ -442,7 +442,7 @@ class Form
|
||||
* @see textwithpicto() Use thisfunction if you can.
|
||||
* TODO Move this as static as soon as everybody use textwithpicto or @Form::textwithtooltip
|
||||
*/
|
||||
public function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 2, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger = '', $forcenowrap = 0)
|
||||
public function textwithtooltip($text, $htmltext, $tooltipon = 1, $direction = 0, $img = '', $extracss = '', $notabs = 3, $incbefore = '', $noencodehtmltext = 0, $tooltiptrigger = '', $forcenowrap = 0)
|
||||
{
|
||||
global $conf;
|
||||
|
||||
@ -458,8 +458,8 @@ class Form
|
||||
$htmltext=str_replace("\n", "", $htmltext);
|
||||
|
||||
$extrastyle='';
|
||||
if ($direction < 0) { $extracss=($extracss?$extracss.' ':'').'inline-block'; $extrastyle='padding: 0px; padding-left: 3px !important;'; }
|
||||
if ($direction > 0) { $extracss=($extracss?$extracss.' ':'').'inline-block'; $extrastyle='padding: 0px; padding-right: 3px !important;'; }
|
||||
if ($direction < 0) { $extracss=($extracss?$extracss.' ':'').($notabs != 3 ? 'inline-block' : ''); $extrastyle='padding: 0px; padding-left: 3px !important;'; }
|
||||
if ($direction > 0) { $extracss=($extracss?$extracss.' ':'').($notabs != 3 ? 'inline-block' : ''); $extrastyle='padding: 0px; padding-right: 3px !important;'; }
|
||||
|
||||
$classfortooltip='classfortooltip';
|
||||
|
||||
@ -476,7 +476,7 @@ class Form
|
||||
}
|
||||
if ($tooltipon == 2 || $tooltipon == 3)
|
||||
{
|
||||
$paramfortooltipimg=' class="'.$classfortooltip.' inline-block'.($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'"';
|
||||
$paramfortooltipimg=' class="'.$classfortooltip.($notabs != 3 ? ' inline-block' : '').($extracss?' '.$extracss:'').'" style="padding: 0px;'.($extrastyle?' '.$extrastyle:'').'"';
|
||||
if ($tooltiptrigger == '') $paramfortooltipimg.=' title="'.($noencodehtmltext?$htmltext:dol_escape_htmltag($htmltext, 1)).'"'; // Attribut to put on img tag to store tooltip
|
||||
else $paramfortooltipimg.=' dolid="'.$tooltiptrigger.'"';
|
||||
}
|
||||
@ -519,15 +519,15 @@ class Form
|
||||
* @param string $text Text to show
|
||||
* @param string $htmltext Content of tooltip
|
||||
* @param int $direction 1=Icon is after text, -1=Icon is before text, 0=no icon
|
||||
* @param string $type Type of picto ('info', 'help', 'warning', 'superadmin', 'mypicto@mymodule', ...) or image filepath or 'none'
|
||||
* @param string $type Type of picto ('info', 'infoclickable', 'help', 'helpclickable', 'warning', 'superadmin', 'mypicto@mymodule', ...) or image filepath or 'none'
|
||||
* @param string $extracss Add a CSS style to td, div or span tag
|
||||
* @param int $noencodehtmltext Do not encode into html entity the htmltext
|
||||
* @param int $notabs 0=Include table and tr tags, 1=Do not include table and tr tags, 2=use div, 3=use span
|
||||
* @param string $tooltiptrigger ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key, clickable link is on image or on link if param $type='none')
|
||||
* @param string $tooltiptrigger ''=Tooltip on hover, 'abc'=Tooltip on click (abc is a unique key, clickable link is on image or on link if param $type='none' or on both if $type='xxxclickable')
|
||||
* @param int $forcenowrap Force no wrap between text and picto (works with notabs=2 only)
|
||||
* @return string HTML code of text, picto, tooltip
|
||||
*/
|
||||
public function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 2, $tooltiptrigger = '', $forcenowrap = 0)
|
||||
public function textwithpicto($text, $htmltext, $direction = 1, $type = 'help', $extracss = '', $noencodehtmltext = 0, $notabs = 3, $tooltiptrigger = '', $forcenowrap = 0)
|
||||
{
|
||||
global $conf, $langs;
|
||||
|
||||
@ -541,7 +541,7 @@ class Form
|
||||
// If info or help with no javascript, show only text
|
||||
if (empty($conf->use_javascript_ajax))
|
||||
{
|
||||
if ($type == 'info' || $type == 'help') return $text;
|
||||
if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable') return $text;
|
||||
else
|
||||
{
|
||||
$alt = $htmltext;
|
||||
@ -552,7 +552,7 @@ class Form
|
||||
// If info or help with smartphone, show only text (tooltip hover can't works)
|
||||
if (! empty($conf->dol_no_mouse_hover) && empty($tooltiptrigger))
|
||||
{
|
||||
if ($type == 'info' || $type == 'help') return $text;
|
||||
if ($type == 'info' || $type == 'infoclickable' || $type == 'help' || $type == 'helpclickable') return $text;
|
||||
}
|
||||
// If info or help with smartphone, show only text (tooltip on click does not works with dialog on smaprtphone)
|
||||
//if (! empty($conf->dol_no_mouse_hover) && ! empty($tooltiptrigger))
|
||||
@ -563,12 +563,13 @@ class Form
|
||||
$img='';
|
||||
if ($type == 'info') $img = img_help(0, $alt);
|
||||
elseif ($type == 'help') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
|
||||
elseif ($type == 'helpclickable') $img = img_help(($tooltiptrigger != '' ? 2 : 1), $alt);
|
||||
elseif ($type == 'superadmin') $img = img_picto($alt, 'redstar');
|
||||
elseif ($type == 'admin') $img = img_picto($alt, 'star');
|
||||
elseif ($type == 'warning') $img = img_warning($alt);
|
||||
elseif ($type != 'none') $img = img_picto($alt, $type); // $type can be an image path
|
||||
|
||||
return $this->textwithtooltip($text, $htmltext, (($tooltiptrigger && ! $img)?3:2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger, $forcenowrap);
|
||||
return $this->textwithtooltip($text, $htmltext, ((($tooltiptrigger && ! $img) || strpos($type, 'clickable'))?3:2), $direction, $img, $extracss, $notabs, '', $noencodehtmltext, $tooltiptrigger, $forcenowrap);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -917,18 +917,18 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
|
||||
|
||||
$contactstatic->fields=array(
|
||||
'name' =>array('type'=>'varchar(128)', 'label'=>'Name', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1),
|
||||
'poste' =>array('type'=>'varchar(128)', 'label'=>'PostOfFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20),
|
||||
'poste' =>array('type'=>'varchar(128)', 'label'=>'PostOrFunction', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>20),
|
||||
'address' =>array('type'=>'varchar(128)', 'label'=>'Address', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'showoncombobox'=>1, 'index'=>1, 'position'=>30),
|
||||
'statut' =>array('type'=>'integer', 'label'=>'Status', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>40, 'arrayofkeyval'=>array(0=>$contactstatic->LibStatut(0, 1), 1=>$contactstatic->LibStatut(1, 1))),
|
||||
);
|
||||
|
||||
// Definition of fields for list
|
||||
$arrayfields=array(
|
||||
't.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0), 'position'=>1),
|
||||
't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10),
|
||||
't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20),
|
||||
't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30),
|
||||
't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>40, 'class'=>'center'),
|
||||
't.rowid'=>array('label'=>"TechnicalID", 'checked'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0), 'enabled'=>($conf->global->MAIN_SHOW_TECHNICAL_ID?1:0), 'position'=>1),
|
||||
't.name'=>array('label'=>"Name", 'checked'=>1, 'position'=>10),
|
||||
't.poste'=>array('label'=>"PostOrFunction", 'checked'=>1, 'position'=>20),
|
||||
't.address'=>array('label'=>(empty($conf->dol_optimize_smallscreen) ? $langs->trans("Address").' / '.$langs->trans("Phone").' / '.$langs->trans("Email") : $langs->trans("Address")), 'checked'=>1, 'position'=>30),
|
||||
't.statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>40, 'class'=>'center'),
|
||||
);
|
||||
// Extra fields
|
||||
if (is_array($extrafields->attributes[$contactstatic->table_element]['label']) && count($extrafields->attributes[$contactstatic->table_element]['label']))
|
||||
@ -939,7 +939,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
|
||||
$arrayfields["ef.".$key]=array(
|
||||
'label'=>$extrafields->attributes[$contactstatic->table_element]['label'][$key],
|
||||
'checked'=>(($extrafields->attributes[$contactstatic->table_element]['list'][$key]<0)?0:1),
|
||||
'position'=>$extrafields->attributes[$contactstatic->table_element]['pos'][$key],
|
||||
'position'=>1000+$extrafields->attributes[$contactstatic->table_element]['pos'][$key],
|
||||
'enabled'=>(abs($extrafields->attributes[$contactstatic->table_element]['list'][$key])!=3 && $extrafields->attributes[$contactstatic->table_element]['perms'][$key]));
|
||||
}
|
||||
}
|
||||
@ -1036,16 +1036,16 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
|
||||
// Fields title search
|
||||
// --------------------------------------------------------------------
|
||||
print '<tr class="liste_titre">';
|
||||
foreach($arrayfields as $key => $val)
|
||||
foreach($contactstatic->fields as $key => $val)
|
||||
{
|
||||
$align='';
|
||||
if (in_array($val['type'], array('t.date','t.datetime','t.timestamp'))) $align.=($align?' ':'').'center';
|
||||
if (in_array($val['type'], array('t.timestamp'))) $align.=($align?' ':'').'nowrap';
|
||||
if ($key == 't.status' || $key == 't.statut') $align.=($align?' ':'').'center';
|
||||
if (! empty($arrayfields[$key]['checked']))
|
||||
if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
|
||||
if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
|
||||
if ($key == 'status' || $key == 'statut') $align.=($align?' ':'').'center';
|
||||
if (! empty($arrayfields['t.'.$key]['checked']))
|
||||
{
|
||||
print '<td class="liste_titre'.($align?' '.$align:'').'">';
|
||||
if (in_array($key, array('t.statut'))){
|
||||
if (in_array($key, array('statut'))){
|
||||
print $form->selectarray('search_status', array('-1'=>'','0'=>$contactstatic->LibStatut(0, 1),'1'=>$contactstatic->LibStatut(1, 1)), $search_status);
|
||||
}else{
|
||||
$fieldName = substr($key, 2);
|
||||
@ -1078,7 +1078,7 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '')
|
||||
if (in_array($val['type'], array('date','datetime','timestamp'))) $align.=($align?' ':'').'center';
|
||||
if (in_array($val['type'], array('timestamp'))) $align.=($align?' ':'').'nowrap';
|
||||
if ($key == 'status' || $key == 'statut') $align.=($align?' ':'').'center';
|
||||
if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
|
||||
if (! empty($arrayfields['t.'.$key]['checked'])) print getTitleFieldOfList($val['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($align?'class="'.$align.'"':''), $sortfield, $sortorder, $align.' ')."\n";
|
||||
}
|
||||
// Extra fields
|
||||
$extrafieldsobjectkey=$contactstatic->table_element;
|
||||
|
||||
@ -2198,11 +2198,12 @@ function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinpu
|
||||
global $conf,$langs,$user;
|
||||
|
||||
$ret='';
|
||||
$ret.='<form action="'.$urlaction.'" method="post" class="searchform nowraponall">';
|
||||
$ret.='<form action="'.$urlaction.'" method="post" class="searchform nowraponall tagtr">';
|
||||
$ret.='<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
|
||||
$ret.='<input type="hidden" name="mode" value="search">';
|
||||
$ret.='<input type="hidden" name="savelogin" value="'.dol_escape_htmltag($user->login).'">';
|
||||
if ($showtitlebefore) $ret.=$title.' ';
|
||||
if ($showtitlebefore) $ret.='<div class="tagtd left">'.$title.'</div> ';
|
||||
$ret.='<div class="tagtd">';
|
||||
$ret.='<input type="text" class="flat '.$htmlmorecss.'"';
|
||||
$ret.=' style="text-indent: 22px; background-image: url(\''.$img.'\'); background-repeat: no-repeat; background-position: 3px;"';
|
||||
$ret.=($accesskey?' accesskey="'.$accesskey.'"':'');
|
||||
@ -2213,6 +2214,7 @@ function printSearchForm($urlaction, $urlobject, $title, $htmlmorecss, $htmlinpu
|
||||
$ret.='<button type="submit" class="button" style="padding-top: 4px; padding-bottom: 4px; padding-left: 6px; padding-right: 6px">';
|
||||
$ret.='<span class="fa fa-search"></span>';
|
||||
$ret.='</button>';
|
||||
$ret.='</div>';
|
||||
$ret.="</form>\n";
|
||||
return $ret;
|
||||
}
|
||||
|
||||
@ -2568,14 +2568,13 @@ else
|
||||
// Parent company
|
||||
if (empty($conf->global->SOCIETE_DISABLE_PARENTCOMPANY))
|
||||
{
|
||||
// Payment term
|
||||
print '<tr><td>';
|
||||
print '<table class="nobordernopadding" width="100%"><tr><td>';
|
||||
print $langs->trans('ParentCompany');
|
||||
print '</td>';
|
||||
if ($action != 'editparentcompany') print '<td class="right"><a href="'.$_SERVER["PHP_SELF"].'?action=editparentcompany&socid='.$object->id.'">'.img_edit($langs->transnoentitiesnoconv('Edit'), 1).'</a></td>';
|
||||
print '</tr></table>';
|
||||
print '</td><td colspan="3">';
|
||||
print '</td><td>';
|
||||
if ($action == 'editparentcompany')
|
||||
{
|
||||
$form->form_thirdparty($_SERVER['PHP_SELF'].'?socid='.$object->id, $object->parent, 'editparentcompany', 's.rowid <> '.$object->id, 1);
|
||||
@ -2596,7 +2595,7 @@ else
|
||||
{
|
||||
$langs->load("members");
|
||||
print '<tr><td>'.$langs->trans("LinkedToDolibarrMember").'</td>';
|
||||
print '<td colspan="3">';
|
||||
print '<td>';
|
||||
$adh=new Adherent($db);
|
||||
$result=$adh->fetch('', '', $object->id);
|
||||
if ($result > 0)
|
||||
|
||||
@ -508,6 +508,13 @@ body[class*="colorblind-"] .text-success{
|
||||
color : <?php print $textDanger ; ?>
|
||||
}
|
||||
|
||||
.editfielda span.fa-pencil-alt {
|
||||
color: #ccc !important;
|
||||
}
|
||||
.editfielda span.fa-pencil-alt:hover {
|
||||
color: rgb(<?php echo $colortexttitle; ?>) !important;
|
||||
}
|
||||
|
||||
|
||||
/* Themes for badges */
|
||||
<?php include dol_buildpath($path.'/theme/'.$theme.'/badges.inc.php', 0); ?>
|
||||
@ -771,6 +778,10 @@ select.selectarrowonleft option {
|
||||
direction: ltr;
|
||||
}
|
||||
|
||||
table[summary="list_of_modules"] .fa-cog {
|
||||
font-size: 1.5em;
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
/* Styles to hide objects */
|
||||
@ -780,7 +791,7 @@ select.selectarrowonleft option {
|
||||
.hideobject { display: none; }
|
||||
.minwidth50 { min-width: 50px; }
|
||||
/* rule for not too small screen only */
|
||||
@media only screen and (min-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 40 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)
|
||||
@media only screen and (min-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 140 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px)
|
||||
{
|
||||
.width25 { width: 25px; }
|
||||
.width50 { width: 50px; }
|
||||
@ -1132,7 +1143,7 @@ div.vmenu, td.vmenu {
|
||||
.menuhider { display: none !important; }
|
||||
|
||||
/* rule to reduce top menu - 3rd reduction: The menu for user is on left */
|
||||
@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 40 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) /* reduction 3 */
|
||||
@media only screen and (max-width: <?php echo empty($conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3) ? round($nbtopmenuentries * 47, 0) + 140 : $conf->global->THEME_ELDY_WITDHOFFSET_FOR_REDUC3; ?>px) /* reduction 3 */
|
||||
{
|
||||
body.sidebar-collapse .side-nav {
|
||||
display: none;
|
||||
@ -3831,6 +3842,7 @@ tr.visible {
|
||||
border-bottom: 1px solid #ccc;
|
||||
background: #e6e6e6;
|
||||
display: inline-block;
|
||||
padding: 4px 0 4px 0;
|
||||
}
|
||||
.websitebar .buttonDelete, .websitebar .button {
|
||||
text-shadow: none;
|
||||
@ -3842,10 +3854,10 @@ tr.visible {
|
||||
line-height: normal;
|
||||
}
|
||||
.websiteselection {
|
||||
display: inline-block;
|
||||
/* display: inline-block; */
|
||||
padding-left: 10px;
|
||||
vertical-align: middle;
|
||||
line-height: 28px;
|
||||
/* line-height: 28px; */
|
||||
}
|
||||
.websitetools {
|
||||
float: right;
|
||||
|
||||
@ -87,7 +87,7 @@ $colorblind_deuteranopes_textWarning = $textWarning; // currently not tested wit
|
||||
|
||||
// Badges colors
|
||||
$badgePrimary ='#007bff';
|
||||
$badgeSecondary ='#999999';
|
||||
$badgeSecondary ='#cccccc';
|
||||
$badgeSuccess ='#28a745';
|
||||
$badgeDanger ='#9f4705';
|
||||
$badgeWarning ='#ffc107';
|
||||
|
||||
@ -708,6 +708,14 @@ body[class*="colorblind-"] .text-success{
|
||||
color : <?php print $textDanger ; ?>
|
||||
}
|
||||
|
||||
.editfielda span.fa-pencil-alt {
|
||||
color: #ccc !important;
|
||||
}
|
||||
.editfielda span.fa-pencil-alt:hover {
|
||||
color: rgb(<?php echo $colortexttitle; ?>) !important;
|
||||
}
|
||||
|
||||
|
||||
/* Themes for badges */
|
||||
<?php include dol_buildpath($path.'/theme/'.$theme.'/badges.inc.php', 0); ?>
|
||||
|
||||
@ -939,6 +947,10 @@ select.selectarrowonleft option {
|
||||
direction: ltr;
|
||||
}
|
||||
|
||||
table[summary="list_of_modules"] .fa-cog {
|
||||
font-size: 1.5em;
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
/* Styles to hide objects */
|
||||
|
||||
@ -1953,18 +1953,18 @@ if (! GETPOST('hide_websitemenu'))
|
||||
|
||||
// ***** Part for web sites
|
||||
print '<!-- Bar for website -->';
|
||||
print '<div class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">';
|
||||
print '<span class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">';
|
||||
print $langs->trans("Website").' : ';
|
||||
print '</div>';
|
||||
print '</span>';
|
||||
|
||||
print '<div class="websiteselection hideonsmartphoneimp">';
|
||||
print '<span class="websiteselection hideonsmartphoneimp">';
|
||||
print ' <input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'" name="createsite">';
|
||||
print '</div>';
|
||||
print '</span>';
|
||||
|
||||
// List of website
|
||||
print '<div class="websiteselection">';
|
||||
print '<span class="websiteselection">';
|
||||
$out='';
|
||||
$out.='<select name="website" class="minwidth100" id="website">';
|
||||
$out.='<select name="website" class="minwidth100 maxwidth300" id="website">';
|
||||
if (empty($object->records)) $out.='<option value="-1"> </option>';
|
||||
// Loop on each sites
|
||||
$i=0;
|
||||
@ -2050,19 +2050,19 @@ if (! GETPOST('hide_websitemenu'))
|
||||
print '<a href="'.$_SERVER["PHP_SEFL"].'?action=replacesite&website='.$website->ref.'" class="button bordertransp"'.$disabled.' title="'.dol_escape_htmltag($langs->trans("ReplaceWebsiteContent")).'"><span class="fa fa-search"><span></a>';
|
||||
}
|
||||
|
||||
print '</div>';
|
||||
print '</span>';
|
||||
|
||||
|
||||
// Toolbar for websites
|
||||
|
||||
print '<div class="websitetools websiteselection">';
|
||||
print '<span class="websitetools websiteselection">';
|
||||
|
||||
if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite')
|
||||
{
|
||||
$urlext=$virtualurl;
|
||||
$urlint=$urlwithroot.'/public/website/index.php?website='.$websitekey;
|
||||
|
||||
print '<div class="websiteinputurl valignmiddle" id="websiteinputurl">';
|
||||
print '<span class="websiteinputurl valignmiddle" id="websiteinputurl">';
|
||||
$linktotestonwebserver = '<a href="'.($virtualurl?$virtualurl:'#').'" class="valignmiddle">';
|
||||
$linktotestonwebserver.= $langs->trans("TestDeployOnWeb", $virtualurl).' '.img_picto('', 'object_globe');
|
||||
$linktotestonwebserver.= '</a>';
|
||||
@ -2096,8 +2096,8 @@ if (! GETPOST('hide_websitemenu'))
|
||||
$htmltext.='<br>';
|
||||
$htmltext.=$langs->trans("YouCanAlsoDeployToAnotherWHP");
|
||||
}
|
||||
print $form->textwithpicto($linktotestonwebserver, $htmltext, 1, 'none', 'valignmiddle', 0, 2, 'helpvirtualhost');
|
||||
print '</div>';
|
||||
print $form->textwithpicto($linktotestonwebserver, $htmltext, 1, 'none', 'valignmiddle', 0, 3, 'helpvirtualhost');
|
||||
print '</span>';
|
||||
}
|
||||
|
||||
if (in_array($action, array('editcss','editmenu','file_manager','replacesite','replacesiteconfirm')))
|
||||
@ -2107,7 +2107,7 @@ if (! GETPOST('hide_websitemenu'))
|
||||
if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="cancel">';
|
||||
}
|
||||
|
||||
print '</div>';
|
||||
print '</span>';
|
||||
|
||||
|
||||
// Toolbar for pages
|
||||
@ -2119,15 +2119,15 @@ if (! GETPOST('hide_websitemenu'))
|
||||
print '<!-- Bar for websitepage -->';
|
||||
print '<div class="centpercent websitebar"'.($style?' style="'.$style.'"':'').'">';
|
||||
|
||||
print '<div class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">';
|
||||
print '<span class="websiteselection hideonsmartphoneimp minwidth100 tdoverflowmax100">';
|
||||
print $langs->trans("PageContainer").': ';
|
||||
print '</div>';
|
||||
print '</span>';
|
||||
|
||||
print '<div class="websiteselection hideonsmartphoneimp">';
|
||||
print '<span class="websiteselection hideonsmartphoneimp">';
|
||||
print '<input type="submit"'.$disabled.' class="button" value="'.dol_escape_htmltag($langs->trans("Add")).'" name="createcontainer">';
|
||||
print '</div>';
|
||||
print '</span>';
|
||||
|
||||
print '<div class="websiteselection">';
|
||||
print '<span class="websiteselection">';
|
||||
|
||||
if ($action != 'addcontainer')
|
||||
{
|
||||
@ -2395,9 +2395,9 @@ if (! GETPOST('hide_websitemenu'))
|
||||
}
|
||||
}
|
||||
|
||||
print '</div>'; // end website selection
|
||||
print '</span>'; // end website selection
|
||||
|
||||
print '<div class="websitetools">';
|
||||
print '<span class="websitetools">';
|
||||
|
||||
if (($pageid > 0 && $atleastonepage) && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone' || $action == 'deletesite'))
|
||||
{
|
||||
@ -2437,9 +2437,9 @@ if (! GETPOST('hide_websitemenu'))
|
||||
if ($action != 'preview') print '<input type="submit" class="button" value="'.dol_escape_htmltag($langs->trans("Cancel")).'" name="preview">';
|
||||
}
|
||||
|
||||
print '</div>'; // end websitetools
|
||||
print '</span>'; // end websitetools
|
||||
|
||||
print '<div class="websitehelp">';
|
||||
print '<span class="websitehelp">';
|
||||
if (GETPOST('editsource', 'alpha') || GETPOST('editcontent', 'alpha'))
|
||||
{
|
||||
$htmltext=$langs->transnoentitiesnoconv("YouCanEditHtmlSource").'<br>';
|
||||
@ -2453,7 +2453,7 @@ if (! GETPOST('hide_websitemenu'))
|
||||
print $form->textwithpicto($langs->trans("SyntaxHelp").' '.img_help(2, $langs->trans("SyntaxHelp")), $htmltext, 1, 'none', 'inline-block', 1, 2, 'tooltipsubstitution');
|
||||
}
|
||||
}
|
||||
print '</div>'; // end websitehelp
|
||||
print '</span>'; // end websitehelp
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user