Merge branch 'release/ANUBIS_1_14' of ssh://gitlab.calexium.com:33022/calexium/c…

…alexium_lib into release/ANUBIS_1_14

Merge branch 'release/ANUBIS_1_14' of ssh://gitlab.calexium.com:33022/calexium/c…
…alexium_lib into release/ANUBIS_1_14
totoro
2 parents f58fea8f 31541417
Showing 14 changed files with 263 additions and 109 deletions Show diff stats
CXM_message_constants.anubis
database/db_types.anubis
database/migration_sqlite3.anubis
database/vtm/view_table_renderer.anubis
mail/send_mail.anubis
web/CXM_dojo.anubis
web/CXM_form.anubis
web/CXM_jquery.anubis
web/CXM_making_a_web_site.anubis
web/CXM_multihost_http_server.anubis
web/CXM_web_arg_utils.anubis
web/jQuery/CXM_jquery_button.anubis
web/widgets/button.anubis
web/widgets/icons_set.anubis
 /*
  * 
- * User: David RENE
+ * User: David RENÉ
  * Date: 07/04/2007
  * Time: 16:06
- * (c) Calexium
+ * © Calexium
  *
  */
-public define Word32 _NO_NAME_MSG                = 0x00000000.             
+public define Word32 _NO_NAME_MSG                 = 0x00000000.             
 // ****************  MAILBOX PROTOCOL ***************
@@ -21,14 +21,14 @@ public define Word32 _CXM_FORCE_PUBLISH_MF_CONFIG = 0x33770007.    // Ask the Ma
   // ****************  PACKAGE BUILDER ***************
-public define Word32 _CXM_PKG_MSG_BASIS      = 0x33770400.   //
-public define Word32 _CXM_PKG_CONTAINER      = 0x33770401.    
-public define Word32 _CXM_PKG_HEADER_PART    = 0x33770402.    // Header Message for Script
-public define Word32 _CXM_PKG_SCRIPT_PART    = 0x33770403.    // Main Message for Script
-public define Word32 _CXM_PKG_S_ADD_FILE     = 0x33770404.   // script action to add file in the destination
-public define Word32 _CXM_PKG_S_RUN          = 0x33770405.   // script action to run a command
-public define Word32 _CXM_PKG_INDEX_PART     = 0x33770440.    // ID of package Index part
-public define Word32 _CXM_PKG_IDX_ENTRY      = 0x33770441.    // Index entry information
+public define Word32 _CXM_PKG_MSG_BASIS           = 0x33770400.   //
+public define Word32 _CXM_PKG_CONTAINER           = 0x33770401.    
+public define Word32 _CXM_PKG_HEADER_PART         = 0x33770402.    // Header Message for Script
+public define Word32 _CXM_PKG_SCRIPT_PART         = 0x33770403.    // Main Message for Script
+public define Word32 _CXM_PKG_S_ADD_FILE          = 0x33770404.   // script action to add file in the destination
+public define Word32 _CXM_PKG_S_RUN               = 0x33770405.   // script action to run a command
+public define Word32 _CXM_PKG_INDEX_PART          = 0x33770440.    // ID of package Index part
+public define Word32 _CXM_PKG_IDX_ENTRY           = 0x33770441.    // Index entry information
   // ****************  UPDATE SERVICE ***************
@@ -104,57 +104,57 @@ public define Word32 _CXM_INSTALLER_GET_MODELS       = 0x33772005.     // return
 // *************   ACCOUNTS SERVICE    *************
-public define Word32 _CXM_ACCOUNT_SERVICE_MSG_BASIS					= 0x33772100.
+public define Word32 _CXM_ACCOUNT_SERVICE_MSG_BASIS   = 0x33772100.
 // *************   MAILINGS SERVICE    *************
