From 760121a3d1aa05157e73e329ff5600d2e1db4cbe Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 11 Apr 2020 14:13:16 +0200 Subject: [PATCH] Can sort list of answers. --- htdocs/compta/bank/transfer.php | 2 +- htdocs/core/lib/functions.lib.php | 6 +++--- htdocs/projet/index.php | 4 ++-- htdocs/theme/eldy/global.inc.php | 11 +++++++---- htdocs/website/index.php | 22 ++++++++++++++-------- 5 files changed, 27 insertions(+), 18 deletions(-) diff --git a/htdocs/compta/bank/transfer.php b/htdocs/compta/bank/transfer.php index cb6073f1109..afc1c6711e0 100644 --- a/htdocs/compta/bank/transfer.php +++ b/htdocs/compta/bank/transfer.php @@ -231,7 +231,7 @@ if ($error) print load_fiche_titre($langs->trans("MenuBankInternalTransfer"), '', 'bank_account'); -print $langs->trans("TransferDesc"); +print ''.$langs->trans("TransferDesc").''; print "

"; print '
'; diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index b40985edff0..de8c73db44a 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3234,7 +3234,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = false, $ 'hrm'=>'bg-infoxbox-adherent', 'group'=>'bg-infoxbox-adherent', 'members'=>'bg-infoxbox-adherent', 'member'=>'bg-infoxbox-adherent', 'user'=>'bg-infoxbox-adherent', 'users'=>'bg-infoxbox-adherent', 'error'=>'pictoerror', 'warning'=>'pictowarning', 'switch_on'=>'font-status4', - 'holiday'=>'bg-infoxbox-holiday', 'resource'=>'bg-infoxbox-action', 'title_hrm'=>'bg-infoxbox-holiday', 'trip'=>'bg-infoxbox-expensereport', + 'holiday'=>'bg-infoxbox-holiday', 'project'=>'bg-infoxbox-project', 'resource'=>'bg-infoxbox-action', 'title_hrm'=>'bg-infoxbox-holiday', 'trip'=>'bg-infoxbox-expensereport', 'title_agenda'=>'bg-infoxbox-action', 'list-alt'=>'imgforviewmode', 'calendar'=>'imgforviewmode', 'calendarweek'=>'imgforviewmode', 'calendarmonth'=>'imgforviewmode', 'calendarday'=>'imgforviewmode', 'calendarperuser'=>'imgforviewmode' ); @@ -4247,7 +4247,7 @@ function load_fiche_titre($titre, $morehtmlright = '', $picto = 'generic', $pict $return .= "\n"; $return .= ''; // maring bottom must be same than into print_barre_list $return .= ''; - if ($picto) $return .= ''; + if ($picto) $return .= ''; $return .= ''; @@ -4313,7 +4313,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '', // Left - if ($picto && $titre) print ''; + if ($picto && $titre) print ''; print '
'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).''.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).''; $return .= '
'.$titre.'
'; $return .= '		'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).''.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).''; print '
'.$titre; if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print '('.$totalnboflines.')'; diff --git a/htdocs/projet/index.php b/htdocs/projet/index.php index 26dcf788714..17a92e99cd0 100644 --- a/htdocs/projet/index.php +++ b/htdocs/projet/index.php @@ -260,8 +260,8 @@ $companystatic = new Societe($db); // We need a clean new object for next loop b print '
'; print ''; print ''; -print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "s.nom", "", "", '', $sortfield, $sortorder); -print_liste_field_titre("NbOfProjects", "", "", "", "", '', $sortfield, $sortorder, 'right '); +print_liste_field_titre("OpenedProjectsByThirdparties", $_SERVER["PHP_SELF"], "", "", "", '', $sortfield, $sortorder); +print_liste_field_titre("NbOfProjects", $_SERVER["PHP_SELF"], "nb", "", "", '', $sortfield, $sortorder, 'right '); print "\n"; $sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount)"; diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php index 8f3b7325b2a..4e77fc7fe2d 100644 --- a/htdocs/theme/eldy/global.inc.php +++ b/htdocs/theme/eldy/global.inc.php @@ -24,7 +24,7 @@ --colortextlink: rgb(); --colortextbackhmenu: #; --colortextbackvmenu: #; - --listetotal: #551188; + --listetotal: #888888; --inputbackgroundcolor: #FFF; --inputbordercolor: rgba(0,0,0,.2); --tooltipbgcolor: ; @@ -1455,6 +1455,9 @@ body.onlinepaymentbody div.fiche { /* For online payment page */ div.fiche>table:first-child { margin-bottom: 15px !important; } +div.fiche>table.table-fiche-title { + margin-bottom: 7px !important; +} div.fichecenter { width: 100%; clear: both; /* This is to have div fichecenter that are true rectangles */ @@ -1568,9 +1571,9 @@ div.nopadding { margin : 0px auto; } -td.nobordernopadding.widthpictotitle.opacityhigh.valignmiddle.col-picto { +td.nobordernopadding.widthpictotitle.col-picto { color: var(--colortexttitlenotab); - opacity: 0.6; + opacity: 0.7; } .pictotitle { margin-: 8px; @@ -2606,7 +2609,7 @@ div.tabBar { div.tabBar tr.titre td { padding-top: 20px; } -div.fiche tr.titre td { +div.fiche table:not(.table-fiche-title) tr.titre td { padding-top: 10px; } diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 59da26083ed..6e290e28eca 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -3410,7 +3410,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm') print ''."\n"; print '

