lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix avoid error when homepage not set

Browse Source
This commit is contained in:
Laurent Destailleur 2018-02-15 01:29:51 +01:00
parent dde5c186e7
commit 18acff5e57
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/website.lang
View File

@ -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

6
htdocs/theme/eldy/style.css.php
View File

@ -3546,14 +3546,14 @@ tr.visible {
.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 {

4
htdocs/theme/md/style.css.php
View File

@ -3599,11 +3599,11 @@ tr.visible {
.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 {

17
htdocs/website/index.php
View File

@ -1388,9 +1388,18 @@ if (count($object->records) > 0)
$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 @@ if (count($object->records) > 0)
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();