-public define Word32 _CXM_MAILING_SERVICE_MSG_BASIS					= 0x33772200.
-public define Word32 _CXM_MAILING_SERVICE_ID								= 0x33772200.	// same as MSG_BASIS
+public define Word32 _CXM_MAILING_SERVICE_MSG_BASIS           = 0x33772200.
+public define Word32 _CXM_MAILING_SERVICE_ID                  = 0x33772200. // same as MSG_BASIS
-public define Word32 _CXM_MAILING_CREATE_CONTACT						= 0x33772201.
-public define Word32 _CXM_MAILING_UPDATE_CONTACT						= 0x33772202.
-public define Word32 _CXM_MAILING_DELETE_CONTACT						= 0x33772203.
+public define Word32 _CXM_MAILING_CREATE_CONTACT              = 0x33772201.
+public define Word32 _CXM_MAILING_UPDATE_CONTACT              = 0x33772202.
+public define Word32 _CXM_MAILING_DELETE_CONTACT              = 0x33772203.
-public define Word32 _CXM_MAILING_CREATE_MAILING						= 0x33772211.
-public define Word32 _CXM_MAILING_UPDATE_MAILING						= 0x33772212.
-public define Word32 _CXM_MAILING_DELETE_MAILING						= 0x33772213.
+public define Word32 _CXM_MAILING_CREATE_MAILING              = 0x33772211.
+public define Word32 _CXM_MAILING_UPDATE_MAILING              = 0x33772212.
+public define Word32 _CXM_MAILING_DELETE_MAILING              = 0x33772213.
-public define Word32 _CXM_MAILING_ADD_CONTACT_TO_MAILING		= 0x33772221.
-public define Word32 _CXM_MAILING_REMOVE_CONTACT_FROM_MAILING	= 0x33772222.
+public define Word32 _CXM_MAILING_ADD_CONTACT_TO_MAILING      = 0x33772221.
+public define Word32 _CXM_MAILING_REMOVE_CONTACT_FROM_MAILING = 0x33772222.
 // *************   DIRECTORY SERVICE   *************
-public define Word32 _CXM_DIRECTORY_SERVICE_MSG_BASIS				= 0x33772300.
+public define Word32 _CXM_DIRECTORY_SERVICE_MSG_BASIS         = 0x33772300.
 // *************  BACKUP SERVICE   *************
-public define Word32 _CXM_BACKUP_SERVICE_MSG_BASIS     = 0x33772400.
-public define Word32 _CXM_BACKUP_SERVICE_ID            = 0x33772401.
-public define Word32 _CXM_BACKUP_GET_STATUS            = 0x33772402.     /// Get backup status for a given MF (can subscribe, subscribed, subscription end date...)
-public define Word32 _CXM_BACKUP_STARTING_BACKUP       = 0x33772403.     /// Notify BackupService that backup process is starting
-public define Word32 _CXM_BACKUP_FINISHING_BACKUP      = 0x33772404.     /// Notify BackupService that backup process is finishing
-public define Word32 _CXM_BACKUP_STARTING_RESTORE      = 0x33772405.     /// Notify BackupService that restore process is starting
-public define Word32 _CXM_BACKUP_FINISHING_RESTORE     = 0x33772406.     /// Notify BackupService that restore process is finishing
+public define Word32 _CXM_BACKUP_SERVICE_MSG_BASIS            = 0x33772400.
+public define Word32 _CXM_BACKUP_SERVICE_ID                   = 0x33772401.
+public define Word32 _CXM_BACKUP_GET_STATUS                   = 0x33772402.     /// Get backup status for a given MF (can subscribe, subscribed, subscription end date...)
+public define Word32 _CXM_BACKUP_STARTING_BACKUP              = 0x33772403.     /// Notify BackupService that backup process is starting
+public define Word32 _CXM_BACKUP_FINISHING_BACKUP             = 0x33772404.     /// Notify BackupService that backup process is finishing
+public define Word32 _CXM_BACKUP_STARTING_RESTORE             = 0x33772405.     /// Notify BackupService that restore process is starting
+public define Word32 _CXM_BACKUP_FINISHING_RESTORE            = 0x33772406.     /// Notify BackupService that restore process is finishing
 // *************  STATISTICS SERVICE   *************
-public define Word32 _CXM_STATS_SERVICE_MSG_BASIS						= 0x33772500.
+public define Word32 _CXM_STATS_SERVICE_MSG_BASIS             = 0x33772500.
 // *************  SUPERVISER SERVICE   *************
-public define Word32 _CXM_SUPERVISER_SERVICE_MSG_BASIS			= 0x33772600.
+public define Word32 _CXM_SUPERVISER_SERVICE_MSG_BASIS      = 0x33772600.
 public define Word32 _CXM_SUPERVISER_SERVICE_ID             = 0x33772600.
 public define Word32 _CXM_SUPERVISER_GET_STATUS             = 0x33772601.
 // *************  OTHER MESSAGES   *************
-public define Word32 _CXM_MF_MODEL                    = 1296912196. 	// 'MMOD'
-public define Word32 _CXM_MF_LICENSE                  = 1296845123. 	// 'MLIC'
+public define Word32 _CXM_MF_MODEL                          = 1296912196. 	// 'MMOD'
+public define Word32 _CXM_MF_LICENSE                        = 1296845123. 	// 'MLIC'
 // *************  TEGAMIGAWA SERVICE   *************
-public define Word32 _CXM_TEGAMIGAWA_SERVICE_MSG_BASIS			= 0x33772700.
+public define Word32 _CXM_TEGAMIGAWA_SERVICE_MSG_BASIS      = 0x33772700.
 public define Word32 _CXM_TEGAMIGAWA_SERVICE_ID             = 0x33772700.
 public define Word32 _CXM_TEGAMIGAWA_REGISTER_CLIENT        = 0x33772701.
