From 1745e06ee72fea0fbb48f64952acf8b1c647ab1a Mon Sep 17 00:00:00 2001 From: Dany De Bontridder Date: Thu, 21 May 2015 00:35:00 +0200 Subject: [PATCH] =?UTF-8?q?Cosmetique=20=3D=3D=3D=3D=3D=3D=3D=3D=20remplac?= =?UTF-8?q?ement=20des=20div=20"fermer"=20et=20pop=20me=20out=20Changement?= =?UTF-8?q?=20des=20focus=20(css)=20Am=C3=A9lioration=20visuelle=20pour=20?= =?UTF-8?q?la=20s=C3=A9lection=20de=20la=20TVA=20+=20filtre?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- html/ajax_card.php | 8 ++++---- html/ajax_ledger.php | 1 - html/ajax_misc.php | 8 ++++---- html/js/scripts.js | 2 +- html/recherche.php | 4 ++-- html/style-classic.css | 27 +++++++++++--------------- include/ajax_mod_periode.php | 6 +++--- include/class_acc_ledger.php | 3 +-- include/class_html_input.php | 6 +++--- include/template/ledger_detail_top.php | 6 +++--- 10 files changed, 32 insertions(+), 39 deletions(-) diff --git a/html/ajax_card.php b/html/ajax_card.php index 0c03f8633..dc42dc490 100644 --- a/html/ajax_card.php +++ b/html/ajax_card.php @@ -177,7 +177,7 @@ case 'dc': { $html.=HtmlInput::submit('save',_('Sauver')); } - $html.=HtmlInput::button('close_'.$ctl,'Fermer',"onclick=\"removeDiv('$ctl')\""); + $html.=HtmlInput::button('close_'.$ctl,'⨉',"onclick=\"removeDiv('$ctl')\""); if ( ! isset ($nohistory))$html.=HtmlInput::history_card_button($f->id,_('Historique')); if ($can_modify==1) { @@ -188,7 +188,7 @@ case 'dc': else { $html.='

'._('Aucune fiche demandée').'

'; - $html.=HtmlInput::button('close_'.$ctl,_('Fermer'),"onclick=\"removeDiv('$ctl')\""); + $html.=HtmlInput::button('close_'.$ctl,_('⨉'),"onclick=\"removeDiv('$ctl')\""); } break; /* ------------------------------------------------------------ */ @@ -347,7 +347,7 @@ case 'sc': { $html.=alert(_('Action interdite'),true); } - $html.=HtmlInput::button('fermer',_('Fermer')," onclick=\"removeDiv('$ctl')\";"); + $html.=HtmlInput::button('fermer',_('⨉')," onclick=\"removeDiv('$ctl')\";"); break; /*---------------------------------------------------------------------- * Search a card @@ -560,7 +560,7 @@ case 'upc': $html.=ob_get_contents(); ob_end_clean(); $html.=$f->Display(true); - $html.=HtmlInput::button('close_'.$ctl,'Fermer',"onclick=\"removeDiv('$ctl')\""); + $html.=HtmlInput::button('close_'.$ctl,'⨉',"onclick=\"removeDiv('$ctl')\""); } } } // switch diff --git a/html/ajax_ledger.php b/html/ajax_ledger.php index 8468a5f6e..e44d94f28 100644 --- a/html/ajax_ledger.php +++ b/html/ajax_ledger.php @@ -245,7 +245,6 @@ case 'file': echo "
"; } - echo "

Document

"; if ( $access=='W') { echo '
'; diff --git a/html/ajax_misc.php b/html/ajax_misc.php index b6eb0ea29..bde0db148 100644 --- a/html/ajax_misc.php +++ b/html/ajax_misc.php @@ -211,8 +211,8 @@ EOF; $r = HtmlInput::anchor_close('tva_select'); $r.=h2(_('Choisissez la TVA '),'class="title"'); $r.='
'; - $r.= ''; - $r.=th(''); + $r.=_('Filter')." ".HtmlInput::filter_table("tva_select_table",'0,1,2,3' , 1); + $r.= '
'; $r.=th(_('code')); $r.=th(_('Taux')); $r.=th(_('Symbole')); @@ -245,8 +245,7 @@ EOF; } $set = ''; $class=($i%2 == 0)?' class="odd" ':' class="even" '; - $r.=''; - $r.=td($set); + $r.=''; $r.=td($row['tva_id']); $r.=td($row['tva_rate']); $r.=td($row['tva_label']); @@ -255,6 +254,7 @@ EOF; } $r.='
'; $r.='
'; + $html = escape_xml($r); header('Content-type: text/xml; charset=UTF-8'); diff --git a/html/js/scripts.js b/html/js/scripts.js index 80c6ae565..ecb9cbc33 100644 --- a/html/js/scripts.js +++ b/html/js/scripts.js @@ -510,7 +510,7 @@ function popup_select_tva(obj) var popup = {'id': 'tva_select', 'cssclass': 'inner_box', 'style': str_style, 'html': code_html, 'drag': true}; add_div(popup); - + $('lk_tva_select_table').focus(); } catch (e) { diff --git a/html/recherche.php b/html/recherche.php index 3941adc9e..3590dda43 100644 --- a/html/recherche.php +++ b/html/recherche.php @@ -64,7 +64,7 @@ echo ''; echo $search_box; echo HtmlInput::submit("viewsearch",_("Recherche")); ?> - + '; @@ -108,7 +108,7 @@ if ( isset ($_GET['viewsearch'])) echo HtmlInput::submit('viewsearch','Export vers CSV'); echo HtmlInput::hidden('p_action','ALL'); ?> - + '; diff --git a/html/style-classic.css b/html/style-classic.css index 8cb965a70..52bfcc8f3 100644 --- a/html/style-classic.css +++ b/html/style-classic.css @@ -19,7 +19,7 @@ BODY { margin:0px; color:#0000FF; font-size:0.9em; - font-size:0.75rem; + font-size:0.95rem; } .notice { color:#FF0000; @@ -576,15 +576,11 @@ div.content input.text { -div.redcontent input:focus { +div.redcontent input:focus , *.input_text:focus, div.content input:focus, div.redcontent textarea:focus +{ background-color:#F93; } -div.content input:focus { - background-color: #F93; -} -div.redcontent textarea:focus { - background-color: #F93; -} + .document { color: #202267; border-collapse:collapse; @@ -1038,6 +1034,8 @@ div.inner_box { @media only screen and (min-width: 1281px) { div.inner_box { width: 85%; + border-radius: 9px; + padding: 5px; } } div.op_detail_title { @@ -1218,16 +1216,15 @@ a.line:hover,div_content a.line } #close_div { - background-color:#FFFFFF; - color:#0000FF; + color:white; text-decoration:none; - border:1px solid #0000FF; margin-left: 2px; margin-right:2px; margin-top:0px; - font-size:12px; - font-size:0.75rem; + font-size:14px; + font-size:1rem; cursor: pointer; + border:0px; } #close_div:hover { @@ -1329,7 +1326,7 @@ h2.title { background-color:#606c88; color:#FFFFFF; text-align:center; - padding:0.24%; + padding:0.14%; border:1px solid #00008B; background: #606c88 !important; /* Old browsers */ background: -moz-linear-gradient(top, #606c88 0%, #3f4c6b 100%); /* FF3.6+ */ @@ -1338,8 +1335,6 @@ h2.title { 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 */ - - } h3.title { color: #0000FF; diff --git a/include/ajax_mod_periode.php b/include/ajax_mod_periode.php index a069d837c..58a6e2c6d 100644 --- a/include/ajax_mod_periode.php +++ b/include/ajax_mod_periode.php @@ -57,7 +57,7 @@ switch ($op) $html.=tr(td(_(' Exercice : ')) . td($p_exercice->input())); $html.=''; $html.=HtmlInput::submit('sauver', _('sauver')); - $html.=HtmlInput::button('close', _('Fermer'), 'onclick="removeDiv(\'mod_periode\')"'); + $html.=HtmlInput::button('close', "⨉", 'onclick="removeDiv(\'mod_periode\')"'); $html.=HtmlInput::hidden('p_id', $_GET['p_id']); $html.='
'; break; @@ -75,7 +75,7 @@ switch ($op) $html.='

'._('Modifier les dates de début et fin de période').'

'; $html.="
"._('Erreur date invalide')."
"; - $html.=HtmlInput::button('close', _('Fermer'), 'onclick="removeDiv(\'mod_periode\')"'); + $html.=HtmlInput::button('close', '⨉', 'onclick="removeDiv(\'mod_periode\')"'); } else { @@ -86,7 +86,7 @@ switch ($op) $html = '

Modifier les dates de début et fin de période

'; $html.='

Sauvé

'; - $html.=HtmlInput::button('close', _('Fermer'), 'onclick=" refresh_window();"'); + $html.=HtmlInput::button('close', "⨉", 'onclick=" refresh_window();"'); } catch (Exception $e) { diff --git a/include/class_acc_ledger.php b/include/class_acc_ledger.php index a137dc66b..317a674d6 100644 --- a/include/class_acc_ledger.php +++ b/include/class_acc_ledger.php @@ -2940,7 +2940,7 @@ class Acc_Ledger extends jrn_def_sql if ($type == "") $type = 'ALL'; $r.='