'; - print load_fiche_titre($langs->trans("ReplaceWebsiteContent")); + print load_fiche_titre($langs->trans("ReplaceWebsiteContent"), '', 'search'); print '
'; @@ -3447,7 +3447,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm') if (GETPOST('optioncontent')) $algo .= 'content'; if (GETPOST('optionsitefiles')) $algo .= 'sitefiles'; - $listofpages = getPagesFromSearchCriterias('', $algo, $searchkey, 1000); + $listofpages = getPagesFromSearchCriterias('', $algo, $searchkey, 1000, $sortfield, $sortorder); print '
'; print '
'; @@ -3471,13 +3471,19 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm') print '
'; } + $param = 'action=replacesiteconfirm&website='.urlencode($website->ref); + $param .= '&searchstring='.urlencode($searchkey); + if (GETPOST('optioncontent')) $param .= '&optioncontent=content'; + if (GETPOST('optionmeta')) $param .= '&optionmeta=meta'; + if (GETPOST('optionsitefiles')) $param .= '&optionsitefiles=optionsitefiles'; + print '
'; print '
'; print ''; - print ''; - print ''; - print ''; - print ''; + print getTitleFieldOfList("Type", 0, $_SERVER['PHP_SELF'], 'type_container', '', $param, '', $sortfield, $sortorder, '')."\n"; + print getTitleFieldOfList("Link", 0, $_SERVER['PHP_SELF'], 'title', '', $param, '', $sortfield, $sortorder, '')."\n"; + print getTitleFieldOfList("Description", 0, $_SERVER['PHP_SELF'], '', '', $param, '', $sortfield, $sortorder, '')."\n"; + print getTitleFieldOfList("", 0 , $_SERVER['PHP_SELF']); print ''; foreach ($listofpages['list'] as $answerrecord) @@ -3485,7 +3491,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm') if (get_class($answerrecord) == 'WebsitePage') { print ''; - print ''; print ''; print ''; }
'.$langs->trans("Type").''.$langs->trans("Link").''.$langs->trans("Description").'
'.$langs->trans("Container").' - '; + print ''.$langs->trans("Container").' - '; print $langs->trans($answerrecord->type_container); // TODO Use label of container print ''; @@ -3506,7 +3512,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm') $disabled = ' disabled'; $urltoedithtmlsource = ''; } - print ''.img_picto($langs->trans("EditHTMLSource"), 'edit').''; + print ''.img_picto($langs->trans("EditHTMLSource"), 'edit').''; print '