@@ -174,10 +174,30 @@ public define Word32 _CXM_KAIWA_RECEIVE_MESSAGE             = 0x33772808.
 // *************************************************
 // *************   BASILIK SERVICES    *************
-public define Word32 _CXM_BSLK_MSG_BASIS                	= 0x33780000.
-public define Word32 _CXM_BSLK_SERVICE_ID               	= 0x33780000.
-public define Word32 _CXM_BSLKLP_SERVICE_ID               	= 0x33781000.
-public define Word32 _CXM_BSLKLP_LOG						= 0x33781001.
+public define Word32 _CXM_BSLK_MSG_BASIS                    = 0x33780000.
+public define Word32 _CXM_BSLK_SERVICE_ID                   = 0x33780000.
+public define Word32 _CXM_BSLKLP_SERVICE_ID                 = 0x33781000.
+public define Word32 _CXM_BSLKLP_LOG                        = 0x33781001.
+// *************************************************
+// *********   HAYAMIKI RESERVED SPACE    **********
+
+public define Word32 _CXM_HK_MSG_BASIS                      = 0x33790000.
+public define Word32 _HK_DATABASE                           = 0x33790400.
+public define Word32 _HK_APP                                = 0x33790401.
+public define Word32 _HK_TABLE                              = 0x33790402.
+public define Word32 _HK_MODEL                              = 0x33790403.
+public define Word32 _HK_COLUMN                             = 0x33790404.
+public define Word32 _HK_COLUMN_ATTRIBUTES                  = 0X33790405.
+public define Word32 _HK_FIELD                              = 0x33790406.
+
+public define Word32 _HK_ICON                               = 0x33790410.
+public define Word32 _HK_HELP_TEXT                          = 0x33790411.
+public define Word32 _HK_MODEL_DISPLAY                      = 0x33790412.
+public define Word32 _HK_LIST_VIEW                          = 0x33790413.
+public define Word32 _HK_EDIT_VIEW                          = 0x33790414.
+public define Word32 _HK_APP_NAME                           = 0x33790415.
+
+public define Word32 _CXM_HK_MSG_END                        = 0x3379FFFF.
@@ -33,7 +33,7 @@ public define String
   if idx is
   {
     none        then "none",
-    db_id(idx)  then abs_to_decimal(idx)
+    db_id(_idx) then abs_to_decimal(_idx)
   }.
 public define String
@@ -164,6 +164,7 @@ define Maybe(One)
         do_migration_loop(db, logger, current_version, db_ver, t, success(h), update_db_version),
   }.
+
 /* SQLite 3 version */
 public define Maybe(One)  
   do_migration
@@ -188,6 +189,74 @@ public define Maybe(One)
     else
       do_migration_loop(db, logger, current_version, db_version, all_migrations, failure, update_db_version)
   ).
+
+/* SQLite 3 version hk_settings*/
+
+define Maybe(One)  
+  do_migration_loop
+  (
+    SQLite3DataBase   db,
+    Logger            logger,
+    String            current_version,    //current version of app
+    String            db_ver,             //version found in db settings
+    List(Migration)   migrations,
+    Maybe(Migration)  need_to_create_table,          // success in case of new DB or when no migration have been done
+    (String) -> One   update_db_version,
+  ) =
+  if migrations is
+  {
+    [] then 
+      if need_to_create_table is
+      {
+        failure then
+          update_db_version(current_version);
+          success(unique),
+        success(last) then
+          if last is migration(_, _, create_tables, create_indexes) then
+          if create_tables(db, logger) is success(_) then
+            if create_indexes(db, logger) is success(_) then
+              update_db_version(current_version);
+              success(unique)
+            else
+              failure
+          else
+            failure
+      },
+    [h . t] then
+      if h is migration(version, migrate_to, _, _) then
+      if compare_db_version(db_ver, version) < 0 then
+        logInfo(logger, "Migrating Database from version " + db_ver + " to version " + version);
+        if migrate_to(db, logger) is failure then 
+          failure
+        else
+          do_migration_loop(db, logger, current_version, version, t, failure, update_db_version)
+      else 
+        do_migration_loop(db, logger, current_version, db_ver, t, success(h), update_db_version),
+  }.
+  
+public define Maybe(One)  
+  do_migration
+  (
+    SQLite3DataBase   db,
+    Logger            logger,
+    String            current_version,
+    String            get_db_version,
+    (String) -> One   update_db_version,
+    List(Migration)   all_migrations,
+  )=
+  if is_empty_database(db) then  // new empty database
+    logInfo(logger, "No database found. Creating a new one...");
+    do_migration_loop(db, logger, current_version, "", [], last(all_migrations), update_db_version)
+  else
+  (
+    with db_version = get_db_version,
+    //if app version is same as db_version, there is nothing to migrate
+    if compare_db_version(db_version, current_version) = 0 then
+      logInfo(logger, "Database version "+db_version+". No database migration found.");
+      success(unique)
+    else
+      do_migration_loop(db, logger, current_version, db_version, all_migrations, failure, update_db_version)
+  ).
 public define Maybe(One)  
   do_create_indexes
