Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Files for variables of themes were renamed from graph-color.php into

Browse Source 
theme_vars.inc.php to match naming convention of extension .inc.php for
files to be included.
This commit is contained in:
Laurent Destailleur 2019-03-11 20:32:25 +01:00
parent c6a269e4c4
commit 6daa262779
14 changed files with 58 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -16,6 +16,8 @@ Following changes may create regressions for some external modules, but were nec
* Method GetUrlTrackingStatus were renamed into getUrlTrackingStatus for consistency with naming rules.
* API getListOfCivility has been renamed into getListOfCivilities for consistency with naming rules.
* Deprecated function img_phone as been removed. You can use img_picto(..., 'call|call_out') instead.;
* Files for variables of themes were renamed from graph-color.php into theme_vars.inc.php to match naming
convention of extension .inc.php for files to be included.
***** ChangeLog for 9.0.1 compared to 9.0.0 *****

2
htdocs/adherents/stats/geo.php
View File

@ -244,7 +244,7 @@ else
// Show graphics
if (count($arrayjs) && $mode == 'memberbycountry')
{
$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php';
$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
if (is_readable($color_file)) include_once $color_file;
// Assume we've already included the proper headers so just call our script inline

2
htdocs/comm/action/index.php
View File

@ -1017,7 +1017,7 @@ $cachecontacts=array();
$cacheusers=array();
// Define theme_datacolor array
$color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php";
$color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/theme_vars.inc.php";
if (is_readable($color_file))
{
include_once $color_file;

2
htdocs/comm/action/pertype.php
View File

@ -555,7 +555,7 @@ $cachethirdparties=array();
$cachecontacts=array();
// Define theme_datacolor array
$color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php";
$color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/theme_vars.inc.php";
if (is_readable($color_file))
{
include_once $color_file;

2
htdocs/comm/action/peruser.php
View File

@ -599,7 +599,7 @@ $cachecontacts=array();
$cacheusers=array();
// Define theme_datacolor array
$color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php";
$color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/theme_vars.inc.php";
if (is_readable($color_file))
{
include_once $color_file;

2
htdocs/core/class/dolgraph.class.php
View File

@ -116,7 +116,7 @@ class DolGraph
$this->datacolor = array(array(120,130,150), array(160,160,180), array(190,190,220));
$this->bgcolor = array(235,235,224);
$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php';
$color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
if (is_readable($color_file))
{
include_once $color_file;

0
htdocs/theme/eldy/_badges.css.php → htdocs/theme/eldy/badges.inc.php
View File

6
htdocs/theme/eldy/_global.css.php → htdocs/theme/eldy/global.inc.php
View File

@ -427,7 +427,7 @@ textarea.centpercent {
cursor: not-allowed;
}
<?php include dol_buildpath($path.'/theme/'.$theme.'/_badges.css.php', 0); ?>
<?php include dol_buildpath($path.'/theme/'.$theme.'/badges.inc.php', 0); ?>
.borderrightlight
{
@ -1488,7 +1488,7 @@ a.tmenuimage:hover{
<?php if (empty($dol_hide_topmenu)) { ?>
<?php if (! defined('DISABLE_FONT_AWSOME') && !empty($conf->global->MAIN_USE_FONT_AWESOME_5)) { ?>
<?php include dol_buildpath($path.'/theme/'.$theme.'/_main_menu_fa_icons.css.php', 0); ?>
<?php include dol_buildpath($path.'/theme/'.$theme.'/main_menu_fa_icons.inc.php', 0); ?>
<?php } else { ?>
div.mainmenu.home{
background-image: url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/menus/home_over.png', 1) ?>);
@ -3578,7 +3578,7 @@ div.ui-tooltip.mytooltip {
-o-box-shadow: 0.5px 0.5px 4px 0px rgba(0, 0, 0, 0.5);
box-shadow: 0.5px 0.5px 4px 0px rgba(0, 0, 0, 0.5);
filter:progid:DXImageTransform.Microsoft.Shadow(color=#656565, Direction=134, Strength=5);
background: <?php print $toolTipBgColor; ?> !important;
background: <?php print $toolTipBgColor; ?> !important;
color : <?php print $toolTipFontColor; ?>;
}

0
htdocs/theme/eldy/_main_menu_fa_icons.css.php → htdocs/theme/eldy/main_menu_fa_icons.inc.php
View File

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

@ -24,7 +24,7 @@
* \file htdocs/theme/eldy/style.css.php
* \brief File for CSS style sheet Eldy
*/
//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('NOREQUIRESOC')) define('NOREQUIRESOC', '1');
@ -39,12 +39,11 @@ if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
define('ISLOADEDBYSTEELSHEET', '1');
require_once __DIR__ . '/theme_vars.php';
require __DIR__ . '/theme_vars.inc.php';
if (defined('THEME_ONLY_CONSTANT')) return;
session_cache_limiter('public');
require_once __DIR__.'/../../main.inc.php'; // __DIR__ allow this script to be included in custom themes
@ -236,10 +235,7 @@ print 'toolTipFontColor='.$toolTipFontColor."\n";
print '*/'."\n";
require_once __DIR__ . '/_global.css.php';
require __DIR__ . '/global.inc.php';
if (is_object($db)) $db->close();

16
htdocs/theme/eldy/theme_vars.php → htdocs/theme/eldy/theme_vars.inc.php
View File

@ -21,12 +21,20 @@
*/
/**
* \file htdocs/theme/eldy/theme_vars.css.php
* \brief File for CSS style sheet Eldy
* \file htdocs/theme/eldy/theme_vars.inc.php
* \brief File to declare variables of CSS style sheet
* \ingroup core
*
* To include file, do this:
* $var_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
* if (is_readable($var_file)) include $var_file;
*/
if (defined('THEME_ONLY_CONSTANT')) return;
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
$theme_bordercolor = array(235,235,224);
$theme_datacolor = array(array(136,102,136), array(0,130,110), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
// Colors
$colorbackhmenu1='60,70,100'; // topmenu

33
htdocs/theme/md/graph-color.php
View File

@ -1,33 +0,0 @@
<?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
/**
* \file htdocs/theme/md/graph-color.php
* \brief File to declare colors to use to build graphics with theme Material Design
* \ingroup core
*
* To include file, do this:
* $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php';
* if (is_readable($color_file)) include_once $color_file;
*/
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
$theme_bordercolor = array(235,235,224);
$theme_datacolor = array(array(136,102,136), array(0,130,110), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));

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

@ -37,31 +37,17 @@ if (! defined('NOLOGIN')) define('NOLOGIN', 1); // File must be
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML', 1);
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX', '1');
// Colors
$colorbackhmenu1='90,50,120'; // topmenu
$colorbackvmenu1='255,255,255'; // vmenu
$colortopbordertitle1=''; // top border of tables-lists title. not defined = default to colorbackhmenu1
$colorbacktitle1='240,240,240'; // title of tables-lists
$colorbacktabcard1='255,255,255'; // card
$colorbacktabactive='234,234,234';
$colorbacklineimpair1='255,255,255'; // line impair
$colorbacklineimpair2='255,255,255'; // line impair
$colorbacklinepair1='248,248,248'; // line pair
$colorbacklinepair2='246,246,246'; // line pair
$colorbacklinepairhover='230,237,244'; // line pair
$colorbacklinebreak='214,218,220';
$colorbackbody='248,248,248';
$colortexttitlenotab='90,90,90';
$colortexttitle='20,20,20';
$colortext='0,0,0';
$colortextlink='0,0,120';
$fontsize='14';
$fontsizesmaller='11';
define('ISLOADEDBYSTEELSHEET', '1');
require __DIR__ . '/theme_vars.inc.php';
if (defined('THEME_ONLY_CONSTANT')) return;
session_cache_limiter('public');
require_once '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';

30
htdocs/theme/eldy/graph-color.php → htdocs/theme/md/theme_vars.inc.php
View File

@ -17,13 +17,13 @@
*/
/**
* \file htdocs/theme/eldy/graph-color.php
* \brief File to declare colors to use to build graphics with theme Eldy
* \file htdocs/theme/md/theme_vars.inc.php
* \brief File to declare variables of CSS style sheet
* \ingroup core
*
* To include file, do this:
* $color_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/graph-color.php';
* if (is_readable($color_file)) include_once $color_file;
* $var_file = DOL_DOCUMENT_ROOT.'/theme/'.$conf->theme.'/theme_vars.inc.php';
* if (is_readable($var_file)) include $var_file;
*/
global $theme_bordercolor, $theme_datacolor, $theme_bgcolor, $theme_bgcoloronglet;
@ -31,3 +31,25 @@ $theme_bordercolor = array(235,235,224);
$theme_datacolor = array(array(136,102,136), array(0,130,110), array(140,140,220), array(190,120,120), array(190,190,100), array(115,125,150), array(100,170,20), array(250,190,30), array(150,135,125), array(85,135,150), array(150,135,80), array(150,80,150));
$theme_bgcolor = array(hexdec('F4'),hexdec('F4'),hexdec('F4'));
$theme_bgcoloronglet = array(hexdec('DE'),hexdec('E7'),hexdec('EC'));
// Colors
$colorbackhmenu1='90,50,120'; // topmenu
$colorbackvmenu1='255,255,255'; // vmenu
$colortopbordertitle1=''; // top border of tables-lists title. not defined = default to colorbackhmenu1
$colorbacktitle1='240,240,240'; // title of tables-lists
$colorbacktabcard1='255,255,255'; // card
$colorbacktabactive='234,234,234';
$colorbacklineimpair1='255,255,255'; // line impair
$colorbacklineimpair2='255,255,255'; // line impair
$colorbacklinepair1='248,248,248'; // line pair
$colorbacklinepair2='246,246,246'; // line pair
$colorbacklinepairhover='230,237,244'; // line pair
$colorbacklinebreak='214,218,220';
$colorbackbody='248,248,248';
$colortexttitlenotab='90,90,90';
$colortexttitle='20,20,20';
$colortext='0,0,0';
$colortextlink='0,0,120';
$fontsize='14';
$fontsizesmaller='11';