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

Merge pull request #16459 from frederic34/theme_code_syntax

Browse Source 
code syntax theme directory
This commit is contained in:
Laurent Destailleur 2021-02-26 13:52:42 +01:00 committed by GitHub
commit 2f649d6582
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 4213 additions and 3924 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/theme/eldy/badges.inc.php
View File

@ -1,5 +1,7 @@
<?php <?php
if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
}
?> ?>
/* Badge style is based on boostrap framework */ /* Badge style is based on boostrap framework */
@ -246,8 +248,12 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
$thisBadgeBackgroundColor = "#fff"; $thisBadgeBackgroundColor = "#fff";
} }
if (in_array((string) $statusName, array('0', '5', '9'))) $thisBadgeTextColor = '#999999'; if (in_array((string) $statusName, array('0', '5', '9'))) {
if (in_array((string) $statusName, array('6'))) $thisBadgeTextColor = '#777777'; $thisBadgeTextColor = '#999999';
}
if (in_array((string) $statusName, array('6'))) {
$thisBadgeTextColor = '#777777';
}
print $cssPrefix.".badge-status".$statusName." {\n"; print $cssPrefix.".badge-status".$statusName." {\n";
print " color: ".$thisBadgeTextColor." !important;\n"; print " color: ".$thisBadgeTextColor." !important;\n";

4
htdocs/theme/eldy/btn.inc.php
View File

