Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
c022ba6eda
@ -187,14 +187,14 @@ class MenuManager
|
||||
foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
|
||||
{
|
||||
print '<ul class="ulmenu" data-role="listview" data-inset="true">';
|
||||
print '<li data-role="list-divider">';
|
||||
print '<li data-role="list-dividerxxx" class="lilevel0">';
|
||||
if ($val['enabled'] == 1)
|
||||
{
|
||||
$relurl=dol_buildpath($val['url'],1);
|
||||
$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
|
||||
$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
|
||||
|
||||
print '<a href="#">'.$val['titre'].'</a>'."\n";
|
||||
print '<a class="alilevel0" href="#">'.$val['titre'].'</a>'."\n";
|
||||
// Search submenu fot this entry
|
||||
$tmpmainmenu=$val['mainmenu'];
|
||||
$tmpleftmenu='all';
|
||||
@ -211,7 +211,7 @@ class MenuManager
|
||||
|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/index.php') !== false))
|
||||
{
|
||||
// We add sub entry
|
||||
print str_pad('',1).'<li data-role="list-divider" class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
|
||||
print str_pad('',1).'<li data-role="list-dividerxxx" class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
|
||||
print '<a href="'.$relurl.'">';
|
||||
print str_pad('',12,' ');
|
||||
if ($langs->trans(ucfirst($val['mainmenu'])."Dashboard") == ucfirst($val['mainmenu'])."Dashboard") print $langs->trans("Access"); // No translation
|
||||
@ -227,7 +227,7 @@ class MenuManager
|
||||
$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
|
||||
//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
|
||||
if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
|
||||
if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
|
||||
if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-dividerxxx"':'').' class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
|
||||
else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">'; // ui-btn to highlight on clic
|
||||
if ($relurl2) print '<a href="'.$relurl2.'">';
|
||||
print str_pad('',($val2['level']+1)*12,' ');
|
||||
|
||||
@ -141,14 +141,14 @@ class MenuManager
|
||||
foreach($this->menu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
|
||||
{
|
||||
print '<ul class="ulmenu" data-role="listview" data-inset="true">';
|
||||
print '<li data-role="list-divider">';
|
||||
print '<li data-role="list-dividerxxx" class="lilevel0">';
|
||||
if ($val['enabled'] == 1)
|
||||
{
|
||||
$relurl=dol_buildpath($val['url'],1);
|
||||
$relurl=preg_replace('/__LOGIN__/',$user->login,$relurl);
|
||||
$relurl=preg_replace('/__USERID__/',$user->id,$relurl);
|
||||
|
||||
print '<a href="#">'.$val['titre'].'</a>'."\n";
|
||||
print '<a class="alilevel0" href="#">'.$val['titre'].'</a>'."\n";
|
||||
// Search submenu fot this entry
|
||||
$tmpmainmenu=$val['mainmenu'];
|
||||
$tmpleftmenu='all';
|
||||
@ -165,7 +165,7 @@ class MenuManager
|
||||
|| (strpos($canonrelurl,'/product/index.php') !== false || strpos($canonrelurl,'/compta/bank/index.php') !== false))
|
||||
{
|
||||
// We add sub entry
|
||||
print str_pad('',1).'<li data-role="list-divider" class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
|
||||
print str_pad('',1).'<li data-role="list-dividerxxx" class="lilevel1 ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
|
||||
print '<a href="'.$relurl.'"';
|
||||
//print ' data-ajax="false"';
|
||||
print '>';
|
||||
@ -183,7 +183,7 @@ class MenuManager
|
||||
$canonurl2=preg_replace('/\?.*$/','',$val2['url']);
|
||||
//var_dump($val2['url'].' - '.$canonurl2.' - '.$val2['level']);
|
||||
if (in_array($canonurl2,array('/admin/index.php','/admin/tools/index.php','/core/tools.php'))) $relurl2='';
|
||||
if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-divider"':'').' class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
|
||||
if ($val2['level']==0) print str_pad('',$val2['level']+1).'<li'.($val2['level']==0?' data-role="list-dividerxxx"':'').' class="lilevel'.($val2['level']+1).' ui-btn-icon-right ui-btn">'; // ui-btn to highlight on clic
|
||||
else print str_pad('',$val2['level']+1).'<li class="lilevel'.($val2['level']+1).'">'; // ui-btn to highlight on clic
|
||||
if ($relurl2)
|
||||
{
|
||||
|
||||
@ -203,7 +203,7 @@ class MenuManager
|
||||
foreach($this->topmenu->liste as $key => $val) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
|
||||
{
|
||||
print '<ul class="ulmenu" data-role="listview" data-inset="true">';
|
||||
print '<li data-role="list-divider">';
|
||||
print '<li data-role="list-dividerxxx" class="lilevel0">';
|
||||
if ($val['enabled'] == 1)
|
||||
{
|
||||
$relurl=dol_buildpath($val['url'],1);
|
||||
@ -227,7 +227,7 @@ class MenuManager
|
||||
if ($canonrelurl != $canonnexturl && ! in_array($val['mainmenu'],array('home','tools')))
|
||||
{
|
||||
// We add sub entry
|
||||
print '<li data-role="list-divider"><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";
|
||||
print '<li data-role="list-dividerxxx"><a href="'.$relurl.'">'.$langs->trans("MainArea").'-'.$val['titre'].'</a></li>'."\n";
|
||||
}
|
||||
foreach($submenu->liste as $key2 => $val2) // $val['url','titre','level','enabled'=0|1|2,'target','mainmenu','leftmenu'
|
||||
{
|
||||
@ -235,7 +235,7 @@ class MenuManager
|
||||
$relurl2=preg_replace('/__LOGIN__/',$user->login,$relurl2);
|
||||
$relurl2=preg_replace('/__USERID__/',$user->id,$relurl2);
|
||||
//var_dump($val2);
|
||||
print '<li'.($val2['level']==0?' data-role="list-divider"':'').'><a href="'.$relurl2.'">'.$val2['titre'].'</a></li>'."\n";
|
||||
print '<li'.($val2['level']==0?' data-role="list-dividerxxx"':'').'><a href="'.$relurl2.'">'.$val2['titre'].'</a></li>'."\n";
|
||||
}
|
||||
//var_dump($submenu);
|
||||
print '</ul>';
|
||||
|
||||
@ -725,13 +725,6 @@ if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea'
|
||||
$conf->css = "/theme/".$conf->theme."/style.css.php";
|
||||
}
|
||||
|
||||
// Disabled bugged themes
|
||||
if (! empty($conf->dol_use_jmobile) && in_array($conf->theme,array('bureau2crea','cameleo')))
|
||||
{
|
||||
$conf->theme='eldy';
|
||||
$conf->css = "/theme/".$conf->theme."/style.css.php";
|
||||
}
|
||||
|
||||
if (! defined('NOREQUIRETRAN'))
|
||||
{
|
||||
if (! GETPOST('lang')) // If language was not forced on URL
|
||||
|
||||
@ -144,6 +144,7 @@ if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->
|
||||
$colorbacklinepairhover='';
|
||||
}
|
||||
|
||||
|
||||
// Set text color to black or white
|
||||
$tmppart=explode(',',$colorback1);
|
||||
$tmpval=(! empty($tmppart[1]) ? $tmppart[1] : '');
|
||||
@ -152,6 +153,8 @@ $tmpval+=(! empty($tmppart[3]) ? $tmppart[3] : '');
|
||||
//print $tmpval;
|
||||
if ($tmpval < 340) $colortextmain='FFFFFF';
|
||||
else $colortextmain='101010';
|
||||
if ($tmpval <= 360) { $colortexttitle='FFF'; $colorshadowtitle='000'; }
|
||||
else { $colortexttitle='444'; $colorshadowtitle='FFF'; }
|
||||
|
||||
$usecss3=true;
|
||||
if ($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10) $usecss3=false;
|
||||
@ -2104,10 +2107,10 @@ div.jnotify-background {
|
||||
/* Datatable */
|
||||
/* ============================================================================== */
|
||||
|
||||
.sorting_asc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png',1); ?>') no-repeat center right;
|
||||
.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png',1); ?>') no-repeat center right;
|
||||
.sorting_asc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled',1); ?>') no-repeat center right;
|
||||
.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled',1); ?>') no-repeat center right;
|
||||
.sorting_asc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png',1); ?>') no-repeat center right; }
|
||||
.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png',1); ?>') no-repeat center right; }
|
||||
.sorting_asc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled',1); ?>') no-repeat center right; }
|
||||
.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled',1); ?>') no-repeat center right; }
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
@ -2224,6 +2227,47 @@ ul.ulmenu {
|
||||
border-bottom: none !important;
|
||||
}
|
||||
|
||||
/* Style for first level menu with jmobile */
|
||||
.ui-bar-b {
|
||||
background: rgb(<?php echo $colorbacktitle1; ?>);
|
||||
background-repeat: repeat-x;
|
||||
<?php if ($usecss3) { ?>
|
||||
background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
font-weight: bold;
|
||||
<?php } ?>
|
||||
color: #<?php echo $colortexttitle; ?> !important;
|
||||
}
|
||||
.alilevel0 {
|
||||
color: #<?php echo $colortexttitle; ?> !important;
|
||||
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
|
||||
}
|
||||
.alilevel1 {
|
||||
color: #<?php echo $colortexttitle; ?> !important;
|
||||
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
|
||||
}
|
||||
.lilevel1 {
|
||||
background-image: -webkit-gradient(linear,left top,left bottom,from( #eee ),to( #e1e1e1 )) !important;
|
||||
background-image: -webkit-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -moz-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -ms-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -o-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
}
|
||||
.lilevel1:hover, .lilevel2:hover, .lilevel3:hover, .lilevel4:hover {
|
||||
background-image: -webkit-gradient(linear,left top,left bottom,from( #ddd ),to( #d1d1d1 )) !important;
|
||||
background-image: -webkit-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -moz-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -ms-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -o-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
}
|
||||
|
||||
|
||||
|
||||
<?php
|
||||
if (is_object($db)) $db->close();
|
||||
?>
|
||||
|
||||
@ -84,6 +84,8 @@ if ((! empty($user->conf->THEME_ELDY_ENABLE_PERSONALIZED) && empty($user->conf->
|
||||
$colorbacklinepairhover='';
|
||||
}
|
||||
|
||||
$colorshadowtitle='000';
|
||||
|
||||
$usecss3=true;
|
||||
if ($conf->browser->name == 'ie' && round($conf->browser->version,2) < 10) $usecss3=false;
|
||||
elseif ($conf->browser->name == 'iceweasel') $usecss3=false;
|
||||
@ -2283,10 +2285,10 @@ div.ecmjqft {
|
||||
/* Datatable */
|
||||
/* ============================================================================== */
|
||||
|
||||
.sorting_asc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png',1); ?>') no-repeat center right;
|
||||
.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png',1); ?>') no-repeat center right;
|
||||
.sorting_asc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled',1); ?>') no-repeat center right;
|
||||
.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled',1); ?>') no-repeat center right;
|
||||
.sorting_asc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png',1); ?>') no-repeat center right; }
|
||||
.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png',1); ?>') no-repeat center right; }
|
||||
.sorting_asc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled',1); ?>') no-repeat center right; }
|
||||
.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled',1); ?>') no-repeat center right; }
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
@ -2397,6 +2399,47 @@ ul.ulmenu {
|
||||
border-bottom: none !important;
|
||||
}
|
||||
|
||||
/* Style for first level menu with jmobile */
|
||||
.ui-bar-b, .lilevel0 {
|
||||
background: #7699A9;
|
||||
background-image: url(<?php echo $img_liste_titre; ?>);
|
||||
background-repeat: repeat-x;
|
||||
<?php if ($usecss3) { ?>
|
||||
background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
font-weight: bold;
|
||||
<?php } ?>
|
||||
color: #FFF !important;
|
||||
}
|
||||
.alilevel0 {
|
||||
color: #FFF !important;
|
||||
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
|
||||
}
|
||||
.alilevel1 {
|
||||
color: #FFF !important;
|
||||
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
|
||||
}
|
||||
.lilevel1 {
|
||||
background-image: -webkit-gradient(linear,left top,left bottom,from( #eee ),to( #e1e1e1 )) !important;
|
||||
background-image: -webkit-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -moz-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -ms-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -o-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
}
|
||||
.lilevel1:hover, .lilevel2:hover, .lilevel3:hover, .lilevel4:hover {
|
||||
background-image: -webkit-gradient(linear,left top,left bottom,from( #ddd ),to( #d1d1d1 )) !important;
|
||||
background-image: -webkit-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -moz-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -ms-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -o-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
}
|
||||
|
||||
|
||||
<?php
|
||||
if (is_object($db)) $db->close();
|
||||
?>
|
||||
|
||||
@ -76,7 +76,7 @@ $dol_optimize_smallscreen=$conf->dol_optimize_smallscreen;
|
||||
$dol_no_mouse_hover=$conf->dol_no_mouse_hover;
|
||||
$dol_use_jmobile=$conf->dol_use_jmobile;
|
||||
|
||||
|
||||
$colorshadowtitle='000';
|
||||
?>
|
||||
|
||||
/* ============================================================================== */
|
||||
@ -2460,10 +2460,10 @@ div.ecmjqft {
|
||||
/* Datatable */
|
||||
/* ============================================================================== */
|
||||
|
||||
.sorting_asc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png',1); ?>') no-repeat center right;
|
||||
.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png',1); ?>') no-repeat center right;
|
||||
.sorting_asc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled',1); ?>') no-repeat center right;
|
||||
.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled',1); ?>') no-repeat center right;
|
||||
.sorting_asc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png',1); ?>') no-repeat center right; }
|
||||
.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png',1); ?>') no-repeat center right; }
|
||||
.sorting_asc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled',1); ?>') no-repeat center right; }
|
||||
.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled',1); ?>') no-repeat center right; }
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
@ -2562,6 +2562,38 @@ ul.ulmenu {
|
||||
-webkit-border-radius: 0;
|
||||
}
|
||||
|
||||
/* Style for first level menu with jmobile */
|
||||
.ui-bar-b, .lilevel0 {
|
||||
background: rgb(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/bg_centerBlock-title2.jpg',1); ?>);
|
||||
background-repeat: repeat-x;
|
||||
color: #<?php echo $colortexttitle; ?> !important;
|
||||
}
|
||||
.alilevel0 {
|
||||
color: #<?php echo $colortexttitle; ?> !important;
|
||||
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
|
||||
}
|
||||
.alilevel1 {
|
||||
color: #<?php echo $colortexttitle; ?> !important;
|
||||
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
|
||||
}
|
||||
.lilevel1 {
|
||||
background-image: -webkit-gradient(linear,left top,left bottom,from( #eee ),to( #e1e1e1 )) !important;
|
||||
background-image: -webkit-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -moz-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -ms-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -o-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
}
|
||||
.lilevel1:hover, .lilevel2:hover, .lilevel3:hover, .lilevel4:hover {
|
||||
background-image: -webkit-gradient(linear,left top,left bottom,from( #ddd ),to( #d1d1d1 )) !important;
|
||||
background-image: -webkit-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -moz-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -ms-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -o-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
}
|
||||
|
||||
|
||||
|
||||
<?php
|
||||
if (is_object($db)) $db->close();
|
||||
|
||||
@ -70,6 +70,7 @@ $path=''; // This value may be used in future for external module to overwr
|
||||
$theme='cameleo'; // Value of theme
|
||||
if (! empty($conf->global->MAIN_OVERWRITE_THEME_RES)) { $path='/'.$conf->global->MAIN_OVERWRITE_THEME_RES; $theme=$conf->global->MAIN_OVERWRITE_THEME_RES; }
|
||||
|
||||
$colorshadowtitle='000';
|
||||
?>
|
||||
|
||||
/* ============================================================================== */
|
||||
@ -2354,10 +2355,10 @@ div.ecmjqft {
|
||||
/* Datatable */
|
||||
/* ============================================================================== */
|
||||
|
||||
.sorting_asc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png',1); ?>') no-repeat center right;
|
||||
.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png',1); ?>') no-repeat center right;
|
||||
.sorting_asc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled',1); ?>') no-repeat center right;
|
||||
.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled',1); ?>') no-repeat center right;
|
||||
.sorting_asc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png',1); ?>') no-repeat center right; }
|
||||
.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png',1); ?>') no-repeat center right; }
|
||||
.sorting_asc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled',1); ?>') no-repeat center right; }
|
||||
.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled',1); ?>') no-repeat center right; }
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
@ -2467,6 +2468,46 @@ ul.ulmenu {
|
||||
border-bottom: none !important;
|
||||
}
|
||||
|
||||
/* Style for first level menu with jmobile */
|
||||
.ui-bar-b, .lilevel0 {
|
||||
background: rgb(<?php echo $colorbacktitle1; ?>);
|
||||
background-repeat: repeat-x;
|
||||
<?php if ($usecss3) { ?>
|
||||
background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
font-weight: bold;
|
||||
<?php } ?>
|
||||
color: #<?php echo $colortexttitle; ?> !important;
|
||||
}
|
||||
.alilevel0 {
|
||||
color: #<?php echo $colortexttitle; ?> !important;
|
||||
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
|
||||
}
|
||||
.alilevel1 {
|
||||
color: #<?php echo $colortexttitle; ?> !important;
|
||||
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
|
||||
}
|
||||
.lilevel1 {
|
||||
background-image: -webkit-gradient(linear,left top,left bottom,from( #eee ),to( #e1e1e1 )) !important;
|
||||
background-image: -webkit-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -moz-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -ms-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -o-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
}
|
||||
.lilevel1:hover, .lilevel2:hover, .lilevel3:hover, .lilevel4:hover {
|
||||
background-image: -webkit-gradient(linear,left top,left bottom,from( #ddd ),to( #d1d1d1 )) !important;
|
||||
background-image: -webkit-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -moz-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -ms-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -o-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
}
|
||||
|
||||
|
||||
<?php
|
||||
if (is_object($db)) $db->close();
|
||||
?>
|
||||
|
||||
@ -220,6 +220,7 @@ if (! empty($conf->dol_optimize_smallscreen)) $fontsize=11;
|
||||
/* Default styles */
|
||||
/* ============================================================================== */
|
||||
|
||||
|
||||
body {
|
||||
<?php if (GETPOST("optioncss") == 'print' || ! empty($conf->dol_optimize_smallscreen)) { ?>
|
||||
background-color: #FFFFFF;
|
||||
@ -1185,6 +1186,7 @@ img.toolbarbutton {
|
||||
overflow: auto; /* add scrolling to content-div */
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* RESIZER-BARS
|
||||
*/
|
||||
@ -1963,6 +1965,7 @@ tr.box_pair {
|
||||
|
||||
|
||||
|
||||
|
||||
/*
|
||||
* Ok, Warning, Error
|
||||
*/
|
||||
@ -2683,10 +2686,10 @@ div.dolEventError h1, div.dolEventError h2 {
|
||||
/* Datatable */
|
||||
/* ============================================================================== */
|
||||
|
||||
.sorting_asc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png',1); ?>') no-repeat center right;
|
||||
.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png',1); ?>') no-repeat center right;
|
||||
.sorting_asc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled',1); ?>') no-repeat center right;
|
||||
.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled',1); ?>') no-repeat center right;
|
||||
.sorting_asc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc.png',1); ?>') no-repeat center right; }
|
||||
.sorting_desc { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc.png',1); ?>') no-repeat center right; }
|
||||
.sorting_asc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_asc_disabled',1); ?>') no-repeat center right; }
|
||||
.sorting_desc_disabled { background: url('<?php echo dol_buildpath('/theme/'.$theme.'/img/sort_desc_disabled',1); ?>') no-repeat center right; }
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
@ -2809,6 +2812,51 @@ ul.ulmenu {
|
||||
border-bottom: none !important;
|
||||
}
|
||||
|
||||
/* Style for first level menu with jmobile */
|
||||
.ui-bar-b, .lilevel0 {
|
||||
border: 1px solid #456f9a;
|
||||
background: rgb(<?php echo $colorbacktitle1; ?>);
|
||||
background-repeat: repeat-x;
|
||||
<?php if ($usecss3) { ?>
|
||||
background-image: -o-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: -moz-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: -webkit-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: -ms-linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
background-image: linear-gradient(bottom, rgba(0,0,0,0.3) 0%, rgba(250,250,250,0.3) 100%);
|
||||
font-weight: bold;
|
||||
<?php } ?>
|
||||
color: #<?php echo $colortexttitle; ?> !important;
|
||||
}
|
||||
.alilevel0 {
|
||||
color: #<?php echo $colortexttitle; ?> !important;
|
||||
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
|
||||
}
|
||||
.ui-btn-up-c .vsmenudisabled {
|
||||
color: #<?php echo $colorshadowtitle; ?> !important;
|
||||
text-shadow: none !important;
|
||||
}
|
||||
.alilevel1 {
|
||||
color: #<?php echo $colortexttitle; ?> !important;
|
||||
text-shadow: 1px 0px 1px #<?php echo $colorshadowtitle; ?>;
|
||||
}
|
||||
.lilevel1 {
|
||||
background-image: -webkit-gradient(linear,left top,left bottom,from( #eee ),to( #e1e1e1 )) !important;
|
||||
background-image: -webkit-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -moz-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -ms-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: -o-linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
background-image: linear-gradient( #eee,#e1e1e1 ) !important;
|
||||
}
|
||||
.lilevel1:hover, .lilevel2:hover, .lilevel3:hover, .lilevel4:hover {
|
||||
background-image: -webkit-gradient(linear,left top,left bottom,from( #ddd ),to( #d1d1d1 )) !important;
|
||||
background-image: -webkit-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -moz-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -ms-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: -o-linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
background-image: linear-gradient( #ddd,#d1d1d1 ) !important;
|
||||
}
|
||||
|
||||
|
||||
<?php
|
||||
if (is_object($db)) $db->close();
|
||||
?>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user