diff --git a/database/vtm/view_table_renderer.anubis b/database/vtm/view_table_renderer.anubis
index a492c29..4c42cde 100644
--- a/database/vtm/view_table_renderer.anubis
+++ b/database/vtm/view_table_renderer.anubis
@@ -25,7 +25,8 @@ 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
 read calexium_lib/web/jQuery/CXM_jquery_datatable_types.anubis
-read calexium_lib/web/jQuery/CXM_jquery_dialog.anubis
+read calexium_lib/web/jQuery/CXM_jquery_dialog.anubis      
+read calexium_lib/web/jQuery/CXM_jquery_button.anubis
 read calexium_lib/web/jQuery/ui-addon/datetimepicker.anubis
 read calexium_lib/web/CXM_form.anubis
 read calexium_lib/web/widgets/css_helper.anubis
@@ -204,9 +205,10 @@ public define HTML_Partial_Content
   partial_content(
       div( [/*class("tableau")*/],
           sequence(
-           [  actioner(same,same, link([class("my_button")],_T("NEW")),"edit_table",[("table_name", rows.table_name)]),
+           [ 
+              partial(jquery_button(jQuery_button(button, "edit_table_"+rows.table_name, "", _T("NEW"), jQuery_actioner(same, jqlink, "edit_table&table_name="+rows.table_name)))),
               //dialog used by datatable entries
-              partial(jq_dialog_create(dialog_id("edit_table_dlg_ajax"), ajax("?a=ajax_edit_table&table_name="+rows.table_name))),
+              partial(jq_dialog_create(dialog_id(action_name+"_dlg_ajax"), ajax("?a=ajax_edit_table&table_name="+rows.table_name))),
               
               table([core_attrs([id("table_view"), class("tableau display compact nowrap")])],
                     make_header(_T, rows.header.list, [action_header_cell]),
diff --git a/web/jQuery/ui-addon/datetimepicker.anubis b/web/jQuery/ui-addon/datetimepicker.anubis
index 7bcc4d2..62a33d0 100644
--- a/web/jQuery/ui-addon/datetimepicker.anubis
+++ b/web/jQuery/ui-addon/datetimepicker.anubis
@@ -17,9 +17,9 @@ read calexium_lib/web/CXM_jquery.anubis
       css(css_file("/css/jquery/ui/datetimepicker.css")),
       js(js_file("js/jquery/ui/jquery-ui-timepicker-addon.js")),
       js_inline(jquery_ready("// Datepicker\n
-        				                       $('.datepicker').datepicker({inline: true});
-        				                       $('.datetimepicker').datetimepicker({inline: true});
-				                               "))
+                               $('.datepicker').datepicker({inline: true});
+                               $('.datetimepicker').datetimepicker({inline: true});
+                               "))
     ]
   .
 
@@ -28,16 +28,43 @@ read calexium_lib/web/CXM_jquery.anubis
 public define List(HTML_Head_Tag)
   jq_datetimepicker_init
   (
-    String  lang
+    String  lang,
+    Bool add_icon
   )
   =
     [
       css(css_file("js/jquery/plug-in/datetimepicker/datetimepicker.css")),
       js(js_file("js/jquery/plug-in/datetimepicker/datetimepicker.js")),
       js_inline(jquery_ready("// Datetimepicker\n
-        				                       $('.datepicker').datetimepicker({lang:'"+lang+"',timepicker:false,format:'d/m/Y'});
-        				                       $('.datetimepicker').datetimepicker({lang:'"+lang+"',format:'Y-m-d H:i'});
-        				                       $('.timepicker').datetimepicker({lang:'"+lang+"',datepicker:false,format:'H:i',step:5})
-				                               "))
+                               $('.datepicker').datetimepicker({lang:'"+lang+"',timepicker:false,format:'d/m/Y'});
+                               $('.datetimepicker').datetimepicker({lang:'"+lang+"',format:'Y-m-d H:i'});
+                               $('.timepicker').datetimepicker({lang:'"+lang+"',datepicker:false,format:'H:i',step:5});
+                               " + if add_icon then "
+                                  var items_add_func = function (index) {
+                                      var icon_file = 'icon_calendar.gif';
+                                      var dt_picker = $(this);
+                                      
+                                      if (dt_picker.hasClass('timepicker')) {
+                                        icon_file = 'icon_clock.gif';
+                                      }
+                                      
+                                      var icon = $('<img src=\"icons/16x16/'+icon_file+'\"/>');
+                                      
+                                      icon.click(function () { dt_picker.datetimepicker('show'); });
+                                      icon.hover(function() { $(this).css('cursor','pointer'); });
+                                      dt_picker.after(icon);
+                                    };
+                                  
+                                  $('.datepicker').each(items_add_func);
+                                  $('.datetimepicker').each(items_add_func);
+                                  $('.timepicker').each(items_add_func);
+                                " else ""))
     ]
   .
+
+public define List(HTML_Head_Tag)
+  jq_datetimepicker_init
+  (
+    String  lang
+  )
+  = jq_datetimepicker_init(lang, true).
--
libgit2 0.21.4