Fix avoid error when homepage not set

Dolibarr · Feb 15, 2018 · 18acff5 · 18acff5
1 parent dde5c18
commit 18acff5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
@@ -64,5 +64,6 @@ BackToListOfThirdParty=Back to list for Third Party
 DisableSiteFirst=Disable website first
 MyContainerTitle=My web site title
 AnotherContainer=Another container
+YouMustDefineTheHomePage=You must first define the default Home page
 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
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
@@ -3546,14 +3546,14 @@
 .websiteiframenoborder {
 	border: 0px;
 }
-a.websitebuttonsitepreview {
+span.websitebuttonsitepreview, a.websitebuttonsitepreview {
 	vertical-align: middle;
 }
-a.websitebuttonsitepreview img {
+span.websitebuttonsitepreview img, a.websitebuttonsitepreview img {
 	width: 26px;
 	display: inline-block;
 }
-a.websitebuttonsitepreviewdisabled img {
+span.websitebuttonsitepreviewdisabled img, a.websitebuttonsitepreviewdisabled img {
 	opacity: 0.2;
 }
 .websitehelp {

diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
@@ -3599,11 +3599,11 @@
 .websiteiframenoborder {
 	border: 0px;
 }
-a.websitebuttonsitepreview img {
+span.websitebuttonsitepreview img, a.websitebuttonsitepreview img {
 	width: 26px;
 	display: inline-block;
 }
-a.websitebuttonsitepreviewdisabled img {
+span.websitebuttonsitepreviewdisabled img, a.websitebuttonsitepreviewdisabled img {
 	opacity: 0.2;
 }
 .websiteiframenoborder {

diff --git a/htdocs/website/index.php b/htdocs/website/index.php
@@ -1388,9 +1388,18 @@
 
 		$urlext=$virtualurl;
 		$urlint=$urlwithroot.'/public/website/index.php?website='.$website;
-		print '<a class="websitebuttonsitepreview'.($urlext?'':' websitebuttonsitepreviewdisabled cursornotallowed').'" id="previewsiteext" href="'.$urlext.'" target="tab'.$website.'ext" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext)).'">';
-		print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:'<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>'), 1, 'preview_ext');
-		print '</a>';
+		if (empty($object->fk_default_home))
+		{
+			print '<span class="websitebuttonsitepreview websitebuttonsitepreviewdisabled cursornotallowed" id="previewsiteextdisabled" href="" target="tab'.$website.'ext" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext)).'">';
+			print $form->textwithpicto('', '<span class="error">'.$langs->trans("YouMustDefineTheHomePage").'</span><br>'.$langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:'<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>'), 1, 'preview_ext');
+			print '</span>';
+		}
+		else
+		{
+			print '<a class="websitebuttonsitepreview'.($urlext?'':' websitebuttonsitepreviewdisabled cursornotallowed').'" id="previewsiteext" href="'.$urlext.'" target="tab'.$website.'ext" alt="'.dol_escape_htmltag($langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext)).'">';
+			print $form->textwithpicto('', $langs->trans("PreviewSiteServedByWebServer", $langs->transnoentitiesnoconv("Site"), $langs->transnoentitiesnoconv("Site"), $dataroot, $urlext?$urlext:'<span class="error">'.$langs->trans("VirtualHostUrlNotDefined").'</span>'), 1, 'preview_ext');
+			print '</a>';
+		}
 	}
 
 	if (in_array($action, array('editcss','editmenu','file_manager')))
@@ -1587,6 +1596,8 @@
                             console.log("Website external url modified "+jQuery("#previewsiteurl").val());
                 			if (jQuery("#previewsiteurl").val() != "") jQuery("a.websitebuttonsitepreviewdisabled img").css({ opacity: 1 });
                 			else jQuery("a.websitebuttonsitepreviewdisabled img").css({ opacity: 0.2 });
+						';
+				print '
                 		});
                     	jQuery("#previewsiteext,#previewpageext").click(function() {
                             newurl=jQuery("#previewsiteurl").val();