From 6e95fb5f057719bb7b22c55cbeb15f4a9d499ef3 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Sep 2018 14:36:13 +0200 Subject: [PATCH 1/4] Warning in website module --- htdocs/langs/en_US/website.lang | 5 +++-- htdocs/website/index.php | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index 5274ff87fab..6c94ee5a809 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -78,7 +78,7 @@ AnotherContainer=Another container WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table WEBSITE_USE_WEBSITE_ACCOUNTSTooltip=Enable the table to store web site accounts (login/pass) for each website / thirdparty YouMustDefineTheHomePage=You must first define the default Home page -OnlyEditionOfSourceForGrabbedContentFuture=Note: only edition of HTML source will be possible when a page content is initialized by grabbing it from an external page (WYSIWYG editor will not be available) +OnlyEditionOfSourceForGrabbedContentFuture=Warning: Creating a web page by importing an external web page is reserved to experienced user. Depending on the complexity of source page, the result of importation may differs once imported from original. Also if the source page use common CSS style or not compatible javascript, it may break the look or features of the Web site editor when working on this page. This method is faster way to have a page but it is recommanded to create your new page from scratch or from a suggested page template.
Note also that only edition of HTML source will be possible when a page content has been initialized by grabbing it from an external page ("Online" editor will NOT be available) OnlyEditionOfSourceForGrabbedContent=Only edition of HTML source is possible when content was grabbed from an external site GrabImagesInto=Grab also images found into css and page. ImagesShouldBeSavedInto=Images should be saved into directory @@ -89,4 +89,5 @@ CorporateHomePage=Corporate Home page EmptyPage=Empty page ExternalURLMustStartWithHttp=External URL must start with http:// or https:// ZipOfWebsitePackageToImport=Zip file of website package -ShowSubcontainers=Show included containers \ No newline at end of file +ShowSubcontainers=Show included containers +InternalURLOfPage=Internal URL of page \ No newline at end of file diff --git a/htdocs/website/index.php b/htdocs/website/index.php index 590423de2e4..9e39e162111 100644 --- a/htdocs/website/index.php +++ b/htdocs/website/index.php @@ -2319,6 +2319,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') print ''; print $langs->trans("URL"); print ''; + print info_admin($langs->trans("OnlyEditionOfSourceForGrabbedContentFuture"), 0, 0, 'warning'); print ' '; print ' '.$langs->trans("GrabImagesInto"); print ' '; @@ -2327,7 +2328,6 @@ if ($action == 'editmeta' || $action == 'createcontainer') print $form->selectarray('grabimagesinto', $arraygrabimagesinto, GETPOSTISSET('grabimagesinto')?GETPOST('grabimagesinto'):'root'); print '
'; print ''; - print '
'.info_admin($langs->trans("OnlyEditionOfSourceForGrabbedContentFuture"), 0, 0, '1'); print ''; print ''; @@ -2347,7 +2347,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') print ''; print ''; - print $langs->trans('WEBSITE_PAGEURL'); + print $langs->trans('InternalURLOfPage'); print ''; print '/public/website/index.php?website='.urlencode($websitekey).'&pageid='.urlencode($pageid); print ''; @@ -2395,6 +2395,7 @@ if ($action == 'editmeta' || $action == 'createcontainer') print ''; print ''; + // Type of container print ''; print $langs->trans('WEBSITE_TYPE_CONTAINER'); print ''; From 6793285997d74470c859f6f2887e2cd0c8aa56de Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Sep 2018 14:38:18 +0200 Subject: [PATCH 2/4] Website --- htdocs/langs/en_US/website.lang | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang index 6c94ee5a809..6a93ae25af0 100644 --- a/htdocs/langs/en_US/website.lang +++ b/htdocs/langs/en_US/website.lang @@ -61,7 +61,7 @@ LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The langu ParentPageId=Parent page ID WebsiteId=Website ID CreateByFetchingExternalPage=Create page/container by fetching page from external URL... -OrEnterPageInfoManually=Or create empty page from scratch... +OrEnterPageInfoManually=Or create page from scratch or from a page template... FetchAndCreate=Fetch and Create ExportSite=Export site ImportSite=Import site From 8793b9e26a653cc36802077dd8a74ad6818db890 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Sep 2018 15:07:42 +0200 Subject: [PATCH 3/4] css --- htdocs/theme/eldy/style.css.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 675b64911a4..e9be2a3d841 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1899,7 +1899,7 @@ if (! empty($conf->global->MAIN_LOGIN_BACKGROUND)) { margin: 8px; } .login_table .tdinputlogin { - background-color: #fff; + background-color: transparent; /* border: 2px solid #ccc; */ min-width: 220px; border-radius: 2px; From 497ab37204f4be4dd654a5abd763e2f5e12bb499 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Thu, 20 Sep 2018 15:11:26 +0200 Subject: [PATCH 4/4] css --- htdocs/theme/eldy/style.css.php | 1 + 1 file changed, 1 insertion(+) diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index e9be2a3d841..d6595554dab 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -1855,6 +1855,7 @@ form#login { max-width: 530px; color: #eee !important; padding-bottom: 20px; + text-shadow: 1px 1px #444; } .login_table label { text-shadow: 1px 1px 1px #FFF;