Merge pull request #19923 from bb2a/Add_param_color_button_action
NEW - Add param color button action
This commit is contained in:
commit
ae0f428acc
@ -5,6 +5,7 @@
|
|||||||
* Copyright (C) 2016 Juanjo Menent <jmenent@2byte.es>
|
* Copyright (C) 2016 Juanjo Menent <jmenent@2byte.es>
|
||||||
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
|
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
|
||||||
* Copyright (C) 2021 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
* Copyright (C) 2021 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||||
|
* Copyright (C) 2021 Anthony Berton <bertonanthony@gmail.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -199,6 +200,13 @@ if ($action == 'update') {
|
|||||||
} else {
|
} else {
|
||||||
dolibarr_set_const($db, "THEME_ELDY_USE_CHECKED", $val, 'chaine', 0, '', $conf->entity);
|
dolibarr_set_const($db, "THEME_ELDY_USE_CHECKED", $val, 'chaine', 0, '', $conf->entity);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$val=(implode(',', (colorStringToArray(GETPOST('THEME_ELDY_BTNACTION'), array()))));
|
||||||
|
if ($val == '') {
|
||||||
|
dolibarr_del_const($db, 'THEME_ELDY_BTNACTION', $conf->entity);
|
||||||
|
} else {
|
||||||
|
dolibarr_set_const($db, 'THEME_ELDY_BTNACTION', $val, 'chaine', 0, '', $conf->entity);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($mode == 'dashboard') {
|
if ($mode == 'dashboard') {
|
||||||
|
|||||||
@ -3,6 +3,7 @@
|
|||||||
* Copyright (C) 2010-2017 Regis Houssin <regis.houssin@inodbox.com>
|
* Copyright (C) 2010-2017 Regis Houssin <regis.houssin@inodbox.com>
|
||||||
* Copyright (C) 2015 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
* Copyright (C) 2015 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||||
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
|
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
|
||||||
|
* Copyright (C) 2021 Anthony Berton <bertonanthony@gmail.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -859,15 +860,15 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
|
|||||||
// Use Checked
|
// Use Checked
|
||||||
if ($foruserprofile) {
|
if ($foruserprofile) {
|
||||||
/* Must first change option to choose color of highlight instead of yes or no.
|
/* Must first change option to choose color of highlight instead of yes or no.
|
||||||
print '<tr class="oddeven">';
|
print '<tr class="oddeven">';
|
||||||
print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
|
print '<td>'.$langs->trans("HighlightLinesOnMouseHover").'</td>';
|
||||||
print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
|
print '<td><input name="check_THEME_ELDY_USE_HOVER" disabled="disabled" type="checkbox" '.($conf->global->THEME_ELDY_USE_HOVER?" checked":"").'></td>';
|
||||||
print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
|
print '<td class="nowrap left" width="20%"><input name="check_MAIN_THEME"'.($edit?'':' disabled').' type="checkbox" '.($selected_theme?" checked":"").'> '.$langs->trans("UsePersonalValue").'</td>';
|
||||||
print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
|
print '<td><input name="check_THEME_ELDY_USE_HOVER"'.($edit?'':' disabled="disabled"').' type="checkbox" '.($hoverdisabled?"":" checked").'>';
|
||||||
print ' ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
|
print ' ('.$langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis").')';
|
||||||
print '</td>';
|
print '</td>';
|
||||||
print '</tr>';
|
print '</tr>';
|
||||||
*/
|
*/
|
||||||
} else {
|
} else {
|
||||||
$default = (empty($colorbacklinepairchecked) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairchecked)));
|
$default = (empty($colorbacklinepairchecked) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($colorbacklinepairchecked)));
|
||||||
|
|
||||||
@ -905,6 +906,52 @@ function showSkins($fuser, $edit = 0, $foruserprofile = false)
|
|||||||
print '</tr>';
|
print '</tr>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Btn action
|
||||||
|
if ($foruserprofile) {
|
||||||
|
/*
|
||||||
|
print '<tr class="oddeven">';
|
||||||
|
print '<td>'.$langs->trans("TopMenuBackgroundColor").'</td>';
|
||||||
|
print '<td>'.($conf->global->THEME_ELDY_TOPMENU_BACK1?$conf->global->THEME_ELDY_BTNACTION:$langs->trans("Default")).'</td>';
|
||||||
|
print '<td class="nowrap left" width="20%"><input name="check_THEME_ELDY_BTNACTION" id="check_THEME_ELDY_BTNACTION" type="checkbox" '.(! empty($object->conf->THEME_ELDY_BTNACTION)?" 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_BTNACTION,array()),''),'THEME_ELDY_BTNACTION','',1).' ';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION,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 = (empty($butactionbg) ? $langs->trans("Unknown") : colorArrayToHex(colorStringToArray($butactionbg)));
|
||||||
|
|
||||||
|
print '<tr class="oddeven">';
|
||||||
|
print '<td>'.$langs->trans("BtnActionColor").'</td>';
|
||||||
|
print '<td colspan="'.($colspan - 1).'">';
|
||||||
|
if ($edit) {
|
||||||
|
print $formother->selectColor(colorArrayToHex(colorStringToArray((!empty($conf->global->THEME_ELDY_BTNACTION) ? $conf->global->THEME_ELDY_BTNACTION : ''), array()), ''), 'THEME_ELDY_BTNACTION', '', 1, '', '', 'colorbtnaction').' ';
|
||||||
|
} else {
|
||||||
|
$color = colorArrayToHex(colorStringToArray($conf->global->THEME_ELDY_BTNACTION, 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 '<input type="text" class="colorthumb" disabled="disabled" style="padding: 1px; margin-top: 0; margin-bottom: 0; background-color: #'.$defaultcolor.'" value="'.$langs->trans("Default").'">';
|
||||||
|
//print '<span style="color: #000078">'.$langs->trans("Default").'</span>';
|
||||||
|
print $langs->trans("Default");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
print ' <span class="nowraponall opacitymedium">'.$langs->trans("Default").'</span>: <strong><span style="color: #'.$default.'">'.$default.'</span></strong> ';
|
||||||
|
print $form->textwithpicto('', $langs->trans("NotSupportedByAllThemes").', '.$langs->trans("PressF5AfterChangingThis"));
|
||||||
|
print '</td>';
|
||||||
|
print '</tr>';
|
||||||
|
}
|
||||||
|
|
||||||
// Use MAIN_OPTIMIZEFORTEXTBROWSER
|
// Use MAIN_OPTIMIZEFORTEXTBROWSER
|
||||||
if ($foruserprofile && !empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
|
if ($foruserprofile && !empty($fuser->conf->MAIN_OPTIMIZEFORTEXTBROWSER)) {
|
||||||
//$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
|
//$default=yn($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER);
|
||||||
|
|||||||
@ -1917,6 +1917,7 @@ ConfFileMustContainCustom=Installing or building an external module from applica
|
|||||||
HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
|
HighlightLinesOnMouseHover=Highlight table lines when mouse move passes over
|
||||||
HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
|
HighlightLinesColor=Highlight color of the line when the mouse passes over (use 'ffffff' for no highlight)
|
||||||
HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
|
HighlightLinesChecked=Highlight color of the line when it is checked (use 'ffffff' for no highlight)
|
||||||
|
BtnActionColor=Color of the action button
|
||||||
TextTitleColor=Text color of Page title
|
TextTitleColor=Text color of Page title
|
||||||
LinkColor=Color of links
|
LinkColor=Color of links
|
||||||
PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
|
PressF5AfterChangingThis=Press CTRL+F5 on keyboard or clear your browser cache after changing this value to have it effective
|
||||||
|
|||||||
@ -5,17 +5,12 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
|
|||||||
/* <style type="text/css" > */
|
/* <style type="text/css" > */
|
||||||
|
|
||||||
:root {
|
:root {
|
||||||
--btncolortext:rgb(<?php print $colortextlink; ?>);
|
--btncolortext: rgb(<?php print $colortextlink; ?>);
|
||||||
--btncolorbg: #fbfbfb;
|
--btncolorbg: #fbfbfb;
|
||||||
--btncolorborderhover: none;
|
--btncolorborderhover: none;
|
||||||
--btncolorborder: #FFF;
|
--btncolorborder: #FFF;
|
||||||
/* --butactionbg:rgba(150, 110, 162, 0.95); */
|
|
||||||
--butactionbg:rgb(118, 145, 225);
|
|
||||||
--butactionbg:rgba(150, 110, 162, 0.95);
|
|
||||||
--butactiondeletebg: rgb(234,228,225);
|
--butactiondeletebg: rgb(234,228,225);
|
||||||
/* tertiary color */
|
--butactionbg: rgb(<?php print $butactionbg; ?>);
|
||||||
/* --butactionbg:rgb(218, 235, 225); */
|
|
||||||
/* --butactionbg:rgb(228, 218, 235); */
|
|
||||||
}
|
}
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
@ -31,8 +26,8 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
|
|||||||
--btncolorbg: rgb(26,27,27);
|
--btncolorbg: rgb(26,27,27);
|
||||||
--btncolorborderhover: #ffffff;
|
--btncolorborderhover: #ffffff;
|
||||||
--btncolorborder: #2b2c2e;
|
--btncolorborder: #2b2c2e;
|
||||||
--butactionbg: rgb(173,140,79);
|
|
||||||
--butactiondeletebg: rgb(252,84,91);
|
--butactiondeletebg: rgb(252,84,91);
|
||||||
|
--butactionbg: rgb(173,140,79);
|
||||||
|
|
||||||
}\n";
|
}\n";
|
||||||
if ($conf->global->THEME_DARKMODEENABLED != 2) {
|
if ($conf->global->THEME_DARKMODEENABLED != 2) {
|
||||||
|
|||||||
@ -5,6 +5,7 @@
|
|||||||
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
|
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
|
||||||
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
|
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
|
||||||
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
|
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
|
||||||
|
* Copyright (C) 2021 Anthony Berton <bertonanthony@gmail.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -150,7 +151,9 @@ if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) {
|
|||||||
if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
|
if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
|
||||||
$conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
|
$conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
|
||||||
}
|
}
|
||||||
|
if (!isset($conf->global->THEME_ELDY_BTNACTION)) {
|
||||||
|
$conf->global->THEME_ELDY_BTNACTION = $butactionbg;
|
||||||
|
}
|
||||||
// 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
|
||||||
@ -178,6 +181,7 @@ $colortexttitle = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
|
|||||||
$colortexttitlelink = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
|
$colortexttitlelink = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
|
||||||
$colortext = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
|
$colortext = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
|
||||||
$colortextlink = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortextlink : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
|
$colortextlink = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTLINK) ? $colortextlink : $conf->global->THEME_ELDY_TEXTLINK) : (empty($user->conf->THEME_ELDY_TEXTLINK) ? $colortextlink : $user->conf->THEME_ELDY_TEXTLINK);
|
||||||
|
$butactionbg = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
|
||||||
$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);
|
$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);
|
$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);
|
||||||
|
|
||||||
|
|||||||
@ -5,6 +5,7 @@
|
|||||||
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
|
* Copyright (C) 2011 Philippe Grand <philippe.grand@atoo-net.com>
|
||||||
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
|
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
|
||||||
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
|
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
|
||||||
|
* Copyright (C) 2021 Anthony Berton <bertonanthony@gmail.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -73,6 +74,7 @@ $fontsizesmaller = '0.75em';
|
|||||||
$topMenuFontSize = '1.1em';
|
$topMenuFontSize = '1.1em';
|
||||||
$toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
|
$toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
|
||||||
$toolTipFontColor = '#333';
|
$toolTipFontColor = '#333';
|
||||||
|
$butactionbg = '150, 110, 162, 0.95';
|
||||||
|
|
||||||
// text color
|
// text color
|
||||||
$textSuccess = '#28a745';
|
$textSuccess = '#28a745';
|
||||||
|
|||||||
@ -10,10 +10,7 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
|
|||||||
--btncolorborderhover: none;
|
--btncolorborderhover: none;
|
||||||
--btncolorborder: #FFF;
|
--btncolorborder: #FFF;
|
||||||
--butactiondeletebg: rgb(234,228,225);
|
--butactiondeletebg: rgb(234,228,225);
|
||||||
/* tertiary color */
|
--butactionbg: rgb(<?php print $butactionbg; ?>);
|
||||||
/* --butactionbg:rgb(218, 235, 225); */
|
|
||||||
/* --butactionbg:rgb(228, 218, 235); */
|
|
||||||
--butactionbg:rgb(118, 145, 225);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
@ -29,8 +26,8 @@ if (!empty($conf->global->THEME_DARKMODEENABLED)) {
|
|||||||
--btncolorbg: rgb(26,27,27);
|
--btncolorbg: rgb(26,27,27);
|
||||||
--btncolorborderhover: #ffffff;
|
--btncolorborderhover: #ffffff;
|
||||||
--btncolorborder: #2b2c2e;
|
--btncolorborder: #2b2c2e;
|
||||||
--butactionbg:rgb(173,140,79);
|
|
||||||
--butactiondeletebg: rgb(252,84,91);
|
--butactiondeletebg: rgb(252,84,91);
|
||||||
|
--butactionbg: rgb(173,140,79);
|
||||||
|
|
||||||
}\n";
|
}\n";
|
||||||
if ($conf->global->THEME_DARKMODEENABLED != 2) {
|
if ($conf->global->THEME_DARKMODEENABLED != 2) {
|
||||||
|
|||||||
@ -6,6 +6,7 @@
|
|||||||
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
|
* Copyright (C) 2012 Juanjo Menent <jmenent@2byte.es>
|
||||||
* Copyright (C) 2015 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
* Copyright (C) 2015 Alexandre Spangaro <aspangaro@open-dsi.fr>
|
||||||
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
|
* Copyright (C) 2018 Ferran Marcet <fmarcet@2byte.es>
|
||||||
|
* Copyright (C) 2021 Anthony Berton <bertonanthony@gmail.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -148,6 +149,9 @@ if (!isset($conf->global->THEME_ELDY_TEXTTITLENOTAB)) {
|
|||||||
if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
|
if (!isset($conf->global->THEME_ELDY_TEXTLINK)) {
|
||||||
$conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
|
$conf->global->THEME_ELDY_TEXTLINK = $colortextlink;
|
||||||
}
|
}
|
||||||
|
if (!isset($conf->global->THEME_ELDY_BTNACTION)) {
|
||||||
|
$conf->global->THEME_ELDY_BTNACTION = $butactionbg;
|
||||||
|
}
|
||||||
|
|
||||||
// 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)) {
|
||||||
@ -177,6 +181,7 @@ $colortexttitle = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (emp
|
|||||||
$colortexttitlelink = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
|
$colortexttitlelink = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $conf->global->THEME_ELDY_TEXTTITLELINK) : (empty($user->conf->THEME_ELDY_TEXTTITLELINK) ? $colortexttitlelink : $user->conf->THEME_ELDY_TEXTTITLELINK);
|
||||||
$colortext = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
|
$colortext = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_TEXT) ? $colortext : $conf->global->THEME_ELDY_TEXT) : (empty($user->conf->THEME_ELDY_TEXT) ? $colortext : $user->conf->THEME_ELDY_TEXT);
|
||||||
$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);
|
$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);
|
||||||
|
$butactionbg = empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) ? (empty($conf->global->THEME_ELDY_BTNACTION) ? $butactionbg : $conf->global->THEME_ELDY_BTNACTION) : (empty($user->conf->THEME_ELDY_BTNACTION) ? $butactionbg : $user->conf->THEME_ELDY_BTNACTION);
|
||||||
$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);
|
$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);
|
$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);
|
||||||
|
|
||||||
@ -338,6 +343,7 @@ print '*/'."\n";
|
|||||||
--productlinestockod: #002200;
|
--productlinestockod: #002200;
|
||||||
--productlinestocktoolow: #884400;
|
--productlinestocktoolow: #884400;
|
||||||
--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
|
--infoboxmoduleenabledbgcolor : linear-gradient(0.4turn, #fff, #fff, #fff, #e4efe8);
|
||||||
|
--butactionbg : #<?php print $butactionbg; ?>;
|
||||||
}
|
}
|
||||||
|
|
||||||
body {
|
body {
|
||||||
@ -439,7 +445,7 @@ input, select {
|
|||||||
margin-top:1px;
|
margin-top:1px;
|
||||||
}
|
}
|
||||||
#mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
|
#mainbody input.button:not(.buttongen):not(.bordertransp), #mainbody a.button:not(.buttongen):not(.bordertransp) {
|
||||||
background: var(--butactionbg);
|
background: var(--butactionbg);;
|
||||||
color: #FFF !important;
|
color: #FFF !important;
|
||||||
border-radius: 3px;
|
border-radius: 3px;
|
||||||
border-collapse: collapse;
|
border-collapse: collapse;
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
|
||||||
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
|
* Copyright (C) 2004-2012 Laurent Destailleur <eldy@users.sourceforge.net>
|
||||||
|
* Copyright (C) 2021 Anthony Berton <bertonanthony@gmail.com>
|
||||||
*
|
*
|
||||||
* This program is free software; you can redistribute it and/or modify
|
* 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
|
* it under the terms of the GNU General Public License as published by
|
||||||
@ -68,6 +69,7 @@ $fontsizesmaller = '11';
|
|||||||
$topMenuFontSize = '1.1em';
|
$topMenuFontSize = '1.1em';
|
||||||
$toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
|
$toolTipBgColor = 'rgba(255, 255, 255, 0.96)';
|
||||||
$toolTipFontColor = '#333';
|
$toolTipFontColor = '#333';
|
||||||
|
$butactionbg = '150, 110, 162, 0.95';
|
||||||
|
|
||||||
// text color
|
// text color
|
||||||
$textSuccess = '#28a745';
|
$textSuccess = '#28a745';
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user