Commit d24bf608ed49ad76fec0440629904ee4900949dc
1 parent
22850256
[~] 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
Showing
2 changed files
with
24 additions
and
7 deletions
Show diff stats
mail/send_mail_type.anubis
| ... | ... | @@ -34,7 +34,7 @@ public define String |
| 34 | 34 | general_error then "GENERAL_ERROR", |
| 35 | 35 | error(_,_,_) then "ERROR", |
| 36 | 36 | warning(_,_,_)then "WARNING", |
| 37 | - in_progress then "IN PROGRESS" | |
| 37 | + in_progress then "IN_PROGRESS" | |
| 38 | 38 | }. |
| 39 | 39 | |
| 40 | 40 | public define (String, List((SQLite3Bind))) |
| ... | ... | @@ -86,7 +86,7 @@ public define Send_Status |
| 86 | 86 | else if status = "GENERAL_ERROR" then general_error |
| 87 | 87 | else if status = "ERROR" then error(code, enhanced_status, message) |
| 88 | 88 | else if status = "WARNING" then warning(code, enhanced_status, message) |
| 89 | - else if status = "IN PROGRESS" then in_progress | |
| 89 | + else if status = "IN_PROGRESS" then in_progress | |
| 90 | 90 | else ready. |
| 91 | 91 | |
| 92 | 92 | public define String |
| ... | ... | @@ -98,10 +98,10 @@ public define String |
| 98 | 98 | { |
| 99 | 99 | ready then "/icons/16x16/status_ready.png", |
| 100 | 100 | finished then "/icons/16x16/status_valid.png", |
| 101 | - timeout then "/icons/16x16/status_error.png", | |
| 101 | + timeout then "/icons/16x16/status_sandglass.png", | |
| 102 | 102 | general_error then "/icons/16x16/status_error.png", |
| 103 | 103 | error(_,_,_) then "/icons/16x16/status_error.png", |
| 104 | - warning(_,_,_) then "/icons/16x16/status_sandglass.png", | |
| 104 | + warning(_,_,_) then "/icons/16x16/status_warning.png", | |
| 105 | 105 | in_progress then "/icons/16x16/status_processing_16x16.gif" |
| 106 | 106 | }. |
| 107 | 107 | ... | ... |
web/jQuery/ui-addon/datetimepicker.anubis
| ... | ... | @@ -9,18 +9,35 @@ |
| 9 | 9 | read calexium_lib/web/CXM_making_a_web_site.anubis |
| 10 | 10 | read calexium_lib/web/CXM_jquery.anubis |
| 11 | 11 | |
| 12 | -/* Initialize jQuery datatables */ | |
| 13 | -public define List(HTML_Head_Tag) | |
| 12 | +/* Initialize jQuery ui datetimepicker */ | |
| 13 | + public define List(HTML_Head_Tag) | |
| 14 | 14 | jq_ui_datetimepicker_init |
| 15 | 15 | = |
| 16 | 16 | [ |
| 17 | 17 | css(css_file("/css/jquery/ui/datetimepicker.css")), |
| 18 | 18 | js(js_file("js/jquery/ui/jquery-ui-timepicker-addon.js")), |
| 19 | 19 | js_inline(jquery_ready("// Datepicker\n |
| 20 | - $('.datepicker').datepicker({inline: true});\n | |
| 20 | + $('.datepicker').datepicker({inline: true}); | |
| 21 | 21 | $('.datetimepicker').datetimepicker({inline: true}); |
| 22 | 22 | ")) |
| 23 | 23 | ] |
| 24 | 24 | . |
| 25 | 25 | |
| 26 | 26 | |
| 27 | +/* Initialize jQuery datetimepicker */ | |
| 28 | +public define List(HTML_Head_Tag) | |
| 29 | + jq_datetimepicker_init | |
| 30 | + ( | |
| 31 | + String lang | |
| 32 | + ) | |
| 33 | + = | |
| 34 | + [ | |
| 35 | + css(css_file("js/jquery/plug-in/datetimepicker/datetimepicker.css")), | |
| 36 | + js(js_file("js/jquery/plug-in/datetimepicker/datetimepicker.js")), | |
| 37 | + js_inline(jquery_ready("// Datetimepicker\n | |
| 38 | + $('.datepicker').datetimepicker({lang:'"+lang+"',timepicker:false,format:'d/m/Y'}); | |
| 39 | + $('.datetimepicker').datetimepicker({lang:'"+lang+"'}); | |
| 40 | + $('.timepicker').datetimepicker({lang:'"+lang+"',datepicker:false,format:'H:i',step:5}) | |
| 41 | + ")) | |
| 42 | + ] | |
| 43 | + . | ... | ... |