[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Noalyss-commit] [noalyss] 01/01: Task #1045 - Amélioration apparence
|
From: |
Dany De Bontridder |
|
Subject: |
[Noalyss-commit] [noalyss] 01/01: Task #1045 - Amélioration apparence : Correct some esthetic bug for IE |
|
Date: |
Mon, 08 Dec 2014 22:18:04 +0000 |
sparkyx pushed a commit to branch master
in repository noalyss.
commit ace4531da938fc784b9cf96b84601b1cfb538359
Author: Dany De Bontridder <address@hidden>
Date: Mon Dec 8 23:16:33 2014 +0100
Task #1045 - Amélioration apparence :
Correct some esthetic bug for IE
---
html/popup.php | 2 +-
html/style-classic.css | 56 +++++++++++++++++++++++++++++++-
html/style-light.css | 46 ++++++++++++++++++++++++++
html/style-mandarine.css | 43 ++++++++++++++++++++++++-
include/class_html_input.php | 4 +-
include/class_icard.php | 6 ++-
include/template/ledger_detail_top.php | 2 +-
7 files changed, 151 insertions(+), 8 deletions(-)
diff --git a/html/popup.php b/html/popup.php
index b3efc0b..a5ba347 100644
--- a/html/popup.php
+++ b/html/popup.php
@@ -77,7 +77,7 @@ load_all_script();
$str=$_SERVER['QUERY_STRING']."&div=popup";
$script="
- var
obj={id:'popup',fixed:1,class:'content',style:'width:auto',html:loading(),qs:'$str',js_success:'success_box',js_error:null,callback:'".$_GET['ajax']."'};
+ var
obj={id:'popup',fixed:1,cssclass:'content',style:'width:auto',html:loading(),qs:'$str',js_success:'success_box',js_error:null,callback:'".$_GET['ajax']."'};
show_box(obj);
";
echo create_script($script);
diff --git a/html/style-classic.css b/html/style-classic.css
index 566ea02..c8f0e34 100644
--- a/html/style-classic.css
+++ b/html/style-classic.css
@@ -979,6 +979,9 @@ box-shadow: 10px 10px 5px #888;
font-size:14.4px;
font-size:0.90rem;
}
+div.inner_box {
+ width: 85%;
+ }
@media only screen and (min-width: 1281px) {
div.inner_box {
width: 85%;
@@ -1063,7 +1066,19 @@ span.remain {
font-weight: bold;
color:#000000;
}
+ div#jrn_name_div
+ {
+ float: right;
+ margin-right:150px;
+
+ }
+ #predef_form {
+ margin-left:35%;
+ width:60%;
+ position:absolute;
+ z-index:2
+ }
@media only screen and (min-width: 955px) {
div#jrn_name_div
{
@@ -1212,6 +1227,15 @@ a.nav:hover,div.content a.nav:hover,div.redcontent
a.nav:hover {
background-color:#00008B;
color:#FFFFFF;
}
+#dossier {
+ display:inline;
+ float:left;
+ width:100%;
+ top:0px;
+ text-align: center;
+ font-variant:small-caps;
+ font-weight: bolder;
+ }
@media only screen and (min-width: 955px) {
#dossier {
display:inline;
@@ -1335,6 +1359,25 @@ div#notice {
background-color:#FCFFCC;
border: 1px solid #000000;
}
+div.name {
+ position:absolute;
+ top:0px;
+ left:0px;
+ display:none;
+ }
+div#modele_op_div{
+ display: none;
+ background-color:#e4e7ed;
+ font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ padding:0px;
+ margin:0px;
+ overflow:hidden;
+ z-index:3;
+ position:absolute;
+ left: 10%;
+ border:1px solid #00008B;
+ width: 80%;
+}
@media only screen and (min-width: 955px) {
div.name {
position:absolute;
@@ -1467,7 +1510,7 @@ div.box {
padding:2px;
overflow:hidden;
border:1px solid #00008B;
- width:30%;
+ width:48%;
height:350px;
float:left;
font-size:14px;
@@ -1601,6 +1644,17 @@ div.autocomplete_fixed em {
color:#0000FF;
font-weight:bold;
}
+div.autocomplete_fixed ul {
+ list-style-type:none;
+ background-color:#FFFFFF;
+ border:1px solid blue;
+ width:300px;
+ margin:0px;
+ padding:0px;
+ }
+div.tag {
+
+}
@media only screen and (max-width: 1280px) {
div.autocomplete_fixed ul {
list-style-type:none;
diff --git a/html/style-light.css b/html/style-light.css
index 4ea3fe4..df2a049 100644
--- a/html/style-light.css
+++ b/html/style-light.css
@@ -1056,6 +1056,7 @@ div.inner_box {
box-shadow: 10px 10px 5px #888;
font-size:14.4px;
font-size:0.90rem;
+width: 85%;
}
@media only screen and (min-width: 1281px) {
@@ -1113,6 +1114,7 @@ div#search_form
-moz-box-shadow: 10px 10px 5px #888;
-webkit-box-shadow: 10px 10px 5px #888;
box-shadow: 10px 10px 5px #888;
+ width:90%;
}
@media only screen and (max-width: 995px) {
div#search_form {
@@ -1150,7 +1152,19 @@ span.remain {
font-weight: bold;
color:#000000;
}
+ div#jrn_name_div
+ {
+ float: right;
+ margin-right:150px;
+
+ }
+ #predef_form {
+ margin-left:20%;
+ width:60%;
+ position:absolute;
+ z-index:2
+ }
@media only screen and (min-width: 955px) {
div#jrn_name_div
{
@@ -1297,6 +1311,20 @@ a.nav:hover,div.content a.nav:hover,div.redcontent
a.nav:hover {
background-color:#00008B;
color:#FFFFFF;
}
+#dossier {
+ display:inline;
+ float:left;
+ width:100%;
+ top:0px;
+ text-align: center;
+ font-variant:small-caps;
+ font-weight: bolder;
+ text-transform: full-width;
+ text-transform: fullwidth;
+
+ text-shadow: 7px 7px 7px darkslategray;
+ font-size: 200%;
+}
@media only screen and (min-width: 955px) {
#dossier {
display:inline;
@@ -1435,6 +1463,24 @@ div#notice {
background-color:#FCFFCC;
border: 1px solid #000000;
}
+ div.name {
+ position:absolute;
+ top:0px;
+ left:0px;
+ }
+ div#modele_op_div{
+ display: none;
+ background-color:#e4e7ed;
+ font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
+ padding:0px;
+ margin:0px;
+ overflow:hidden;
+ z-index:3;
+ position:absolute;
+ left: 17.5%;
+ border:1px solid #00008B;
+ width: 75%;
+}
@media only screen and (min-width: 955px) {
div.name {
position:absolute;
diff --git a/html/style-mandarine.css b/html/style-mandarine.css
index aaffc21..d4fd386 100644
--- a/html/style-mandarine.css
+++ b/html/style-mandarine.css
@@ -999,6 +999,7 @@ div.inner_box {
box-shadow: 10px 10px 5px #888;
font-size:14.4px;
font-size:0.90rem;
+ width: 95%;
}
@media only screen and (min-width: 1281px) {
div.inner_box {
@@ -1091,6 +1092,18 @@ span.remain {
font-weight: bold;
color:#000000;
}
+div#jrn_name_div
+{
+ float: right;
+ margin-right:150px;
+
+
+}
+#predef_form {
+ margin-left:20%;
+ width:60%;
+ position: absolute;
+}
@media only screen and (min-width: 955px) {
div#jrn_name_div
@@ -1245,6 +1258,15 @@ a.nav:hover,div.content a.nav:hover,div.redcontent
a.nav:hover {
background-color:#6D3F2E;
color:#FFFFFF;
}
+#dossier {
+ display:inline;
+ float:left;
+ width:100%;
+ top:0px;
+ text-align: center;
+ font-variant:small-caps;
+ font-weight: bolder;
+ }
@media only screen and (min-width: 955px) {
#dossier {
display:inline;
@@ -1380,6 +1402,25 @@ div#notice {
background-color:#FCFFCC;
border: 1px solid #000000;
}
+div.name {
+ position:absolute;
+ top:0px;
+ left:0px;
+ display:none;
+}
+div#modele_op_div{
+ display: none;
+ background-color:#FFF1ED;
+ font-family: "Liberation Sans", FreeSans, sans-serif,Arial, Helvetica;
+ padding:0px;
+ margin:0px;
+ overflow:hidden;
+ z-index:3;
+ position:absolute;
+ left: 10%;
+ border:1px solid #6D3F2E;
+ width: 80%;
+}
@media only screen and (min-width: 955px) {
div.name {
position:absolute;
@@ -1511,7 +1552,7 @@ div.box {
padding:2px;
overflow:hidden;
border:1px solid #6D3F2E;
- width:30%;
+ width:60%;
height:350px;
float:left;
font-size:14px;
diff --git a/include/class_html_input.php b/include/class_html_input.php
index ee40566..1c3206e 100755
--- a/include/class_html_input.php
+++ b/include/class_html_input.php
@@ -427,7 +427,7 @@ class HtmlInput
static function anchor_close($div)
{
$r='';
- $r.='<div
style="float:right;margin-right:2px;margin-top:5px;padding:0px;">';
+ $r.='<div style="position:absolute;right:2px;margin:2px;padding:0px;">';
$r.= '<A id="close_div" class="input_text"
onclick="removeDiv(\''.$div.'\');">'._('Fermer').'</A>';
$r.='</div>';
return $r;
@@ -474,7 +474,7 @@ class HtmlInput
static function anchor_hide($action,$javascript)
{
$r='';
- $r.='<div style="float:right;margin:2px;">';
+ $r.='<div style="position:absolute;margin:2px;right:2px">';
$r.= '<span id="close_div" class="input_text"
onclick="'.$javascript.'">'.$action.'</span>';
$r.='</div>';
return $r;
diff --git a/include/class_icard.php b/include/class_icard.php
index c2ff579..6916331 100644
--- a/include/class_icard.php
+++ b/include/class_icard.php
@@ -220,7 +220,8 @@ class ICard extends HtmlInput
);
if ( $this->autocomplete == 1)
{
- $ind=sprintf('<span id="%s" class="autocomplete"
style="display:none">Un instant... <img src="image/loading.gif"
alt="Chargement..."/>'.
+ $this->indicator="ind_".$this->id;
+ $ind=sprintf('<span id="%s" class="autocomplete"
style="position:absolute;display:none">Un instant... <img
src="image/loading.gif" alt="Chargement..."/>'.
'</span>',
$this->indicator);
@@ -229,12 +230,13 @@ class ICard extends HtmlInput
$query=dossier::get().'&e='.urlencode($this->typecard);
$javascript=sprintf('try { new
Ajax.Autocompleter("%s","%s","fid_card.php?%s",'.
-
'{paramName:"FID",minChars:1,indicator:null, '.
+
'{paramName:"FID",minChars:1,indicator:%s, '.
'callback:%s, '.
'
afterUpdateElement:%s});} catch (e){alert(e.message);};',
$this->id,
$this->choice,
$query,
+
$this->indicator,
$this->callback,
$this->fct);
diff --git a/include/template/ledger_detail_top.php
b/include/template/ledger_detail_top.php
index f569746..b817f24 100644
--- a/include/template/ledger_detail_top.php
+++ b/include/template/ledger_detail_top.php
@@ -1,7 +1,7 @@
<?php
//This file is part of NOALYSS and is under GPL
//see licence.txt
-?><div
style="float:right;height:10px;display:block;margin-top:0.48%;margin-right:0.48%">
+?><div
style="position:absolute;right:2px;height:10px;display:block;margin-top:0.48%;margin-right:0.48%">
<?php
if ($div != "popup") {
$callback=$_SERVER['PHP_SELF'];