thomascube
2005-09-25 20a1b3a0e1a46266b149a23562bb71680e666edb
*** empty log message ***


6 files modified
21 ■■■■ changed files
program/localization/de/labels.inc 1 ●●●● patch | view | raw | blame | history
program/localization/en/labels.inc 3 ●●●● patch | view | raw | blame | history
program/steps/mail/func.inc 6 ●●●● patch | view | raw | blame | history
program/steps/settings/func.inc 7 ●●●● patch | view | raw | blame | history
skins/default/mail.css 2 ●●●●● patch | view | raw | blame | history
skins/default/templates/compose.html 2 ●●● patch | view | raw | blame | history
program/localization/de/labels.inc
@@ -107,6 +107,7 @@
$labels['sendmessage']  = 'Nachricht jetzt senden';
$labels['addattachment']  = 'Datei anfügen';
$labels['attachments'] = 'Anhänge';
$labels['upload'] = 'Hochladen';
$labels['close']  = 'Schliessen';
program/localization/en/labels.inc
@@ -90,7 +90,7 @@
// toolbar buttons
$labels['writenewmessage']  = 'Create a new message';
$labels['replytomessage']   = 'Reply to the message';
$labels['forwardmessage']   = 'Forwad the message';
$labels['forwardmessage']   = 'Forward the message';
$labels['deletemessage']    = 'Move message to trash';
$labels['printmessage']     = 'Print this message';
$labels['previousmessages'] = 'Show previous set of messages';
@@ -107,6 +107,7 @@
$labels['sendmessage']  = 'Send the message now';
$labels['addattachment']  = 'Attach a file';
$labels['attachments'] = 'Attachments';
$labels['upload'] = 'Upload';
$labels['close']  = 'Close';
program/steps/mail/func.inc
@@ -427,13 +427,13 @@
    $url_chars_within = '\?\.~,!';
    $convert_patterns[] = "/([\w]+):\/\/([a-z0-9\-\.]+[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie";
    $convert_replaces[] = "rcmail_str_replacement('<a href=\"\\1://\\2\" target=\"_blank\">\\1://\\2</a>', &\$replace_strings)";
    $convert_replaces[] = "rcmail_str_replacement('<a href=\"\\1://\\2\" target=\"_blank\">\\1://\\2</a>', \$replace_strings)";
    $convert_patterns[] = "/([^\/:]|\s)(www\.)([a-z0-9\-]{2,}[a-z]{2,4}([$url_chars$url_chars_within]*[$url_chars])?)/ie";
    $convert_replaces[] = "rcmail_str_replacement('\\1<a href=\"http://\\2\\3\" target=\"_blank\">\\2\\3</a>', &\$replace_strings)";
    $convert_replaces[] = "rcmail_str_replacement('\\1<a href=\"http://\\2\\3\" target=\"_blank\">\\2\\3</a>', \$replace_strings)";
    
    $convert_patterns[] = '/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/ie';
    $convert_replaces[] = "rcmail_str_replacement('<a href=\"mailto:\\1\" onclick=\"return $JS_OBJECT_NAME.command(\'compose\',\'\\1\',this)\">\\1</a>', &\$replace_strings)";
    $convert_replaces[] = "rcmail_str_replacement('<a href=\"mailto:\\1\" onclick=\"return $JS_OBJECT_NAME.command(\'compose\',\'\\1\',this)\">\\1</a>', \$replace_strings)";
    $body = wordwrap(trim($body), 80);
    $body = preg_replace($convert_patterns, $convert_replaces, $body);
program/steps/settings/func.inc
@@ -51,8 +51,13 @@
  // show language selection
  $field_id = 'rcmfd_lang';
  $select_lang = new select(array('name' => '_language', 'id' => $field_id));
  $select_lang->add('English', 'en');
  // $select_lang->add('Czech', 'cs');
  $select_lang->add('Dansk', 'da');
  $select_lang->add('Deutsch', 'de');
  $select_lang->add('English', 'en');
  $select_lang->add('Espanol', 'es');
  $select_lang->add('Franais', 'fr');
  $select_lang->add('Italiano', 'it');
  $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                  $field_id,
skins/default/mail.css
@@ -187,6 +187,8 @@
  background-color: #F9F9F9;
  list-style-image: none;
  list-style-type: none;
  overflow: hidden;
  white-space: nowrap;
}
#mailboxlist li
skins/default/templates/compose.html
@@ -95,7 +95,7 @@
</div>
<div id="compose-attachments">
<div>Attachments</div>
<div><roundcube:label name="attachments" /></div>
<roundcube:object name="composeAttachmentList" />
<p><roundcube:button command="add-attachment" imagePas="/images/buttons/add_pas.png" imageAct="/images/buttons/add_act.png" width="23" height="18" title="addattachment" />
</div>