From d24bf608ed49ad76fec0440629904ee4900949dc Mon Sep 17 00:00:00 2001 From: totoro Date: Sat, 11 Jul 2015 13:28:42 +0200 Subject: [PATCH] [~] change icon of timeout and warning in mail_type. [~] change the the in_progress of mailt_type from 'IN PROGRESS' into "IN_PROGRESS" with an underscore in place of white space --- mail/send_mail_type.anubis | 8 ++++---- web/jQuery/ui-addon/datetimepicker.anubis | 23 ++++++++++++++++++++--- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/mail/send_mail_type.anubis b/mail/send_mail_type.anubis index 550c5a0..0bd56ef 100644 --- a/mail/send_mail_type.anubis +++ b/mail/send_mail_type.anubis @@ -34,7 +34,7 @@ public define String general_error then "GENERAL_ERROR", error(_,_,_) then "ERROR", warning(_,_,_)then "WARNING", - in_progress then "IN PROGRESS" + in_progress then "IN_PROGRESS" }. public define (String, List((SQLite3Bind))) @@ -86,7 +86,7 @@ public define Send_Status else if status = "GENERAL_ERROR" then general_error else if status = "ERROR" then error(code, enhanced_status, message) else if status = "WARNING" then warning(code, enhanced_status, message) - else if status = "IN PROGRESS" then in_progress + else if status = "IN_PROGRESS" then in_progress else ready. public define String @@ -98,10 +98,10 @@ public define String { ready then "/icons/16x16/status_ready.png", finished then "/icons/16x16/status_valid.png", - timeout then "/icons/16x16/status_error.png", + timeout then "/icons/16x16/status_sandglass.png", general_error then "/icons/16x16/status_error.png", error(_,_,_) then "/icons/16x16/status_error.png", - warning(_,_,_) then "/icons/16x16/status_sandglass.png", + warning(_,_,_) then "/icons/16x16/status_warning.png", in_progress then "/icons/16x16/status_processing_16x16.gif" }. diff --git a/web/jQuery/ui-addon/datetimepicker.anubis b/web/jQuery/ui-addon/datetimepicker.anubis index e371b60..98d0012 100644 --- a/web/jQuery/ui-addon/datetimepicker.anubis +++ b/web/jQuery/ui-addon/datetimepicker.anubis @@ -9,18 +9,35 @@ read calexium_lib/web/CXM_making_a_web_site.anubis read calexium_lib/web/CXM_jquery.anubis -/* Initialize jQuery datatables */ -public define List(HTML_Head_Tag) +/* Initialize jQuery ui datetimepicker */ + public define List(HTML_Head_Tag) jq_ui_datetimepicker_init = [ 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});\n + $('.datepicker').datepicker({inline: true}); $('.datetimepicker').datetimepicker({inline: true}); ")) ] . +/* Initialize jQuery datetimepicker */ +public define List(HTML_Head_Tag) + jq_datetimepicker_init + ( + String lang + ) + = + [ + 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+"'}); + $('.timepicker').datetimepicker({lang:'"+lang+"',datepicker:false,format:'H:i',step:5}) + ")) + ] + . -- libgit2 0.21.4