From b61bee1f8dcabda3d68d53131d43c1263b28f73f Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 11 Oct 2022 11:45:01 +0200 Subject: [PATCH] Fix setup of status --- htdocs/langs/en_US/website.lang | 2 +- htdocs/website/index.php | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index 8644becdd8c..874cdc76f28 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -140,7 +140,7 @@ PagesRegenerated=%s page(s)/container(s) regenerated RegenerateWebsiteContent=Regenerate web site cache files AllowedInFrames=Allowed in Frames DefineListOfAltLanguagesInWebsiteProperties=Define list of all available languages into web site properties. -GenerateSitemaps=Generate website sitemap file +GenerateSitemaps=Generate website sitemap.xml file ConfirmGenerateSitemaps=If you confirm, you will erase the existing sitemap file... ConfirmSitemapsCreation=Confirm sitemap generation SitemapGenerated=Sitemap file %s generated diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 55c2b8f31a8..6d07e9f5c5f 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -2775,7 +2775,7 @@ if (!GETPOST('hide_websitemenu')) { // Toolbar for websites // - print ''; + print ''; if ($action != 'file_manager') { print '
'; print $langs->trans("Website").': '; @@ -3012,7 +3012,7 @@ if (!GETPOST('hide_websitemenu')) { if ($websitekey && $websitekey != '-1' && (!in_array($action, array('editcss', 'editmenu', 'importsite', 'file_manager', 'replacesiteconfirm'))) && (!in_array($mode, array('replacesite'))) && !$file_manager) { print '
'; // Close current websitebar to open a new one - print ''; + print ''; print '
'; print '
'; @@ -3052,19 +3052,18 @@ if (!GETPOST('hide_websitemenu')) { print $out; - if (!empty($conf->use_javascript_ajax)) { print ''; //print '
'; if ($object->status == $object::STATUS_DRAFT) { // website is off, we do not allow to change status of page $text_off = 'SetWebsiteOnlineBefore'; - if ($objectpage->status == $objectpage::STATUS_DRAFT) { + if ($websitepage->status == $websitepage::STATUS_DRAFT) { // page is off print ''.img_picto($langs->trans($text_off), 'switch_off').''; } else { print ''.img_picto($langs->trans($text_off), 'switch_on').''; } } else { - print ajax_object_onoff($objectpage, 'status', 'status', 'Online', 'Offline', array(), 'valignmiddle', 'statuswebsitepage'); + print ajax_object_onoff($websitepage, 'status', 'status', 'Online', 'Offline', array(), 'valignmiddle'.(empty($websitepage->id) ? ' opacitymedium disabled' : ''), 'statuswebsitepage'); } //print '
'; print '
';