@@ -20,6 +20,7 @@ read system/convert.anubis
 //read utils.anubis
 read locale/L3LanguageInfo.anubis
 read calexium_lib/web/CXM_common.anubis
+read calexium_lib/web/CXM_web_arg_utils.anubis
 read calexium_lib/web/CXM_making_a_web_site.anubis
 read calexium_lib/web/CXM_multihost_http_server.anubis
 read calexium_lib/web/jQuery/CXM_jquery_datatable.anubis
@@ -76,9 +77,9 @@ public define List(CXM_Form_Field)
           integer(s_name, c_name, value, help) then  
             [input(_T(s_name), wan(c_name), init(abs_to_decimal(value)), small, mandatory), help_line(help, _T)],
           date(s_name, c_name, value, help) then  
-            [input([class("datepicker")], _T(s_name), htmlId(c_name), wan(c_name), init(value), narrow, non_mandatory), help_line(help, _T)],
+            [input([class("datepicker")], _T(s_name), htmlId(c_name), wan(c_name), init(value), small, non_mandatory), help_line(help, _T)],
           datetime(s_name, c_name, value, help) then  
-            [input([class("datetimepicker")], _T(s_name), htmlId(c_name), wan(c_name), init(value), narrow, mandatory), help_line(help, _T)],
+            [input([class("datetimepicker")], _T(s_name), htmlId(c_name), wan(c_name), init(value), small, mandatory), help_line(help, _T)],
         },
      edit_form_lines(db, _T, t, reverse(line)+so_far)
   }.
@@ -93,13 +94,14 @@ public define HTML_Partial_Content
     VT_edit               vt_elist
   ) =
   //if tb is tool_box(lang, _T, _, _, db, _) then
-  with table_name = vt_elist.table_name,
+  with table_name  = vt_elist.table_name,
+  with button_name = if get_String(lwa, "id","none") = "none" then _T("CREATE") else _T("UPDATE"),
   partial_content(jq_datetimepicker_init(lang),
   partial(html_wave_box(
     _T(to_upper(table_name)),
     cxm_form( table_name, htmlId(table_name), lwa,      
       edit_form_lines(db, _T, vt_elist.list, [])+
-     [ submit("create", failure, _T("CREATE"), [("table_name", table_name)]) ]
+     [ submit("create", failure, button_name, [("table_name", table_name)]) ]
      )))).
 public define Maybe(HTML_Partial_Content) 
@@ -129,14 +131,14 @@ define HTML_Row(HTML_Off_Form)  make_line
     String              table_name,
     String              action_name,            //default is "edit_table", but can be surcharged for own use
     List(VT_view_entry) entries,
-    List(HTML_Cell(HTML_Off_Form)) so_far,
-    Int                 odd_even
+    List(HTML_Cell(HTML_Off_Form)) so_far
+    //Int                 odd_even
   )=
   if entries is
   {
     []      then  
-        with line = if odd_even = 0 then "tr_even" else "tr_odd",
-        row( [core_attrs([class(line)])], reverse(so_far)),
+        //with line = if odd_even = 0 then "tr_even" else "tr_odd",
+        row( [], reverse(so_far)),
     [h . t] then
       with cell = if h is
                   {
@@ -144,7 +146,7 @@ define HTML_Row(HTML_Off_Form)  make_line
                     link(id, string) then cell((HTML_Off_Form)actioner(same,same, link(string), action_name, [("table_name", table_name),("id",id)])),
                     icon(icon_path)  then cell((HTML_Off_Form)image([], icon_path, ""))
                   },
-      make_line(table_name, action_name, t, [cell . so_far], odd_even)
+      make_line(table_name, action_name, t, [cell . so_far])
   }.
 define List(HTML_Row(HTML_Off_Form))  make_lines
@@ -153,13 +155,13 @@ define List(HTML_Row(HTML_Off_Form))  make_lines
     String            table_name,
     String            action_name,
     List(VT_view_row) entries,
