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

Merge remote-tracking branch 'upstream/develop' into new_branch_20_09_2018

Browse Source
This commit is contained in:
Philippe GRAND 2018-09-20 15:16:33 +02:00
commit 6f18992bcc
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,7 @@ LanguageMustNotBeSameThanClonedPage=You clone a page as a translation. The langu
ParentPageId=Parent page ID ParentPageId=Parent page ID
WebsiteId=Website ID WebsiteId=Website ID
CreateByFetchingExternalPage=Create page/container by fetching page from external URL... 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 FetchAndCreate=Fetch and Create
ExportSite=Export site ExportSite=Export site
ImportSite=Import site ImportSite=Import site
@ -78,7 +78,7 @@ AnotherContainer=Another container
WEBSITE_USE_WEBSITE_ACCOUNTS=Enable the web site account table 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 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 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.<br>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 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. GrabImagesInto=Grab also images found into css and page.
ImagesShouldBeSavedInto=Images should be saved into directory ImagesShouldBeSavedInto=Images should be saved into directory
@ -90,3 +90,4 @@ EmptyPage=Empty page
ExternalURLMustStartWithHttp=External URL must start with http:// or https:// ExternalURLMustStartWithHttp=External URL must start with http:// or https://
ZipOfWebsitePackageToImport=Zip file of website package ZipOfWebsitePackageToImport=Zip file of website package
ShowSubcontainers=Show included containers ShowSubcontainers=Show included containers
InternalURLOfPage=Internal URL of page

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

@ -1855,6 +1855,7 @@ form#login {
max-width: 530px; max-width: 530px;
color: #eee !important; color: #eee !important;
padding-bottom: 20px; padding-bottom: 20px;
text-shadow: 1px 1px #444;
} }
.login_table label { .login_table label {
text-shadow: 1px 1px 1px #FFF; text-shadow: 1px 1px 1px #FFF;
@ -1899,7 +1900,7 @@ if (! empty($conf->global->MAIN_LOGIN_BACKGROUND)) {
margin: 8px; margin: 8px;
} }
.login_table .tdinputlogin { .login_table .tdinputlogin {
background-color: #fff; background-color: transparent;
/* border: 2px solid #ccc; */ /* border: 2px solid #ccc; */
min-width: 220px; min-width: 220px;
border-radius: 2px; border-radius: 2px;

5
htdocs/website/index.php
View File

@ -2319,6 +2319,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
print '<tr><td class="titlefield">'; print '<tr><td class="titlefield">';
print $langs->trans("URL"); print $langs->trans("URL");
print '</td><td>'; print '</td><td>';
print info_admin($langs->trans("OnlyEditionOfSourceForGrabbedContentFuture"), 0, 0, 'warning');
print '<input class="flat minwidth300" type="text" name="externalurl" value="'.dol_escape_htmltag(GETPOST('externalurl','alpha')).'" placeholder="https://externalsite/pagetofetch"> '; print '<input class="flat minwidth300" type="text" name="externalurl" value="'.dol_escape_htmltag(GETPOST('externalurl','alpha')).'" placeholder="https://externalsite/pagetofetch"> ';
print '<input class="flat paddingtop" type="checkbox" name="grabimages" value="1" checked="checked"> '.$langs->trans("GrabImagesInto"); print '<input class="flat paddingtop" type="checkbox" name="grabimages" value="1" checked="checked"> '.$langs->trans("GrabImagesInto");
print ' '; print ' ';
@ -2327,7 +2328,6 @@ if ($action == 'editmeta' || $action == 'createcontainer')
print $form->selectarray('grabimagesinto', $arraygrabimagesinto, GETPOSTISSET('grabimagesinto')?GETPOST('grabimagesinto'):'root'); print $form->selectarray('grabimagesinto', $arraygrabimagesinto, GETPOSTISSET('grabimagesinto')?GETPOST('grabimagesinto'):'root');
print '<br>'; print '<br>';
print '<input class="button" style="margin-top: 5px" type="submit" name="fetchexternalurl" value="'.dol_escape_htmltag($langs->trans("FetchAndCreate")).'">'; print '<input class="button" style="margin-top: 5px" type="submit" name="fetchexternalurl" value="'.dol_escape_htmltag($langs->trans("FetchAndCreate")).'">';
print '<br>'.info_admin($langs->trans("OnlyEditionOfSourceForGrabbedContentFuture"), 0, 0, '1');
print '</td></tr>'; print '</td></tr>';
print '</table>'; print '</table>';
@ -2347,7 +2347,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
print '</td></tr>'; print '</td></tr>';
print '<tr><td class="titlefield">'; print '<tr><td class="titlefield">';
print $langs->trans('WEBSITE_PAGEURL'); print $langs->trans('InternalURLOfPage');
print '</td><td>'; print '</td><td>';
print '/public/website/index.php?website='.urlencode($websitekey).'&pageid='.urlencode($pageid); print '/public/website/index.php?website='.urlencode($websitekey).'&pageid='.urlencode($pageid);
print '</td></tr>'; print '</td></tr>';
@ -2395,6 +2395,7 @@ if ($action == 'editmeta' || $action == 'createcontainer')
print '<input type="text" class="flat minwidth300" name="WEBSITE_PAGENAME" id="WEBSITE_PAGENAME" value="'.dol_escape_htmltag($pageurl).'">'; print '<input type="text" class="flat minwidth300" name="WEBSITE_PAGENAME" id="WEBSITE_PAGENAME" value="'.dol_escape_htmltag($pageurl).'">';
print '</td></tr>'; print '</td></tr>';
// Type of container
print '<tr><td class="titlefield fieldrequired">'; print '<tr><td class="titlefield fieldrequired">';
print $langs->trans('WEBSITE_TYPE_CONTAINER'); print $langs->trans('WEBSITE_TYPE_CONTAINER');
print '</td><td>'; print '</td><td>';