';
- if ($picto) $return .= '| '.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).' | ';
+ if ($picto) $return .= ''.img_picto('', $picto, 'class="valignmiddle widthpictotitle pictotitle"', $pictoisfullpath).' | ';
$return .= '';
$return .= ' '.$titre.' ';
$return .= ' | ';
@@ -4313,7 +4313,7 @@ function print_barre_liste($titre, $page, $file, $options = '', $sortfield = '',
// Left
- if ($picto && $titre) print ''.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).' | ';
+ if ($picto && $titre) print ''.img_picto('', $picto, 'class="valignmiddle pictotitle widthpictotitle"', $pictoisfullpath).' | ';
print '';
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 '| '.$langs->trans("Type").' | ';
- print ''.$langs->trans("Link").' | ';
- print ''.$langs->trans("Description").' | ';
- 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 '| '.$langs->trans("Container").' - ';
+ print ' | '.$langs->trans("Container").' - ';
print $langs->trans($answerrecord->type_container); // TODO Use label of container
print ' | ';
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 ' | ';
print ' ';
}
|