diff --git a/htdocs/core/website.inc.php b/htdocs/core/website.inc.php
index b5053fcc814..6456fabf5b3 100644
--- a/htdocs/core/website.inc.php
+++ b/htdocs/core/website.inc.php
@@ -27,6 +27,18 @@
include_once DOL_DOCUMENT_ROOT.'/website/class/website.class.php';
include_once DOL_DOCUMENT_ROOT.'/website/class/websitepage.class.php';
+// Detection browser (copy of code from main.inc.php)
+if (isset($_SERVER["HTTP_USER_AGENT"]) && is_object($conf) && empty($conf->browser->name))
+{
+ $tmp = getBrowserInfo($_SERVER["HTTP_USER_AGENT"]);
+ $conf->browser->name = $tmp['browsername'];
+ $conf->browser->os = $tmp['browseros'];
+ $conf->browser->version = $tmp['browserversion'];
+ $conf->browser->layout = $tmp['layout']; // 'classic', 'phone', 'tablet'
+ //var_dump($conf->browser);
+
+ if ($conf->browser->layout == 'phone') $conf->dol_no_mouse_hover = 1;
+}
// Define $website
if (!is_object($website))
{
@@ -48,11 +60,16 @@ if (!is_object($weblangs))
{
$weblangs = new Translate('', $conf);
}
+if (!is_object($pagelangs))
+{
+ $pagelangs = new Translate('', $conf);
+}
if ($pageid > 0)
{
$websitepage->fetch($pageid);
- $weblangs->setDefaultLang($websitepage->lang ? $websitepage->lang : 'auto');
+ $weblangs->setDefaultLang(empty($_COOKIE['weblangs-shortcode']) ? 'auto' : $_COOKIE['weblangs-shortcode']);
+ $pagelangs->setDefaultLang($websitepage->lang ? $websitepage->lang : $weblangs->shortlang);
if (!defined('USEDOLIBARREDITOR') && in_array($websitepage->type_container, array('menu', 'other')))
{
diff --git a/htdocs/langs/en_US/website.lang b/htdocs/langs/en_US/website.lang
index f4d88b0d606..2c555b40c20 100644
--- a/htdocs/langs/en_US/website.lang
+++ b/htdocs/langs/en_US/website.lang
@@ -57,7 +57,7 @@ NoPageYet=No pages yet
YouCanCreatePageOrImportTemplate=You can create a new page or import a full website template
SyntaxHelp=Help on specific syntax tips
YouCanEditHtmlSourceckeditor=You can edit HTML source code using the "Source" button in editor.
-YouCanEditHtmlSource=
You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs.
You can also include content of another Page/Container with the following syntax:
<?php includeContainer('alias_of_container_to_include'); ?>
You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>
To add a link to another page, use the syntax:
<a href="alias_of_page_to_link_to.php">mylink<a>
To include a link to download a file stored into the documents directory, use the document.php wrapper:
Example, for a file into documents/ecm (need to be logged), syntax is:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
For a file into documents/medias (open directory for public access), syntax is:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
For a file shared with a share link (open access using the sharing hash key of file), syntax is:
<a href="/document.php?hashp=publicsharekeyoffile">
To include an image stored into the documents directory, use the viewimage.php wrapper:
Example, for an image into documents/medias (open directory for public access), syntax is:
<img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
More examples of HTML or dynamic code available on the wiki documentation
.
+YouCanEditHtmlSource=
You can include PHP code into this source using tags <?php ?>. The following global variables are available: $conf, $db, $mysoc, $user, $website, $websitepage, $weblangs, $pagelangs.
You can also include content of another Page/Container with the following syntax:
<?php includeContainer('alias_of_container_to_include'); ?>
You can make a redirect to another Page/Container with the following syntax (Note: do not output any content before a redirect):
<?php redirectToContainer('alias_of_container_to_redirect_to'); ?>
To add a link to another page, use the syntax:
<a href="alias_of_page_to_link_to.php">mylink<a>
To include a link to download a file stored into the documents directory, use the document.php wrapper:
Example, for a file into documents/ecm (need to be logged), syntax is:
<a href="/document.php?modulepart=ecm&file=[relative_dir/]filename.ext">
For a file into documents/medias (open directory for public access), syntax is:
<a href="/document.php?modulepart=medias&file=[relative_dir/]filename.ext">
For a file shared with a share link (open access using the sharing hash key of file), syntax is:
<a href="/document.php?hashp=publicsharekeyoffile">
To include an image stored into the documents directory, use the viewimage.php wrapper:
Example, for an image into documents/medias (open directory for public access), syntax is:
<img src="/viewimage.php?modulepart=medias&file=[relative_dir/]filename.ext">
More examples of HTML or dynamic code available on the wiki documentation
.
ClonePage=Clone page/container
CloneSite=Clone site
SiteAdded=Website added
diff --git a/htdocs/societe/card.php b/htdocs/societe/card.php
index 96a9dd7deed..681d4a37fc9 100644
--- a/htdocs/societe/card.php
+++ b/htdocs/societe/card.php
@@ -1401,7 +1401,7 @@ else
}
$i++;
}
- if ($j % 2 == 1) print ' | ';
+ if ($NBCOLS > 1 && ($j % 2 == 1)) print ' | ';
// Vat is used
print '| '.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).' | ';
@@ -1445,11 +1445,11 @@ else
//TODO: Place into a function to control showing by country or study better option
if ($mysoc->localtax1_assuj == "1" && $mysoc->localtax2_assuj == "1")
{
- print '
| '.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).' | ';
+ print ' |
| '.$langs->transcountry("LocalTax1IsUsed", $mysoc->country_code).' | ';
print $form->selectyesno('localtax1assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX1 : 0), 1);
- print ' |
';
+ print '';
if ($conf->browser->layout == 'phone') print '';
- print '
| '.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).' | ';
+ print ' | '.$langs->transcountry("LocalTax2IsUsed", $mysoc->country_code).' | ';
print $form->selectyesno('localtax2assuj_value', (isset($conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2) ? $conf->global->THIRDPARTY_DEFAULT_USELOCALTAX2 : 0), 1);
print ' |
';
}
@@ -2019,7 +2019,7 @@ else
}
$i++;
}
- if ($j % 2 == 1) print ' | ';
+ if ($NBCOLS > 0 && $j % 2 == 1) print ' | ';
// VAT is used
print '| '.$form->editfieldkey('VATIsUsed', 'assujtva_value', '', $object, 0).' | ';
|