From b09300ab61245bfb9e6efd3734f979bfec794946 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 11 May 2017 13:01:49 +0200
Subject: [PATCH] NEW Can edit background color for odd and even lines in
tables
---
htdocs/admin/ihm.php | 66 +++++-------
htdocs/core/lib/files.lib.php | 69 ++++++++++++-
htdocs/core/lib/usergroups.lib.php | 141 ++++++++++++++++++--------
htdocs/langs/en_US/modulebuilder.lang | 2 +-
htdocs/modulebuilder/index.php | 23 ++++-
htdocs/theme/eldy/style.css.php | 49 +++++----
htdocs/theme/md/style.css.php | 74 +++++---------
7 files changed, 259 insertions(+), 165 deletions(-)
diff --git a/htdocs/admin/ihm.php b/htdocs/admin/ihm.php
index cfa08f003ea..6e5c814639b 100644
--- a/htdocs/admin/ihm.php
+++ b/htdocs/admin/ihm.php
@@ -87,32 +87,46 @@ if ($action == 'update')
dolibarr_set_const($db, "MAIN_THEME", $_POST["main_theme"],'chaine',0,'',$conf->entity);
- $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array()))));
- if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKBODY', $conf->entity);
- else dolibarr_set_const($db, 'THEME_ELDY_BACKBODY', implode(',',colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array())),'chaine',0,'',$conf->entity);
-
$val=GETPOST('THEME_TOPMENU_DISABLE_IMAGE');
if (! $val) dolibarr_del_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', $conf->entity);
else dolibarr_set_const($db, 'THEME_TOPMENU_DISABLE_IMAGE', GETPOST('THEME_TOPMENU_DISABLE_IMAGE'),'chaine',0,'',$conf->entity);
+ $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKBODY'),array()))));
+ if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKBODY', $conf->entity);
+ else dolibarr_set_const($db, 'THEME_ELDY_BACKBODY', $val,'chaine',0,'',$conf->entity);
+
$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array()))));
if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TOPMENU_BACK1', $conf->entity);
- else dolibarr_set_const($db, 'THEME_ELDY_TOPMENU_BACK1', implode(',',colorStringToArray(GETPOST('THEME_ELDY_TOPMENU_BACK1'),array())),'chaine',0,'',$conf->entity);
+ else dolibarr_set_const($db, 'THEME_ELDY_TOPMENU_BACK1', $val,'chaine',0,'',$conf->entity);
- $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array()))));
+ $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array()))));
if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_BACKTITLE1', $conf->entity);
- else dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', implode(',',colorStringToArray(GETPOST('THEME_ELDY_BACKTITLE1'),array())),'chaine',0,'',$conf->entity);
-
- $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array()))));
+ else dolibarr_set_const($db, 'THEME_ELDY_BACKTITLE1', $val,'chaine',0,'',$conf->entity);
+
+ $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'),array()))));
+ if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR1', $conf->entity);
+ else dolibarr_set_const($db, 'THEME_ELDY_LINEIMPAIR1', $val,'chaine',0,'',$conf->entity);
+ $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEIMPAIR1'),array()))));
+ if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEIMPAIR2', $conf->entity);
+ else dolibarr_set_const($db, 'THEME_ELDY_LINEIMPAIR2', $val,'chaine',0,'',$conf->entity);
+
+ $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'),array()))));
+ if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR1', $conf->entity);
+ else dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR1', $val,'chaine',0,'',$conf->entity);
+ $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_LINEPAIR1'),array()))));
+ if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_LINEPAIR2', $conf->entity);
+ else dolibarr_set_const($db, 'THEME_ELDY_LINEPAIR2', $val,'chaine',0,'',$conf->entity);
+
+ $val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array()))));
if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $conf->entity);
- else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLENOTAB', implode(',',colorStringToArray(GETPOST('THEME_ELDY_TEXTTITLENOTAB'),array())),'chaine',0,'',$conf->entity);
+ else dolibarr_set_const($db, 'THEME_ELDY_TEXTTITLENOTAB', $val,'chaine',0,'',$conf->entity);
if (GETPOST('THEME_ELDY_USE_HOVER') == '') dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", '0', 'chaine', 0, '', $conf->entity); // If empty, we set to '0' ('000000' is for black)
else dolibarr_set_const($db, "THEME_ELDY_USE_HOVER", $_POST["THEME_ELDY_USE_HOVER"], 'chaine', 0, '', $conf->entity);
$val=(implode(',',(colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array()))));
if ($val == '') dolibarr_del_const($db, 'THEME_ELDY_TEXTLINK', $conf->entity);
- else dolibarr_set_const($db, 'THEME_ELDY_TEXTLINK', implode(',',colorStringToArray(GETPOST('THEME_ELDY_TEXTLINK'),array())),'chaine',0,'',$conf->entity);
+ else dolibarr_set_const($db, 'THEME_ELDY_TEXTLINK', $val,'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_SIZE_LISTE_LIMIT", $_POST["main_size_liste_limit"],'chaine',0,'',$conf->entity);
dolibarr_set_const($db, "MAIN_SIZE_SHORTLIST_LIMIT", $_POST["main_size_shortliste_limit"],'chaine',0,'',$conf->entity);
@@ -149,34 +163,6 @@ if ($action == 'update')
if ($result > 0)
{
dolibarr_set_const($db, "MAIN_LOGIN_BACKGROUND",$original_file,'chaine',0,'',$conf->entity);
-
- // Create thumbs of logo (Note that PDF use original file and not thumbs)
- /*
- if ($isimage > 0)
- {
- // Create thumbs
- //$object->addThumbs($newfile); // We can't use addThumbs here yet because we need name of generated thumbs to add them into constants. TODO Check if need such constants. We should be able to retreive value with get...
-
- // Create small thumb, Used on logon for example
- $imgThumbSmall = vignette($dirforimage.$original_file, $maxwidthsmall, $maxheightsmall, '_small', $quality);
- if (image_format_supported($imgThumbSmall) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbSmall,$reg))
- {
- $imgThumbSmall = $reg[1]; // Save only basename
- dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_SMALL",$imgThumbSmall,'chaine',0,'',$conf->entity);
- }
- else dol_syslog($imgThumbSmall);
-
- // Create mini thumb, Used on menu or for setup page for example
- $imgThumbMini = vignette($dirforimage.$original_file, $maxwidthmini, $maxheightmini, '_mini', $quality);
- if (image_format_supported($imgThumbMini) >= 0 && preg_match('/([^\\/:]+)$/i',$imgThumbMini,$reg))
- {
- $imgThumbMini = $reg[1]; // Save only basename
- dolibarr_set_const($db, "MAIN_INFO_SOCIETE_LOGO_MINI",$imgThumbMini,'chaine',0,'',$conf->entity);
- }
- else dol_syslog($imgThumbMini);
- }
- else dol_syslog("ErrorImageFormatNotSupported",LOG_WARNING);
- */
}
else if (preg_match('/^ErrorFileIsInfectedWithAVirus/',$result))
{
@@ -574,7 +560,7 @@ else // Show
print '</table>'."\n";
- print '<div class="tabsAction">';
+ print '<div class="tabsAction tabsActionNoBottom">';
print '<a class="butAction" href="'.$_SERVER["PHP_SELF"].'?action=edit">'.$langs->trans("Modify").'</a>';
print '</div>';
}
diff --git a/htdocs/core/lib/files.lib.php b/htdocs/core/lib/files.lib.php
index 47501a86e8d..39865905553 100644
--- a/htdocs/core/lib/files.lib.php
+++ b/htdocs/core/lib/files.lib.php
@@ -44,7 +44,8 @@ function dol_basename($pathfile)
* @param string $path Starting path from which to search. This is a full path.
* @param string $types Can be "directories", "files", or "all"
* @param int $recursive Determines whether subdirectories are searched
- * @param string $filter Regex filter to restrict list. This regex value must be escaped for '/', since this char is used for preg_match function. Filter is checked into basename only.
+ * @param string $filter Regex filter to restrict list. This regex value must be escaped for '/' by doing preg_quote($var,'/'), since this char is used for preg_match function,
+ * but must not contains the start and end '/'. Filter is checked into basename only.
* @param array $excludefilter Array of Regex for exclude filter (example: array('(\.meta|_preview.*\.png)$','^\.')). Exclude is checked into fullpath.
* @param string $sortcriteria Sort criteria ("","fullname","name","date","size")
* @param string $sortorder Sort order (SORT_ASC, SORT_DESC)
@@ -440,6 +441,70 @@ function dol_filemtime($pathoffile)
return @filemtime($newpathoffile); // @Is to avoid errors if files does not exists
}
+/**
+ * Make replacement of strings into a file.
+ *
+ * @param string $srcfile Source file (can't be a directory)
+ * @param array $arrayreplacement Array with strings to replace
+ * @param string $destfile Destination file (can't be a directory). If empty, will be same than source file.
+ * @param int $newmask Mask for new file (0 by default means $conf->global->MAIN_UMASK). Example: '0666'
+ * @return int <0 if error, 0 if nothing done (dest file already exists), >0 if OK
+ * @see dolCopyr
+ */
+function dolReplaceInFile($srcfile, $arrayreplacement, $destfile='', $newmask=0)
+{
+ global $conf;
+
+ dol_syslog("files.lib.php::dolReplaceInFile srcfile=".$srcfile." destfile=".$destfile." newmask=".$newmask);
+
+ if (empty($srcfile)) return -1;
+ if (empty($destfile)) $destfile=$srcfile;
+
+ $destexists=dol_is_file($destfile);
+ if (($destfile != $srcfile) && $destexists) return 0;
+
+ $tmpdestfile=$destfile.'.tmp';
+
+ $newpathofsrcfile=dol_osencode($srcfile);
+ $newpathoftmpdestfile=dol_osencode($tmpdestfile);
+ $newpathofdestfile=dol_osencode($destfile);
+ $newdirdestfile=dirname($newpathofdestfile);
+
+ if ($destexists && ! is_writable($newpathofdestfile))
+ {
+ dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to overwrite target file", LOG_WARNING);
+ return -1;
+ }
+ if (! is_writable($newdirdestfile))
+ {
+ dol_syslog("files.lib.php::dolReplaceInFile failed Permission denied to write into target directory ".$newdirdestfile, LOG_WARNING);
+ return -2;
+ }
+
+ dol_delete_file($tmpdestfile);
+
+
+
+
+ // Rename
+ $result=dol_move($newpathoftmpdestfile, $newpathofdestfile, $newmask, (($destfile == $srcfile)?1:0));
+ if (! $result)
+ {
+ dol_syslog("files.lib.php::dolReplaceInFile failed to move tmp file to final dest", LOG_WARNING);
+ return -3;
+ }
+ if (empty($newmask) && ! empty($conf->global->MAIN_UMASK)) $newmask=$conf->global->MAIN_UMASK;
+ if (empty($newmask)) // This should no happen
+ {
+ dol_syslog("Warning: dolReplaceInFile called with empty value for newmask and no default value defined", LOG_WARNING);
+ $newmask='0664';
+ }
+
+ @chmod($newpathofdestfile, octdec($newmask));
+
+ return 1;
+}
+
/**
* Copy a file to another file.
*
@@ -940,7 +1005,7 @@ function dol_delete_file($file,$disableglob=0,$nophperrors=0,$nohook=0,$object=n
// If error because of not exists, we must should return true and we should return false if this is a permission problem
}
}
- else dol_syslog("No files to delete found", LOG_WARNING);
+ else dol_syslog("No files to delete found", LOG_DEBUG);
}
else
{
diff --git a/htdocs/core/lib/usergroups.lib.php b/htdocs/core/lib/usergroups.lib.php
index d983f799c0d..797af488f46 100644
--- a/htdocs/core/lib/usergroups.lib.php
+++ b/htdocs/core/lib/usergroups.lib.php
@@ -443,6 +443,49 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print '</td></tr>';
+ // TopMenuDisableImages
+ if ($foruserprofile)
+ {
+ /*
+ print '<tr class="oddeven">';
+ print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
+ print '<td>'.($conf->global->THEME_TOPMENU_DISABLE_IMAGE?$conf->global->THEME_TOPMENU_DISABLE_IMAGE:$langs->trans("Default")).'</td>';
+ print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_THEME_TOPMENU_DISABLE_IMAGE" id="check_THEME_TOPMENU_DISABLE_IMAGE" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
+ print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"'; // Disabled for demo
+ print '> '.$langs->trans("UsePersonalValue").'</td>';
+ print '<td>';
+ if ($edit)
+ {
+ print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),''),'THEME_TOPMENU_DISABLE_IMAGE','formcolor',1).' ';
+ }
+ else
+ {
+ $color = colorArrayToHex(colorStringToArray($conf->global->THEME_TOPMENU_DISABLE_IMAGE,array()),'');
+ if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+ else print '';
+ }
+ if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
+ print '</td>';*/
+ }
+ else
+ {
+ $default=$langs->trans('No');
+ print '<tr class="oddeven">';
+ print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
+ print '<td colspan="'.($colspan-1).'">';
+ if ($edit)
+ {
+ print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
+ }
+ else
+ {
+ print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
+ }
+ print ' ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+ print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+ print '</td>';
+ }
+
// Background color THEME_ELDY_BACKBODY
if ($foruserprofile)
{
@@ -535,78 +578,88 @@ function show_theme($fuser,$edit=0,$foruserprofile=false)
print '</td>';
}
- // TopMenuBackgroundColor
+ // BackgroundTableTitleColor
if ($foruserprofile)
{
- /*
- print '<tr class="oddeven">';
- print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
- print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_TOPMENU_BACK1:$langs->trans("Default")).'</td>';
- print '<td align="left" class="nowrap" width="20%"><input '.$bc[$var].' name="check_THEME_ELDY_TOPMENU_BACK1" id="check_THEME_ELDY_TOPMENU_BACK1" type="checkbox" '.(! empty($object->conf->THEME_ELDY_TOPMENU_BACK1)?" checked":"");
- print (empty($dolibarr_main_demo) && $edit)?'':' disabled="disabled"'; // Disabled for demo
- print '> '.$langs->trans("UsePersonalValue").'</td>';
- print '<td>';
- if ($edit)
- {
- print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),''),'THEME_ELDY_TOPMENU_BACK1','formcolor',1).' ';
- }
- else
- {
- $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_TOPMENU_BACK1,array()),'');
- if ($color) print '<input type="text" class="colorthumb" disabled style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
- else print '';
- }
- if ($edit) print '<br>('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
- print '</td>';*/
+
+
+ }
+ else
+ {
+ print '<tr class="oddeven">';
+ print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
+ print '<td colspan="'.($colspan-1).'">';
+ if ($edit)
+ {
+ print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1,array()),''),'THEME_ELDY_BACKTITLE1','formcolor',1).' ';
+ }
+ else
+ {
+ print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
+ }
+ print ' ('.$langs->trans("Default").': <strong>f0f0f0</strong>) '; // $colorbacktitle1 in CSS
+ print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+ print '</td>';
+
+ print '</tr>';
+ }
+
+ // BackgroundTableLineOddColor
+ if ($foruserprofile)
+ {
+
}
else
{
- $default=$langs->trans('No');
+ $default='ffffff';
+ if ($conf->theme == 'md') $default='ffffff';
+
print '<tr class="oddeven">';
- print '<td>'.$langs->trans("TopMenuDisableImages").'</td>';
+ print '<td>'.$langs->trans("BackgroundTableLineOddColor").'</td>';
print '<td colspan="'.($colspan-1).'">';
if ($edit)
{
- print $form->selectyesno('THEME_TOPMENU_DISABLE_IMAGE', $conf->global->THEME_TOPMENU_DISABLE_IMAGE, 1);
+ print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),''),'THEME_ELDY_LINEIMPAIR1','formcolor',1).' ';
}
else
{
- print yn($conf->global->THEME_TOPMENU_DISABLE_IMAGE);
+ $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEIMPAIR1,array()),'');
+ if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+ else print $langs->trans("Default");
}
print ' ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
- print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+ print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
print '</td>';
}
-
-
-
- // BackgroundTableTitleColor
+ // BackgroundTableLineEvenColor
if ($foruserprofile)
{
-
-
+
}
else
- {
+ {
+ $default='f8f8f8';
+ if ($conf->theme == 'md') $default='f8f8f8';
+
print '<tr class="oddeven">';
- print '<td>'.$langs->trans("BackgroundTableTitleColor").'</td>';
+ print '<td>'.$langs->trans("BackgroundTableLineEvenColor").'</td>';
print '<td colspan="'.($colspan-1).'">';
if ($edit)
{
- print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BACKTITLE1,array()),''),'THEME_ELDY_BACKTITLE1','formcolor',1).' ';
+ print $formother->selectColor(colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),''),'THEME_ELDY_LINEPAIR1','formcolor',1).' ';
}
- else
- {
- print $formother->showColor($conf->global->THEME_ELDY_BACKTITLE1, $langs->trans("Default"));
- }
- print ' ('.$langs->trans("Default").': <strong>f0f0f0</strong>) '; // $colorbacktitle1 in CSS
- print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
+ else
+ {
+ $color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_LINEPAIR1,array()),'');
+ if ($color) print '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$color.'" value="'.$color.'">';
+ else print $langs->trans("Default");
+ }
+ print ' ('.$langs->trans("Default").': <strong>'.$default.'</strong>) ';
+ print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
print '</td>';
-
- print '</tr>';
}
-
+
// TextTitleColor
if ($foruserprofile)
{
diff --git a/htdocs/langs/en_US/modulebuilder.lang b/htdocs/langs/en_US/modulebuilder.lang
index da734ea1356..18b7044b55d 100644
--- a/htdocs/langs/en_US/modulebuilder.lang
+++ b/htdocs/langs/en_US/modulebuilder.lang
@@ -4,5 +4,5 @@ ModuleBuilderDesc2=Path were modules are generated/edited (first alternative dir
ModuleBuilderDesc3=Generated/editable modules found: <strong>%s</strong> (they are detected as editable when the file <strong>%s</strong> exists in root of module directory).
NewModule=New module
ModuleKey=Key for new module
-
+ModuleInitialized=Module initialized
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 6ad747a7694..bdad41e8556 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -59,14 +59,27 @@ if ($dircustom && $action == 'initmodule' && $modulename)
$destfile = $dircustom.'/'.$modulename;
$result = dolCopyDir($srcfile, $destfile, 0, 0);
//dol_mkdir($destfile);
-
- if ($result > 0)
+ if ($result <= 0)
{
- setEventMessages('ModuleInitialized', null);
+ $error++;
+ setEventMessages($langs->trans("ErrorFailedToCopyDir"), null, 'errors');
}
- else
+
+ // Edit PHP files
+ $listofphpfilestoedit = dol_dir_list($destfile, 'files', 1, '\.php$', 'fullname', SORT_ASC, 0, true);
+ foreach($listofphpfilestoedit as $phpfileval)
{
- setEventMessages($langs->trans("ErrorFailedToCopyDir"), null, 'errors');
+ $arrayreplacement=array(
+ 'mymodule'=>$modulename
+ );
+ $result=dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
+ var_dump($phpfileval);
+ var_dump($result);
+ }
+
+ if (! $error)
+ {
+ setEventMessages('ModuleInitialized', null);
}
}
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index f923413da4c..f6021be8a9a 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2017 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2007-2017 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
@@ -35,6 +35,28 @@ if (! defined('NOLOGIN')) define('NOLOGIN',1); // File must be
if (! defined('NOREQUIREHTML')) define('NOREQUIREHTML',1);
if (! defined('NOREQUIREAJAX')) define('NOREQUIREAJAX','1');
+// Colors
+$colorbackhmenu1='80,90,120'; // topmenu
+$colorbackvmenu1='255,255,255'; // vmenu
+$colortopbordertitle1='120,120,120'; // top border of title
+$colorbacktitle1='230,230,230'; // title of tables,list
+$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='248,248,248'; // line pair
+$colorbacklinepairhover='238,246,252'; // line pair
+$colorbackbody='255,255,255';
+$colortexttitlenotab='100,60,20';
+$colortexttitle='0,0,0';
+$colortext='0,0,0';
+$colortextlink='0,0,100';
+$fontsize='13';
+$fontsizesmaller='12';
+
+if (defined('THEME_ONLY_CONSTANT')) return;
+
session_cache_limiter(FALSE);
require_once '../../main.inc.php';
@@ -77,25 +99,6 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
//$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
//var_dump($user->conf->THEME_ELDY_RGB);
-// Colors
-$colorbackhmenu1='80,90,120'; // topmenu
-$colorbackvmenu1='255,255,255'; // vmenu
-$colortopbordertitle1='120,120,120'; // top border of title
-$colorbacktitle1='240,240,240'; // title of tables,list
-$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='248,248,248'; // line pair
-$colorbacklinepairhover='238,246,252'; // line pair
-$colorbackbody='255,255,255';
-$colortexttitlenotab='100,60,20';
-$colortexttitle='0,0,0';
-$colortext='0,0,0';
-$colortextlink='0,0,100';
-$fontsize='13';
-$fontsizesmaller='12';
$useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
$borderwith=2;
@@ -113,17 +116,11 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu
$conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // card
$conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
- $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
- $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
- $conf->global->THEME_ELDY_LINEPAIR1='248,248,248';
- $conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
- $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
$conf->global->THEME_ELDY_TEXT='0,0,0';
$conf->global->THEME_ELDY_FONT_SIZE1='13';
$conf->global->THEME_ELDY_FONT_SIZE2='12';
}
-
// Case of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on
$colorbackhmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$conf->global->THEME_ELDY_TOPMENU_BACK1) :(empty($user->conf->THEME_ELDY_TOPMENU_BACK1)?$colorbackhmenu1:$user->conf->THEME_ELDY_TOPMENU_BACK1);
$colorbackvmenu1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$conf->global->THEME_ELDY_VERMENU_BACK1) :(empty($user->conf->THEME_ELDY_VERMENU_BACK1)?$colorbackvmenu1:$user->conf->THEME_ELDY_VERMENU_BACK1);
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index 3bd33b07225..9604da70905 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -1,5 +1,5 @@
<?php
-/* Copyright (C) 2004-2015 Laurent Destailleur <eldy@users.sourceforge.net>
+/* Copyright (C) 2004-2017 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2006 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2007-2017 Regis Houssin <regis.houssin@capnetworks.com>
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
@@ -36,6 +36,28 @@ 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='250,250,250'; // line pair
+$colorbacklinepair2='248,248,248'; // line pair
+$colorbacklinepairhover='244,244,244'; // line pair
+$colorbackbody='240,240,240';
+$colortexttitlenotab='90,90,90';
+$colortexttitle='20,20,20';
+$colortext='0,0,0';
+$colortextlink='0,0,120';
+$fontsize='13';
+$fontsizesmaller='11';
+
+if (defined('THEME_ONLY_CONSTANT')) return;
+
session_cache_limiter(FALSE);
require_once '../../main.inc.php';
@@ -78,34 +100,14 @@ $dol_no_mouse_hover=$conf->dol_no_mouse_hover;
//$user->conf->THEME_ELDY_ENABLE_PERSONALIZED=0;
//var_dump($user->conf->THEME_ELDY_RGB);
-// 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='250,250,250'; // line pair
-$colorbacklinepair2='248,248,248'; // line pair
-$colorbacklinepairhover='244,244,244'; // line pair
-$colorbackbody='240,240,240';
-$colortexttitlenotab='90,90,90';
-$colortexttitle='20,20,20';
-$colortext='0,0,0';
-$colortextlink='0,0,120';
-$fontsize='13';
-$fontsizesmaller='11';
-$usegradient=0;
$useboldtitle=(isset($conf->global->THEME_ELDY_USEBOLDTITLE)?$conf->global->THEME_ELDY_USEBOLDTITLE:1);
$borderwith=2;
// Case of option always editable
if (! isset($conf->global->THEME_ELDY_BACKBODY)) $conf->global->THEME_ELDY_BACKBODY=$colorbackbody;
-if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='90,50,120';
+if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=$colorbackhmenu1;
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=='238,246,252';
+if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER==$colorbacklinepairhover;
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;
@@ -116,12 +118,6 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu
$conf->global->THEME_ELDY_BACKTABCARD1='255,255,255'; // card
$conf->global->THEME_ELDY_BACKTABACTIVE='234,234,234';
- $conf->global->THEME_ELDY_LINEIMPAIR1='255,255,255';
- $conf->global->THEME_ELDY_LINEIMPAIR2='255,255,255';
- $conf->global->THEME_ELDY_LINEPAIR1='250,250,250';
- $conf->global->THEME_ELDY_LINEPAIR2='248,248,248';
- $conf->global->THEME_ELDY_LINEPAIRHOVER='238,246,252';
- $conf->global->THEME_ELDY_USE_HOVER='238,246,252';
$conf->global->THEME_ELDY_TEXT='0,0,0';
$conf->global->THEME_ELDY_FONT_SIZE1='13';
$conf->global->THEME_ELDY_FONT_SIZE2='11';
@@ -139,7 +135,6 @@ $colorbacklineimpair1=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty(
$colorbacklineimpair2=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEIMPAIR2) ?$colorbacklineimpair2:$conf->global->THEME_ELDY_LINEIMPAIR2):(empty($user->conf->THEME_ELDY_LINEIMPAIR2)?$colorbacklineimpair2:$user->conf->THEME_ELDY_LINEIMPAIR2);
$colorbacklinepair1 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR1) ?$colorbacklinepair1:$conf->global->THEME_ELDY_LINEPAIR1) :(empty($user->conf->THEME_ELDY_LINEPAIR1)?$colorbacklinepair1:$user->conf->THEME_ELDY_LINEPAIR1);
$colorbacklinepair2 =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIR2) ?$colorbacklinepair2:$conf->global->THEME_ELDY_LINEPAIR2) :(empty($user->conf->THEME_ELDY_LINEPAIR2)?$colorbacklinepair2:$user->conf->THEME_ELDY_LINEPAIR2);
-$colorbacklinepairhover =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_LINEPAIRHOVER) ?$colorbacklinepairhover:$conf->global->THEME_ELDY_LINEPAIRHOVER) :(empty($user->conf->THEME_ELDY_LINEPAIRHOVER)?$colorbacklinepairhover:$user->conf->THEME_ELDY_LINEPAIRHOVER);
$colorbackbody =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_BACKBODY) ?$colorbackbody:$conf->global->THEME_ELDY_BACKBODY) :(empty($user->conf->THEME_ELDY_BACKBODY)?$colorbackbody:$user->conf->THEME_ELDY_BACKBODY);
$colortexttitlenotab =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$conf->global->THEME_ELDY_TEXTTITLENOTAB) :(empty($user->conf->THEME_ELDY_TEXTTITLENOTAB)?$colortexttitlenotab:$user->conf->THEME_ELDY_TEXTTITLENOTAB);
$colortexttitle =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTTITLE) ?$colortext:$conf->global->THEME_ELDY_TEXTTITLE) :(empty($user->conf->THEME_ELDY_TEXTTITLE)?$colortexttitle:$user->conf->THEME_ELDY_TEXTTITLE);
@@ -147,6 +142,7 @@ $colortext =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty(
$colortextlink =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_TEXTLINK) ?$colortext:$conf->global->THEME_ELDY_TEXTLINK) :(empty($user->conf->THEME_ELDY_TEXTLINK)?$colortextlink:$user->conf->THEME_ELDY_TEXTLINK);
$fontsize =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE1) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE1) :(empty($user->conf->THEME_ELDY_FONT_SIZE1)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE1);
$fontsizesmaller =empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empty($conf->global->THEME_ELDY_FONT_SIZE2) ?$fontsize:$conf->global->THEME_ELDY_FONT_SIZE2) :(empty($user->conf->THEME_ELDY_FONT_SIZE2)?$fontsize:$user->conf->THEME_ELDY_FONT_SIZE2);
+
// Hover color
$colorbacklinepairhover=((! isset($conf->global->THEME_ELDY_USE_HOVER) || (string) $conf->global->THEME_ELDY_USE_HOVER === '0')?'':($conf->global->THEME_ELDY_USE_HOVER === '1'?'edf4fb':$conf->global->THEME_ELDY_USE_HOVER));
if (! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED))
@@ -154,7 +150,7 @@ 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'?'edf4fb':$user->conf->THEME_ELDY_USE_HOVER));
}
-if (empty($colortopbordertitle1)) $colortopbordertitle1=$colorbackhmenu1;
+//if (empty($colortopbordertitle1)) $colortopbordertitle1=$colorbackhmenu1;
// Set text color to black or white
@@ -2709,15 +2705,7 @@ tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, tabl
}
div.liste_titre, tr.liste_titre, tr.liste_titre_sel, form.liste_titre, form.liste_titre_sel, table.dataTable thead tr
{
- <?php if ($usegradient) { ?>
- background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
- background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
- background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
- background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
- background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
- <?php } else { ?>
background: rgb(<?php echo $colorbacktitle1; ?>);
- <?php } ?>
font-weight: <?php echo $useboldtitle?'bold':'normal'; ?>;
color: rgb(<?php echo $colortexttitle; ?>);
@@ -2974,15 +2962,7 @@ tr.box_titre {
color: #000 !important; */
/* TO MATCH ELDY */
- <?php if ($usegradient) { ?>
- background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
- background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
- background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
- background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
- background-image: linear-gradient(bottom, rgba(0,0,0,0.1) 0%, rgba(250,250,250,0.3) 100%);
- <?php } else { ?>
background: rgb(<?php echo $colorbacktitle1; ?>);
- <?php } ?>
background-repeat: repeat-x;
color: rgb(<?php echo $colortexttitle; ?>);
--
GitLab