';
-
+
if ($action != 'add')
{
$out='';
@@ -336,7 +336,7 @@ if (count($object->records) > 0)
}
$pageid=$homepageid?$homepageid:$firstpageid; // We choose home page and if not defined yet, we take first page
}
-
+
foreach($array as $key => $valpage)
{
$out.='
';
if ($action == 'preview')
@@ -454,7 +454,7 @@ if (count($object->records) > 0)
},
context: document.body
});
-
+
jQuery("#previewsiteext").attr("href",newurl);
jQuery("#previewpageext").attr("href",newpage);
});
@@ -483,15 +483,15 @@ if ($action == 'editcontent')
/*
* Editing global variables not related to a specific theme
*/
-
+
$csscontent = @file_get_contents($filecss);
-
+
$contentforedit = '';
/*$contentforedit.=''."\n";*/
$contentforedit .= $objectpage->content;
-
+
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
$doleditor=new DolEditor('PAGE_CONTENT',$contentforedit,'',500,'Full','',true,true,true,ROWS_5,'90%');
$doleditor->Create(0, '', false);
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index dd6332b11a7..abb7f7e56d3 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -6,6 +6,7 @@ ConfirmDeleteWebsite=Are you sure you want to delete this web site. All its page
WEBSITE_PAGENAME=Page name/alias
WEBSITE_CSS_URL=URL of external CSS file
WEBSITE_CSS_INLINE=CSS content
+PageNameAliasHelp=Name or alias of the page. This alias is also used to forge a SEO URL when website is read from a Virtual host of a Web server (like Apacke, Nginx, ...). Use the button "%s" to edit this alias.
MediaFiles=Media library
EditCss=Edit Style/CSS
EditMenu=Edit menu
@@ -24,7 +25,7 @@ ViewPageInNewTab=View page in new tab
SetAsHomePage=Set as Home page
RealURL=Real URL
ViewWebsiteInProduction=View web site using home URLs
-SetHereVirtualHost=If you can set, on your web server, a dedicated virtual host with a root directory on %s, define here the virtual hostname so the preview can be done also using this direct web server access and not only using Dolibarr server.
+SetHereVirtualHost=If you can create, on your web server (Apache, Nginx, ...), a dedicated Virtual Host with PHP enabled and a Root directory on %s then enter here the virtual hostname you have created, so the preview can be done also using this direct web server access, and not only using Dolibarr server.
PreviewSiteServedByWebServer=Preview %s in a new tab.
The %s will be served by an external web server (like Apache, Nginx, IIS). You must install and setup this server before to point to directory: %s URL served by external server: %s
PreviewSiteServedByDolibarr=Preview %s in a new tab.
The %s will be served by Dolibarr server so it does not need any extra web server (like Apache, Nginx, IIS) to be installed. The inconvenient is that URL of pages are not user friendly and start with path of your Dolibarr. URL served by Dolibarr: %s
To use your own external web server to serve this web site, create a virtual host on your web server that point on directory %s then enter the name of this virtual server and click on the other preview button.
NoPageYet=No pages yet
\ No newline at end of file
diff --git a/htdocs/websites/index.php b/htdocs/websites/index.php
index 1a11ea2a4e1..a5c2ae4e046 100644
--- a/htdocs/websites/index.php
+++ b/htdocs/websites/index.php
@@ -727,7 +727,7 @@ if (count($object->records) > 0)
print '';
//print '';
$htmltext=$langs->trans("SetHereVirtualHost", $dataroot);
- print $form->textwithpicto('', $htmltext);
+ print $form->textwithpicto('', $htmltext, 1, 'help', '', 0, 2, 'helpvirtualhost');
print '';
$urlext=$virtualurl;
@@ -846,8 +846,8 @@ if (count($object->records) > 0)
print '