summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-02-08 09:13:04 +0000
committeralecpl <alec@alec.pl>2011-02-08 09:13:04 +0000
commit768091e09416cc071eee1224000f67fe6cae16ac (patch)
tree373bc1927ee7b240859bfe2bee57d0d3f28a371e
parentde62f02eed97d533ab9cf187c80125297e025065 (diff)
- Make so addcontact icon doesn't jump alone to next line
-rw-r--r--program/steps/mail/func.inc9
-rw-r--r--skins/default/mail.css5
2 files changed, 10 insertions, 4 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index fd00142d1..0ccc923d2 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1261,7 +1261,7 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null)
}
else if (check_email($part['mailto'], false)) {
if ($linked) {
- $out .= html::a(array(
+ $address = html::a(array(
'href' => 'mailto:'.$mailto,
'onclick' => sprintf("return %s.command('compose','%s',this)", JS_OBJECT_NAME, JQ($mailto)),
'title' => $mailto,
@@ -1270,12 +1270,12 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null)
Q($name ? $name : $mailto));
}
else {
- $out .= html::span(array('title' => $mailto, 'class' => "rcmContactAddress"),
+ $address = html::span(array('title' => $mailto, 'class' => "rcmContactAddress"),
Q($name ? $name : $mailto));
}
if ($addicon && $got_writable_abook) {
- $out .= '&nbsp;' . html::a(array(
+ $address = '<span>' . $address . html::a(array(
'href' => "#add",
'onclick' => sprintf("return %s.command('add-contact','%s',this)", JS_OBJECT_NAME, urlencode($string)),
'title' => rcube_label('addtoaddressbook'),
@@ -1283,8 +1283,9 @@ function rcmail_address_string($input, $max=null, $linked=false, $addicon=null)
html::img(array(
'src' => $CONFIG['skin_path'] . $addicon,
'alt' => "Add contact",
- )));
+ ))) . '</span>';
}
+ $out .= $address;
}
else {
if ($name)
diff --git a/skins/default/mail.css b/skins/default/mail.css
index 1eb82cb08..0ac7aa03a 100644
--- a/skins/default/mail.css
+++ b/skins/default/mail.css
@@ -1046,6 +1046,11 @@ table.headers-table tr td.subject
font-weight: bold;
}
+table.headers-table tr td.header span
+{
+ white-space: nowrap;
+}
+
#attachment-list
{
margin: 0;