From 81b8961dab725fb2171e3bbdc62e135c54487ce5 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 17 Mar 2014 11:13:53 +0100
Subject: [PATCH] Qual: Dead code war
---
htdocs/core/class/menubase.class.php | 1 -
htdocs/main.inc.php | 17 +----------------
htdocs/theme/amarok/style.css.php | 4 ----
htdocs/theme/auguria/style.css.php | 4 ----
htdocs/theme/bureau2crea/style.css.php | 2 --
htdocs/theme/cameleo/style.css.php | 4 ----
htdocs/theme/eldy/style.css.php | 2 --
7 files changed, 1 insertion(+), 33 deletions(-)
diff --git a/htdocs/core/class/menubase.class.php b/htdocs/core/class/menubase.class.php
index 961cfd5733c..c884344dd1f 100644
--- a/htdocs/core/class/menubase.class.php
+++ b/htdocs/core/class/menubase.class.php
@@ -547,7 +547,6 @@ class Menubase
$tmpcond=$menu['enabled'];
if ($leftmenu == 'all') $tmpcond=preg_replace('/\$leftmenu\s*==\s*["\'a-zA-Z_]+/','1==1',$tmpcond); // Force part of condition to true
$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
diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index 7140c04a80c..68f341e612b 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -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.
// 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))
{
print '<script type="text/javascript">
@@ -1352,22 +1353,6 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
</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
print "\n".'<script type="text/javascript">
jQuery(document).ready(function () {
diff --git a/htdocs/theme/amarok/style.css.php b/htdocs/theme/amarok/style.css.php
index 003faa6d34e..5654ff08507 100644
--- a/htdocs/theme/amarok/style.css.php
+++ b/htdocs/theme/amarok/style.css.php
@@ -198,9 +198,7 @@ body {
background-color: <?php print $colorbackbody; ?>;
<?php } ?>
color:#232323;
- <?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size:<?php print $fontsize ?>px;
- <?php } ?>
font-family:<?php print $fontlist ?>;
<?php print 'direction:'.$langs->trans("DIRECTION").";\n"; ?>
}
@@ -2127,9 +2125,7 @@ li.ui-li-divider .ui-link {
padding-left: 10px;
padding-right: 10px;
white-space: normal;
- <?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px;
- <?php } ?>
}
.ui-btn-icon-right .ui-btn-inner {
padding-right: 34px;
diff --git a/htdocs/theme/auguria/style.css.php b/htdocs/theme/auguria/style.css.php
index 814cb61e958..d088034c18a 100644
--- a/htdocs/theme/auguria/style.css.php
+++ b/htdocs/theme/auguria/style.css.php
@@ -109,9 +109,7 @@ body {
background: #ffffff url(<?php echo $img_head; ?>) 0 0 no-repeat;
<?php } ?>
color: #101010;
- <?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px;
- <?php } ?>
font-family: <?php print $fontlist ?>;
margin-top: 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;
padding-left: 10px;
padding-right: 10px;
- <?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px;
- <?php } ?>
/* white-space: normal; */ /* Warning, enable this break the truncate feature */
}
.ui-select .ui-btn-icon-right .ui-btn-inner {
diff --git a/htdocs/theme/bureau2crea/style.css.php b/htdocs/theme/bureau2crea/style.css.php
index 15e7e61f516..973fe5cb889 100644
--- a/htdocs/theme/bureau2crea/style.css.php
+++ b/htdocs/theme/bureau2crea/style.css.php
@@ -86,9 +86,7 @@ $colorshadowtitle='000';
body {
/* background-color: #FFFFFF; */
color: #101010;
- <?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px;
- <?php } ?>
font-family: <?php print $fontlist ?>;
margin-top: 0;
margin-bottom: 0;
diff --git a/htdocs/theme/cameleo/style.css.php b/htdocs/theme/cameleo/style.css.php
index b338a367745..fe8fd71cdb9 100644
--- a/htdocs/theme/cameleo/style.css.php
+++ b/htdocs/theme/cameleo/style.css.php
@@ -84,9 +84,7 @@ body {
/*background: #ffffff url(<?php echo dol_buildpath($path.'/theme/'.$theme.'/img/headbg2.jpg',1); ?>) 0 0 no-repeat;*/
<?php } ?>
color: #101010;
- <?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px;
- <?php } ?>
font-family: <?php print $fontlist ?>;
margin-top: 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;
padding-left: 10px;
padding-right: 10px;
- <?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px;
- <?php } ?>
/* white-space: normal; */ /* Warning, enable this break the truncate feature */
}
.ui-select .ui-btn-icon-right .ui-btn-inner {
diff --git a/htdocs/theme/eldy/style.css.php b/htdocs/theme/eldy/style.css.php
index dbf46122a37..f91b548c2ba 100644
--- a/htdocs/theme/eldy/style.css.php
+++ b/htdocs/theme/eldy/style.css.php
@@ -228,9 +228,7 @@ body {
background: <?php print $colorbackbody; ?>;
<?php } ?>
color: #101010;
- <?php if (empty($dol_use_jmobile) || 1==1) { ?>
font-size: <?php print $fontsize ?>px;
- <?php } ?>
font-family: <?php print $fontlist ?>;
margin-top: 0;
margin-bottom: 0;
--
GitLab