diff --git a/htdocs/langs/en_US/other.lang b/htdocs/langs/en_US/other.lang index 253560454ec..cecfe1e71e6 100644 --- a/htdocs/langs/en_US/other.lang +++ b/htdocs/langs/en_US/other.lang @@ -70,12 +70,13 @@ PredefinedMailContentSendFichInter=__CONTACTCIVNAME__\n\nYou will find here the PredefinedMailContentThirdparty=__CONTACTCIVNAME__\n\n__PERSONALIZED__\n\n__SIGNATURE__ DemoDesc=Dolibarr is a compact ERP/CRM supporting several functional modules. A demo showcasing all modules makes no sense as this scenario never occurs. So, several demo profiles are available. ChooseYourDemoProfil=Choose the demo profile that best suits your needs... +ChooseYourDemoProfilMore=...or build your own profile
(manual module selection) DemoFundation=Manage members of a foundation DemoFundation2=Manage members and bank account of a foundation -DemoCompanyServiceOnly=Manage a freelance activity selling service only +DemoCompanyServiceOnly=Company or freelance selling service only DemoCompanyShopWithCashDesk=Manage a shop with a cash desk -DemoCompanyProductAndStocks=Manage a small or medium company selling products -DemoCompanyAll=Manage a small or medium company with multiple activities (all main modules) +DemoCompanyProductAndStocks=Company selling products with a shop +DemoCompanyAll=Company with multiple activities (all main modules) CreatedBy=Created by %s ModifiedBy=Modified by %s ValidatedBy=Validated by %s diff --git a/htdocs/public/demo/demo-profile-all.jpg b/htdocs/public/demo/demo-profile-all.jpg new file mode 100644 index 00000000000..6d7ee37a863 Binary files /dev/null and b/htdocs/public/demo/demo-profile-all.jpg differ diff --git a/htdocs/public/demo/demo-profile-foundation.jpg b/htdocs/public/demo/demo-profile-foundation.jpg new file mode 100644 index 00000000000..4574643090a Binary files /dev/null and b/htdocs/public/demo/demo-profile-foundation.jpg differ diff --git a/htdocs/public/demo/demo-profile-product.jpg b/htdocs/public/demo/demo-profile-product.jpg new file mode 100644 index 00000000000..a7c4afb93bb Binary files /dev/null and b/htdocs/public/demo/demo-profile-product.jpg differ diff --git a/htdocs/public/demo/demo-profile-service.jpg b/htdocs/public/demo/demo-profile-service.jpg new file mode 100644 index 00000000000..1fffacafaf9 Binary files /dev/null and b/htdocs/public/demo/demo-profile-service.jpg differ diff --git a/htdocs/public/demo/dolibarr_demo_ban.jpg b/htdocs/public/demo/dolibarr_demo_ban.jpg new file mode 100644 index 00000000000..f3059fcc2e4 Binary files /dev/null and b/htdocs/public/demo/dolibarr_demo_ban.jpg differ diff --git a/htdocs/public/demo/index.php b/htdocs/public/demo/index.php index 4c7c8cbebc8..a83ef87b65b 100644 --- a/htdocs/public/demo/index.php +++ b/htdocs/public/demo/index.php @@ -54,6 +54,13 @@ $alwaysuncheckedmodules=array(); $alwayshiddencheckedmodules=array(); $alwayshiddenuncheckedmodules=array(); +$url=DOL_URL_ROOT.'/index.php?'; +$url.=($url?'&':'').($conf->dol_hide_topmenu?'dol_hide_topmenu='.$conf->dol_hide_topmenu:''); +$url.=($url?'&':'').($conf->dol_hide_leftmenu?'dol_hide_leftmenu='.$conf->dol_hide_leftmenu:''); +$url.=($url?'&':'').($conf->dol_optimize_smallscreen?'dol_optimize_smallscreen='.$conf->dol_optimize_smallscreen:''); +$url.=($url?'&':'').($conf->dol_no_mouse_hover?'dol_no_mouse_hover='.$conf->dol_no_mouse_hover:''); +$url.=($url?'&':'').($conf->dol_use_jmobile?'dol_use_jmobile='.$conf->dol_use_jmobile:''); + $tmpaction = 'view'; $parameters=array(); $object=new stdClass(); @@ -64,22 +71,38 @@ if (empty($reshook)) $demoprofiles=array( array('default'=>'1', 'key'=>'profdemoservonly','label'=>'DemoCompanyServiceOnly', 'disablemodules'=>'adherent,barcode,cashdesk,don,expedition,externalsite,incoterm,mailmanspip,margin,prelevement,product,productbatch,stock', - 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot8.png'), + //'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot8.png', + 'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-service.jpg', + 'url'=>$url + ), array('default'=>'-1','key'=>'profdemoshopwithdesk','label'=>'DemoCompanyShopWithCashDesk', 'disablemodules'=>'adherent,don,externalsite,ficheinter,incoterm,mailmanspip,prelevement,product,productbatch,stock', - 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'), + 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png', + 'url'=>$url + ), array('default'=>'0', 'key'=>'profdemoprodstock','label'=>'DemoCompanyProductAndStocks', 'disablemodules'=>'adherent,contrat,don,externalsite,ficheinter,mailmanspip,prelevement,service', - 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png'), - array('default'=>'0', 'key'=>'profdemoall','label'=>'DemoCompanyAll', - 'disablemodules'=>'adherent,don,externalsite,mailmanspip', - 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png'), + //'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot2.png', + 'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-product.jpg', + 'url'=>$url + ), array('default'=>'-1', 'key'=>'profdemofun','label'=>'DemoFundation', 'disablemodules'=>'banque,barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,ficheinter,incoterm,mailmanspip,margin,prelevement,product,productbatch,projet,propal,propale,service,societe,stock,tax', - 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png'), + 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png', + 'url'=>$url + ), array('default'=>'0', 'key'=>'profdemofun2','label'=>'DemoFundation2', 'disablemodules'=>'barcode,cashdesk,commande,commercial,compta,comptabilite,contrat,expedition,externalsite,ficheinter,incoterm,mailmanspip,margin,prelevement,product,productbatch,projet,propal,propale,service,societe,stock,tax', - 'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png') + //'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot6.png', + 'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-foundation.jpg', + 'url'=>$url + ), + // All demo profile + array('default'=>'0', 'key'=>'profdemoall','label'=>'ChooseYourDemoProfilMore', + 'disablemodules'=>'adherent,don,externalsite,mailmanspip', + //'icon'=>DOL_URL_ROOT.'/public/demo/dolibarr_screenshot9.png' + 'icon'=>DOL_URL_ROOT.'/public/demo/demo-profile-all.jpg' + ) ); // Visible @@ -209,14 +232,8 @@ if (GETPOST("action") == 'gotodemo') // Do redirect to login page if ($disablestring) { - $url=''; - $url.=($url?'&':'').($conf->dol_hide_topmenu?'dol_hide_topmenu='.$conf->dol_hide_topmenu:''); - $url.=($url?'&':'').($conf->dol_hide_leftmenu?'dol_hide_leftmenu='.$conf->dol_hide_leftmenu:''); - $url.=($url?'&':'').($conf->dol_optimize_smallscreen?'dol_optimize_smallscreen='.$conf->dol_optimize_smallscreen:''); - $url.=($url?'&':'').($conf->dol_no_mouse_hover?'dol_no_mouse_hover='.$conf->dol_no_mouse_hover:''); - $url.=($url?'&':'').($conf->dol_use_jmobile?'dol_use_jmobile='.$conf->dol_use_jmobile:''); if (GETPOST('urlfrom')) $url.=($url?'&':'').'urlfrom='.urlencode(GETPOST('urlfrom','alpha')); - $url=DOL_URL_ROOT.'/index.php?'.($url?$url.'&':'').'disablemodules='.$disablestring; + $url.=($url?'&':'').'disablemodules='.$disablestring; header("Location: ".$url); exit; } @@ -231,18 +248,16 @@ $head=''; $head.=''."\n"; $head.=''."\n"; $head.=' @@ -309,20 +333,23 @@ llxHeaderVierge($langs->trans("DolibarrDemo"), $head); print "\n"; -print ''; - -print ''; -print ''; -print ''; +print ''; -// Description -print ''; - -print '
'; -print '

