Aleksander Machniak
2015-10-09 bb1ed2740d5d576d0f43b9d6ad9557948dbc2805
Display attachment size in compose (#1484774)
4 files modified
14 ■■■■ changed files
CHANGELOG 1 ●●●● patch | view | raw | blame | history
program/steps/mail/attachments.inc 3 ●●●● patch | view | raw | blame | history
program/steps/mail/compose.inc 6 ●●●● patch | view | raw | blame | history
skins/larry/mail.css 4 ●●●● patch | view | raw | blame | history
CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
- Display attachment size in compose (#1484774)
- Added possibility to drag-n-drop attachments from mail preview to compose window
- Implemented mail messages searching with predefined date interval
- PGP encryption support via Mailvelope integration
program/steps/mail/attachments.inc
@@ -203,7 +203,8 @@
        'aria-label' => $RCMAIL->gettext('delete') . ' ' . $attachment['name'],
    ), $button);
    $content .= rcube::Q($attachment['name']);
    $content .= sprintf('%s <span class="attachment-size">(%s)</span>',
        rcube::Q($attachment['name']), $RCMAIL->show_bytes($attachment['size']));
    $RCMAIL->output->command('add2attachment_list', "rcmfile$id", array(
        'html'      => $content,
program/steps/mail/compose.inc
@@ -385,6 +385,7 @@
                    'group'    => $COMPOSE_ID,
                    'name'     => $filename,
                    'mimetype' => rcube_mime::file_content_type($attach, $filename),
                    'size'     => filesize($attach),
                    'path'     => $attach,
                );
            }
@@ -1557,6 +1558,9 @@
                continue;
            }
            $content = sprintf('%s <span class="attachment-size">(%s)</span>',
                rcube::Q($a_prop['name']), $RCMAIL->show_bytes($a_prop['size']));
            $out .= html::tag('li', array(
                    'id'          => 'rcmfile'.$id,
                    'class'       => rcube_utils::file2class($a_prop['mimetype'], $a_prop['name']),
@@ -1571,7 +1575,7 @@
                        'aria-label'   => $RCMAIL->gettext('delete') . ' ' . $a_prop['name'],
                    ),
                    $button
                ) . rcube::Q($a_prop['name'])
                ) . $content
            );
            $jslist['rcmfile'.$id] = array(
skins/larry/mail.css
@@ -1366,6 +1366,10 @@
    -webkit-box-shadow: 0 0 5px 2px rgba(71,135,177, 0.9);
}
#compose-attachments .attachment-size {
    color: #888;
}
#composeview-bottom .formbuttons.floating {
    position: absolute;
    width: auto;