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

Qual: Dead code war

Browse Source
This commit is contained in:
Laurent Destailleur 2014-03-17 11:13:53 +01:00
parent 7974ae96ad
commit 81b8961dab
7 changed files with 1 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/core/class/menubase.class.php
View File

@ -547,7 +547,6 @@ class Menubase
$tmpcond=$menu['enabled']; $tmpcond=$menu['enabled'];
if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond); // Force part of condition to true if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond); // Force part of condition to true
$enabled = verifCond($tmpcond); $enabled = verifCond($tmpcond);
//if ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_MENU_USE_JQUERY_ACCORDION) && empty($conf->dol_use_jmobile) && preg_match('/^\$leftmenu/',$menu['enabled'])) $enabled=1;
} }
// Define $title // Define $title

17
htdocs/main.inc.php
View File

@ -1177,6 +1177,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
{ {
// We must force not using ajax because cache of jquery does not load js of other pages. // We must force not using ajax because cache of jquery does not load js of other pages.
// This also increase seriously speed onto mobile device where complex js code is very slow and memory very low. // This also increase seriously speed onto mobile device where complex js code is very slow and memory very low.
// Note: dol_use_jmobile=1 use jmobile without ajax, dol_use_jmobile=2 use jmobile with ajax
if (empty($conf->dol_use_jmobile) || ($conf->dol_use_jmobile != 2 && $conf->dol_use_jmobile != 3)) if (empty($conf->dol_use_jmobile) || ($conf->dol_use_jmobile != 2 && $conf->dol_use_jmobile != 3))
{ {
print '<script type="text/javascript"> print '<script type="text/javascript">
@ -1352,22 +1353,6 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
</script>'; </script>';
} }
/* This make menu bugged
if ($conf->use_javascript_ajax && ! empty($conf->global->MAIN_MENU_USE_JQUERY_ACCORDION) && empty($conf->dol_use_jmobile))
{
print "\n".'<script type="text/javascript">
jQuery(document).ready(function () {
jQuery( ".vmenu" ).accordion({
autoHeight: false,
event: "mouseover",
//collapsible: true,
//active: 2,
header: "> .blockvmenupair > .menu_titre"
});
});
</script>';
} */
// Wrapper to show tooltips // Wrapper to show tooltips
print "\n".'<script type="text/javascript"> print "\n".'<script type="text/javascript">
jQuery(document).ready(function () { jQuery(document).ready(function () {

4
htdocs/theme/amarok/style.css.php
View File

@ -198,9 +198,7 @@ body {
background-color: <?php print $colorbackbody; ?>; background-color: <?php print $colorbackbody; ?>;
<?php } ?> <?php } ?>
color:#232323; color:#232323;
<?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size:<?php print $fontsize ?>px; font-size:<?php print $fontsize ?>px;
<?php } ?>
font-family:<?php print $fontlist ?>; font-family:<?php print $fontlist ?>;
<?php print 'direction:'.$langs->trans("DIRECTION").";\n"; ?> <?php print 'direction:'.$langs->trans("DIRECTION").";\n"; ?>
} }
@ -2127,9 +2125,7 @@ li.ui-li-divider .ui-link {
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
white-space: normal; white-space: normal;
<?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
<?php } ?>
} }
.ui-btn-icon-right .ui-btn-inner { .ui-btn-icon-right .ui-btn-inner {
padding-right: 34px; padding-right: 34px;

4
htdocs/theme/auguria/style.css.php
View File

@ -109,9 +109,7 @@ body {
background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat; background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat;
<?php } ?> <?php } ?>
color: #101010; color: #101010;
<?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
<?php } ?>
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
@ -2304,9 +2302,7 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i
min-width: .4em; min-width: .4em;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
<?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
<?php } ?>
/* white-space: normal; */ /* Warning, enable this break the truncate feature */ /* white-space: normal; */ /* Warning, enable this break the truncate feature */
} }
.ui-select .ui-btn-icon-right .ui-btn-inner { .ui-select .ui-btn-icon-right .ui-btn-inner {

2
htdocs/theme/bureau2crea/style.css.php
View File

@ -86,9 +86,7 @@ $colorshadowtitle='000';
body { body {
/* background-color: #FFFFFF; */ /* background-color: #FFFFFF; */
color: #101010; color: #101010;
<?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
<?php } ?>
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;

4
htdocs/theme/cameleo/style.css.php
View File

@ -84,9 +84,7 @@ body {
/*background: #ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); ?>) 0 0 no-repeat;*/ /*background: #ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); ?>) 0 0 no-repeat;*/
<?php } ?> <?php } ?>
color: #101010; color: #101010;
<?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
<?php } ?>
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;
@ -2377,9 +2375,7 @@ a.ui-link, a.ui-link:hover, .ui-btn:hover, span.ui-btn-text:hover, span.ui-btn-i
min-width: .4em; min-width: .4em;
padding-left: 10px; padding-left: 10px;
padding-right: 10px; padding-right: 10px;
<?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
<?php } ?>
/* white-space: normal; */ /* Warning, enable this break the truncate feature */ /* white-space: normal; */ /* Warning, enable this break the truncate feature */
} }
.ui-select .ui-btn-icon-right .ui-btn-inner { .ui-select .ui-btn-icon-right .ui-btn-inner {

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

@ -228,9 +228,7 @@ body {
background: <?php print $colorbackbody; ?>; background: <?php print $colorbackbody; ?>;
<?php } ?> <?php } ?>
color: #101010; color: #101010;
<?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px; font-size: <?php print $fontsize ?>px;
<?php } ?>
font-family: <?php print $fontlist ?>; font-family: <?php print $fontlist ?>;
margin-top: 0; margin-top: 0;
margin-bottom: 0; margin-bottom: 0;