start refactoring filename without CXM prefix

David RENÉ
1 parent 61e55d80
Showing 46 changed files with 103 additions and 101 deletions Show diff stats
mail/send_mail.anubis
net_services/CXM_generic_client.anubis → net_services/generic_client.anubis
net_services/CXM_generic_protocol.anubis → net_services/generic_protocol.anubis
net_services/get_file.anubis
net_services/CXM_net_services.anubis → net_services/net_services.anubis
net_services/send_file.anubis
net_services_protocols/ftp_client.anubis
net_services_protocols/logger_server.anubis
unit_test/xml_rpc.unit_test.anubis
web/common.anubis
web/controllers_web_site.anubis
web/CXM_dojo.anubis → web/dojo.anubis
web/CXM_dropzone.anubis → web/dropzone.anubis
web/fonts/awesome.anubis
web/CXM_generic_form.anubis → web/generic_form.anubis
web/CXM_generic_login.anubis → web/generic_login.anubis
web/CXM_generic_table.anubis → web/generic_table.anubis
web/CXM_http_get.anubis → web/http_get.anubis
web/CXM_https_get.anubis → web/https_get.anubis
web/jQuery/jq_animate.anubis
@@ -25,7 +25,7 @@ read authentication.anubis
 read smtp_client.anubis
  
 public define String send_mail_log    = "SendMail".
-public define String cxm_lib          = "cxm_lib".
+public define String xlib             = "Xlib".
  
 public define LogMask send_mail_mask  = logMask("send_mail").
  
@@ -214,8 +214,8 @@ public define Result(SmtpClientResult, One)
             param, 
             prepare_mail_callback,
             (Int _) |-> unique,
-            (LogLevel level, String txt) |-> if level is logTrace then log(cxm_lib, logDebug, send_mail_log, txt)
-                                                                  else log(cxm_lib, level, send_mail_log, txt),
+            (LogLevel level, String txt) |-> if level is logTrace then log(xlib, logDebug, send_mail_log, txt)
+                                                                  else log(xlib, level, send_mail_log, txt),
             handle_result                                                                  
             ).
  
