diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/main.inc | 20 | ||||
| -rwxr-xr-x | program/include/rcube_template.php | 11 |
2 files changed, 24 insertions, 7 deletions
diff --git a/program/include/main.inc b/program/include/main.inc index 55f0a8aae..012ee8ddf 100644 --- a/program/include/main.inc +++ b/program/include/main.inc @@ -1608,6 +1608,26 @@ function rcmail_display_server_error($fallback=null, $fallback_args=null) /** + * Generate CSS classes from mimetype and filename extension + * + * @param string Mimetype + * @param string The filename + * @return string CSS classes separated by space + */ +function rcmail_filetype2classname($mimetype, $filename) +{ + list($primary, $secondary) = explode('/', $mimetype); + + $classes = array($primary ? $primary : 'unknown'); + if ($secondary) + $classes[] = $secondary; + if (preg_match('/\.([a-z0-9]+)$/', $filename, $m)) + $classes[] = $m[1]; + + return join(" ", $classes); +} + +/** * Output HTML editor scripts * * @param string Editor mode diff --git a/program/include/rcube_template.php b/program/include/rcube_template.php index 06503f2f5..f65080373 100755 --- a/program/include/rcube_template.php +++ b/program/include/rcube_template.php @@ -983,14 +983,11 @@ class rcube_template extends rcube_html_page if ($attrib['label']) { $attrib['value'] = $attrib['label']; } + if ($attrib['command']) { + $attrib['disabled'] = 'disabled'; + } - $attrib_str = html::attrib_string( - $attrib, - array( - 'type', 'value', 'onclick', 'id', 'class', 'style', 'tabindex' - ) - ); - $out = sprintf('<input%s disabled="disabled" />', $attrib_str); + $out = html::tag('input', $attrib, '', array('type', 'value', 'onclick', 'id', 'class', 'style', 'tabindex', 'disabled')); } // generate html code for button |