diff --git a/htdocs/core/class/conf.class.php b/htdocs/core/class/conf.class.php
index d876dad3a80..a2c19812434 100644
--- a/htdocs/core/class/conf.class.php
+++ b/htdocs/core/class/conf.class.php
@@ -357,11 +357,7 @@ class Conf
$this->product->limit_size=$this->global->PRODUIT_LIMIT_SIZE;
// conf->theme et $this->css
- if (empty($this->global->MAIN_THEME))
- {
- if (isset($_SERVER["HTTP_USER_AGENT"]) && preg_match('/(epiphany|iceweasel)/i',$_SERVER["HTTP_USER_AGENT"])) $this->global->MAIN_THEME="auguria";
- else $this->global->MAIN_THEME="eldy";
- }
+ if (empty($this->global->MAIN_THEME)) $this->global->MAIN_THEME="eldy";
$this->theme=$this->global->MAIN_THEME;
$this->css = "/theme/".$this->theme."/style.css.php";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 0cc6ca201c9..c76924f5822 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -138,6 +138,7 @@ function getBrowserInfo()
elseif (preg_match('/chrome(\/|\s)([\d\.]+)/i', $_SERVER["HTTP_USER_AGENT"], $reg)) { $name='chrome'; $version=$reg[2]; } // we can have 'chrome (Mozilla...) chrome x.y' in one string
elseif (preg_match('/chrome/i', $_SERVER["HTTP_USER_AGENT"], $reg)) { $name='chrome'; }
elseif (preg_match('/iceweasel/i',$_SERVER["HTTP_USER_AGENT"])) { $name='iceweasel'; $version=$reg[2]; }
+ elseif (preg_match('/epiphany/i',$_SERVER["HTTP_USER_AGENT"])) { $name='epiphany'; $version=$reg[2]; }
elseif ((empty($phone) || preg_match('/iphone/i',$_SERVER["HTTP_USER_AGENT"])) && preg_match('/safari(\/|\s)([\d\.]*)/i',$_SERVER["HTTP_USER_AGENT"], $reg)) { $name='safari'; $version=$reg[2]; } // Safari is often present in string for mobile but its not.
elseif (preg_match('/opera(\/|\s)([\d\.]*)/i', $_SERVER["HTTP_USER_AGENT"], $reg)) { $name='opera'; $version=$reg[2]; }
elseif (preg_match('/msie(\/|\s)([\d\.]*)/i', $_SERVER["HTTP_USER_AGENT"], $reg)) { $name='ie'; $version=$reg[2]; } // MS products at end
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 309b93c9984..56d97ff11fc 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -1222,7 +1222,7 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
$loginhtmltext.='
'.$langs->trans("CurrentTheme").': '.$conf->theme;
$s=picto_from_langcode($langs->getDefaultLang());
$loginhtmltext.='
'.$langs->trans("CurrentUserLanguage").': '.($s?$s.' ':'').$langs->getDefaultLang();
- $loginhtmltext.='
'.$langs->trans("Browser").': '.$conf->browser->name.' ('.$_SERVER['HTTP_USER_AGENT'].')';
+ $loginhtmltext.='
'.$langs->trans("Browser").': '.$conf->browser->name.($conf->browser->version?' '.$conf->browser->version:'').' ('.$_SERVER['HTTP_USER_AGENT'].')';
if (! empty($conf->browser->phone)) $loginhtmltext.='
'.$langs->trans("Phone").': '.$conf->browser->phone;
if (! empty($_SESSION["disablemodules"])) $loginhtmltext.='
'.$langs->trans("DisabledModules").':
'.join(', ',explode(',',$_SESSION["disablemodules"]));
diff --git a/htdocs/theme/eldy/img/liste_titre.png b/htdocs/theme/eldy/img/liste_titre.png
new file mode 100644
index 00000000000..7405550c080
Binary files /dev/null and b/htdocs/theme/eldy/img/liste_titre.png differ
diff --git a/htdocs/theme/eldy/img/liste_titre2.png b/htdocs/theme/eldy/img/liste_titre2.png
new file mode 100755
index 00000000000..038c8d3c5d5
Binary files /dev/null and b/htdocs/theme/eldy/img/liste_titre2.png differ
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index bcd6caec7f6..4519a2756e3 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -154,6 +154,10 @@ print 'colorbacklinepair1='.$colorbacklinepair1."\n";
print 'colorbacklinepair2='.$colorbacklinepair2."\n";
print '*/'."\n";
+$usecss3=true;
+if ($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10) $usecss3=false;
+elseif ($conf->browser->name == 'iceweasel') $usecss3=false;
+elseif ($conf->browser->name == 'epiphany') $usecss3=false;
?>
/* ============================================================================== */
@@ -356,13 +360,17 @@ div.tmenu {
font-weight: normal;
height: px;
-/* DYN */
-background-image: linear-gradient(bottom, rgb() 75%, rgb() 100%);
-background-image: -o-linear-gradient(bottom, rgb() 75%, rgb() 100%);
-background-image: -moz-linear-gradient(bottom, rgb() 75%, rgb() 100%);
-background-image: -webkit-linear-gradient(bottom, rgb() 40%, rgb() 60%, rgb() 100%);
-background-image: -ms-linear-gradient(bottom, rgb() 75%, rgb() 100%);
-
+
+ background-image: -o-linear-gradient(bottom, rgb() 75%, rgb() 100%);
+ background-image: -moz-linear-gradient(bottom, rgb() 75%, rgb() 100%);
+ background-image: -webkit-linear-gradient(bottom, rgb() 40%, rgb() 60%, rgb() 100%);
+ background-image: -ms-linear-gradient(bottom, rgb() 75%, rgb() 100%);
+ background-image: linear-gradient(bottom, rgb() 75%, rgb() 100%);
+
+ background-image: url();
+ background-position:top;
+ background-repeat:repeat-x;
+
color: #000000;
text-decoration: none;
@@ -704,13 +712,17 @@ div.blockvmenupair, div.blockvmenuimpair
padding-bottom: 3px;
margin: 1px 0px 8px 2px;
-/* DYN */
-background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-
+
+ background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%);
+
+ background-image: url();
+ background-position:top;
+ background-repeat:repeat-x;
+
border-left: 1px solid #CCCCCC;
border-right: 1px solid #BBBBBB;
border-bottom: 1px solid #BBBBBB;
@@ -736,12 +748,13 @@ div.blockvmenusearch
margin: 6px 0px 8px 2px;
background: #E3E6E8;
-/* DYN */
-background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+
+ background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%);
+
border-left: 1px solid #CCCCCC;
border-right: 1px solid #BBBBBB;
@@ -769,12 +782,13 @@ div.blockvmenubookmarks
margin: 6px 0px 8px 2px;
background: #E3E6E8;
-/* DYN */
-background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+
+ background-image: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background-image: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background-image: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background-image: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background-image: linear-gradient(bottom, rgb() 85%, rgb() 100%);
+
border-left: 1px solid #CCCCCC;
border-right: 1px solid #BBBBBB;
@@ -851,12 +865,16 @@ td.photo {
/* ============================================================================== */
.toolbar {
- background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%) !important;
+
background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important;
background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important;
background-image: -webkit-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important;
background-image: -ms-linear-gradient(bottom, rgb() 15%, rgb() 100%) !important;
-
+ background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%) !important;
+
+ background-image: url(theme.'/img/tmenu2.jpg' ?>) !important;
+ background-repeat: repeat-x !important;
+
border: 1px solid #CCC !important;
-moz-border-radius: 5px 5px 5px 5px !important;
@@ -1100,13 +1118,15 @@ div.tabBar {
border-left: 1px solid #D0D0D0;
border-top: 1px solid #D8D8D8;
- /* DYN */
- background-image: linear-gradient(bottom, rgb() 25%, rgb() 100%);
+
background-image: -o-linear-gradient(bottom, rgb() 25%, rgb() 100%);
background-image: -moz-linear-gradient(bottom, rgb() 25%, rgb() 100%);
background-image: -webkit-linear-gradient(bottom, rgb() 25%, rgb() 100%);
background-image: -ms-linear-gradient(bottom, rgb() 25%, rgb() 100%);
-
+ background-image: linear-gradient(bottom, rgb() 25%, rgb() 100%);
+
+ background: #dee7ec url() repeat-x;
+
-moz-box-shadow: 4px 4px 4px #CCC;
-webkit-box-shadow: 4px 4px 4px #CCC;
box-shadow: 4px 4px 4px #CCC;
@@ -1144,17 +1164,24 @@ a.tab:link, a.tab:visited, a.tab:hover, a.tab#active {
border-: 1px solid #D8D8D8;
border-top: 1px solid #D8D8D8;
- /* DYN */
- background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%);
+
background-image: -o-linear-gradient(bottom, rgb() 35%, rgb() 100%);
background-image: -moz-linear-gradient(bottom, rgb() 35%, rgb() 100%);
background-image: -webkit-linear-gradient(bottom, rgb() 35%, rgb() 100%);
background-image: -ms-linear-gradient(bottom, rgb() 35%, rgb() 100%);
+ background-image: linear-gradient(bottom, rgb() 35%, rgb() 100%);
+
+ background: #dee7ec;
+
}
a.tab#active {
+
border-bottom: 1px solid rgb() !important;
background-color: rgb() !important;
+
+ background: #ffffff;
+
background-image: none !important;
}
a.tab:link, a.tab:visited, a.tab:hover, a.tab#active
@@ -1412,13 +1439,16 @@ div.liste_titre, tr.liste_titre, tr.liste_titre_sel
height: 20px !important;
background-repeat: repeat-x;
- /* DYN */
- background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%);
+
background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%);
background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%);
background-image: -webkit-linear-gradient(bottom, rgb() 15%, rgb() 100%);
background-image: -ms-linear-gradient(bottom, rgb() 15%, rgb() 100%);
-
+ background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%);
+
+ background: #7699A9;
+ background-image: url();
+
color: #;
font-family: ;
font-weight: normal;
@@ -1461,13 +1491,15 @@ tr.liste_total td {
}
.impair {
- /* DYN */
+
background: linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-
+
+ background: #eaeaea;
+
font-family: ;
border: 0px;
margin-bottom: 1px;
@@ -1481,13 +1513,15 @@ tr.liste_total td {
*/
.pair {
- /* DYN */
+
background: linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-
+
+ background: #ffffff;
+
font-family: ;
border: 0px;
margin-bottom: 1px;
@@ -1519,68 +1553,68 @@ div.tabBar .noborder {
*/
.boxtable {
--moz-box-shadow: 4px 4px 4px #CCC;
--webkit-box-shadow: 4px 4px 4px #CCC;
-box-shadow: 4px 4px 4px #CCC;
-margin-bottom: 8px !important;
+ -moz-box-shadow: 4px 4px 4px #CCC;
+ -webkit-box-shadow: 4px 4px 4px #CCC;
+ box-shadow: 4px 4px 4px #CCC;
+ margin-bottom: 8px !important;
}
.box {
-padding-right: 0px;
-padding-left: 0px;
-padding-bottom: 4px;
+ padding-right: 0px;
+ padding-left: 0px;
+ padding-bottom: 4px;
}
tr.box_titre {
-height: 20px;
-background: #7699A9;
+ height: 20px;
+ background: #7699A9;
-/* DYN */
-background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%);
-background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%);
-background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%);
-background-image: -webkit-linear-gradient(bottom, rgb() 15%, rgb() 100%);
-background-image: -ms-linear-gradient(bottom, rgb() 15%, rgb() 100%);
-
-background-repeat: repeat-x;
-color: #;
-font-family: , sans-serif;
-font-weight: normal;
-border-bottom: 1px solid #FDFFFF;
-white-space: nowrap;
+
+ background-image: -o-linear-gradient(bottom, rgb() 15%, rgb() 100%);
+ background-image: -moz-linear-gradient(bottom, rgb() 15%, rgb() 100%);
+ background-image: -webkit-linear-gradient(bottom, rgb() 15%, rgb() 100%);
+ background-image: -ms-linear-gradient(bottom, rgb() 15%, rgb() 100%);
+ background-image: linear-gradient(bottom, rgb() 15%, rgb() 100%);
+
+ background-image: url();
+
+ background-repeat: repeat-x;
+ color: #;
+ font-family: , sans-serif;
+ font-weight: normal;
+ border-bottom: 1px solid #FDFFFF;
+ white-space: nowrap;
}
tr.box_impair {
-/* background: #e6ebed; */
-/* background: #f6f6f6; */
-
-/* DYN */
-background: linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-
-font-family: ;
+
+ background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background: linear-gradient(bottom, rgb() 85%, rgb() 100%);
+
+ background: #eaeaea;
+
+ font-family: ;
}
tr.box_pair {
-/* background: #d0d4d7; */
-/* background: #ffffff; */
-
-/* DYN */
-background: linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
-
-font-family: ;
+
+ background: -o-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background: -moz-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background: -webkit-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background: -ms-linear-gradient(bottom, rgb() 85%, rgb() 100%);
+ background: linear-gradient(bottom, rgb() 85%, rgb() 100%);
+
+ background: #ffffff;
+
+ font-family: ;
}
tr.fiche {
-font-family: ;
+ font-family: ;
}