@@ -243,17 +243,17 @@ public define Result(SmtpClientResult, One)
   {
     failure           then
       //println("IP address NOT found for Mail server ["+server+"]");
-      logWarning(cxm_lib, send_mail_log,"IP address NOT found for Mail server ["+server+"]");
+      logWarning(xlib, send_mail_log,"IP address NOT found for Mail server ["+server+"]");
       error(error),
  
     success(ip_addr)  then
       with ip_txt = ip_addr_to_string(ip_addr),
-      logTrace(cxm_lib, send_mail_log, send_mail_mask, "send_mail: Trying to connect to "+ip_txt);
+      logTrace(xlib, send_mail_log, send_mail_mask, "send_mail: Trying to connect to "+ip_txt);
       //println("send_mail: Trying to connect to "+ip_txt);
       if (Result(NetworkConnectError,RWStream))connect(ip_addr, port) is 
       {
         error(e)               then 
-          logWarning(cxm_lib, send_mail_log, "send_mail: Can't connect to "+ip_txt); 
+          logWarning(xlib, send_mail_log, "send_mail: Can't connect to "+ip_txt); 
           error(error),
  
         ok(server_conn)        then 
 /*
  * 
- * User: David RENE
+ * User: フランスのトトロ aka (David RENÉ) 
  * Date: 25/04/2007
  * Time: 16:20
- * (c) Calexium
+ * © David RENÉ
  *
  */
  
@@ -13,7 +13,7 @@ read system/string.anubis
 read system/files.anubis
 read tools/basis.anubis
 read system/message_queue.anubis
-read xlib/CXM_message_constants.anubis
+read xlib/message_constants.anubis
 read xlib/types/generated/file_ref.anubis
  
  
@@ -7,9 +7,9 @@
  */
  
  
-read xlib/CXM_message_constants.anubis
-read xlib/net_services/CXM_generic_protocol.anubis
-read xlib/net_services/CXM_generic_client.anubis  //for get_ip
+read xlib/message_constants.anubis
+read xlib/net_services/generic_protocol.anubis
+read xlib/net_services/generic_client.anubis  //for get_ip
 read xlib/types/generated/file_ref.anubis
 read system/message_queue.anubis
 read system/message_transceiver.anubis
 /*
  * 
- * User: David RENE
+ * User: フランスのトトロ aka (David RENÉ) 
  * Date: 25/04/2007
  * Time: 11:01
- * (c) Calexium
+ * © David RENÉ
  *
  */
+ 
 read tools/basis.anubis
 read system/convert.anubis
 read system/string.anubis
@@ -14,8 +15,8 @@ read system/data_io.anubis
 read system/message_queue.anubis
 read system/message_transceiver.anubis
 read system/logger.anubis
-read CXM_generic_protocol.anubis
-read xlib/CXM_message_constants.anubis
+read xlib/net_services/generic_protocol.anubis
+read xlib/message_constants.anubis
  
 public type NetService:
   net_service(
@@ -19,9 +19,9 @@ read system/files.anubis
 read system/logger.anubis
  
 read xlib/net_services_protocols/logger_client.anubis
-read xlib/CXM_message_constants.anubis
-read xlib/net_services/CXM_net_services.anubis
-read xlib/net_services/CXM_generic_protocol.anubis
+read xlib/message_constants.anubis
+read xlib/net_services/net_services.anubis
+read xlib/net_services/generic_protocol.anubis
 read xlib/types/generated/file_ref.anubis
  read app_constants.anubis
  
@@ -8,9 +8,9 @@
  *
  */
  
-read xlib/CXM_message_constants.anubis
-read xlib/net_services/CXM_generic_protocol.anubis
-read xlib/net_services/CXM_generic_client.anubis  //for get_ip
+read xlib/message_constants.anubis
+read xlib/net_services/generic_protocol.anubis
+read xlib/net_services/generic_client.anubis  //for get_ip
 read system/message_queue.anubis
 read system/message_transceiver.anubis
 read system/muscle.anubis
@@ -13,7 +13,7 @@ read system/string.anubis
 read system/files.anubis
 read system/parameter/inifile.anubis
 read system/message_queue.anubis
-read xlib/CXM_message_constants.anubis
+read xlib/message_constants.anubis
  
  read logger_client.anubis
  
-
-read web/CXM_xml_rpc.anubis
-read asterisk/ami.anubis
-
+
+read web/xml_rpc.anubis
+read asterisk/ami.anubis
+
@@ -231,7 +231,7 @@ public type Redirections:
    Now, you  may also  want to  recover web argument  values which  have been  encoded (by
    'web_arg_encode'). In this case, use the following:
  
-read CXM_web_arg_encode.anubis   
+read web_arg_encode.anubis   
  
  
 public define Maybe($T)   
@@ -151,7 +151,7 @@ define HTTP_Answer
  
       // content of page
       sequence([
-        preformated([size(14)],"Anubis Web Server - Standard Lib v1.14.0.0 - Anubis language v1.14"),
+        preformated([size(14)],"Anubis Web Server - Standard Lib v1.19.0.0 - Anubis language v1.19"),
         preformated([size(12)],"Error "+to_String(http_status)),
         preformated([size(12)],"Internal message :"+message),
         br,
@@ -12,9 +12,9 @@ read locale/L3LanguageInfo.anubis
 read system/string.anubis
 read system/logger.anubis
  
-read xlib/web/CXM_common.anubis
-read xlib/web/CXM_making_a_web_site.anubis
-read xlib/web/CXM_multihost_http_server.anubis
+read xlib/web/common.anubis
+read xlib/web/making_a_web_site.anubis
+read xlib/web/multihost_http_server.anubis
  read xlib/net_services_protocols/logger_service.anubis
  
 public type Dojo_Grid_Data :
@@ -8,8 +8,8 @@
  
 read tools/basis.anubis
 read system/string.anubis
-read xlib/web/CXM_making_a_web_site.anubis
-read xlib/web/CXM_jquery.anubis
+read xlib/web/making_a_web_site.anubis
+read xlib/web/jquery.anubis
  
 public define HTML_Partial_Content
   dropzone
@@ -24,8 +24,8 @@ public define HTML_Partial_Content
   ) =
   with dropzone_form_id = to_lower(dropzone_form_name+"_"+generate_random_string(15)),
   partial_content(
-    [ js(js_file("js/dropzone.js")), 
-      css(css_file("css/dropzone.css")),
+    [ js(js_file("xlib/js/dropzone.js")), 
+      css(css_file("xlib/css/dropzone.css")),
       js_script("
         Dropzone.options." + to_Camel_case(dropzone_form_id) + " = {
         dictDefaultMessage : \"" + dict_default_message + "\",
@@ -6,7 +6,7 @@
  * © David RENÉ
  */
  
-read xlib/web/CXM_making_a_web_site.anubis
+read xlib/web/making_a_web_site.anubis
  
 public type Font_Awesome:
   awesome(
@@ -32,8 +32,8 @@
  
 read tools/basis.anubis
 read system/string.anubis
-transmit xlib/web/CXM_common.anubis   
-transmit xlib/web/CXM_http_get_common.anubis   
+transmit xlib/web/common.anubis   
+transmit xlib/web/http_get_common.anubis   
  
  
 public type HTTP_GET_Result:
@@ -65,12 +65,12 @@
 read tools/basis.anubis
 read tools/printable_tree.anubis
  
-read xlib/web/CXM_making_a_web_site.anubis
-read xlib/web/CXM_json.anubis
-read xlib/web/CXM_jquery.anubis
-read xlib/web/jQuery/CXM_jquery_easing.anubis
+read xlib/web/making_a_web_site.anubis
+read xlib/web/json.anubis
+read xlib/web/jquery.anubis
+read xlib/web/jQuery/jq_easing.anubis
  
-read xlib/web/CXM_style_tools.anubis
+read xlib/web/style_tools.anubis
 read xlib/web/js_tools.anubis
  
 public type AnimatableCSSStyle:
@@ -130,9 +130,9 @@ public type JQueryAnimation:
 type JQueryFormattedAnimation:
     formatted_animation(String id, String trigger_name, JsonValue stop_anim_id, JsonValue css_props, JsonValue options).
  
-define HTML_Head_Tag required_js = js(js_file("js/cxm/cxm_jquery_animate.js")).
+define HTML_Head_Tag required_js = js(js_file("xlib/js/jquery_animate.js")).
  
-define String js_anim_function_name = "CalexiumToolBox.CXM_Animate.animate".
+define String js_anim_function_name = "Xlib.CXM_Animate.animate".
  
 define List(JsonMember)
     animatables_to_json_members
@@ -286,7 +286,7 @@ public define HTML_Partial_Content
   )=
   with uid = generate_random_string(10),
  
-       js_confirm_dialog_data_obj  = "CalexiumToolBox.data.confirm_dialog['" + uid + "']",
+       js_confirm_dialog_data_obj  = "Xlib.data.confirm_dialog['" + uid + "']",
        js_data = js_confirm_dialog_data_obj + " = {
                     title:  " + to_JS_String(dlg_title)  + ",
                     text:   " + to_JS_String(dlg_text)   + ",
@@ -294,7 +294,7 @@ public define HTML_Partial_Content
                     cancel: " + to_JS_String(dlg_cancel) + "};",
  
        button_name  = uid,
-       _actioner    = jQuery_actioner(same, jqscript("CalexiumToolBox.make_confirm_dialog(this, " /*+ to_js_string("/?a=" + url + format_extra_operands(extra_ops))+*/ + to_JS_String(jquery_button_get_onclick_action(actioner)) + ");")),
+       _actioner    = jQuery_actioner(same, jqscript("Xlib.make_confirm_dialog(this, " /*+ to_js_string("/?a=" + url + format_extra_operands(extra_ops))+*/ + to_JS_String(jquery_button_get_onclick_action(actioner)) + ");")),
  
   partial_content([
       js(js_file("js/cxm/cxm.js")),
@@ -322,7 +322,7 @@ public define HTML_Partial_Content
   since button is jquery_img_button(img_url, button_label, button_name, actioner, orientation),
   with uid = generate_random_string(10),
  
-       js_confirm_dialog_data_obj  = "CalexiumToolBox.data.confirm_dialog['" + uid + "']",
+       js_confirm_dialog_data_obj  = "Xlib.data.confirm_dialog['" + uid + "']",
        js_data = js_confirm_dialog_data_obj + " = {
                     title:  " + to_JS_String(dlg_title)  + ",
                     text:   " + to_JS_String(dlg_text)   + ",
@@ -330,7 +330,7 @@ public define HTML_Partial_Content
                     cancel: " + to_JS_String(dlg_cancel) + "};",
  
        _button_name  = uid,
-       _actioner     = jQuery_actioner(same, jqscript("CalexiumToolBox.make_confirm_dialog(this, " + to_JS_String(jquery_button_get_onclick_action(actioner)) +");")),
+       _actioner     = jQuery_actioner(same, jqscript("Xlib.make_confirm_dialog(this, " + to_JS_String(jquery_button_get_onclick_action(actioner)) +");")),
  
   partial_content([
       js(js_file("js/cxm/cxm.js")), 
@@ -130,7 +130,7 @@ public define String
     WEB_Action_Name       action,
     List((String,String)) extra_ops
   )=
-  "CalexiumToolBox.jq_dialog_load('"+id(dialog_id)+"',"+format_web_action_name_to_js(action, extra_ops)+");"
+  "Xlib.jq_dialog_load('"+id(dialog_id)+"',"+format_web_action_name_to_js(action, extra_ops)+");"
 .
  
  
@@ -150,7 +150,7 @@ define String
     JQuery_dialog_id dialog_id,
     String           params
   )= 
-  with js_function = "CalexiumToolBox.jquery_dialog_click('"+id(dialog_id)+"', "+(if length(params)=0 then "''" else params) +");",
+  with js_function = "Xlib.jquery_dialog_click('"+id(dialog_id)+"', "+(if length(params)=0 then "''" else params) +");",
   if mb_html is
   {
     failure        then  js_function,
@@ -6,7 +6,7 @@
  * © David RENÉ
  */
  
-read xlib/web/CXM_making_a_web_site.anubis
+read xlib/web/making_a_web_site.anubis
  
 public define List(HTML_Head_Tag)
   jq_flot_init
@@ -6,10 +6,10 @@
  * © Calexium
  */
  
-transmit xlib/web/CXM_making_a_web_site.anubis
-transmit xlib/web/CXM_jquery.anubis
-transmit xlib/web/jQuery/CXM_jquery_button.anubis
-transmit xlib/web/jQuery/CXM_jquery_icons.anubis
+transmit xlib/web/making_a_web_site.anubis
+transmit xlib/web/jquery.anubis
+transmit xlib/web/jQuery/jq_button.anubis
+transmit xlib/web/jQuery/jq_icons.anubis
 transmit xlib/web/js_tools.anubis
 transmit tools/basis.anubis
 transmit system/string.anubis
@@ -90,8 +90,8 @@ public define HTML_Partial_Content
                         $(this).attr('value', ui.newTab.index());
                       });
  
-                    if (typeof CalexiumToolBox !== 'undefined' && typeof CalexiumToolBox.jq_tab_activate !== 'undefined') {
-                      CalexiumToolBox.jq_tab_activate(event, ui);
+                    if (typeof Xlib !== 'undefined' && typeof Xlib.jq_tab_activate !== 'undefined') {
+                      Xlib.jq_tab_activate(event, ui);
                     }
                   },
                 create: function( event, ui ) {
@@ -92,7 +92,7 @@ public define String
                 }+
                 "$('#"+form+"').submit();\n",
               jqformload(form_id, target_id, web_action, extra_args)       then 
-                "CalexiumToolBox.jq_form_submit_and_load('"+form_id+"', '"+format_web_action_name(web_action, extra_args)+"', '"+target_id+"');\n"
+                "Xlib.jq_form_submit_and_load('"+form_id+"', '"+format_web_action_name(web_action, extra_args)+"', '"+target_id+"');\n"
               jqlink(control_action, extra_ops)  then 
                 if control_action is
                 {
@@ -121,7 +121,7 @@ public define String
                 }+
                 "$('#"+form+"').submit();\n",       
               jqformload(form_id, target_id, web_action, extra_args)       then 
-                "CalexiumToolBox.jq_form_submit_and_load('"+form_id+"', '"+format_web_action_name(web_action, extra_args)+"', '"+target_id+"');\n"
+                "Xlib.jq_form_submit_and_load('"+form_id+"', '"+format_web_action_name(web_action, extra_args)+"', '"+target_id+"');\n"
               jqlink(control_action, extra_ops)  then 
                 if control_action is
                 {
@@ -150,7 +150,7 @@ public define String
                 }+
                 "$('#"+form+"').submit();\n",
               jqformload(form_id, target_id, web_action, extra_args)       then 
-                "CalexiumToolBox.jq_form_submit_and_load('"+form_id+"', '"+format_web_action_name(web_action, extra_args)+"', '"+target_id+"');\n"
+                "Xlib.jq_form_submit_and_load('"+form_id+"', '"+format_web_action_name(web_action, extra_args)+"', '"+target_id+"');\n"
               jqlink(control_action, extra_ops)  then 
                 if control_action is
                 {
@@ -6,7 +6,7 @@
     jquery-ui (if you want to use advanced animating functions, ie: easing)
  
   Usage:
-    CalexiumToolBox.CXM_Animate.animate(selector, trigger_type, css_props, options, second_options);
+    Xlib.CXM_Animate.animate(selector, trigger_type, css_props, options, second_options);
  
   Arguments:
     - selector
@@ -37,17 +37,17 @@
 */
  
 $(document).ready(function () {
-  if (window.CalexiumToolBox === undefined) {
-    CalexiumToolBox = {};
+  if (window.Xlib === undefined) {
+    Xlib = {};
   }
  
-  if (CalexiumToolBox.CXM_Animate === undefined) {
-    CalexiumToolBox.CXM_Animate = {
+  if (Xlib.CXM_Animate === undefined) {
+    Xlib.CXM_Animate = {
       animate: null // see below
     };
   }
  
-  CalexiumToolBox.CXM_Animate.animate = function (selector, anims) {
+  Xlib.CXM_Animate.animate = function (selector, anims) {
     $(selector).each(function() {
       var elem = $(this),
  
@@ -9,7 +9,7 @@
 read system/convert.anubis
 read xlib/web/types/making_a_web_site.anubis
 read xlib/web/web_action.anubis
-//read xlib/web/CXM_jquery.anubis
+//read xlib/web/jquery.anubis
 read xlib/web/js_tools.anubis
  
 public define String
@@ -21,7 +21,7 @@ public define String
     Bool                  replace
   )=
  
-  "Xlib.ajax_load_content('"+target+"', '"+format_web_action_name(web_action, extra_args)+"', "+to_String(replace)+");"
+  "Xlib.load_content('"+target+"', '"+format_web_action_name(web_action, extra_args)+"', "+to_String(replace)+");"
 .
  
 public define String
@@ -32,7 +32,7 @@ public define String
     List((String,String)) extra_args,
     Bool                  replace
   )=
-  to_JS_String("Xlib.ajax_load_content('"+target+"', "+format_web_action_name_to_js(web_action, extra_args)+", "+to_String(replace)+")")
+  to_JS_String("Xlib.load_content('"+target+"', "+format_web_action_name_to_js(web_action, extra_args)+", "+to_String(replace)+")")
 .
  
 public define String
@@ -366,7 +366,7 @@ public define List(HTTP_header)
   =
     //println("Set-Cookie state_"+website_name+"="+state_name);
     [
-      http_header("Set-Cookie", "session_"+website_name+"="+session_name)
+      http_header("Set-Cookie", "session_"+website_name+"="+session_name+"; SameSite=Strict")
     ]
   .
  
@@ -2362,7 +2362,7 @@ public define String
    'web_arg_encode'.  The  name  of  the  file  into  which the  state  is  saved  is  the
    concatenation of "s" and the name of the state.
  
-read CXM_web_arg_encode.anubis   
+read web_arg_encode.anubis   
  
    The tool below  constructs the function which is  able to save a state  on the server's
    disk.
@@ -2469,7 +2469,7 @@ public define List(HTTP_header)
    =
    [
      http_header("Date", format_http_date(now)),
-     http_header("Server", "Anubis Calexium Embedded Server v" + major_version_number + "." + minor_version_number),
+     http_header("Server", "Anubis Embedded Web Server v" + major_version_number + "." + minor_version_number),
      /*http_header("Connection", "close"), */
    ].
  
@@ -11,7 +11,7 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
  
-read xlib/web/CXM_making_a_web_site.anubis
+read xlib/web/making_a_web_site.anubis
 read tools/basis.anubis
  
 // this js code is to include in the <head> section of a webpage, it enable Piwik tracking for the given site/domains (Note: Only if the website was added to the Piwik tracker)
@@ -6,11 +6,11 @@
  * © David RENÉ
  */
  
-transmit xlib/web/CXM_jquery.anubis
-transmit xlib/web/types/XL_web_stepper.anubis
+transmit xlib/web/jquery.anubis
+transmit xlib/web/types/web_stepper.anubis
 transmit xlib/web/controllers_web_site.anubis
-read xlib/web/CXM_page_message.anubis
-read xlib/web/jQuery/CXM_jquery_button.anubis
+read xlib/web/page_message.anubis
+read xlib/web/jQuery/jq_button.anubis
 read xlib/web_controllers/language/language_management.anubis
 read xlib/web/widgets/icons_set.anubis
  
@@ -209,7 +209,8 @@ define List(CoreAttrs)
   with ok_action =  if load_content_target = "" then
                       to_JS_String("Xlib.jq_query("+format_web_action_name_to_js(web_action, extra_ops)+")")
                     else
-                      to_JS_String("Xlib.ajax_load_content('"+load_content_target+"', "+format_web_action_name_to_js(web_action, extra_ops)+", true)"),
+                      load_content_JS_String(load_content_target, web_action, extra_ops, true),
+                      //to_JS_String("Xlib.ajax_load_content('"++"', "+format_web_action_name_to_js(web_action, extra_ops)+", true)"),
  
   core_attrs + [id(uid), style("cursor: pointer"), event(onclick, "Xlib.make_confirm_dialog(this, "+ ok_action +");")].
  
@@ -299,7 +300,7 @@ public define HTML_Partial_Content
     String                  load_content_target //if empty doesn't use load content
   ) =
   with uid = generate_random_string(20),
-  //with event_click = (CoreAttrs)event(onclick, "CalexiumToolBox.jq_query("+format_web_action_name_to_js(web_action, extra_ops)+")"),
+  //with event_click = (CoreAttrs)event(onclick, "Xlib.jq_query("+format_web_action_name_to_js(web_action, extra_ops)+")"),
  
   partial_content([js(js_file("xlib/js/xlib.js")), js_inline(jquery_ready(img_button_confirm_js(uid, dlg_title, dlg_text, dlg_ok, dlg_cancel)))],
     img(img_button_confirm_image_attrs(core_attrs, uid, web_action, extra_ops, load_content_target), img_path))
@@ -8,8 +8,8 @@
  
 read tools/basis.anubis
  
-read xlib/web/CXM_common.anubis
-read xlib/web/CXM_making_a_web_site.anubis
+read xlib/web/common.anubis
+read xlib/web/making_a_web_site.anubis
  
 transmit css_helper.anubis
  
@@ -7,9 +7,9 @@
  */
  
 transmit tools/basis.anubis
-transmit xlib/web/CXM_making_a_web_site.anubis
-read xlib/web/jQuery/CXM_jquery_animate.anubis
-read xlib/web/CXM_jquery.anubis
+transmit xlib/web/making_a_web_site.anubis
+read xlib/web/jQuery/jquery_animate.anubis
+read xlib/web/jquery.anubis
  
 public type FisheyeEntry:
   fisheye_entry(
@@ -7,7 +7,7 @@
  */
  
 transmit xlib/web/fonts/awesome.anubis
-read xlib/web/CXM_making_a_web_site.anubis
+read xlib/web/making_a_web_site.anubis
  
 public type Icon:
   no_icon,
@@ -7,8 +7,8 @@
  */
  
 transmit xlib/web/widgets/left_menu.anubis
-read xlib/web/CXM_making_a_web_site.anubis
-read xlib/web/CXM_web_action.anubis
+read xlib/web/making_a_web_site.anubis
+read xlib/web/web_action.anubis
 read xlib/web/load_content.anubis
  
 define List(HTML_Off_Form)
@@ -33,7 +33,7 @@ define List(HTML_Off_Form)
               failure             then p([class(item_class+_menu_id+"_icon"+if _menu_id=selected then " selected" else ""+ " "+join(" ", _classes))],actioner(same,same, link(_T(_text)),_action,_extra)),
               success(target_id)  then 
                 p([class(item_class+"clickable "+_menu_id+"_icon"+if _menu_id=selected then " selected" else ""+ " "+join(" ", _classes)),
-//                   event(onclick, "CalexiumToolBox.ajax_load_content('"+target_id+"', "+format_web_action_name_to_js(_action, _extra)+")")],text(_T(_text))),
+//                   event(onclick, "Xlib.load_content('"+target_id+"', "+format_web_action_name_to_js(_action, _extra)+")")],text(_T(_text))),
                    event(onclick, load_content(target_id, _action, _extra))],text(_T(_text))),
             }
  
@@ -10,7 +10,7 @@
 transmit tools/basis.anubis
 read system/string.anubis
  
-read xlib/web/CXM_making_a_web_site.anubis
+read xlib/web/making_a_web_site.anubis
 transmit xlib/web/widgets/icon.anubis
  
 public type Menu_Item:
@@ -224,7 +224,7 @@ public define HTML_Partial_Content
   {
     no_menu     then partial_content(empty),
     menu(items) then
-      partial_content([css(css_file("/css/cxm/cxm_menu.css"))],
+      partial_content([css(css_file("xlib/css/menu.css"))],
       //partial_content([css(css_file("/css/admin_theme.css"))],
         sequence(make_menu(_T, items, _direction)))
   }.
@@ -6,8 +6,8 @@
  * © David RENÉ
  */
  
-read xlib/web/CXM_making_a_web_site.anubis
-read xlib/web/CXM_web_session.anubis
+read xlib/web/making_a_web_site.anubis
+read xlib/web/web_session.anubis
  
 public define HTML_Partial_Content
   control_panel_pager
@@ -17,7 +17,7 @@ public define HTML_Partial_Content
     String  next
   )
   =
-  partial_content([js(js_file("js/cxm/cxm_pager.js"))],
+  partial_content([js(js_file("xlib/js/pager.js"))],
   div(id(pager_id), [
     text(class("o_pager_current_page"),"0"),
     text("/"),
@@ -11,11 +11,11 @@ transmit tools/basis.anubis
 read tools/connections.anubis
 read system/convert.anubis
 transmit system/string.anubis
-read xlib/web/CXM_common.anubis
-read xlib/web/CXM_http_get_common.anubis
-read xlib/web/CXM_multihost_http_server.anubis
-transmit xlib/web/CXM_xml_rpc_parser.anubis
-transmit xlib/web/CXM_xml_rpc_types.anubis
+read xlib/web/common.anubis
+read xlib/web/http_get_common.anubis
+read xlib/web/multihost_http_server.anubis
+transmit xlib/web/xml_rpc_parser.anubis
+transmit xlib/web/xml_rpc_types.anubis
  
  
 define XML_RPC_parameters sysinfo_params =
@@ -6,7 +6,7 @@
  * 
  */
  
-read xlib/web/CXM_xml_rpc_types.anubis
+read xlib/web/xml_rpc_types.anubis
 read tools/streams.anubis
 read tools/basis.anubis
 read system/string.anubis