Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Can sort list of answers.

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-11 14:13:16 +02:00
parent 1ed24d3949
commit 760121a3d1
5 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/compta/bank/transfer.php
View File

@ -231,7 +231,7 @@ if ($error)
print load_fiche_titre($langs->trans("MenuBankInternalTransfer"), '', 'bank_account');
print $langs->trans("TransferDesc");
print '<span class="opacitymedium">'.$langs->trans("TransferDesc").'</span>';
print "<br><br>";
print '<form name="add" method="post" action="'.$_SERVER["PHP_SELF"].'">';

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

@ -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 .= '<table '.($id ? 'id="'.$id.'" ' : '').'class="centpercent notopnoleftnoright table-fiche-title'.($morecssontable ? ' '.$morecssontable : '').'">'; // maring bottom must be same than into print_barre_list
$return .= '<tr class="titre">';
if ($picto) $return .= '<td class="nobordernopadding widthpictotitle opacityhigh valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';
if ($picto) $return .= '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).'</td>';
$return .= '<td class="nobordernopadding valignmiddle col-title">';
$return .= '<div class="titre inline-block">'.$titre.'</div>';
$return .= '</td>';
@ -4313,7 +4313,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
// Left
if ($picto && $titre) print '<td class="nobordernopadding widthpictotitle opacityhigh valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).'</td>';
if ($picto && $titre) print '<td class="nobordernopadding widthpictotitle valignmiddle col-picto">'.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).'</td>';
print '<td class="nobordernopadding valignmiddle col-title">';
print '<div class="titre inline-block">'.$titre;
if (!empty($titre) && $savtotalnboflines >= 0 && (string) $savtotalnboflines != '') print '<span class="opacitymedium colorblack paddingleft">('.$totalnboflines.')</span>';

4
htdocs/projet/index.php
View File

@ -260,8 +260,8 @@ $companystatic = new Societe($db); // We need a clean new object for next loop b
print '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
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 "</tr>\n";
$sql = "SELECT COUNT(p.rowid) as nb, SUM(p.opp_amount)";

11
htdocs/theme/eldy/global.inc.php
View File

@ -24,7 +24,7 @@
--colortextlink: rgb(<?php print $colortextlink; ?>);
--colortextbackhmenu: #<?php echo $colortextbackhmenu; ?>;
--colortextbackvmenu: #<?php print $colortextbackvmenu; ?>;
--listetotal: #551188;
--listetotal: #888888;
--inputbackgroundcolor: #FFF;
--inputbordercolor: rgba(0,0,0,.2);
--tooltipbgcolor: <?php print $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-<?php echo $right; ?>: 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;
}

22
htdocs/website/index.php
View File

@ -3410,7 +3410,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm')
print '<!-- Replace string -->'."\n";
print '<div class="fiche"><br>';
print load_fiche_titre($langs->trans("ReplaceWebsiteContent"));
print load_fiche_titre($langs->trans("ReplaceWebsiteContent"), '', 'search');
print '<div class="tagtable">';
@ -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 '<br>';
print '<br>';
@ -3471,13 +3471,19 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm')
print '<br>';
}
$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 '<div class="div-table-responsive-no-min">';
print '<table class="noborder centpercent">';
print '<tr class="liste_titre">';
print '<th>'.$langs->trans("Type").'</th>';
print '<th>'.$langs->trans("Link").'</th>';
print '<th>'.$langs->trans("Description").'</th>';
print '<th></th>';
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 '</tr>';
foreach ($listofpages['list'] as $answerrecord)
@ -3485,7 +3491,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm')
if (get_class($answerrecord) == 'WebsitePage')
{
print '<tr>';
print '<td>'.$langs->trans("Container").' - ';
print '<td class="nowraponall">'.$langs->trans("Container").' - ';
print $langs->trans($answerrecord->type_container); // TODO Use label of container
print '</td>';
print '<td>';
@ -3506,7 +3512,7 @@ if ($action == 'replacesite' || $action == 'replacesiteconfirm')
$disabled = ' disabled';
$urltoedithtmlsource = '';
}
print '<a class="'.$disabled.'" href="'.$urltoedithtmlsource.'" title="'.$langs->trans("EditHTMLSource").'">'.img_picto($langs->trans("EditHTMLSource"), 'edit').'</a>';
print '<a class="editfielda '.$disabled.'" href="'.$urltoedithtmlsource.'" title="'.$langs->trans("EditHTMLSource").'">'.img_picto($langs->trans("EditHTMLSource"), 'edit').'</a>';
print '</td>';
print '</tr>';
}