diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index a329661a056..e96e60f14f9 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -55,7 +55,7 @@ OrEnterPageInfoManually=Or create empty page from scratch... FetchAndCreate=Fetch and Create ExportSite=Export site IDOfPage=Id of page -Banner=Bandeau +Banner=Banner BlogPost=Blog post WebsiteAccount=Web site account WebsiteAccounts=Web site accounts @@ -64,3 +64,5 @@ BackToListOfThirdParty=Back to list for Third Party DisableSiteFirst=Disable website first MyContainerTitle=My web site title AnotherContainer=Another container +OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is intiliazed by grabbing it from an external page (WYSIWYG editor will not be available) +OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabber from an external site \ No newline at end of file diff --git a/htdocs/website/class/websitepage.class.php b/htdocs/website/class/websitepage.class.php index 51c737673a0..408f5d194ae 100644 --- a/htdocs/website/class/websitepage.class.php +++ b/htdocs/website/class/websitepage.class.php @@ -59,10 +59,12 @@ class WebsitePage extends CommonObject public $keywords; public $htmlheader; public $content; + public $grabbed_from; public $status; public $date_creation; public $date_modification; + // BEGIN MODULEBUILDER PROPERTIES /** * @var array Array with all fields and their property. Do not use it as a static var. It may be modified by constructor. diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 6f515568bc2..f57d28a2acb 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -1476,6 +1476,12 @@ if (count($object->records) > 0) //print ''; print ''; + $websitepage = new WebSitePage($db); + if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')) + { + $websitepage->fetch($pageid); + } + if ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone') { $disabled=''; @@ -1516,7 +1522,15 @@ if (count($object->records) > 0) print '   '; print ''; - print ''; + if ($websitepage->grabbed_from) + { + print ''; + } + else + { + print ''; + } + print ''; if ($object->fk_default_home > 0 && $pageid == $object->fk_default_home) print ''; else print ''; @@ -1529,11 +1543,8 @@ if (count($object->records) > 0) print '
'; - if ($website && $pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')) + if ($pageid > 0 && ($action == 'preview' || $action == 'createfromclone' || $action == 'createpagefromclone')) { - $websitepage = new WebSitePage($db); - $websitepage->fetch($pageid); - $realpage=$urlwithroot.'/public/website/index.php?website='.$website.'&pageref='.$websitepage->pageurl; $pagealias = $websitepage->pageurl; @@ -1894,8 +1905,9 @@ if ($action == 'editmeta' || $action == 'createcontainer') print ''; print $langs->trans("URL"); print ''; - print ' '; + print ' '; print ''; + print '

'.info_admin($langs->trans("OnlyEditionOfSourceForGrabbedContentFuture"), 0, 0, '1'); print ''; print '';