[Noalyss-commit] [noalyss] 02/10: Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss

[Dany De Bontridder]

sparkyx pushed a commit to branch master
in repository noalyss.

commit 5f55ba73c1b3c0aa28052cfa026eb78d9b4fd444
Merge: a02ebda 6f169ca
Author: sparkyx <danydb@noalyss.eu>
AuthorDate: Mon Mar 22 18:05:06 2021 +0100

    Merge branch 'master' of gitlab.noalyss.eu:noalyss/noalyss

 html/js/managetable.js                 |  5 +++--
 include/lib/manage_table_sql.class.php | 18 ++++++++++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --cc html/js/managetable.js
index ab5914c,78c2ddd..4e13291
--- a/html/js/managetable.js
+++ b/html/js/managetable.js
@@@ -86,9 -74,9 +86,10 @@@ var ManageTable = function (p_table_nam
  {
      this.callback = "ajax.php"; //!< File to call
      this.control = "dtr"; //<! Prefix Id of dialog box, table, row
 -    this.mt_style={position: "fixed", top:  '15%', width: "auto", 
"max-width":"60%","margin-left": "20%"};
 +    this.mt_style={};
      this.sort_column=0;
 +    this.afterSaveFct=undefined; // function to call after "save"
+     this.cssclass="inner_box";
      this.param = {"table": p_table_name, "ctl_id": this.control}; //<! 
default value to pass
      this.set_style=function(p_json) {
          this.mt_style=p_json;
@@@ -350,21 -306,21 +351,21 @@@
              parameters: this.param,
              method: "get",
              onSuccess: function (req) {
 -                remove_waiting_box();
 +                
                  try {
                      var x = here.parseXML(req);
-                     var obj = {id: control, "cssclass": "inner_box", "html": 
loading()};
+                     var obj = {id: control, "cssclass": here.cssclass, 
"html": loading()};
 -                    add_div(obj);
 -                    var pos = calcy(50);
 +                    create_div(obj);
 +                    var pos = calcy(3);
                      if (window.innerWidth < 1200) {
                          here.mt_style["margin-left"]="2%";
                          here.mt_style["max-width"]="80%";
                      }
-                     here.mt_style['top']=pos+"px";
 -                    here.mt_style["position"]="absolute";
+                     here.mt_style["top"]=pos+"px";
 -                    console.log(here.mt_style);
                      $(obj.id).setStyle(here.mt_style);
 +                    remove_waiting_box();
                      $(obj.id).update(x['html']);
 +                    
Effect.SlideDown(obj.id,{duration:0.3,scaleX:true,scaleY:true,scaleContent:false});
                  } catch (e) {
                      smoke.alert(content[48] + e.message);
                  }