From db941d5395fc1ebba5039f709e5a6e40728b93d8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 15 Nov 2015 11:31:09 +0100
Subject: [PATCH] NEW Enhance style engine. Add option to set color of links
---
htdocs/index.php | 2 +-
htdocs/langs/en_US/admin.lang | 2 +-
htdocs/societe/list.php | 1 +
htdocs/theme/eldy/style.css.php | 11 ++++++++---
4 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/htdocs/index.php b/htdocs/index.php
index 818da8f9ecd..cda19147001 100644
--- a/htdocs/index.php
+++ b/htdocs/index.php
@@ -279,7 +279,7 @@ if (empty($user->societe_id))
$var=!$var;
if (!empty($langfile[$key])) $langs->load($langfile[$key]);
$text=$langs->trans($titres[$key]);
- print '<a href="'.$links[$key].'" class="nobold nounderline">';
+ print '<a href="'.$links[$key].'" class="thumbstat nobold nounderline">';
print '<div class="boxstats">';
print img_object("",$icons[$key]).' '.$text.'<br>';
//print '</a>';
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index 8f8428b3c75..88a67a58a28 100755
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -333,7 +333,7 @@ UMaskExplanation=This parameter allow you to define permissions set by default o
SeeWikiForAllTeam=Take a look at the wiki page for full list of all actors and their organisation
UseACacheDelay= Delay for caching export response in seconds (0 or empty for no cache)
DisableLinkToHelpCenter=Hide link "<b>Need help or support</b>" on login page
-DisableLinkToHelp=Hide link "<b>%s Online help</b>" on left menu
+DisableLinkToHelp=Hide link to online help "<b>%s</b>"
AddCRIfTooLong=There is no automatic wrapping, so if line is out of page on documents because too long, you must add yourself carriage returns in the textarea.
ModuleDisabled=Module disabled
ModuleDisabledSoNoEvent=Module disabled so event never created
diff --git a/htdocs/societe/list.php b/htdocs/societe/list.php
index 1ebdde8b717..8477eb97788 100644
--- a/htdocs/societe/list.php
+++ b/htdocs/societe/list.php
@@ -37,6 +37,7 @@ $langs->load("companies");
$langs->load("customers");
$langs->load("suppliers");
$langs->load("bills");
+$langs->load("compta");
// Security check
$socid = GETPOST('socid','int');
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index 6b6ec39a2e0..2a78039ed55 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -90,10 +90,10 @@ $colorbacklinepair1='250,250,250'; // line pair
$colorbacklinepair2='248,248,248'; // line pair
$colorbacklinepairhover='238,246,252'; // line pair
$colorbackbody='255,255,255';
-//$colortexttitlenotab='40,0,70';
$colortexttitlenotab='80,80,0';
$colortexttitle='';
$colortext='';
+$colortextlink='0,0,70';
$fontsize='12';
$fontsizesmaller='11';
$usegradient=1;
@@ -121,6 +121,7 @@ if (empty($conf->global->THEME_ELDY_ENABLE_PERSONALIZED))
$conf->global->THEME_ELDY_BACKBODY='255,255,255';
//$conf->global->THEME_ELDY_TEXTTITLE='0,0,0';
$conf->global->THEME_ELDY_TEXT='0,0,0';
+ $conf->global->THEME_ELDY_TEXTLINK='0,0,70';
$conf->global->THEME_ELDY_FONT_SIZE1='12';
$conf->global->THEME_ELDY_FONT_SIZE2='11';
@@ -142,6 +143,7 @@ $colorbacklinepairhover=empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED)?(empt
$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);
$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);
$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);
$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);
@@ -191,6 +193,7 @@ if ($colorbacklinepairhover != '') $colorbacklinepairhover=join(',',colorStringT
$colorbackbody=join(',',colorStringToArray($colorbackbody));
$colortexttitle=join(',',colorStringToArray($colortexttitle));
$colortext=join(',',colorStringToArray($colortext));
+$colortextlink=join(',',colorStringToArray($colortextlink));
print '/*'."\n";
print 'colorbackbody='.$colorbackbody."\n";
@@ -204,6 +207,7 @@ print 'colorbacklinepair2='.$colorbacklinepair2."\n";
print 'colorbacklinepairhover='.$colorbacklinepairhover."\n";
print '$colortexttitle='.$colortexttitle."\n";
print '$colortext='.$colortext."\n";
+print '$colortextlink='.$colortextlink."\n";
print 'dol_hide_topmenu='.$dol_hide_topmenu."\n";
print 'dol_hide_leftmenu='.$dol_hide_leftmenu."\n";
print 'dol_optimize_smallscreen='.$dol_optimize_smallscreen."\n";
@@ -242,9 +246,10 @@ body {
<?php print 'direction: '.$langs->trans("DIRECTION").";\n"; ?>
}
-a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: bold; color: #000; text-decoration: none; }
+th a, .thumbstat, a.tab { color: rgb(<?php print $colortexttitle; ?>) !important; }
-a:hover { text-decoration: underline; color: #000000;}
+a:link, a:visited, a:hover, a:active { font-family: <?php print $fontlist ?>; font-weight: bold; color: rgb(<?php print $colortextlink; ?>); text-decoration: none; }
+a:hover { text-decoration: underline; color: rgb(<?php print $colortextlink; ?>); }
<?php if (empty($dol_use_jmobile)) { ?>
--
GitLab