@ -1,5 +1,7 @@
<?php <?php
if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > */ /* <style type="text/css" > */
:root { :root {

4
htdocs/theme/eldy/dropdown.inc.php
View File

@ -1,5 +1,7 @@
<?php <?php
if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > dont remove this line it's an ide hack */ /* <style type="text/css" > dont remove this line it's an ide hack */
/* /*
* Dropdown of user popup * Dropdown of user popup

87
htdocs/theme/eldy/global.inc.php
View File

@ -1,4 +1,6 @@
<?php if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> <?php if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > */ /* <style type="text/css" > */
/* ============================================================================== */ /* ============================================================================== */
@ -1171,7 +1173,9 @@ div.fiche {
} }
.flexcontainer { .flexcontainer {
<?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) echo 'display: inline-flex;'."\n"; ?> <?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) {
echo 'display: inline-flex;'."\n";
} ?>
flex-flow: row wrap; flex-flow: row wrap;
justify-content: flex-start; justify-content: flex-start;
} }
@ -1759,8 +1763,12 @@ div.vmenu, td.vmenu {
div.fiche { div.fiche {
margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '30' : '6')); ?>px; margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '30' : '6')); ?>px;
margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '28' : '6')); ?>px; margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '28' : '6')); ?>px;
<?php if (!empty($dol_hide_leftmenu)) print 'margin-bottom: 12px;'."\n"; ?> <?php if (!empty($dol_hide_leftmenu)) {
<?php if (!empty($dol_hide_leftmenu)) print 'margin-top: 12px;'."\n"; ?> print 'margin-bottom: 12px;'."\n";
} ?>
<?php if (!empty($dol_hide_leftmenu)) {
print 'margin-top: 12px;'."\n";
} ?>
} }
body.onlinepaymentbody div.fiche { /* For online payment page */ body.onlinepaymentbody div.fiche { /* For online payment page */
margin: 20px !important; margin: 20px !important;
@ -1779,28 +1787,50 @@ div.fichecenterbis {
margin-top: 8px; margin-top: 8px;
} }
div.fichethirdleft { div.fichethirdleft {
<?php if ($conf->browser->layout != 'phone') { print "float: ".$left.";\n"; } ?> <?php if ($conf->browser->layout != 'phone') {
<?php if ($conf->browser->layout != 'phone') { print "width: 50%;\n"; } ?> print "float: ".$left.";\n";
<?php if ($conf->browser->layout == 'phone') { print "padding-bottom: 6px;\n"; } ?> } ?>
<?php if ($conf->browser->layout != 'phone') {
print "width: 50%;\n";
} ?>
<?php if ($conf->browser->layout == 'phone') {
print "padding-bottom: 6px;\n";
} ?>
} }
div.fichetwothirdright { div.fichetwothirdright {
<?php if ($conf->browser->layout != 'phone') { print "float: ".$right.";\n"; } ?> <?php if ($conf->browser->layout != 'phone') {
<?php if ($conf->browser->layout != 'phone') { print "width: 50%;\n"; } ?> print "float: ".$right.";\n";
<?php if ($conf->browser->layout == 'phone') { print "padding-bottom: 6px\n"; } ?> } ?>
<?php if ($conf->browser->layout != 'phone') {
print "width: 50%;\n";
} ?>
<?php if ($conf->browser->layout == 'phone') {
print "padding-bottom: 6px\n";
} ?>
} }
div.fichetwothirdright div.ficheaddleft { div.fichetwothirdright div.ficheaddleft {
padding-<?php echo $left; ?>: 20px; padding-<?php echo $left; ?>: 20px;
} }
div.fichehalfleft { div.fichehalfleft {
<?php if ($conf->browser->layout != 'phone') { print "float: ".$left.";\n"; } ?> <?php if ($conf->browser->layout != 'phone') {
<?php if ($conf->browser->layout != 'phone') { print "width: calc(50% - 10px);\n"; } ?> print "float: ".$left.";\n";
} ?>
<?php if ($conf->browser->layout != 'phone') {
print "width: calc(50% - 10px);\n";
} ?>
} }
div.fichehalfright { div.fichehalfright {
<?php if ($conf->browser->layout != 'phone') { print "float: ".$right.";\n"; } ?> <?php if ($conf->browser->layout != 'phone') {
<?php if ($conf->browser->layout != 'phone') { print "width: calc(50% - 10px);\n"; } ?> print "float: ".$right.";\n";
} ?>
<?php if ($conf->browser->layout != 'phone') {
print "width: calc(50% - 10px);\n";
} ?>
} }
div.fichehalfright { div.fichehalfright {
<?php if ($conf->browser->layout == 'phone') { print "margin-top: 10px;\n"; } ?> <?php if ($conf->browser->layout == 'phone') {
print "margin-top: 10px;\n";
} ?>
} }
div.firstcolumn div.box { div.firstcolumn div.box {
padding-right: 10px; padding-right: 10px;
@ -2280,8 +2310,7 @@ a.tmenuimage:hover{
'barcode'=>'', 'fckeditor'=>'', 'categorie'=>'', 'barcode'=>'', 'fckeditor'=>'', 'categorie'=>'',
); );
$mainmenuused = 'home'; $mainmenuused = 'home';
foreach ($conf->modules as $val) foreach ($conf->modules as $val) {
{
$mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val); $mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
} }
$mainmenuusedarray = array_unique(explode(',', $mainmenuused)); $mainmenuusedarray = array_unique(explode(',', $mainmenuused));
@ -2291,26 +2320,26 @@ a.tmenuimage:hover{
$divalreadydefined = array('home', 'companies', 'products', 'mrp', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'takepos', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website'); $divalreadydefined = array('home', 'companies', 'products', 'mrp', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'takepos', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website');
// Put here list of menu entries we are sure we don't want // Put here list of menu entries we are sure we don't want
$divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition'); $divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
foreach ($mainmenuusedarray as $val) foreach ($mainmenuusedarray as $val) {
{ if (empty($val) || in_array($val, $divalreadydefined)) {
if (empty($val) || in_array($val, $divalreadydefined)) continue; continue;
if (in_array($val, $divnotrequired)) continue; }
if (in_array($val, $divnotrequired)) {
continue;
}
//print "XXX".$val; //print "XXX".$val;
// Search img file in module dir // Search img file in module dir
$found = 0; $url = ''; $found = 0; $url = '';
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot) {
{ if (file_exists($dirroot."/".$val."/img/".$val.".png")) {
if (file_exists($dirroot."/".$val."/img/".$val.".png"))
{
$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1); $url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
$found = 1; $found = 1;
break; break;
} }
} }
// Img file not found // Img file not found
if (!$found) if (!$found) {
{
if (!defined('DISABLE_FONT_AWSOME')) { if (!defined('DISABLE_FONT_AWSOME')) {
print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n"; print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one. */\n";
print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n"; print "/* Overwrite this definition in your own css with a different content to use your own font awesome icon. */\n";
@ -6865,7 +6894,9 @@ include dol_buildpath($path.'/theme/'.$theme.'/info-box.inc.php', 0);
include dol_buildpath($path.'/theme/'.$theme.'/progress.inc.php', 0); include dol_buildpath($path.'/theme/'.$theme.'/progress.inc.php', 0);
include dol_buildpath($path.'/theme/'.$theme.'/timeline.inc.php', 0); include dol_buildpath($path.'/theme/'.$theme.'/timeline.inc.php', 0);
if (!empty($conf->global->THEME_CUSTOM_CSS)) print $conf->global->THEME_CUSTOM_CSS; if (!empty($conf->global->THEME_CUSTOM_CSS)) {
print $conf->global->THEME_CUSTOM_CSS;
}
?> ?>

16
htdocs/theme/eldy/info-box.inc.php
View File

@ -1,5 +1,7 @@
<?php <?php
if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > */ /* <style type="text/css" > */
/* /*
@ -240,10 +242,16 @@ a.info-box-text{ text-decoration: none;}
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$prefix = ''; $prefix = '';
if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-'; if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) {
$prefix = 'background-';
}
if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.7; if (!isset($conf->global->THEME_SATURATE_RATIO)) {
if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int'); $conf->global->THEME_SATURATE_RATIO = 0.7;
}
if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
$conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
}
?> ?>
.info-box-icon { .info-box-icon {

4
htdocs/theme/eldy/main_menu_fa_icons.inc.php
View File

@ -1,4 +1,6 @@
<?php if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> <?php if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > */ /* <style type="text/css" > */
.mainmenu::before{ .mainmenu::before{

57
htdocs/theme/eldy/manifest.json.php
View File

@ -25,16 +25,36 @@
* \brief File for The Web App * \brief File for The Web App
*/ */
if (!defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1'); if (!defined('NOREQUIREUSER')) {
if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1'); define('NOREQUIREUSER', '1');
if (!defined('NOREQUIRETRAN')) define('NOREQUIRETRAN', '1'); }
if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', '1'); if (!defined('NOREQUIRESOC')) {
if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); define('NOREQUIRESOC', '1');
if (!defined('NOLOGIN')) define('NOLOGIN', '1'); }
if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); if (!defined('NOREQUIRETRAN')) {
if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1'); define('NOREQUIRETRAN', '1');
if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); }
if (!defined('NOSESSION')) define('NOSESSION', '1'); if (!defined('NOCSRFCHECK')) {
define('NOCSRFCHECK', '1');
}
if (!defined('NOTOKENRENEWAL')) {
define('NOTOKENRENEWAL', '1');
}
if (!defined('NOLOGIN')) {
define('NOLOGIN', '1');
}
if (!defined('NOREQUIREMENU')) {
define('NOREQUIREMENU', '1');
}
if (!defined('NOREQUIREHTML')) {
define('NOREQUIREHTML', '1');
}
if (!defined('NOREQUIREAJAX')) {
define('NOREQUIREAJAX', '1');
}
if (!defined('NOSESSION')) {
define('NOSESSION', '1');
}
require_once __DIR__.'/../../main.inc.php'; require_once __DIR__.'/../../main.inc.php';
@ -45,8 +65,7 @@ if (empty($dolibarr_nocache)) {
header('Cache-Control: max-age=10800, public, must-revalidate'); header('Cache-Control: max-age=10800, public, must-revalidate');
// For a text/json, we must set an Expires to avoid to have it forced to an expired value by the web server // For a text/json, we must set an Expires to avoid to have it forced to an expired value by the web server
header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + 10800) . ' GMT'); header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + 10800) . ' GMT');
} } else {
else {
header('Cache-Control: no-cache'); header('Cache-Control: no-cache');
} }
@ -55,7 +74,9 @@ $manifest = new stdClass();
$manifest->name = constant('DOL_APPLICATION_TITLE'); $manifest->name = constant('DOL_APPLICATION_TITLE');
if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $manifest->name = $conf->global->MAIN_APPLICATION_TITLE; if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
$manifest->name = $conf->global->MAIN_APPLICATION_TITLE;
}
$manifest->theme_color = !empty($conf->global->MAIN_MANIFEST_APPLI_THEME_COLOR)?$conf->global->MAIN_MANIFEST_APPLI_THEME_COLOR:'#F05F40'; $manifest->theme_color = !empty($conf->global->MAIN_MANIFEST_APPLI_THEME_COLOR)?$conf->global->MAIN_MANIFEST_APPLI_THEME_COLOR:'#F05F40';
@ -67,12 +88,14 @@ $manifest->icons = array();
if (!empty($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL)) { if (!empty($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL)) {
$icon = new stdClass(); $icon = new stdClass();
$icon->src = $conf->global->MAIN_MANIFEST_APPLI_LOGO_URL; $icon->src = $conf->global->MAIN_MANIFEST_APPLI_LOGO_URL;
if ($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL_SIZE) { $icon->sizes = $conf->global->MAIN_MANIFEST_APPLI_LOGO_URL_SIZE."x".$conf->global->MAIN_MANIFEST_APPLI_LOGO_URL_SIZE; } if ($conf->global->MAIN_MANIFEST_APPLI_LOGO_URL_SIZE) {
else { $icon->sizes = "512x512"; } $icon->sizes = $conf->global->MAIN_MANIFEST_APPLI_LOGO_URL_SIZE."x".$conf->global->MAIN_MANIFEST_APPLI_LOGO_URL_SIZE;
} else {
$icon->sizes = "512x512";
}
$icon->type = "image/png"; $icon->type = "image/png";
$manifest->icons[] = $icon; $manifest->icons[] = $icon;
} } elseif (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED)) {
elseif (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED)){
if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI)) { if (!empty($conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI)) {
$iconRelativePath = 'logos/thumbs/'.$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI; $iconRelativePath = 'logos/thumbs/'.$conf->global->MAIN_INFO_SOCIETE_LOGO_SQUARRED_MINI;
$iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath; $iconPath = $conf->mycompany->dir_output.'/'.$iconRelativePath;

4
htdocs/theme/eldy/progress.inc.php
View File

@ -1,5 +1,7 @@
<?php <?php
if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > */ /* <style type="text/css" > */
/* /*
progress style is based on boostrap and admin lte framework progress style is based on boostrap and admin lte framework

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

@ -27,21 +27,35 @@
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled because need to load personalized language //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled because need to load personalized language
//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled to increase speed. Language code is found on url. //if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled to increase speed. Language code is found on url.
if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1'); if (!defined('NOREQUIRESOC')) {
define('NOREQUIRESOC', '1');
}
//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled because need to do translations //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled because need to do translations
if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1); if (!defined('NOCSRFCHECK')) {
if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); define('NOCSRFCHECK', 1);
if (!defined('NOLOGIN')) define('NOLOGIN', 1); // File must be accessed by logon page so without login. }
if (!defined('NOTOKENRENEWAL')) {
define('NOTOKENRENEWAL', 1);
}
if (!defined('NOLOGIN')) {
define('NOLOGIN', 1); // File must be accessed by logon page so without login.
}
//if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); // We load menu manager class (note that object loaded may have wrong content because NOLOGIN is set and some values depends on login) //if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); // We load menu manager class (note that object loaded may have wrong content because NOLOGIN is set and some values depends on login)
if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1); if (!defined('NOREQUIREHTML')) {
if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); define('NOREQUIREHTML', 1);
}
if (!defined('NOREQUIREAJAX')) {
define('NOREQUIREAJAX', '1');
}
define('ISLOADEDBYSTEELSHEET', '1'); define('ISLOADEDBYSTEELSHEET', '1');
require __DIR__.'/theme_vars.inc.php'; require __DIR__.'/theme_vars.inc.php';
if (defined('THEME_ONLY_CONSTANT')) return; if (defined('THEME_ONLY_CONSTANT')) {
return;
}
session_cache_limiter('public'); session_cache_limiter('public');
@ -51,8 +65,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
// Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined) // Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined)
// and permission, so we can later calculate number of top menu ($nbtopmenuentries) according to user profile. // and permission, so we can later calculate number of top menu ($nbtopmenuentries) according to user profile.
if (empty($user->id) && !empty($_SESSION['dol_login'])) if (empty($user->id) && !empty($_SESSION['dol_login'])) {
{
$user->fetch('', $_SESSION['dol_login'], '', 1); $user->fetch('', $_SESSION['dol_login'], '', 1);
$user->getrights(); $user->getrights();
@ -65,12 +78,21 @@ if (empty($user->id) && !empty($_SESSION['dol_login']))
// Define css type // Define css type
top_httphead('text/css'); top_httphead('text/css');
// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access. // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate'); if (empty($dolibarr_nocache)) {
else header('Cache-Control: no-cache'); header('Cache-Control: max-age=10800, public, must-revalidate');
} else {
header('Cache-Control: no-cache');
}
if (GETPOST('theme', 'alpha')) $conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL if (GETPOST('theme', 'alpha')) {
if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL $conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL
if (GETPOST('THEME_DARKMODEENABLED', 'int')) $conf->global->THEME_DARKMODEENABLED = GETPOST('THEME_DARKMODEENABLED', 'int'); // If darkmode was forced on URL }
if (GETPOST('lang', 'aZ09')) {
$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
}
if (GETPOST('THEME_DARKMODEENABLED', 'int')) {
$conf->global->THEME_DARKMODEENABLED = GETPOST('THEME_DARKMODEENABLED', 'int'); // If darkmode was forced on URL
}
$langs->load("main", 0, 1); $langs->load("main", 0, 1);
$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right'); $right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
@ -78,7 +100,9 @@ $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
$path = ''; // This value may be used in future for external module to overwrite theme $path = ''; // This value may be used in future for external module to overwrite theme
$theme = 'eldy'; // Value of theme $theme = 'eldy'; // Value of theme
if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path = '/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme = $conf->global->MAIN_OVERWRITE_THEME_RES; } if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {
$path = '/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme = $conf->global->MAIN_OVERWRITE_THEME_RES;
}
// Define image path files and other constants // Define image path files and other constants
$fontlist = 'arial,tahoma,verdana,helvetica'; //$fontlist='helvetica, verdana, arial, sans-serif'; $fontlist = 'arial,tahoma,verdana,helvetica'; //$fontlist='helvetica, verdana, arial, sans-serif';
@ -98,19 +122,36 @@ $useboldtitle = (isset($conf->global->THEME_ELDY_USEBOLDTITLE) ? $conf->global->
$borderwidth = 1; $borderwidth = 1;
// Case of option always editable // Case of option always editable
if (!isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY = $colorbackbody; if (!isset($conf->global->THEME_ELDY_BACKBODY)) {
if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1; $conf->global->THEME_ELDY_BACKBODY = $colorbackbody;
if (!isset($conf->global->THEME_ELDY_VERMENU_BACK1)) $conf->global->THEME_ELDY_VERMENU_BACK1 = $colorbackvmenu1; }
if (!isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1 = $colorbacktitle1; if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
if (!isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER = $colorbacklinepairhover; $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
if (!isset($conf->global->THEME_ELDY_USE_CHECKED)) $conf->global->THEME_ELDY_USE_CHECKED = $colorbacklinepairchecked; }
if (!isset($conf->global->THEME_ELDY_LINEBREAK)) $conf->global->THEME_ELDY_LINEBREAK = $colorbacklinebreak; if (!isset($conf->global->THEME_ELDY_VERMENU_BACK1)) {
if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) $conf->global->THEME_ELDY_TEXTTITLENOTAB = $colortexttitlenotab; $conf->global->THEME_ELDY_VERMENU_BACK1 = $colorbackvmenu1;
if (!isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK = $colortextlink; }
if (!isset($conf->global->THEME_ELDY_BACKTITLE1)) {
$conf->global->THEME_ELDY_BACKTITLE1 = $colorbacktitle1;
}
if (!isset($conf->global->THEME_ELDY_USE_HOVER)) {
$conf->global->THEME_ELDY_USE_HOVER = $colorbacklinepairhover;
}
if (!isset($conf->global->THEME_ELDY_USE_CHECKED)) {
$conf->global->THEME_ELDY_USE_CHECKED = $colorbacklinepairchecked;
}
if (!isset($conf->global->THEME_ELDY_LINEBREAK)) {
$conf->global->THEME_ELDY_LINEBREAK = $colorbacklinebreak;
}
if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) {
$conf->global->THEME_ELDY_TEXTTITLENOTAB = $colortexttitlenotab;
}
if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
$conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
}
// Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
{
$conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card $conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
$conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234'; $conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234';
$conf->global->THEME_ELDY_TEXT = '0,0,0'; $conf->global->THEME_ELDY_TEXT = '0,0,0';
@ -142,8 +183,7 @@ $fontsizesmaller = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
// Hover color // Hover color
$colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_HOVER === '1' ? 'e6edf0' : $conf->global->THEME_ELDY_USE_HOVER)); $colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_HOVER === '1' ? 'e6edf0' : $conf->global->THEME_ELDY_USE_HOVER));
$colorbacklinepairchecked = ((!isset($conf->global->THEME_ELDY_USE_CHECKED) || (string) $conf->global->THEME_ELDY_USE_CHECKED === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $conf->global->THEME_ELDY_USE_CHECKED)); $colorbacklinepairchecked = ((!isset($conf->global->THEME_ELDY_USE_CHECKED) || (string) $conf->global->THEME_ELDY_USE_CHECKED === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $conf->global->THEME_ELDY_USE_CHECKED));
if (!empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)) if (!empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)) {
{
$colorbacklinepairhover = ((!isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0') ? '' : ($user->conf->THEME_ELDY_USE_HOVER === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_HOVER)); $colorbacklinepairhover = ((!isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '0') ? '' : ($user->conf->THEME_ELDY_USE_HOVER === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_HOVER));
$colorbacklinepairchecked = ((!isset($user->conf->THEME_ELDY_USE_CHECKED) || $user->conf->THEME_ELDY_USE_CHECKED === '0') ? '' : ($user->conf->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_CHECKED)); $colorbacklinepairchecked = ((!isset($user->conf->THEME_ELDY_USE_CHECKED) || $user->conf->THEME_ELDY_USE_CHECKED === '0') ? '' : ($user->conf->THEME_ELDY_USE_CHECKED === '1' ? 'e6edf0' : $user->conf->THEME_ELDY_USE_CHECKED));
} }
@ -153,26 +193,42 @@ if (!empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z' $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
$tmppart = explode(',', $colorbackhmenu1); $tmppart = explode(',', $colorbackhmenu1);
$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0); $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
if ($tmpval <= 460) $colortextbackhmenu = 'FFFFFF'; if ($tmpval <= 460) {
else $colortextbackhmenu = '000000'; $colortextbackhmenu = 'FFFFFF';
} else {
$colortextbackhmenu = '000000';
}
$colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z' $colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z'
$tmppart = explode(',', $colorbackvmenu1); $tmppart = explode(',', $colorbackvmenu1);
$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0); $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; } else { $colortextbackvmenu = '000000'; } if ($tmpval <= 460) {
$colortextbackvmenu = 'FFFFFF';
} else {
$colortextbackvmenu = '000000';
}
$colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z' $colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
$tmppart = explode(',', $colorbacktitle1); $tmppart = explode(',', $colorbacktitle1);
if ($colortexttitle == '') if ($colortexttitle == '') {
{
$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0); $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; } else { $colortexttitle = '000000'; $colorshadowtitle = 'FFFFFF'; } if ($tmpval <= 460) {
} else $colorshadowtitle = '888888'; $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888';
} else {
$colortexttitle = '000000'; $colorshadowtitle = 'FFFFFF';
}
} else {
$colorshadowtitle = '888888';
}
$colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z' $colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
$tmppart = explode(',', $colorbacktabcard1); $tmppart = explode(',', $colorbacktabcard1);
$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0); $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; } else { $colortextbacktab = '000000'; } if ($tmpval <= 460) {
$colortextbacktab = 'FFFFFF';
} else {
$colortextbacktab = '000000';
}
// Format color value to match expected format (may be 'FFFFFF' or '255,255,255') // Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
@ -185,8 +241,12 @@ $colorbacklineimpair1 = join(',', colorStringToArray($colorbacklineimpair1));
$colorbacklineimpair2 = join(',', colorStringToArray($colorbacklineimpair2)); $colorbacklineimpair2 = join(',', colorStringToArray($colorbacklineimpair2));
$colorbacklinepair1 = join(',', colorStringToArray($colorbacklinepair1)); $colorbacklinepair1 = join(',', colorStringToArray($colorbacklinepair1));
$colorbacklinepair2 = join(',', colorStringToArray($colorbacklinepair2)); $colorbacklinepair2 = join(',', colorStringToArray($colorbacklinepair2));
if ($colorbacklinepairhover != '') $colorbacklinepairhover = join(',', colorStringToArray($colorbacklinepairhover)); if ($colorbacklinepairhover != '') {
if ($colorbacklinepairchecked != '') $colorbacklinepairchecked = join(',', colorStringToArray($colorbacklinepairchecked)); $colorbacklinepairhover = join(',', colorStringToArray($colorbacklinepairhover));
}
if ($colorbacklinepairchecked != '') {
$colorbacklinepairchecked = join(',', colorStringToArray($colorbacklinepairchecked));
}
$colorbackbody = join(',', colorStringToArray($colorbackbody)); $colorbackbody = join(',', colorStringToArray($colorbackbody));
$colortexttitlenotab = join(',', colorStringToArray($colortexttitlenotab)); $colortexttitlenotab = join(',', colorStringToArray($colortexttitlenotab));
$colortexttitle = join(',', colorStringToArray($colortexttitle)); $colortexttitle = join(',', colorStringToArray($colortexttitle));
@ -195,7 +255,9 @@ $colortextlink = join(',', colorStringToArray($colortextlink));
$nbtopmenuentries = $menumanager->showmenu('topnb'); $nbtopmenuentries = $menumanager->showmenu('topnb');
if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries, 10); if ($conf->browser->layout == 'phone') {
$nbtopmenuentries = max($nbtopmenuentries, 10);
}
$minwidthtmenu = 66; /* minimum width for one top menu entry */ $minwidthtmenu = 66; /* minimum width for one top menu entry */
@ -203,11 +265,19 @@ $heightmenu = 50; /* height of top menu, part with image */
$heightmenu2 = 49; /* height of top menu, part with login */ $heightmenu2 = 49; /* height of top menu, part with login */
$disableimages = 0; $disableimages = 0;
$maxwidthloginblock = 180; $maxwidthloginblock = 180;
if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $disableimages = 1; $maxwidthloginblock = $maxwidthloginblock + 50; $minwidthtmenu = 0; } if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) {
$disableimages = 1; $maxwidthloginblock = $maxwidthloginblock + 50; $minwidthtmenu = 0;
}
if (!empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) { $maxwidthloginblock = $maxwidthloginblock + 55; } if (!empty($conf->global->MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)) {
if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) { $maxwidthloginblock = $maxwidthloginblock + 55; } $maxwidthloginblock = $maxwidthloginblock + 55;
if (!empty($conf->bookmark->enabled)) { $maxwidthloginblock = $maxwidthloginblock + 55; } }
if (!empty($conf->global->MAIN_USE_TOP_MENU_SEARCH_DROPDOWN)) {
$maxwidthloginblock = $maxwidthloginblock + 55;
}
if (!empty($conf->bookmark->enabled)) {
$maxwidthloginblock = $maxwidthloginblock + 55;
}
print '/*'."\n"; print '/*'."\n";
@ -247,4 +317,6 @@ print '*/'."\n";
require __DIR__.'/global.inc.php'; require __DIR__.'/global.inc.php';
if (is_object($db)) $db->close(); if (is_object($db)) {
$db->close();
}

