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

Fix css

Browse Source
This commit is contained in:
Laurent Destailleur 2015-10-02 11:58:19 +02:00
parent 53269a2703
commit 17a5b0a0f4
4 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -949,7 +949,7 @@ if (empty($action) || $action == 'show_month') // View by month
$newparam=preg_replace('/viewcal=[0-9]+&?/i','',$newparam); $newparam=preg_replace('/viewcal=[0-9]+&?/i','',$newparam);
$newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam); // Restore correct parameter $newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam); // Restore correct parameter
$newparam.='&viewcal=1'; $newparam.='&viewcal=1';
echo '<table width="100%" class="nocellnopadd cal_month">'; echo '<table width="100%" class="noborder nocellnopadd cal_month">';
echo ' <tr class="liste_titre">'; echo ' <tr class="liste_titre">';
$i=0; $i=0;
while ($i < 7) while ($i < 7)
@ -1026,7 +1026,7 @@ elseif ($action == 'show_week') // View by week
$newparam=preg_replace('/viewweek=[0-9]+&?/i','',$newparam); $newparam=preg_replace('/viewweek=[0-9]+&?/i','',$newparam);
$newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam); // Restore correct parameter $newparam=preg_replace('/showbirthday_=/i','showbirthday=',$newparam); // Restore correct parameter
$newparam.='&viewweek=1'; $newparam.='&viewweek=1';
echo '<table width="100%" class="nocellnopadd cal_month">'; echo '<table width="100%" class="noborder nocellnopadd cal_month">';
echo ' <tr class="liste_titre">'; echo ' <tr class="liste_titre">';
$i=0; $i=0;
while ($i < 7) while ($i < 7)
@ -1083,7 +1083,7 @@ else // View by day
$timestamp=dol_mktime(12,0,0,$month,$day,$year); $timestamp=dol_mktime(12,0,0,$month,$day,$year);
$arraytimestamp=dol_getdate($timestamp); $arraytimestamp=dol_getdate($timestamp);
echo '<table width="100%" class="nocellnopadd cal_month">'; echo '<table width="100%" class="noborder nocellnopadd cal_month">';
echo ' <tr class="liste_titre">'; echo ' <tr class="liste_titre">';
echo ' <td align="center">'.$langs->trans("Day".$arraytimestamp['wday'])."</td>\n"; echo ' <td align="center">'.$langs->trans("Day".$arraytimestamp['wday'])."</td>\n";
echo " </tr>\n"; echo " </tr>\n";

2
htdocs/product/stats/card.php
View File

@ -223,7 +223,7 @@ if (! empty($id) || ! empty($ref))
// Show graph // Show graph
print '<table class="border" width="100%">'; print '<table class="noborder" width="100%">';
// Label // Label
print '<tr class="liste_titre"><td colspan="2">'; print '<tr class="liste_titre"><td colspan="2">';
print $graphfiles[$key]['label']; print $graphfiles[$key]['label'];

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

@ -106,19 +106,20 @@ $colorbacklinepair2=(250+round($isred/3)).','.(250+round($isgreen/3)).','.(250+r
$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line pair $colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)); // line pair
$colorbackbody='255,255,255'; $colorbackbody='255,255,255';
$colortext='40,40,40'; $colortext='40,40,40';
$fontsize='13'; $fontsize='12';
$fontsizesmaller='11'; $fontsizesmaller='11';
$usegradient=1; $usegradient=1;
// Eldy colors
// Case of option always editable
if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='140,150,180'; // topmenu (140,160,185)
//if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180'; // title of arrays TO MATCH ELDY (140,160,185)
if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; // title of arrays TO MATCH BOOTSTRAP
//if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=''; // color for links
// Fields not yet editable by default
if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
{ {
// Case of option always editable
if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1='140,150,180'; // topmenu (140,160,185)
//if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180'; // title of arrays TO MATCH ELDY (140,160,185)
if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; // title of arrays TO MATCH BOOTSTRAP
if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=''; // color for links
// Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on // Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on
$conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236'; $conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236';
$conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu $conf->global->THEME_ELDY_VERMENU_BACK1='255,255,255'; // vmenu
@ -138,6 +139,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_FONT_SIZE1='12'; $conf->global->THEME_ELDY_FONT_SIZE1='12';
$conf->global->THEME_ELDY_FONT_SIZE2='11'; $conf->global->THEME_ELDY_FONT_SIZE2='11';
} }
//var_dump($conf->global->THEME_ELDY_BACKBODY);
// Cas of option availables only if THEME_ELDY_ENABLE_PERSONALIZED is on // Cas 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); $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);
@ -1957,17 +1959,21 @@ table.noborder, table.formdoc, div.noborder {
border-spacing: 0px; border-spacing: 0px;
border-top-width: 1px; border-top-width: 1px;
border-top-color: #CCC; border-top-color: #BBB;
border-top-style: solid; border-top-style: solid;
border-right-width: 1px; border-right-width: 1px;
border-right-color: #CCC; border-right-color: #BBB;
border-right-style: solid; border-right-style: solid;
border-left-width: 1px; border-left-width: 1px;
border-left-color: #CCC; border-left-color: #BBB;
border-left-style: solid; border-left-style: solid;
border-bottom-width: 1px;
border-bottom-color: #BBB;
border-bottom-style: solid;
margin: 0px 0px 2px 0px; margin: 0px 0px 2px 0px;
-moz-box-shadow: 2px 2px 4px #CCC; -moz-box-shadow: 2px 2px 4px #CCC;

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

@ -111,15 +111,15 @@ $fontsize='13';
$fontsizesmaller='11'; $fontsizesmaller='11';
$usegradient=1; $usegradient=1;
// Eldy colors // Case of option always editable
if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474F')); // topmenu (140,160,185)
if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180'; // title of arrays TO MATCH ELDY (140,160,185)
//if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; // title of arrays TO MATCH BOOTSTRAP
//if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=''; // color for links
// Fields not yet editable by default
if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED)) if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
{ {
// Case of option always editable
if (! isset($conf->global->THEME_ELDY_TOPMENU_BACK1)) $conf->global->THEME_ELDY_TOPMENU_BACK1=join(',',colorStringToArray('#37474F')); // topmenu (140,160,185)
if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='140,150,180'; // title of arrays TO MATCH ELDY (140,160,185)
//if (! isset($conf->global->THEME_ELDY_BACKTITLE1)) $conf->global->THEME_ELDY_BACKTITLE1='230,230,230'; // title of arrays TO MATCH BOOTSTRAP
if (! isset($conf->global->THEME_ELDY_USE_HOVER)) $conf->global->THEME_ELDY_USE_HOVER=''; // color for links
// Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on // Cas of option editable if option THEME_ELDY_ENABLE_PERSONALIZED is on
// 90A4AE, 607D8B, 455A64, 37474F // 90A4AE, 607D8B, 455A64, 37474F
$conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236'; $conf->global->THEME_ELDY_TOPMENU_BACK2='236,236,236';
@ -1848,7 +1848,7 @@ table.noborder, table.formdoc, div.noborder {
border-spacing: 0px; border-spacing: 0px;
border-width: 1px; border-width: 1px;
border-color: #CCC; border-color: #BBB;
border-style: solid; border-style: solid;
margin: 0px 0px 2px 0px; margin: 0px 0px 2px 0px;