-    List(HTML_Row(HTML_Off_Form))  so_far,
-    Int                 odd_even
+    List(HTML_Row(HTML_Off_Form))  so_far
+//    Int                 odd_even
   )=
   if entries is
   {
     []      then  reverse(so_far),
-    [h . t] then  make_lines(table_name, action_name, t, [make_line(table_name, action_name, h.list, [], odd_even). so_far], 1 - odd_even )
+    [h . t] then  make_lines(table_name, action_name, t, [make_line(table_name, action_name, h.list, []). so_far] )
   }.
   // View table part
@@ -192,12 +194,12 @@ public define HTML_Partial_Content  view_table_form
     VT_view               rows
   )=
   //if tb is tool_box(_, _T, _, _, db, _) then
-  partial_content(div( [class("tableau")],
+  partial_content(div( [/*class("tableau")*/],
           sequence(
            [  actioner(same,same, link([class("my_button")],_T("NEW")),"edit_table",[("table_name", rows.table_name)]),
-              table([core_attrs([id("table_view"), class("display compact nowrap")])],
+              table([core_attrs([id("table_view"), class("tableau display compact nowrap")])],
                     make_header(_T, rows.header.list, []),
-                    make_lines(rows.table_name, action_name, rows.list, [], 0))
+                    make_lines(rows.table_name, action_name, rows.list, []))
            ]
            )
       ))
@@ -210,7 +210,7 @@ public define Result(SmtpClientResult, One)
   ) =
   send_mail(conn, 
             param, 
-            (SmtpClientSession sm_session, Send_Param param) |-> ok(param),
+            (SmtpClientSession sm_session, Send_Param parameter) |-> ok(parameter),
             handle_result
             ).
@@ -824,9 +824,8 @@ public define List(HTML_Head_Tag)
     String theme_name
   )
   =
-     with theme_name =
-      if file_exists(web_dir+"/public/js/dojo/dijit/themes/"+theme_name+"/"+theme_name+".css")then theme_name else "claro",
-        [ css(css_file("js/dojo/dijit/themes/"+theme_name+"/"+theme_name+".css")) .
-          [ css(css_file("js/dojo/dijit/themes/"+theme_name+"/"+theme_name+"_rtl.css")) . dojo_defaults ]
-        ]
+  with _theme_name = if file_exists(web_dir+"/public/js/dojo/dijit/themes/"+theme_name+"/"+theme_name+".css")then theme_name else "claro",
+  [ css(css_file("js/dojo/dijit/themes/"+_theme_name+"/"+_theme_name+".css")) .
+    [ css(css_file("js/dojo/dijit/themes/"+_theme_name+"/"+_theme_name+"_rtl.css")) . dojo_defaults ]
+  ]
   .
@@ -142,6 +142,14 @@ public type CXM_Form_Field:
                    WebArgValue    web_arg_value,
                    Bool           checked,
                    Mandatory      mandatory), 
