[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 02/02: problème IE for color, suggest to use
|
From: |
Dany De Bontridder |
|
Subject: |
[Noalyss-commit] [noalyss] 02/02: problème IE for color, suggest to use chrome or FF |
|
Date: |
Thu, 11 Dec 2014 15:28:22 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit 5fce629c3fababcc39eacc3805c93cfe795cfaba
Author: Dany De Bontridder <address@hidden>
Date: Thu Dec 11 16:26:48 2014 +0100
problème IE for color, suggest to use chrome or FF
---
html/js/acc_ledger.js | 17 ++++++++---------
html/style-classic.css | 10 +++++-----
include/ac_common.php | 21 +++++++++++++++------
include/compta_ach.inc.php | 6 +++++-
include/compta_ven.inc.php | 12 ++++++++++--
5 files changed, 43 insertions(+), 23 deletions(-)
diff --git a/html/js/acc_ledger.js b/html/js/acc_ledger.js
index 5ac906c..1251eab 100644
--- a/html/js/acc_ledger.js
+++ b/html/js/acc_ledger.js
@@ -347,7 +347,7 @@ function ledger_fin_add_row()
*/
function ledger_add_row()
{
- try{
+ try{
style='class="input_text"';
var mytable=g("sold_item").tBodies[0];
var ofirstRow=mytable.rows[1];
@@ -368,19 +368,18 @@ function ledger_add_row()
new_tt.evalScripts();
}
- g("e_march"+nb.value+"_label").innerHTML=' ';
- g("e_march"+nb.value+"_label").value='';
- g("e_march"+nb.value+"_price").value='0';
- g("e_march"+nb.value).value="";
- g("e_quant"+nb.value).value="1";
- if ($("e_march"+nb.value+"_tva_amount"))
g("e_march"+nb.value+"_tva_amount").value=0;
+ $("e_march"+nb.value+"_label").innerHTML='';
+ $("e_march"+nb.value+"_label").value='';
+ $("e_march"+nb.value+"_price").value='0';
+ $("e_march"+nb.value).value="";
+ $("e_quant"+nb.value).value="1";
+ if ($("e_march"+nb.value+"_tva_amount"))
$("e_march"+nb.value+"_tva_amount").value=0;
nb.value++;
new_tt.evalScripts();
} catch(e) {alert(e.message);}
-
- }
+}
/**
* @brief compute the sum of a purchase, update the span tvac, htva and tva
* all the needed data are taken from the document (hidden field : gdossier)
diff --git a/html/style-classic.css b/html/style-classic.css
index 6246374..996e448 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -1296,19 +1296,19 @@ h1.title {
text-transform: uppercase;
}
h2.title {
- background-color:#879ED4;
+ background-color:#606c88;
color:#FFFFFF;
text-align:center;
padding:0.24%;
border:1px solid #00008B;
- background: #606c88; /* Old browsers */
+ background: #606c88 !important; /* Old browsers */
background: -moz-linear-gradient(top, #606c88 0%, #3f4c6b 100%); /* FF3.6+
*/
- background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#606c88), color-stop(100%,#3f4c6b)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /*
Chrome10+,Safari5.1+ */
+ background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#606c88), color-stop(100%,#3f4c6b)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /*
Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* Opera
11.10+ */
background: -ms-linear-gradient(top, #606c88 0%,#3f4c6b 100%); /* IE10+ */
background: linear-gradient(to bottom, #606c88 0%,#3f4c6b 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient(
startColorstr='#606c88', endColorstr='#3f4c6b',GradientType=0 ); /* IE6-9 */
+
}
h3.title {
diff --git a/include/ac_common.php b/include/ac_common.php
index 784f946..11e4d6a 100644
--- a/include/ac_common.php
+++ b/include/ac_common.php
@@ -290,11 +290,7 @@ function html_page_start($p_theme="", $p_script="",
$p_script2="")
else
$title=$_REQUEST['ac']." ".$title;
}
- if ( strpos ($_SERVER['HTTP_USER_AGENT'],'MSIE 8.0') != 0 ||
- strpos ($_SERVER['HTTP_USER_AGENT'],'MSIE 9.0') != 0 )
- $is_msie=1;
- else
- $is_msie=0;
+ $is_msie=is_msie();
if ($is_msie == 0 )
echo '<!doctype html>';
@@ -308,7 +304,7 @@ function html_page_start($p_theme="", $p_script="",
$p_script2="")
$style=trim($style);
$DIR=dirname(__FILE__);
echo "<HEAD>";
- // if ( $is_msie == 1 )echo ' <meta http-equiv="x-ua-compatible"
content="IE=edge"/>';
+ if ( $is_msie == 1 )echo ' <meta http-equiv="x-ua-compatible"
content="IE=edge"/>';
echo "
<TITLE>$title</TITLE>
<link rel=\"icon\" type=\"image/ico\" href=\"favicon.ico\" />
@@ -1167,4 +1163,17 @@ function factory_Ledger(Database &$p_cn, $ledger_id)
}
return $obj;
}
+/**
+ * Check if we use IE 8 or 9
+ * @return int 1 for IE8-9;0 otherwise
+ */
+function is_msie()
+{
+ if ( strpos ($_SERVER['HTTP_USER_AGENT'],'MSIE 8.0') != 0 ||
+ strpos ($_SERVER['HTTP_USER_AGENT'],'MSIE 9.0') != 0 )
+ $is_msie=1;
+ else
+ $is_msie=0;
+ return $is_msie;
+}
?>
diff --git a/include/compta_ach.inc.php b/include/compta_ach.inc.php
index ec307d1..9f79173 100644
--- a/include/compta_ach.inc.php
+++ b/include/compta_ach.inc.php
@@ -203,7 +203,11 @@ echo $op->form_get('do.php?'.$url);
echo '</div>';
echo '</div>';
-echo '<div style="position:absolute" class="content">';
+if ( is_msie() == 0 )
+ echo '<div style="position:absolute" class="content">';
+else
+ echo '<div class="content">';
+
echo '<p class="notice">'.$p_msg.'</p>';
echo "<FORM class=\"print\"NAME=\"form_detail\" METHOD=\"POST\" >";
/* request for a predefined operation */
diff --git a/include/compta_ven.inc.php b/include/compta_ven.inc.php
index ebed9af..5f0e10f 100644
--- a/include/compta_ven.inc.php
+++ b/include/compta_ven.inc.php
@@ -142,7 +142,11 @@ $p_msg="";
if ( ! isset($correct))
{
- echo '<div style="position:absolute" class="content">';
+ if ( is_msie() == 0 )
+ echo '<div style="position:absolute" class="content">';
+ else
+ echo '<div class="content">';
+
$Ledger=new Acc_Ledger_Sold($cn,$_POST['p_jrn']);
$internal=$Ledger->insert($_POST);
@@ -185,7 +189,11 @@ $p_msg="";
//
// pre defined operation
//
-echo '<div style="position:absolute" class="content">';
+if ( is_msie() == 0 )
+ echo '<div style="position:absolute" class="content">';
+else
+ echo '<div class="content">';
+
if ( !isset($_REQUEST ['p_jrn']) )
{
$def_ledger=$Ledger->get_first('ven',2);