diff --git a/html/index.css b/html/index.css index 3330dd63b..bf22f6a28 100644 --- a/html/index.css +++ b/html/index.css @@ -183,7 +183,7 @@ BODY { left:0px; top:20px; - /*! height: 15%; */ + height: 15%; } #login_frm { position:absolute; @@ -203,7 +203,7 @@ BODY { width: 20rem; } } -@media only screen and (max-width : 1100px) { +@media only screen and (min-width : 1100px) { #alternate_browser { position:absolute; bottom: 30px; @@ -215,9 +215,8 @@ BODY { z-index:-1; position:absolute; width:19%; - left:0%; - top:0%; - height: auto; + left:8%; + top:19.5%; } #login_frm { position:absolute; @@ -230,7 +229,7 @@ BODY { } #recover_link { position:absolute; - /*! top:397px; */ + top:397px; left:539px; background-color: white; width:auto; @@ -260,10 +259,10 @@ BODY { #logo_id { z-index: -1; position: absolute; - width: 148px; + width: 140px; left: 5px; top: 22px; - height: 155px; + height: 140px; } #login_frm { position:absolute; @@ -275,11 +274,11 @@ BODY { width: 24rem; } #recover_link { - position:fixed; + position:absolute; + top:55%; left:55%; background-color: white; margin-top:0px; - bottom: 10px; } #recover_box { diff --git a/include/history_operation.inc.php b/include/history_operation.inc.php index 6a64386f2..2c63377aa 100644 --- a/include/history_operation.inc.php +++ b/include/history_operation.inc.php @@ -128,7 +128,8 @@ echo dossier::hidden(); list($count, $html) = $Ledger->list_operation($sql, $offset, $ask_pay); echo $html; echo $bar; -$r = HtmlInput::get_to_hidden(array('search_opnb_jrn', +$r = HtmlInput::get_to_hidden(array('search_opnb_jrn', + 'operation_filter', 'search_opqcode', 'l', 'date_start', @@ -168,8 +169,8 @@ echo ''; * Export to csv */ $r = HtmlInput::get_to_hidden(array('l', 'date_paid_start','date_paid_end', - 'date_start', 'date_end', 'desc', 'amount_min', 'amount_max', 'qcode', - 'accounting', 'unpaid', 'gDossier', 'ledger_type', 'p_action')); + 'date_start', 'date_end', 'desc', 'amount_min', 'amount_max', 'qcode','operation_filter', + 'accounting', 'unpaid', 'gDossier', 'ledger_type', 'p_action')); if (isset($_GET['search_opr_jrn'])) { foreach ($a_search_opr_jrn as $k => $v)