+  //radio_button_hide_show
+  radio_button_hide_show(
+                    List(InputAttrs)  options,
+                    String            label,
+                    WebArgName        web_arg_name, 
+                    WebArgValue       web_arg_value,
+                    Bool              checked,
+                    List(CXM_Form_Field)   fields),                   
    // the same one, but with the tag on the right of the radio_button
    radio_buttonr  (List(InputAttrs) options,
                    String         label, 
@@ -388,35 +396,42 @@ public define HTML_In_Form
     selector(options, label, id, wan, size, items, selected, mand) then
        if selected is
        {
-         failure       then selector(options, label + star(mand), id, wan, size, items),
-         success(default) then selector(options, label + star(mand), id, wan, size, items, init(get_String(lwa, wan.name, default.value))),
+         failure          then selector([class("in") . options], label + star(mand), id, wan, size, items),
+         success(default) then selector([class("in") . options], label + star(mand), id, wan, size, items, init(get_String(lwa, wan.name, default.value))),
        },
     selector_c(options, label, id, wan, size, items, selected, mand) then
        if selected is
        {
-         failure       then selector_c(options, label + star(mand), id, wan, size, items),
-         success(default) then selector_c(options, label + star(mand), id, wan, size, items, init(get_String(lwa, wan.name, default.value))),
+         failure          then selector_c([class("in") . options], label + star(mand), id, wan, size, items),
+         success(default) then selector_c([class("in") . options], label + star(mand), id, wan, size, items, init(get_String(lwa, wan.name, default.value))),
        },
     checkbox(options, label, id, wan, val, checked, mand) then
-      check_box(options, label + star(mand), id, wan, val, get_Bool(lwa, wan.name, checked)),
+      check_box([class("in") . options], label + star(mand), id, wan, val, get_Bool(lwa, wan.name, checked)),
     checkboxr(options, label, id, wan, val, checked, mand) then
-      check_box_r(options, label + star(mand), id, wan, val, get_Bool(lwa, wan.name, checked)),
+      check_box_r([class("in") . options], label + star(mand), id, wan, val, get_Bool(lwa, wan.name, checked)),
     checkbox_hide_show(options, label, wan, val, checked, fields)  then  
       with div_id = generate_random_string(15),
       sequence([
-        check_box([event(onclick, "checkbox_hide_show_element('"+div_id+"', this);")], label, htmlId(""), wan, val, get_Bool(lwa, wan.name, checked)),
+        check_box([class("in"), event(onclick, "checked_hide_show_element('"+div_id+"', this);")], label, htmlId(""), wan, val, get_Bool(lwa, wan.name, checked)),
         div([id(div_id), style("display:"+if checked then "block" else "none")], sequence(map((CXM_Form_Field ff2) |-> div([class("form_field")], cxm_format_form_field(ff2, lwa)),fields)))
               ]),
     radio_button(options, label, id, wan, val, checked, mand) then
-      radio_button(options, label + star(mand), id, wan, val, get_Bool(lwa, wan.name, checked)),
+      radio_button([class("in"), event(onclick, "radio_hide_show_group('"+wan.name+"', this);") . options], label + star(mand), id, wan, val, get_Bool(lwa, wan.name, checked)),
+
+    radio_button_hide_show(options, label, wan, val, checked, fields)  then  
+      with div_id = generate_random_string(15),
+      sequence([
+        radio_button([data("show_id", div_id), class("in"), event(onclick, "radio_hide_show_group('"+wan.name+"', this);")], label, htmlId(""), wan, val, get_Bool(lwa, wan.name, checked)),
+        div([id(div_id), style("display:"+if checked then "block" else "none")], sequence(map((CXM_Form_Field ff2) |-> div([class("form_field")], cxm_format_form_field(ff2, lwa)),fields)))
+              ]),
     radio_buttonr(options, label, id, wan, val, checked, mand) then
-      radio_button_r(options, label + star(mand), id, wan, val, get_Bool(lwa, wan.name, checked)),
+      radio_button_r([class("in") . options], label + star(mand), id, wan, val, get_Bool(lwa, wan.name, checked)),
     radio_button_list (options, label, id, wan, items, selected, mand, wide) then
       with new_selected = 
@@ -434,8 +449,8 @@ public define HTML_In_Form
           map( ((WebArgValue, String) item) |->
                   i <- *i + 1;
                   if item is (wav, item_label) then
-                  with id = if id is htmlId(the_id) then htmlId(the_id + "_radio_" + *i),
-                  div([class(itemclass)], radio_button_r(options, item_label, id, wan, wav, 
+                  with _id = if id is htmlId(the_id) then htmlId(the_id + "_radio_" + *i),
+                  div([class(itemclass)], radio_button_r(options, item_label, _id, wan, wav, 
                                                          if new_selected is success(v) then wav.value = v.value else false)),
                items))
         ),
@@ -446,14 +461,14 @@ public define HTML_In_Form
     ,
     upload(options, label, id, name, w, mand) then
-      file_upload(options, label + star(mand), id, name, pixels(w)),
+      file_upload([class("in") . options], label + star(mand), id, name, pixels(w)),
     raw_in_form(html)   then  html,
 //      div([class("in")], html),
     raw_in_form(label, id, input) then
       sequence([
-        if id is htmlId(id) then
-          literal("<label for=\"" + id + "\">" + label + "</label>"),
+        if id is htmlId(_id) then
+          literal("<label for=\"" + _id + "\">" + label + "</label>"),
           input]),
     div(options, e)     then  div(options, e),          
     partial(p_content)  then partial(p_content),     
@@ -39,8 +39,8 @@ define String
       if options is
       {
         [ ] then formated_options,
-        [ h . t ] then
-          if h is
+        [ c . t ] then
+          if c is
           {
              resizable  then jquery_button_get_onclick_action_window_options(
                                 t, formated_options+ comma+ "resizable=yes" ),
@@ -753,6 +753,7 @@ public type CoreAttrs:
 public define CoreAttrs   attr(String name, Bool value) = attr(name, if value then "true" else "false").
 public type InputAttrs:
+  id        (String),
   class     (String),
   style     (String),
   title     (String),
@@ -761,7 +762,9 @@ public type InputAttrs:
   accesskey  (Word8),
   tabindex  (Int),
   attr      (String, String),
-  event      (HtmlEvents, String).
+  event      (HtmlEvents, String),
+  //HTML5
+  data      (String name, String value).
 public define InputAttrs   attr(String name, Bool value) = attr(name, if value then "true" else "false").
@@ -1040,9 +1043,47 @@ public type TextAreaOption:
 public type CSS_Style:
    text_options(List(Text_Option)). 
+public type CSS_File_Media:
+  screen,     //Intended for non-paged computer screens.
+  tty,        //Intended for media using a fixed-pitch character grid, such as teletypes, terminals, or portable devices with limited display capabilities.
+  tv,         //Intended for television-type devices (low resolution, color, limited scrollability).
+  projection, //Intended for projectors.
+  handheld,   //Intended for handheld devices (small screen, monochrome, bitmapped graphics, limited bandwidth).
+  print,      //Intended for paged, opaque material and for documents viewed on screen in print preview mode.
+  braille,    //Intended for braille tactile feedback devices.
+  aural,      //Intended for speech synthesizers.
+  all.        //Suitable for all devices.
+
+public define String
+  to_String
+  (
+    CSS_File_Media css_file_media
+  )=
+  if css_file_media is
+  {
+    screen      then  "screen",
+    tty         then  "tty",
+    tv          then  "tv",
+    projection  then  "projection",
+    handheld    then  "handheld",
+    print       then  "print",
+    braille     then  "braille",
+    aural       then  "aural",
+    all         then  "all"      
+  }.
+  
+
+  .
 public type CSS_File:
-   css_file(String file_name).
+   css_file(String file_name, CSS_File_Media).
+public define CSS_File
+  css_file
+  (
+    String file_name
+  )=
+  css_file(file_name, all).
+  
 public type JS_Attribute:
   attr      (String, String).
@@ -3187,6 +3228,8 @@ define String
     [h . t] then 
       with current = if h is
       {
+        id(id_name)          then
+           " id=\"" + id_name + "\"",
         class(class_name) then 
            format_attrs(t, [class_name. classes], styles),
         style(style_string)  then
@@ -3213,6 +3256,8 @@ define String
         event(e, value) then  
            " " + event_name(e) + "=\"" + value + "\"",
+        data(name, value) then
+          " data-" + to_lower(name) + "=\"" + value + "\"",
       },
       current + format_attrs(t, classes, styles)
   }.
@@ -3927,17 +3972,18 @@ define Printable_tree
      }.
 define Printable_tree
-   add_css_files
-     (
-       List(CSS_File)   l
-     ) =
-   if l is 
-     {
-       [ ] then [ ], 
-       [h . t] then 
-       [ ["<link rel=\"stylesheet\" type=\"text/css\" href=\"" + file_name(h) + "\" />\n" ]
+  add_css_files
+  (
+    List(CSS_File)   l
+  ) =
+  if l is 
+  {
+    [ ]     then [ ], 
+    [h . t] then 
+      since h is css_file(file_name, media),
+       [ ["<link rel=\"stylesheet\" type=\"text/css\" href=\"" + file_name + "\" media=\""+to_String(media)+"\"/>\n" ]
          . add_css_files(t)]
-     }.
+  }.
 define Printable_tree
    add_js_files_attributes
@@ -4402,7 +4448,7 @@ define Printable_tree
        div_empty(options)           then
           format(cinfo, sn, ic_v, any_div_empty(options), format_element, is_https, action_count, head_tags),    
        iframe(options, css_styles, css_files, js_files, body) then 
-          if body is body(body_options,element) then
+          if body is body(body_options,elem) then
           [ "<iframe", format_attrs(options), ">\n",
             "<html style=\"margin: 0pt; padding: 0pt;\">\n",
             "<head>\n",
@@ -4411,7 +4457,7 @@ define Printable_tree
             add_js_files(js_files),
             "</head>\n",
             "<body ", format(body_options), ">\n",                       // format body options
-            format(cinfo,sn,ic_v,element,is_https, action_count, head_tags), 
+            format(cinfo,sn,ic_v,elem,is_https, action_count, head_tags), 
             "</body>\n",
             "</html>\n",
             "</iframe>\n",
@@ -4539,7 +4585,8 @@ define Printable_tree
                 script(type, _) then ["<script type=\"" + type + "\">"+content(jsi)+"</script>\n" . _format_html_head(t, so_far)],
             }
           css(cssf)         then
-            ["<link rel=\"stylesheet\" type=\"text/css\" href=\""+file_name(cssf)+"\" />\n" . _format_html_head(t, so_far)],
+            since cssf is css_file(file_name, media),          
+            ["<link rel=\"stylesheet\" type=\"text/css\" href=\""+file_name+"\" media=\""+to_String(media)+"\" />\n" . _format_html_head(t, so_far)],
           css_inline(cssi)  then
             ["<style>"+cssi+"</style>\n" . _format_html_head(t, so_far)]
         }
@@ -2872,14 +2872,14 @@ public define List(Web_arg)
   if find_the_first(body_temp_file, __boundary, file_offset) is
   {
     failure         then println("first boundary NOT found");[ ],
-    success(first)  then
-      with first = first + file_offset, //adjust the offset to real offset in file
+    success(_first) then
+      with first = _first + file_offset, //adjust the offset to real offset in file
     //get the second boundary position
     if find_the_first(body_temp_file, __boundary, first + boundary_length) is
     {
       failure       then println("last boundary NOT found");[ ],
-      success(last) then
-        with last = last + first + boundary_length, //adjust the offset to real offset in file
+      success(_last)then
+        with last = _last + first + boundary_length, //adjust the offset to real offset in file
       //Extract the file content here
       if get_multipart_entity(web_site_dir, body_temp_file, first+boundary_length, last, s) is
       {
@@ -27,9 +27,10 @@ public define DB_id
         if decimal_scan(value) is 
         {
           failure         then none, 
-          success(value)  then db_id(value)
+          success(_value) then db_id(_value)
         }
   }.
+  
 public define Maybe(DB_date)
   get_DB_date
   (
@@ -225,10 +226,10 @@ public define Maybe(Word32)
   ) =
   if get_Word32(lwa, name) is
   {
-    failure         then /*logDebug(debug_log, "Can't convert argument '" + name + "' to integer.");*/ failure
+    failure         then  failure
     success(value)  then
       if value +< min | value >+ max then
-        /*logDebug(debug_log, "The entered value (" + val + ")is out of boundaries [" + min + "," + max + "].");*/ failure
+         failure
       else
         success(value)
   }.
@@ -270,10 +271,10 @@ public define Maybe(Word8)
   ) =
   if get_Word8(lwa, name) is
   {
-    failure         then /*logDebug(debug_log, "Can't convert argument '" + name + "' to integer.");*/ failure
+    failure         then failure
     success(value)  then
       if value +< min | value >+ max then
-        /*logDebug(debug_log, "The entered value (" + val + ")is out of boundaries [" + min + "," + max + "].");*/ failure
+        failure
       else
         success(value)
   }.  
@@ -281,10 +281,10 @@ 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, "CalexiumToolBox.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")), js_inline(jquery_ready(js_data))],sequence([
-            partial(jquery_button(jQuery_button(button, uid, button_name, button_label, actioner, jq_icon_none, jq_icon_none)))
+            partial(jquery_button(jQuery_button(button, uid, button_name, button_label, _actioner, jq_icon_none, jq_icon_none)))
         ])).
 public define HTML_Partial_Content
