From 2986417e32dbaeb255998355ca64cd973db6ced2 Mon Sep 17 00:00:00 2001 From: sparkyx Date: Tue, 23 Mar 2021 19:32:36 +0100 Subject: [PATCH] Task #1913 : cosmetic CSS --- html/js/managetable.js | 7 ++----- include/ajax/ajax_history_anc_account.php | 4 +++- include/class/anc_operation.class.php | 4 ++-- include/class/periode.class.php | 4 ++-- include/company.inc.php | 6 ++++-- include/lib/html_input.class.php | 2 +- include/lib/icon_action.class.php | 4 ++-- include/lib/manage_table_sql.class.php | 4 ++-- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/html/js/managetable.js b/html/js/managetable.js index 4e13291ab..215067125 100644 --- a/html/js/managetable.js +++ b/html/js/managetable.js @@ -356,11 +356,8 @@ var ManageTable = function (p_table_name) var x = here.parseXML(req); var obj = {id: control, "cssclass": here.cssclass, "html": loading()}; create_div(obj); - var pos = calcy(3); - if (window.innerWidth < 1200) { - here.mt_style["margin-left"]="2%"; - here.mt_style["max-width"]="80%"; - } + var pos = calcy(50); + here.mt_style["top"]=pos+"px"; $(obj.id).setStyle(here.mt_style); remove_waiting_box(); diff --git a/include/ajax/ajax_history_anc_account.php b/include/ajax/ajax_history_anc_account.php index 5e643574b..6a4927814 100644 --- a/include/ajax/ajax_history_anc_account.php +++ b/include/ajax/ajax_history_anc_account.php @@ -66,4 +66,6 @@ echo HtmlInput::title_box($poste_analytic->getp("po_name"), $div, "close", "", " echo $anc_grandlivre->display_html(0); $anc_grandlivre->pa_id=$poste_analytic->pa_id; -echo $anc_grandlivre->show_button(); \ No newline at end of file +echo $anc_grandlivre->button_export_csv(); +echo HtmlInput::button_close($div); + \ No newline at end of file diff --git a/include/class/anc_operation.class.php b/include/class/anc_operation.class.php index d28f395f8..132980739 100644 --- a/include/class/anc_operation.class.php +++ b/include/class/anc_operation.class.php @@ -328,9 +328,9 @@ class Anc_Operation $ret.=td(h($row['oa_description'])); $js="anc_remove_operation(".$gDossier.",".$oldgroup.")"; - $ret.="".HtmlInput::image_click("trash-24.gif", $js, _("Effacer")).""; + $ret.="".Icon_Action::trash(uniqid(), $js) .""; $js="anc_detail_op({$row['oa_group']},{$gDossier})"; - $ret .= "". HtmlInput::image_click("crayon-mod-b24.png", $js, _("Modifier")).""; + $ret .= "". Icon_Action::modify(uniqid(), $js).""; $ret.=""; } $ret.=''; diff --git a/include/class/periode.class.php b/include/class/periode.class.php index a8b0272b5..dd652a0ca 100644 --- a/include/class/periode.class.php +++ b/include/class/periode.class.php @@ -597,12 +597,12 @@ class Periode // Updatable $js=sprintf("%s.box_display('%d')", $p_js, $obj->p_id); echo ""; - echo HtmlInput::image_click("crayon-mod-b24.png", $js, _("Effacer")); + echo Icon_Action::modify(uniqid(), $js); echo ""; //removable $js=sprintf("%s.remove('%d')", $p_js, $obj->p_id); echo ""; - echo HtmlInput::image_click("trash-24.gif", $js, _("Effacer")); + echo Icon_Action::trash(uniqid(), $js); echo ""; } else diff --git a/include/company.inc.php b/include/company.inc.php index 85de93eee..b9749d67a 100644 --- a/include/company.inc.php +++ b/include/company.inc.php @@ -23,10 +23,11 @@ * CA .... */ if ( ! defined ('ALLOWED') ) die('Appel direct ne sont pas permis'); +require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php'; + global $g_user; $http=new HttpInput(); echo '
'; -require_once NOALYSS_INCLUDE.'/class/noalyss_parameter_folder.class.php'; if (isset($_POST['record_company'])) { $m = new Noalyss_Parameter_Folder($cn); @@ -162,7 +163,8 @@ $all->value = ''; echo "" . td(_("Pays"), 'style="text-align:right"') . $all->input("p_pays", $my->MY_PAYS) . ""; $all->value = ''; echo "" . td(_("Numéro de Tva"), 'style="text-align:right"') . $all->input("p_tva", $my->MY_TVA) . ""; -echo "" . td(_("Utilisation de la compta. analytique"), 'style="text-align:right"') . $compta->input("p_compta", $array) . ""; +echo "" . td(_("Utilisation de la compta. analytique"), 'style="text-align:right"') . + $compta->input("p_compta", $array) . ""; echo ''. td(_("Opération analytique uniquement pour les postes comptables commençant par")). ''. $anc_filter->input(). diff --git a/include/lib/html_input.class.php b/include/lib/html_input.class.php index aec96ab64..63433cdee 100755 --- a/include/lib/html_input.class.php +++ b/include/lib/html_input.class.php @@ -861,7 +861,7 @@ class HtmlInput } elseif ($p_mod=='hide') { - $r.=Icon_Action::hide("⨉", "$('$p_div').hide();$p_js"); + $r.=Icon_Action::hide("×", "$('$p_div').hide();$p_js"); } elseif ($p_mod=='custom') { diff --git a/include/lib/icon_action.class.php b/include/lib/icon_action.class.php index 0eb4c22b1..ddf9df9d6 100644 --- a/include/lib/icon_action.class.php +++ b/include/lib/icon_action.class.php @@ -156,7 +156,7 @@ class Icon_Action static function close($p_div) { $r=''; - $r.=sprintf('⨉', + $r.=sprintf('×', $p_div); return $r; } @@ -211,7 +211,7 @@ class Icon_Action static function hide($action, $javascript) { $r=''; - $r.=''.$action.''; + $r.=''.$action.''; return $r; } /** diff --git a/include/lib/manage_table_sql.class.php b/include/lib/manage_table_sql.class.php index df95bd4bc..8962ca162 100644 --- a/include/lib/manage_table_sql.class.php +++ b/include/lib/manage_table_sql.class.php @@ -866,7 +866,7 @@ function check() $js=sprintf("%s.input('%s','%s');", $this->object_name, $p_row[$this->table->primary_key], $this->object_name ); - echo HtmlInput::image_click("crayon-mod-b24.png", $js, _("Modifier")); + echo Icon_Action::modify(uniqid(), $js); echo ""; } } @@ -879,7 +879,7 @@ function check() $js=sprintf("%s.remove('%s','%s');", $this->object_name, $p_row[$this->table->primary_key], $this->object_name ); - echo HtmlInput::image_click("trash-24.gif", $js, _("Effacer")); + echo Icon_Action::trash(uniqid(), $js); echo ""; } }