From 8beee1b56812aeddfaf4a5d8a43f7e9309b073df Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 05 Sep 2008 06:26:10 -0400
Subject: [PATCH] Indicate allowed max. attachment size in compose screen (#1485030)
---
program/localization/de_DE/labels.inc | 1 +
CHANGELOG | 1 +
program/steps/mail/compose.inc | 8 +++++---
skins/default/mail.css | 10 +++++++---
program/localization/en_US/labels.inc | 1 +
program/localization/de_CH/labels.inc | 1 +
6 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index d4cf8ef..034f33d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@
- Enable export of address book contacts as vCard
- Respect Content-Location headers in multipart/related messages according to RFC2110 (#1484946)
- Applied mime_decode patch by David Lublink
+- Allowed max. attachment size now indicated in compose screen (#1485030)
2008/09/04 (alec)
----------
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index fc285b4..31410a8 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -155,6 +155,7 @@
$labels['plaintoggle'] = 'Klartext';
$labels['savesentmessagein'] = 'Nachricht speichern in';
$labels['dontsave'] = 'nicht speichern';
+$labels['maxuploadsize'] = 'Maximal erlaubte Dateigrösse ist $size';
$labels['addcc'] = 'Cc hinzufügen';
$labels['addbcc'] = 'Bcc hinzufügen';
$labels['addreplyto'] = 'Antwortadresse hinzufügen';
diff --git a/program/localization/de_DE/labels.inc b/program/localization/de_DE/labels.inc
index 409c18a..616e2cf 100644
--- a/program/localization/de_DE/labels.inc
+++ b/program/localization/de_DE/labels.inc
@@ -154,6 +154,7 @@
$labels['plaintoggle'] = 'Nur-Text';
$labels['savesentmessagein'] = 'Nachricht speichern in';
$labels['dontsave'] = 'nicht speichern';
+$labels['maxuploadsize'] = 'Maximal erlaubte Dateigrösse ist $size';
$labels['addcc'] = 'Cc hinzufügen';
$labels['addbcc'] = 'Bcc hinzufügen';
$labels['addreplyto'] = 'Antwortadresse hinzufügen';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index dec9d46..565cdc4 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -192,6 +192,7 @@
$labels['plaintoggle'] = 'Plain text';
$labels['savesentmessagein'] = 'Save sent message in';
$labels['dontsave'] = 'don\'t save';
+$labels['maxuploadsize'] = 'Maximum allowed file size is $size';
$labels['addcc'] = 'Add Cc';
$labels['addbcc'] = 'Add Bcc';
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index ba3cc7d..62ee147 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -693,9 +693,11 @@
$out = html::div($attrib,
$OUTPUT->form_tag(array('name' => 'form', 'method' => 'post', 'enctype' => 'multipart/form-data')) .
- rcmail_compose_attachment_field(array()) . html::br() .
- $button->show(rcube_label('close'), array('onclick' => "document.getElementById('$attrib[id]').style.visibility='hidden'")) .
- $button->show(rcube_label('upload'), array('onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)"))
+ html::div(null, rcmail_compose_attachment_field(array())) .
+ html::div('hint', rcube_label(array('name' => 'maxuploadsize', 'vars' => array('size' => show_bytes(parse_bytes(ini_get('upload_max_filesize'))))))) .
+ html::div('buttons',
+ $button->show(rcube_label('close'), array('onclick' => "document.getElementById('$attrib[id]').style.visibility='hidden'")) . ' ' .
+ $button->show(rcube_label('upload'), array('onclick' => JS_OBJECT_NAME . ".command('send-attachment', this.form)")))
);
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 9bf1b0e..2de7756 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -929,14 +929,18 @@
top: 150px;
left: 20px;
z-index: 200;
- padding: 8px;
+ padding: 6px;
visibility: hidden;
border: 1px solid #CCCCCC;
background-color: #F9F9F9;
}
-#attachment-form input.button
+#attachment-form div
{
- margin-top: 8px;
+ padding: 2px;
}
+#attachment-form div.buttons
+{
+ margin-top: 4px;
+}
--
Gitblit v1.9.1