@@ -309,11 +309,11 @@ public define HTML_Partial_Content
                     ok :    " + to_JS_String(dlg_ok)     + ",
                     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)) +");"),
+       _button_name  = uid,
+       _actioner     = jQuery_actioner(same, jqscript, "CalexiumToolBox.make_confirm_dialog(this, " + to_JS_String(jquery_button_get_onclick_action(actioner)) +");"),
   partial_content([js(js_file("js/cxm/cxm.js")), js_inline(jquery_ready(js_data))],sequence([
-              partial(jquery_button(jquery_img_button(img_url, button_label, button_name, actioner, orientation)))
+              partial(jquery_button(jquery_img_button(img_url, button_label, _button_name, _actioner, orientation)))
           ])).
 public define HTML_Partial_Content
@@ -7,7 +7,7 @@
  */
 read calexium_lib/web/CXM_making_a_web_site.anubis
-read calexium_lib/web/CXM_jquery.anubis
+transmit calexium_lib/web/CXM_jquery.anubis
 read calexium_lib/web/CXM_json.anubis
 read calexium_lib/web/js_tools.anubis
 transmit calexium_lib/web/widgets/icons_set.anubis
@@ -6,19 +6,20 @@
  * © Calexium 
  */
-
 public define String icn16_edit         = "icons/16x16/edit.png".
 public define String icn16_calendar     = "icons/16x16/calendar.png".
 public define String icn16_check        = "icons/16x16/check.png".
 public define String icn16_clock        = "icons/16x16/clock.png".
 public define String icn16_cross        = "icons/16x16/cross.png".
+public define String icn16_home         = "icons/16x16/home.png".
 public define String icn16_key          = "icons/16x16/key.png".
 public define String icn16_locked       = "icons/16x16/locked.png".
 public define String icn16_phone        = "icons/16x16/phone.png".
-public define String icn16_vcard_add    = "icons/16x16/vcard_add.png".
 public define String icn16_folder_edit  = "icons/16x16/folder_edit.png".
 public define String icn16_group        = "icons/16x16/group.png".
 public define String icn16_question     = "icons/16x16/question.png".
+public define String icn16_refresh      = "icons/16x16/arrow_refresh.png".
+public define String icn16_vcard_add    = "icons/16x16/vcard_add.png".
 public define String icn16_warning      = "icons/16x16/warning.png".
 public define String icn16_true         = "icons/16x16/check.png".