'; -print '
'; +print '
'; +print '
'; +print ''; +print '
'; +print '
'; +print '
'; +print '
'; print '
'.$langs->trans("DemoDesc").'

'; -print '
'; print ''.$langs->trans("ChooseYourDemoProfil").''; +print '
'; +print '
'; -print '
'; -//print ''."\n"; +print '
'; +print '
'; + $i=0; foreach ($demoprofiles as $profilearray) { @@ -339,11 +366,12 @@ foreach ($demoprofiles as $profilearray) //print $urlfrom; if (! empty($profilearray['url'])) $urlwithmod=$profilearray['url']; - //if ($i % $NBOFCOLS == 0) print '
'; - //print ''; - //print ''; - //if ($i % $NBOFCOLS == ($NBOFCOLS-1)) print ''."\n"; - //print ''."\n"; $i++; } } -//print '
'."\n"; - - print '
'."\n"; + if (empty($profilearray['url'])) + { + print '
'; + } + + print ''."\n"; print ''."\n"; print ''."\n"; print ''."\n"; @@ -354,20 +382,35 @@ foreach ($demoprofiles as $profilearray) print ''."\n"; print ''."\n"; - print ''."\n"; - // Title - print ''; - print ''; - print ''; - print ''."\n"; + print '
'."\n"; + print '
'; - print ''; - print ''."\n"; - print ''; + print ''; + + print '
'; + print ''; + print '
'; + + print ''; } - print '
Demo '.$profilearray['label'].''.$langs->trans($profilearray['label']).'
'; + print '
'; + + print ''; print '
'."\n"; - //print '
'; -print '
'; - - -print '
'; // TODO Replace this with a hook // Google Adsense (need Google module) @@ -477,7 +512,7 @@ function llxHeaderVierge($title, $head = "") top_htmlhead($head,$title); - print '
'."\n"; + print '
'."\n"; } /** diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php index 34536323ec6..c42ea93cfce 100644 --- a/htdocs/theme/eldy/style.css.php +++ b/htdocs/theme/eldy/style.css.php @@ -4549,20 +4549,36 @@ border-top-right-radius: 6px; /* For demo pages */ +.demobody { + line-height: 130%; + font-size: 150%; + text-align: center; +} +.demobantext { + max-width: 1024px; + text-align: center; + display: inline-block; +} +.demobanbox { + font-size: 90%; +} img.demothumb { - box-shadow: 2px 2px 8px #BBB; + /* box-shadow: 2px 2px 8px #BBB; */ margin-right: 20px; margin-left: 10px; + width: 110px; } - .demobackground { - /* - background-image: url(/dolibarr_5.0/htdocs/theme/image-demo.jpg); + background-image: url(); background-size: cover; object-fit: contain; - */ + height: 140px; + background-position-y: bottom; +} +div#tr1profdemoall { + margin-left: -40px; + margin-right: -40px; } - /* ============================================================================== */ @@ -4601,12 +4617,19 @@ img.demothumb { width: px; } + .demobody { + line-height: 150% !important; + font-size: 100% !important; + } img.demothumb { box-shadow: 1px 1px 4px #BBB; margin-right: 6px; margin-left: 4px; width: 80px; } + .demobanbox { + font-size: 100%; + } div.tabBar { padding-left: 0px;