Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-11 12:01:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use correct style for table header

Browse Source
This commit is contained in:
Laurent Destailleur
2019-10-01 12:02:28 +02:00
parent 35fdaaf355
commit 11e01f5c86
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
htdocs/core/lib/functions.lib.php
View File

@@ -1370,8 +1370,19 @@ function dol_banner_tab($object, $paramid, $morehtml = '', $shownav = 1, $fieldi
$showimage=$object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->ref); $showimage=$object->is_photo_available($conf->ticket->multidir_output[$entity].'/'.$object->ref);
$maxvisiblephotos=(isset($conf->global->TICKET_MAX_VISIBLE_PHOTO)?$conf->global->TICKET_MAX_VISIBLE_PHOTO:2); $maxvisiblephotos=(isset($conf->global->TICKET_MAX_VISIBLE_PHOTO)?$conf->global->TICKET_MAX_VISIBLE_PHOTO:2);
if ($conf->browser->layout == 'phone') $maxvisiblephotos=1; if ($conf->browser->layout == 'phone') $maxvisiblephotos=1;
if ($showimage) $morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0).'</div>'; if ($showimage)
else {
$showphoto = $object->show_photos('ticket', $conf->ticket->multidir_output[$entity], 'small', $maxvisiblephotos, 0, 0, 0, $width, 0);
if ($object->nbphoto > 0)
{
$morehtmlleft.='<div class="floatleft inline-block valignmiddle divphotoref">'.$showphoto.'</div>';
}
else
{
$showimage = 0;
}
}
if (! $showimage)
{ {
if (!empty($conf->global->TICKET_NODISPLAYIFNOPHOTO)) { if (!empty($conf->global->TICKET_NODISPLAYIFNOPHOTO)) {
$nophoto=''; $nophoto='';

28
htdocs/core/lib/ticket.lib.php
View File

@@ -502,38 +502,36 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
$out.="\n"; $out.="\n";
$out.='<div class="div-table-responsive-no-min">'; $out.='<div class="div-table-responsive-no-min">';
$out.='<table class="noborder" width="100%">'; $out.='<table class="noborder borderbottom centpercent">';
$out.='<tr class="liste_titre">'; $out.='<tr class="liste_titre">';
$out.='<td class="liste_titre">'; //$out.='<td class="liste_titre">';
if($sortorder === 'desc') { if($sortorder === 'desc') {
$sortUrl = $_SERVER["PHP_SELF"] . '?sortfield=a.datep&sortorder=asc' . $param; $out .= getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ')."\n";
$out .= dolGetButtonTitle($langs->trans('Date'), $langs->trans('OrderByDateAsc'), 'fa fa-sort-numeric-down', $sortUrl, '', 1);
} }
else{ else{
$sortUrl = $_SERVER["PHP_SELF"] . '?sortfield=a.datep&sortorder=desc' . $param; $out .= getTitleFieldOfList('Date', 0, $_SERVER["PHP_SELF"], 'a.datep', '', $param, '', $sortfield, $sortorder, 'maxwidthsearch center ')."\n";
$out .= dolGetButtonTitle($langs->trans('Date'), $langs->trans('OrderByDateDesc'), 'fa fa-sort-numeric-down-alt', $sortUrl, '', 1);
} }
$out.='</td>'; //$out.='</td>';
$out.='<td class="liste_titre"><strong>'.$langs->trans("Search").' : </strong></td>'; $out.='<th class="liste_titre"><strong>'.$langs->trans("Search").' : </strong></th>';
if ($donetodo) if ($donetodo)
{ {
$out.='<td class="liste_titre"></td>'; $out.='<th class="liste_titre"></th>';
} }
$out.='<td class="liste_titre">'.$langs->trans("Type").' '; $out.='<th class="liste_titre">'.$langs->trans("Type").' ';
$out.=$formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1, 0, 0, 1); $out.=$formactions->select_type_actions($actioncode, "actioncode", '', empty($conf->global->AGENDA_USE_EVENT_TYPE)?1:-1, 0, 0, 1);
$out.='</td>'; $out.='</th>';
$out.='<td class="liste_titre maxwidth100onsmartphone">'; $out.='<th class="liste_titre maxwidth100onsmartphone">';
$out.=$langs->trans("Label").' '; $out.=$langs->trans("Label").' ';
$out.='<input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'">'; $out.='<input type="text" class="maxwidth100onsmartphone" name="search_agenda_label" value="'.$filters['search_agenda_label'].'">';
$out.='</td>'; $out.='</th>';
$out.='<td class="liste_titre" align="middle">'; $out.='<th class="liste_titre width50 middle">';
$searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1); $searchpicto=$form->showFilterAndCheckAddButtons($massactionbutton?1:0, 'checkforselect', 1);
$out.=$searchpicto; $out.=$searchpicto;
$out.='</td>'; $out.='</th>';
$out.='</tr>'; $out.='</tr>';