9
htdocs/theme/eldy/theme_vars.inc.php
View File

@ -33,12 +33,9 @@
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
$theme_bordercolor = array(235, 235, 224); $theme_bordercolor = array(235, 235, 224);
$theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(80, 166, 90), array(190, 190, 100), array(91, 115, 247), array(140, 140, 220), array(190, 120, 120), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150)); $theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(80, 166, 90), array(190, 190, 100), array(91, 115, 247), array(140, 140, 220), array(190, 120, 120), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
if (!defined('ISLOADEDBYSTEELSHEET')) // File is run after an include of a php page, not by the style sheet, if the constant is not defined. if (!defined('ISLOADEDBYSTEELSHEET')) { // File is run after an include of a php page, not by the style sheet, if the constant is not defined.
{ if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) { // user is loaded by dolgraph.class.php
if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) // user is loaded by dolgraph.class.php if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy') {
{
if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
{
$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150)); $theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
} else { } else {
// for now we use the same configuration for all types of color blind // for now we use the same configuration for all types of color blind

4
htdocs/theme/eldy/timeline.inc.php
View File

@ -8,7 +8,9 @@
* Please visit http://opensource.org/licenses/MIT for more information * Please visit http://opensource.org/licenses/MIT for more information
*/ */
if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > */ /* <style type="text/css" > */

12
htdocs/theme/md/badges.inc.php
View File

@ -1,5 +1,7 @@
<?php <?php
if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > */ /* <style type="text/css" > */
/* /*
Badge style is based on boostrap framework Badge style is based on boostrap framework
@ -231,8 +233,12 @@ function _createStatusBadgeCss($statusName, $statusVarNamePrefix = '', $commentL
$thisBadgeBackgroundColor = "#fff"; $thisBadgeBackgroundColor = "#fff";
} }
if (in_array((string) $statusName, array('0', '5', '9'))) $thisBadgeTextColor = '#999999'; if (in_array((string) $statusName, array('0', '5', '9'))) {
if (in_array((string) $statusName, array('6'))) $thisBadgeTextColor = '#777777'; $thisBadgeTextColor = '#999999';
}
if (in_array((string) $statusName, array('6'))) {
$thisBadgeTextColor = '#777777';
}
print $cssPrefix.".badge-status".$statusName." {\n"; print $cssPrefix.".badge-status".$statusName." {\n";
print " color: ".$thisBadgeTextColor." !important;\n"; print " color: ".$thisBadgeTextColor." !important;\n";

4
htdocs/theme/md/btn.inc.php
View File

@ -1,5 +1,7 @@
<?php <?php
if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > */ /* <style type="text/css" > */
:root { :root {

4
htdocs/theme/md/dropdown.inc.php
View File

@ -1,5 +1,7 @@
<?php <?php
if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > dont remove this line it's an ide hack */ /* <style type="text/css" > dont remove this line it's an ide hack */
/* /*

24
htdocs/theme/md/info-box.inc.php
View File

@ -1,5 +1,7 @@
<?php <?php
if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > */ /* <style type="text/css" > */
@ -12,10 +14,16 @@ if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
$prefix = ''; $prefix = '';
if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) $prefix = 'background-'; if (!empty($conf->global->THEME_INFOBOX_COLOR_ON_BACKGROUND)) {
$prefix = 'background-';
}
if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.7; if (!isset($conf->global->THEME_SATURATE_RATIO)) {
if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int'); $conf->global->THEME_SATURATE_RATIO = 0.7;
}
if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
$conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
}
?> ?>
@ -315,8 +323,12 @@ a.info-box-text{ text-decoration: none;}
} }
<?php <?php
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php'; include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
if (!isset($conf->global->THEME_SATURATE_RATIO)) $conf->global->THEME_SATURATE_RATIO = 0.7; if (!isset($conf->global->THEME_SATURATE_RATIO)) {
if (GETPOSTISSET('THEME_SATURATE_RATIO')) $conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int'); $conf->global->THEME_SATURATE_RATIO = 0.7;
}
if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
$conf->global->THEME_SATURATE_RATIO = GETPOST('THEME_SATURATE_RATIO', 'int');
}
?> ?>
.bg-infobox-project i.fa{ .bg-infobox-project i.fa{
color: #605ca8 !important; color: #605ca8 !important;

4
htdocs/theme/md/main_menu_fa_icons.inc.php
View File

@ -1,4 +1,6 @@
<?php if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?> <?php if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
} ?>
/* <style type="text/css" > */ /* <style type="text/css" > */
.mainmenu::before{ .mainmenu::before{

51
htdocs/theme/md/manifest.json.php
View File

@ -25,22 +25,46 @@
* \brief File for The Web App * \brief File for The Web App
*/ */
if (!defined('NOREQUIREUSER')) define('NOREQUIREUSER', '1'); if (!defined('NOREQUIREUSER')) {
if (!defined('NOREQUIREDB')) define('NOREQUIREDB', '1'); define('NOREQUIREUSER', '1');
if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1'); }
if (!defined('NOREQUIRETRAN')) define('NOREQUIRETRAN', '1'); if (!defined('NOREQUIREDB')) {
if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', '1'); define('NOREQUIREDB', '1');
if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', '1'); }
if (!defined('NOLOGIN')) define('NOLOGIN', '1'); if (!defined('NOREQUIRESOC')) {
if (!defined('NOREQUIREMENU')) define('NOREQUIREMENU', '1'); define('NOREQUIRESOC', '1');
if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', '1'); }
if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); if (!defined('NOREQUIRETRAN')) {
if (!defined('NOSESSION')) define('NOSESSION', '1'); define('NOREQUIRETRAN', '1');
}
if (!defined('NOCSRFCHECK')) {
define('NOCSRFCHECK', '1');
}
if (!defined('NOTOKENRENEWAL')) {
define('NOTOKENRENEWAL', '1');
}
if (!defined('NOLOGIN')) {
define('NOLOGIN', '1');
}
if (!defined('NOREQUIREMENU')) {
define('NOREQUIREMENU', '1');
}
if (!defined('NOREQUIREHTML')) {
define('NOREQUIREHTML', '1');
}
if (!defined('NOREQUIREAJAX')) {
define('NOREQUIREAJAX', '1');
}
if (!defined('NOSESSION')) {
define('NOSESSION', '1');
}
require_once __DIR__.'/../../main.inc.php'; require_once __DIR__.'/../../main.inc.php';
$appli = constant('DOL_APPLICATION_TITLE'); $appli = constant('DOL_APPLICATION_TITLE');
if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli = $conf->global->MAIN_APPLICATION_TITLE; if (!empty($conf->global->MAIN_APPLICATION_TITLE)) {
$appli = $conf->global->MAIN_APPLICATION_TITLE;
}
top_httphead('text/json'); top_httphead('text/json');
// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access. // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
@ -48,8 +72,7 @@ if (empty($dolibarr_nocache)) {
header('Cache-Control: max-age=10800, public, must-revalidate'); header('Cache-Control: max-age=10800, public, must-revalidate');
// For a text/json, we must set an Expires to avoid to have it forced to an expired value by the web server // For a text/json, we must set an Expires to avoid to have it forced to an expired value by the web server
header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + 10800) . ' GMT'); header('Expires: '.gmdate('D, d M Y H:i:s', dol_now('gmt') + 10800) . ' GMT');
} } else {
else {
header('Cache-Control: no-cache'); header('Cache-Control: no-cache');
} }

4
htdocs/theme/md/progress.inc.php
View File

@ -1,5 +1,7 @@
<?php <?php
if (!defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); if (!defined('ISLOADEDBYSTEELSHEET')) {
die('Must be call by steelsheet');
}
include dol_buildpath($path.'/theme/eldy/progress.inc.php', 0); // actually md use same style as eldy theme include dol_buildpath($path.'/theme/eldy/progress.inc.php', 0); // actually md use same style as eldy theme

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

@ -28,21 +28,35 @@
//if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled because need to load personalized language //if (! defined('NOREQUIREUSER')) define('NOREQUIREUSER','1'); // Not disabled because need to load personalized language
//if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled to increase speed. Language code is found on url. //if (! defined('NOREQUIREDB')) define('NOREQUIREDB','1'); // Not disabled to increase speed. Language code is found on url.
if (!defined('NOREQUIRESOC')) define('NOREQUIRESOC', '1'); if (!defined('NOREQUIRESOC')) {
define('NOREQUIRESOC', '1');
}
//if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled because need to do translations //if (! defined('NOREQUIRETRAN')) define('NOREQUIRETRAN','1'); // Not disabled because need to do translations
if (!defined('NOCSRFCHECK')) define('NOCSRFCHECK', 1); if (!defined('NOCSRFCHECK')) {
if (!defined('NOTOKENRENEWAL')) define('NOTOKENRENEWAL', 1); define('NOCSRFCHECK', 1);
if (!defined('NOLOGIN')) define('NOLOGIN', 1); // File must be accessed by logon page so without login }
if (!defined('NOTOKENRENEWAL')) {
define('NOTOKENRENEWAL', 1);
}
if (!defined('NOLOGIN')) {
define('NOLOGIN', 1); // File must be accessed by logon page so without login
}
//if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); // We need top menu content //if (! defined('NOREQUIREMENU')) define('NOREQUIREMENU',1); // We need top menu content
if (!defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1); if (!defined('NOREQUIREHTML')) {
if (!defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1'); define('NOREQUIREHTML', 1);
}
if (!defined('NOREQUIREAJAX')) {
define('NOREQUIREAJAX', '1');
}
define('ISLOADEDBYSTEELSHEET', '1'); define('ISLOADEDBYSTEELSHEET', '1');
require __DIR__.'/theme_vars.inc.php'; require __DIR__.'/theme_vars.inc.php';
if (defined('THEME_ONLY_CONSTANT')) return; if (defined('THEME_ONLY_CONSTANT')) {
return;
}
session_cache_limiter('public'); session_cache_limiter('public');
@ -52,8 +66,7 @@ require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
// Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined) // Load user to have $user->conf loaded (not done into main because of NOLOGIN constant defined)
// and permission, so we can later calculate number of top menu ($nbtopmenuentries) according to user profile. // and permission, so we can later calculate number of top menu ($nbtopmenuentries) according to user profile.
if (empty($user->id) && !empty($_SESSION['dol_login'])) if (empty($user->id) && !empty($_SESSION['dol_login'])) {
{
$user->fetch('', $_SESSION['dol_login'], '', 1); $user->fetch('', $_SESSION['dol_login'], '', 1);
$user->getrights(); $user->getrights();
@ -66,11 +79,18 @@ if (empty($user->id) && !empty($_SESSION['dol_login']))
// Define css type // Define css type
top_httphead('text/css'); top_httphead('text/css');
// Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access. // Important: Following code is to avoid page request by browser and PHP CPU at each Dolibarr page access.
if (empty($dolibarr_nocache)) header('Cache-Control: max-age=10800, public, must-revalidate'); if (empty($dolibarr_nocache)) {
else header('Cache-Control: no-cache'); header('Cache-Control: max-age=10800, public, must-revalidate');
} else {
header('Cache-Control: no-cache');
}
if (GETPOST('theme', 'alpha')) $conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL if (GETPOST('theme', 'alpha')) {
if (GETPOST('lang', 'aZ09')) $langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL $conf->theme = GETPOST('theme', 'alpha'); // If theme was forced on URL
}
if (GETPOST('lang', 'aZ09')) {
$langs->setDefaultLang(GETPOST('lang', 'aZ09')); // If language was forced on URL
}
$langs->load("main", 0, 1); $langs->load("main", 0, 1);
$right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right'); $right = ($langs->trans("DIRECTION") == 'rtl' ? 'left' : 'right');
@ -78,7 +98,9 @@ $left = ($langs->trans("DIRECTION") == 'rtl' ? 'right' : 'left');
$path = ''; // This value may be used in future for external module to overwrite theme $path = ''; // This value may be used in future for external module to overwrite theme
$theme = 'md'; // Value of theme $theme = 'md'; // Value of theme
if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path = '/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme = $conf->global->MAIN_OVERWRITE_THEME_RES; } if (!empty($conf->global->MAIN_OVERWRITE_THEME_RES)) {
$path = '/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme = $conf->global->MAIN_OVERWRITE_THEME_RES;
}
// Define image path files and other constants // Define image path files and other constants
$fontlist = 'roboto,arial,tahoma,verdana,helvetica'; //$fontlist='verdana,helvetica,arial,sans-serif'; $fontlist = 'roboto,arial,tahoma,verdana,helvetica'; //$fontlist='verdana,helvetica,arial,sans-serif';
@ -98,19 +120,36 @@ $useboldtitle = (isset($conf->global->THEME_ELDY_USEBOLDTITLE) ? $conf->global->
$borderwidth = 2; $borderwidth = 2;
// Case of option always editable // Case of option always editable
if (!isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY = $colorbackbody; if (!isset($conf->global->THEME_ELDY_BACKBODY)) {
if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1; $conf->global->THEME_ELDY_BACKBODY = $colorbackbody;
if (!isset($conf->global->THEME_ELDY_VERMENU_BACK1)) $conf->global->THEME_ELDY_VERMENU_BACK1 = $colorbackvmenu1; }
if (!isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1 = $colorbacktitle1; if (!isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) {
if (!isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER = $colorbacklinepairhover; $conf->global->THEME_ELDY_TOPMENU_BACK1 = $colorbackhmenu1;
if (!isset($conf->global->THEME_ELDY_USE_CHECKED)) $conf->global->THEME_ELDY_USE_CHECKED = $colorbacklinepairchecked; }
if (!isset($conf->global->THEME_ELDY_LINEBREAK)) $conf->global->THEME_ELDY_LINEBREAK = $colorbacklinebreak; if (!isset($conf->global->THEME_ELDY_VERMENU_BACK1)) {
if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) $conf->global->THEME_ELDY_TEXTTITLENOTAB = $colortexttitlenotab; $conf->global->THEME_ELDY_VERMENU_BACK1 = $colorbackvmenu1;
if (!isset($conf->global->THEME_ELDY_TEXTLINK)) $conf->global->THEME_ELDY_TEXTLINK = $colortextlink; }
if (!isset($conf->global->THEME_ELDY_BACKTITLE1)) {
$conf->global->THEME_ELDY_BACKTITLE1 = $colorbacktitle1;
}
if (!isset($conf->global->THEME_ELDY_USE_HOVER)) {
$conf->global->THEME_ELDY_USE_HOVER = $colorbacklinepairhover;
}
if (!isset($conf->global->THEME_ELDY_USE_CHECKED)) {
$conf->global->THEME_ELDY_USE_CHECKED = $colorbacklinepairchecked;
}
if (!isset($conf->global->THEME_ELDY_LINEBREAK)) {
$conf->global->THEME_ELDY_LINEBREAK = $colorbacklinebreak;
}
if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) {
$conf->global->THEME_ELDY_TEXTTITLENOTAB = $colortexttitlenotab;
}
if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
$conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
}
// Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on // Case of option editable only if option THEME_ELDY_ENABLE_PERSONALIZED is on
if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) {
{
// 90A4AE, 607D8B, 455A64, 37474F // 90A4AE, 607D8B, 455A64, 37474F
$conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card $conf->global->THEME_ELDY_BACKTABCARD1 = '255,255,255'; // card
$conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234'; $conf->global->THEME_ELDY_BACKTABACTIVE = '234,234,234';
@ -143,38 +182,55 @@ $fontsizesmaller = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
// Hover color // Hover color
$colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_HOVER === '1' ? 'edf4fb' : $conf->global->THEME_ELDY_USE_HOVER)); $colorbacklinepairhover = ((!isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_HOVER === '1' ? 'edf4fb' : $conf->global->THEME_ELDY_USE_HOVER));
$colorbacklinepairchecked = ((!isset($conf->global->THEME_ELDY_USE_CHECKED) || (string) $conf->global->THEME_ELDY_USE_CHECKED === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_CHECKED === '1' ? 'edf4fb' : $conf->global->THEME_ELDY_USE_CHECKED)); $colorbacklinepairchecked = ((!isset($conf->global->THEME_ELDY_USE_CHECKED) || (string) $conf->global->THEME_ELDY_USE_CHECKED === '255,255,255') ? '' : ($conf->global->THEME_ELDY_USE_CHECKED === '1' ? 'edf4fb' : $conf->global->THEME_ELDY_USE_CHECKED));
if (!empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)) if (!empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)) {
{
$colorbacklinepairhover = ((!isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '255,255,255') ? '' : ($user->conf->THEME_ELDY_USE_HOVER === '1' ? 'edf4fb' : $user->conf->THEME_ELDY_USE_HOVER)); $colorbacklinepairhover = ((!isset($user->conf->THEME_ELDY_USE_HOVER) || $user->conf->THEME_ELDY_USE_HOVER === '255,255,255') ? '' : ($user->conf->THEME_ELDY_USE_HOVER === '1' ? 'edf4fb' : $user->conf->THEME_ELDY_USE_HOVER));
$colorbacklinepairchecked = ((!isset($user->conf->THEME_ELDY_USE_CHECKED) || $user->conf->THEME_ELDY_USE_CHECKED === '255,255,255') ? '' : ($user->conf->THEME_ELDY_USE_CHECKED === '1' ? 'edf4fb' : $user->conf->THEME_ELDY_USE_CHECKED)); $colorbacklinepairchecked = ((!isset($user->conf->THEME_ELDY_USE_CHECKED) || $user->conf->THEME_ELDY_USE_CHECKED === '255,255,255') ? '' : ($user->conf->THEME_ELDY_USE_CHECKED === '1' ? 'edf4fb' : $user->conf->THEME_ELDY_USE_CHECKED));
} }
if (empty($colortopbordertitle1)) $colortopbordertitle1 = $colorbackhmenu1; if (empty($colortopbordertitle1)) {
$colortopbordertitle1 = $colorbackhmenu1;
}
// Set text color to black or white // Set text color to black or white
$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z' $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); // Normalize value to 'x,y,z'
$tmppart = explode(',', $colorbackhmenu1); $tmppart = explode(',', $colorbackhmenu1);
$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0); $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
if ($tmpval <= 460) $colortextbackhmenu = 'FFFFFF'; if ($tmpval <= 460) {
else $colortextbackhmenu = '000000'; $colortextbackhmenu = 'FFFFFF';
} else {
$colortextbackhmenu = '000000';
}
$colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z' $colorbackvmenu1 = join(',', colorStringToArray($colorbackvmenu1)); // Normalize value to 'x,y,z'
$tmppart = explode(',', $colorbackvmenu1); $tmppart = explode(',', $colorbackvmenu1);
$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0); $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
if ($tmpval <= 460) { $colortextbackvmenu = 'FFFFFF'; } else { $colortextbackvmenu = '000000'; } if ($tmpval <= 460) {
$colortextbackvmenu = 'FFFFFF';
} else {
$colortextbackvmenu = '000000';
}
$colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z' $colorbacktitle1 = join(',', colorStringToArray($colorbacktitle1)); // Normalize value to 'x,y,z'
$tmppart = explode(',', $colorbacktitle1); $tmppart = explode(',', $colorbacktitle1);
if ($colortexttitle == '') if ($colortexttitle == '') {
{
$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0); $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
if ($tmpval <= 460) { $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888'; } else { $colortexttitle = '101010'; $colorshadowtitle = 'FFFFFF'; } if ($tmpval <= 460) {
} else $colorshadowtitle = '888888'; $colortexttitle = 'FFFFFF'; $colorshadowtitle = '888888';
} else {
$colortexttitle = '101010'; $colorshadowtitle = 'FFFFFF';
}
} else {
$colorshadowtitle = '888888';
}
$colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z' $colorbacktabcard1 = join(',', colorStringToArray($colorbacktabcard1)); // Normalize value to 'x,y,z'
$tmppart = explode(',', $colorbacktabcard1); $tmppart = explode(',', $colorbacktabcard1);
$tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0); $tmpval = (!empty($tmppart[0]) ? $tmppart[0] : 0) + (!empty($tmppart[1]) ? $tmppart[1] : 0) + (!empty($tmppart[2]) ? $tmppart[2] : 0);
if ($tmpval <= 460) { $colortextbacktab = 'FFFFFF'; } else { $colortextbacktab = '111111'; } if ($tmpval <= 460) {
$colortextbacktab = 'FFFFFF';
} else {
$colortextbacktab = '111111';
}
// Format color value to match expected format (may be 'FFFFFF' or '255,255,255') // Format color value to match expected format (may be 'FFFFFF' or '255,255,255')
$colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1)); $colorbackhmenu1 = join(',', colorStringToArray($colorbackhmenu1));
@ -186,8 +242,12 @@ $colorbacklineimpair1 = join(',', colorStringToArray($colorbacklineimpair1));
$colorbacklineimpair2 = join(',', colorStringToArray($colorbacklineimpair2)); $colorbacklineimpair2 = join(',', colorStringToArray($colorbacklineimpair2));
$colorbacklinepair1 = join(',', colorStringToArray($colorbacklinepair1)); $colorbacklinepair1 = join(',', colorStringToArray($colorbacklinepair1));
$colorbacklinepair2 = join(',', colorStringToArray($colorbacklinepair2)); $colorbacklinepair2 = join(',', colorStringToArray($colorbacklinepair2));
if ($colorbacklinepairhover != '') $colorbacklinepairhover = join(',', colorStringToArray($colorbacklinepairhover)); if ($colorbacklinepairhover != '') {
if ($colorbacklinepairchecked != '') $colorbacklinepairchecked = join(',', colorStringToArray($colorbacklinepairchecked)); $colorbacklinepairhover = join(',', colorStringToArray($colorbacklinepairhover));
}
if ($colorbacklinepairchecked != '') {
$colorbacklinepairchecked = join(',', colorStringToArray($colorbacklinepairchecked));
}
$colorbackbody = join(',', colorStringToArray($colorbackbody)); $colorbackbody = join(',', colorStringToArray($colorbackbody));
$colortexttitlenotab = join(',', colorStringToArray($colortexttitlenotab)); $colortexttitlenotab = join(',', colorStringToArray($colortexttitlenotab));
$colortexttitle = join(',', colorStringToArray($colortexttitle)); $colortexttitle = join(',', colorStringToArray($colortexttitle));
@ -195,7 +255,9 @@ $colortext = join(',', colorStringToArray($colortext));
$colortextlink = join(',', colorStringToArray($colortextlink)); $colortextlink = join(',', colorStringToArray($colortextlink));
$nbtopmenuentries = $menumanager->showmenu('topnb'); $nbtopmenuentries = $menumanager->showmenu('topnb');
if ($conf->browser->layout == 'phone') $nbtopmenuentries = max($nbtopmenuentries, 10); if ($conf->browser->layout == 'phone') {
$nbtopmenuentries = max($nbtopmenuentries, 10);
}
print '/*'."\n"; print '/*'."\n";
print 'colorbackbody='.$colorbackbody."\n"; print 'colorbackbody='.$colorbackbody."\n";
@ -1167,7 +1229,9 @@ div.fiche>form>div.div-table-responsive {
} }
.flexcontainer { .flexcontainer {
<?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) echo 'display: inline-flex;' ?> <?php if (in_array($conf->browser->name, array('chrome', 'firefox'))) {
echo 'display: inline-flex;';
} ?>
flex-flow: row wrap; flex-flow: row wrap;
justify-content: flex-start; justify-content: flex-start;
} }
@ -1718,7 +1782,9 @@ div.fiche {
div.fiche { div.fiche {
margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '24' : '6')); ?>px; margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '24' : '6')); ?>px;
margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '22' : '6')); ?>px; margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : (empty($conf->dol_optimize_smallscreen) ? '22' : '6')); ?>px;
<?php if (!empty($dol_hide_leftmenu) && !empty($dol_hide_topmenu)) print 'margin-top: 12px;'; ?> <?php if (!empty($dol_hide_leftmenu) && !empty($dol_hide_topmenu)) {
print 'margin-top: 12px;';
} ?>
margin-bottom: 15px; margin-bottom: 15px;
} }
body.onlinepaymentbody div.fiche { /* For online payment page */ body.onlinepaymentbody div.fiche { /* For online payment page */
@ -1735,28 +1801,50 @@ div.fichecenterbis {
margin-top: 8px; margin-top: 8px;
} }
div.fichethirdleft { div.fichethirdleft {
<?php if ($conf->browser->layout != 'phone') { print "float: ".$left.";\n"; } ?> <?php if ($conf->browser->layout != 'phone') {
<?php if ($conf->browser->layout != 'phone') { print "width: 50%;\n"; } ?> print "float: ".$left.";\n";
<?php if ($conf->browser->layout == 'phone') { print "padding-bottom: 6px;\n"; } ?> } ?>
<?php if ($conf->browser->layout != 'phone') {
print "width: 50%;\n";
} ?>
<?php if ($conf->browser->layout == 'phone') {
print "padding-bottom: 6px;\n";
} ?>
} }
div.fichetwothirdright { div.fichetwothirdright {
<?php if ($conf->browser->layout != 'phone') { print "float: ".$right.";\n"; } ?> <?php if ($conf->browser->layout != 'phone') {
<?php if ($conf->browser->layout != 'phone') { print "width: 50%;\n"; } ?> print "float: ".$right.";\n";
<?php if ($conf->browser->layout == 'phone') { print "padding-bottom: 6px\n"; } ?> } ?>
<?php if ($conf->browser->layout != 'phone') {
print "width: 50%;\n";
} ?>
<?php if ($conf->browser->layout == 'phone') {
print "padding-bottom: 6px\n";
} ?>
} }
div.fichetwothirdright div.ficheaddleft { div.fichetwothirdright div.ficheaddleft {
padding-left: 20px; padding-left: 20px;
} }
div.fichehalfleft { div.fichehalfleft {
<?php if ($conf->browser->layout != 'phone') { print "float: ".$left.";\n"; } ?> <?php if ($conf->browser->layout != 'phone') {
<?php if ($conf->browser->layout != 'phone') { print "width: calc(50% - 10px);\n"; } ?> print "float: ".$left.";\n";
} ?>
<?php if ($conf->browser->layout != 'phone') {
print "width: calc(50% - 10px);\n";
} ?>
} }
div.fichehalfright { div.fichehalfright {
<?php if ($conf->browser->layout != 'phone') { print "float: ".$right.";\n"; } ?> <?php if ($conf->browser->layout != 'phone') {
<?php if ($conf->browser->layout != 'phone') { print "width: calc(50% - 10px);\n"; } ?> print "float: ".$right.";\n";
} ?>
<?php if ($conf->browser->layout != 'phone') {
print "width: calc(50% - 10px);\n";
} ?>
} }
div.fichehalfright { div.fichehalfright {
<?php if ($conf->browser->layout == 'phone') { print "margin-top: 10px;\n"; } ?> <?php if ($conf->browser->layout == 'phone') {
print "margin-top: 10px;\n";
} ?>
} }
div.firstcolumn div.box { div.firstcolumn div.box {
padding-right: 10px; padding-right: 10px;
@ -1770,7 +1858,9 @@ div.secondcolumn div.box {
div.fiche { div.fiche {
margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : ($dol_hide_leftmenu ? '4' : '20')); ?>px; margin-<?php print $left; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 6 : ($dol_hide_leftmenu ? '4' : '20')); ?>px;
margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 8 : 16); ?>px; margin-<?php print $right; ?>: <?php print (GETPOST('optioncss', 'aZ09') == 'print' ? 8 : 16); ?>px;
<?php if (!empty($conf->dol_hide_leftmenu) && !empty($conf->dol_hide_topmenu)) print 'margin-top: 4px;'; ?> <?php if (!empty($conf->dol_hide_leftmenu) && !empty($conf->dol_hide_topmenu)) {
print 'margin-top: 4px;';
} ?>
margin-bottom: 15px; margin-bottom: 15px;
} }
div.fichecenter { div.fichecenter {
@ -1987,7 +2077,9 @@ $heightmenu = 48; /* height of top menu, part with image */
$heightmenu2 = 48; /* height of top menu, ârt with login */ $heightmenu2 = 48; /* height of top menu, ârt with login */
$disableimages = 0; $disableimages = 0;
$maxwidthloginblock = 110; $maxwidthloginblock = 110;
if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) { $heightmenu = 30; $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu = 0; } if (!empty($conf->global->THEME_TOPMENU_DISABLE_IMAGE)) {
$heightmenu = 30; $disableimages = 1; $maxwidthloginblock = 180; $minwidthtmenu = 0;
}
?> ?>
div#tmenu_tooltip { div#tmenu_tooltip {
@ -2098,7 +2190,8 @@ li.tmenu, li.tmenusel {
padding: 0px 0px 2px 0px; padding: 0px 0px 2px 0px;
<?php } else { ?> <?php } else { ?>
padding: 0px 0px 0px 0px; padding: 0px 0px 0px 0px;
<?php } } ?> <?php }
} ?>
position:relative; position:relative;
display: block; display: block;
margin: 0px 0px 0px 0px; margin: 0px 0px 0px 0px;
@ -2265,8 +2358,7 @@ div.mainmenu.website {
'barcode'=>'', 'fckeditor'=>'', 'categorie'=>'', 'barcode'=>'', 'fckeditor'=>'', 'categorie'=>'',
); );
$mainmenuused = 'home'; $mainmenuused = 'home';
foreach ($conf->modules as $val) foreach ($conf->modules as $val) {
{
$mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val); $mainmenuused .= ','.(isset($moduletomainmenu[$val]) ? $moduletomainmenu[$val] : $val);
} }
$mainmenuusedarray = array_unique(explode(',', $mainmenuused)); $mainmenuusedarray = array_unique(explode(',', $mainmenuused));
@ -2276,26 +2368,26 @@ div.mainmenu.website {
$divalreadydefined = array('home', 'companies', 'products', 'mrp', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'takepos', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website'); $divalreadydefined = array('home', 'companies', 'products', 'mrp', 'commercial', 'externalsite', 'accountancy', 'project', 'tools', 'members', 'agenda', 'ftp', 'holiday', 'hrm', 'bookmark', 'cashdesk', 'takepos', 'ecm', 'geoipmaxmind', 'gravatar', 'clicktodial', 'paypal', 'stripe', 'webservices', 'website');
// Put here list of menu entries we are sure we don't want // Put here list of menu entries we are sure we don't want
$divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition'); $divnotrequired = array('multicurrency', 'salaries', 'ticket', 'margin', 'opensurvey', 'paybox', 'expensereport', 'incoterm', 'prelevement', 'propal', 'workflow', 'notification', 'supplier_proposal', 'cron', 'product', 'productbatch', 'expedition');
foreach ($mainmenuusedarray as $val) foreach ($mainmenuusedarray as $val) {
{ if (empty($val) || in_array($val, $divalreadydefined)) {
if (empty($val) || in_array($val, $divalreadydefined)) continue; continue;
if (in_array($val, $divnotrequired)) continue; }
if (in_array($val, $divnotrequired)) {
continue;
}
//print "XXX".$val; //print "XXX".$val;
// Search img file in module dir // Search img file in module dir
$found = 0; $url = ''; $found = 0; $url = '';
foreach ($conf->file->dol_document_root as $dirroot) foreach ($conf->file->dol_document_root as $dirroot) {
{ if (file_exists($dirroot."/".$val."/img/".$val.".png")) {
if (file_exists($dirroot."/".$val."/img/".$val.".png"))
{
$url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1); $url = dol_buildpath('/'.$val.'/img/'.$val.'.png', 1);
$found = 1; $found = 1;
break; break;
} }
} }
// Img file not found // Img file not found
if (!$found) if (!$found) {
{
if (!defined('DISABLE_FONT_AWSOME')) { if (!defined('DISABLE_FONT_AWSOME')) {
print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n"; print "/* A mainmenu entry was found but img file ".$val.".png not found (check /".$val."/img/".$val.".png), so we use a generic one */\n";
print 'div.mainmenu.'.$val.'::before { print 'div.mainmenu.'.$val.'::before {
@ -6578,9 +6670,13 @@ include dol_buildpath($path.'/theme/'.$theme.'/info-box.inc.php', 0);
include dol_buildpath($path.'/theme/'.$theme.'/progress.inc.php', 0); include dol_buildpath($path.'/theme/'.$theme.'/progress.inc.php', 0);
include dol_buildpath($path.'/theme/eldy/timeline.inc.php', 0); // actually md use same style as eldy theme include dol_buildpath($path.'/theme/eldy/timeline.inc.php', 0); // actually md use same style as eldy theme
if (!empty($conf->global->THEME_CUSTOM_CSS)) print $conf->global->THEME_CUSTOM_CSS; if (!empty($conf->global->THEME_CUSTOM_CSS)) {
print $conf->global->THEME_CUSTOM_CSS;
}
if (is_object($db)) $db->close(); if (is_object($db)) {
$db->close();
}
?> ?>
/* This must be at end */ /* This must be at end */

9
htdocs/theme/md/theme_vars.inc.php
View File

@ -29,12 +29,9 @@
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet; global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
$theme_bordercolor = array(235, 235, 224); $theme_bordercolor = array(235, 235, 224);
$theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(191, 75, 57), array(80, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150)); $theme_datacolor = array(array(137, 86, 161), array(60, 147, 183), array(250, 190, 80), array(191, 75, 57), array(80, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
if (!defined('ISLOADEDBYSTEELSHEET')) // File is run after an include of a php page, not by the style sheet, if the constant is not defined. if (!defined('ISLOADEDBYSTEELSHEET')) { // File is run after an include of a php page, not by the style sheet, if the constant is not defined.
{ if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) { // user is loaded by dolgraph.class.php
if (!empty($conf->global->MAIN_OPTIMIZEFORCOLORBLIND)) // user is loaded by dolgraph.class.php if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy') {
{
if ($conf->global->MAIN_OPTIMIZEFORCOLORBLIND == 'flashy')
{
$theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150)); $theme_datacolor = array(array(157, 56, 191), array(0, 147, 183), array(250, 190, 30), array(221, 75, 57), array(0, 166, 90), array(140, 140, 220), array(190, 120, 120), array(190, 190, 100), array(115, 125, 150), array(100, 170, 20), array(150, 135, 125), array(85, 135, 150), array(150, 135, 80), array(150, 80, 150));
} else { } else {
// for now we use the same configuration for all types of color blind // for now we use the same configuration for all types of color blind