From d8a9bf66352a76a79477131eeaca2c99294285af Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Sat, 4 Nov 2017 11:37:44 +0100 Subject: [PATCH] CSS Esthetic : comment span or IText can have the CSSclass label_item --- html/style-r692.css | 16 ++++++++++++---- include/class/acc_ledger_fin.class.php | 6 +++--- include/class/acc_ledger_purchase.class.php | 3 ++- include/class/acc_ledger_sold.class.php | 14 ++++++++------ include/lib/ispan.class.php | 6 ++++-- 5 files changed, 29 insertions(+), 16 deletions(-) diff --git a/html/style-r692.css b/html/style-r692.css index 32ac6f9ca..98a914e5b 100644 --- a/html/style-r692.css +++ b/html/style-r692.css @@ -1075,9 +1075,9 @@ a.line:hover,div_content a.line { color:white; text-decoration:none; - margin-left: 2px; + margin-left: 6px; margin-right:6px; - margin-top:0px; + /*! padding-top:10px; */ font-size:14px; font-size:1rem; cursor: pointer; @@ -1086,7 +1086,8 @@ a.line:hover,div_content a.line } #close_div:hover { - background-color: #F93; + background-color: white; + color: blue; } #popmeout { @@ -1409,7 +1410,7 @@ div.bxbutton float:right; height:10px; display:block; - margin-top:0%; + margin-top:3px; margin-right:0.48%; } div.inner_box tr.odd { @@ -2140,4 +2141,11 @@ span.inplace_edit_input div.content a.arrow { background-color:white; color:black; +} +/* + * Span or input-text to contain name of a card + */ +.label_item { + width: 500px; + display:block; } \ No newline at end of file diff --git a/include/class/acc_ledger_fin.class.php b/include/class/acc_ledger_fin.class.php index 6541bb962..f84d90417 100644 --- a/include/class/acc_ledger_fin.class.php +++ b/include/class/acc_ledger_fin.class.php @@ -415,9 +415,9 @@ class Acc_Ledger_Fin extends Acc_Ledger $array[$i]['cname'] = $wcard_name->input(); // Comment - $wComment = new IText("e_other$i" . "_comment", $tiers_comment); - - $wComment->size = 35; + $wComment = new IText("e_other$i" . "_comment", $tiers_comment); + $wComment->style='class="input_text label_item"'; + $wComment->setReadOnly($pview_only); $array[$i]['comment'] = $wComment->input(); // amount diff --git a/include/class/acc_ledger_purchase.class.php b/include/class/acc_ledger_purchase.class.php index 5f8c0a5db..88dc8630e 100644 --- a/include/class/acc_ledger_purchase.class.php +++ b/include/class/acc_ledger_purchase.class.php @@ -1231,10 +1231,11 @@ class Acc_Ledger_Purchase extends Acc_Ledger if ( $g_parameter->MY_UPDLAB == 'Y') { $Span=new IText("e_march".$i."_label"); - $Span->css_size="40"; + $Span->style='class="input_text label_item"'; } else { $Span=new ISpan("e_march".$i."_label"); + $Span->extra='class="label_item"'; } $Span->value=$march_label; $Span->setReadOnly(false); diff --git a/include/class/acc_ledger_sold.class.php b/include/class/acc_ledger_sold.class.php index e82c9abb2..df377c591 100644 --- a/include/class/acc_ledger_sold.class.php +++ b/include/class/acc_ledger_sold.class.php @@ -1259,12 +1259,14 @@ EOF; $tvac->value = 0; $array[$i]['tvac'] = $tvac->input(); - if ($g_parameter->MY_UPDLAB == 'Y') { - $Span = new IText("e_march" . $i . "_label"); - - $Span->size= "40"; - } else { - $Span = new ISpan("e_march" . $i . "_label"); + if ( $g_parameter->MY_UPDLAB == 'Y') + { + $Span=new IText("e_march".$i."_label"); + $Span->style='class="input_text label_item"'; + } else + { + $Span=new ISpan("e_march".$i."_label"); + $Span->extra='class="label_item"'; } $Span->value = $march_label; $Span->setReadOnly(false); diff --git a/include/lib/ispan.class.php b/include/lib/ispan.class.php index b65eb8bad..7e87950a3 100644 --- a/include/lib/ispan.class.php +++ b/include/lib/ispan.class.php @@ -28,7 +28,8 @@ class ISpan extends HtmlInput public function __construct($p_name="",$p_value="") { parent::__construct($p_name,$p_value); - $this->style="display:inline"; + $this->style=""; + $this->extra=""; } /*!\brief show the html input of the widget, the span is always readonly */ @@ -38,9 +39,10 @@ class ISpan extends HtmlInput $this->value=($p_value==null)?$this->value:$p_value; - $r=sprintf('%s ', + $r=sprintf('%s ', $this->style, $this->name, + $this->extra, $this->value );