diff --git a/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html b/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html index 3f50a3f64..58d63020c 100644 --- a/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html +++ b/SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html @@ -1,3 +1,6 @@ + + + -------- Original Message -------- Subject: <#subject/> Date: <#date/> diff --git a/SoObjects/Mailer/SOGoMailDutchReply.wo/SOGoMailDutchReply.html b/SoObjects/Mailer/SOGoMailDutchReply.wo/SOGoMailDutchReply.html index e4e5dc000..add97cbc1 100644 --- a/SoObjects/Mailer/SOGoMailDutchReply.wo/SOGoMailDutchReply.html +++ b/SoObjects/Mailer/SOGoMailDutchReply.wo/SOGoMailDutchReply.html @@ -1,9 +1,8 @@ -<#signaturePlacementOnTop> - +<#replyPlacementOnTop> +<#signaturePlacementOnTop> <#signature/> - -<#outlookMode>-------- Original Message -------- +<#outlookMode>-------- Original Message -------- Subject: <#subject/> Date: <#date/> From: <#from/> @@ -12,6 +11,6 @@ From: <#from/> <#standardMode>On <#date/>, <#from/> wrote: <#messageBody/> +<#replyPlacementOnBottom> - -<#signaturePlacementOnBottom><#signature/> +<#signaturePlacementOnBottom><#signature/> diff --git a/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html b/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html index 3f50a3f64..58d63020c 100644 --- a/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html +++ b/SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html @@ -1,3 +1,6 @@ + + + -------- Original Message -------- Subject: <#subject/> Date: <#date/> diff --git a/SoObjects/Mailer/SOGoMailEnglishReply.wo/SOGoMailEnglishReply.html b/SoObjects/Mailer/SOGoMailEnglishReply.wo/SOGoMailEnglishReply.html index e4e5dc000..add97cbc1 100644 --- a/SoObjects/Mailer/SOGoMailEnglishReply.wo/SOGoMailEnglishReply.html +++ b/SoObjects/Mailer/SOGoMailEnglishReply.wo/SOGoMailEnglishReply.html @@ -1,9 +1,8 @@ -<#signaturePlacementOnTop> - +<#replyPlacementOnTop> +<#signaturePlacementOnTop> <#signature/> - -<#outlookMode>-------- Original Message -------- +<#outlookMode>-------- Original Message -------- Subject: <#subject/> Date: <#date/> From: <#from/> @@ -12,6 +11,6 @@ From: <#from/> <#standardMode>On <#date/>, <#from/> wrote: <#messageBody/> +<#replyPlacementOnBottom> - -<#signaturePlacementOnBottom><#signature/> +<#signaturePlacementOnBottom><#signature/> diff --git a/SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.html b/SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.html index 6ebbd4598..9629fc846 100644 --- a/SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.html +++ b/SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.html @@ -1,3 +1,6 @@ + + + -------- Message original -------- Sujet: <#subject/> Date: <#date/> diff --git a/SoObjects/Mailer/SOGoMailFrenchReply.wo/SOGoMailFrenchReply.html b/SoObjects/Mailer/SOGoMailFrenchReply.wo/SOGoMailFrenchReply.html index 177f36d57..768b51bc3 100644 --- a/SoObjects/Mailer/SOGoMailFrenchReply.wo/SOGoMailFrenchReply.html +++ b/SoObjects/Mailer/SOGoMailFrenchReply.wo/SOGoMailFrenchReply.html @@ -1,9 +1,8 @@ -<#signaturePlacementOnTop> - +<#replyPlacementOnTop> +<#signaturePlacementOnTop> <#signature/> - -<#outlookMode>-------- Message original -------- +<#outlookMode>-------- Message original -------- Sujet: <#subject/> Date: <#date/> De: <#from/> @@ -12,6 +11,6 @@ De: <#from/> <#standardMode>Le <#date/>, <#from/> a écrit: <#messageBody/> +<#replyPlacementOnBottom> - -<#signaturePlacementOnBottom><#signature/> +<#signaturePlacementOnBottom><#signature/> diff --git a/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html b/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html index 8db39152f..5c561becb 100644 --- a/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html +++ b/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html @@ -1,3 +1,6 @@ + + + -------- Original-Nachricht -------- Betreff: <#subject/> Datum: <#date/> diff --git a/SoObjects/Mailer/SOGoMailGermanReply.wo/SOGoMailGermanReply.html b/SoObjects/Mailer/SOGoMailGermanReply.wo/SOGoMailGermanReply.html index e9552fe4e..791c93c0c 100644 --- a/SoObjects/Mailer/SOGoMailGermanReply.wo/SOGoMailGermanReply.html +++ b/SoObjects/Mailer/SOGoMailGermanReply.wo/SOGoMailGermanReply.html @@ -1,9 +1,8 @@ -<#signaturePlacementOnTop> - +<#replyPlacementOnTop> +<#signaturePlacementOnTop> <#signature/> - -<#outlookMode>-------- Original-Nachricht -------- +<#outlookMode>-------- Original-Nachricht -------- Betreff: <#subject/> Datum: <#date/> Von: <#from/> @@ -12,6 +11,6 @@ Von: <#from/> <#standardMode>Am <#date/>, <#from/> schrieb: <#messageBody/> +<#replyPlacementOnBottom> - -<#signaturePlacementOnBottom><#signature/> +<#signaturePlacementOnBottom><#signature/> diff --git a/SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.html b/SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.html index 369e66697..706dcd931 100644 --- a/SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.html +++ b/SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.html @@ -1,3 +1,6 @@ + + + -------- Messaggio originale -------- Oggetto: <#subject/> Data: <#date/> diff --git a/SoObjects/Mailer/SOGoMailItalianReply.wo/SOGoMailItalianReply.html b/SoObjects/Mailer/SOGoMailItalianReply.wo/SOGoMailItalianReply.html index 2265ebb3c..dca17cf6b 100644 --- a/SoObjects/Mailer/SOGoMailItalianReply.wo/SOGoMailItalianReply.html +++ b/SoObjects/Mailer/SOGoMailItalianReply.wo/SOGoMailItalianReply.html @@ -1,9 +1,8 @@ -<#signaturePlacementOnTop> - +<#replyPlacementOnTop> +<#signaturePlacementOnTop> <#signature/> - -<#outlookMode>-------- Messaggio originale -------- +<#outlookMode>-------- Messaggio originale -------- Oggetto: <#subject/> Data: <#date/> Da: <#from/> @@ -12,6 +11,6 @@ Da: <#from/> <#standardMode>Il giorno <#date/>, <#from/> ha scritto: <#messageBody/> +<#replyPlacementOnBottom> - -<#signaturePlacementOnBottom><#signature/> +<#signaturePlacementOnBottom><#signature/> diff --git a/SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.html b/SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.html index 3f50a3f64..58d63020c 100644 --- a/SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.html +++ b/SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.html @@ -1,3 +1,6 @@ + + + -------- Original Message -------- Subject: <#subject/> Date: <#date/> diff --git a/SoObjects/Mailer/SOGoMailRussianReply.wo/SOGoMailRussianReply.html b/SoObjects/Mailer/SOGoMailRussianReply.wo/SOGoMailRussianReply.html index ebfee2a42..add97cbc1 100644 --- a/SoObjects/Mailer/SOGoMailRussianReply.wo/SOGoMailRussianReply.html +++ b/SoObjects/Mailer/SOGoMailRussianReply.wo/SOGoMailRussianReply.html @@ -1,9 +1,8 @@ -<#signaturePlacementOnTop> - +<#replyPlacementOnTop> +<#signaturePlacementOnTop> <#signature/> - -<#outlookMode>-------- Original Message -------- +<#outlookMode>-------- Original Message -------- Subject: <#subject/> Date: <#date/> From: <#from/> @@ -12,5 +11,6 @@ From: <#from/> <#standardMode>On <#date/>, <#from/> wrote: <#messageBody/> +<#replyPlacementOnBottom> -<#signature/> +<#signaturePlacementOnBottom><#signature/> diff --git a/SoObjects/Mailer/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.html b/SoObjects/Mailer/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.html index 3f50a3f64..58d63020c 100644 --- a/SoObjects/Mailer/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.html +++ b/SoObjects/Mailer/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.html @@ -1,3 +1,6 @@ + + + -------- Original Message -------- Subject: <#subject/> Date: <#date/> diff --git a/SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.html b/SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.html index 832eb39bd..d13f46cd0 100644 --- a/SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.html +++ b/SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.html @@ -1 +1,13 @@ --------- Original Message -------- Testun: <#subject/> Dyddiad: <#date/> Oddi wrth: <#from/> <#hasReplyTo>Ymateb i: <#replyTo/><#hasOrganization>Sefydliad: <#organization/>I: <#to/> <#hasCc>CC: <#cc/><#hasNewsGroups>Grwpiau newyddion: <#newsgroups/><#hasReferences>Cyfeirnodau: <#references/> <#messageBody/> <#signature/> \ No newline at end of file + + + +-------- Original Message -------- +Testun: <#subject/> +Dyddiad: <#date/> +Oddi wrth: <#from/> +<#hasReplyTo>Ymateb i: <#replyTo/><#hasOrganization>Sefydliad: <#organization/>I: <#to/> +<#hasCc>CC: <#cc/><#hasNewsGroups>Grwpiau newyddion: <#newsgroups/><#hasReferences>Cyfeirnodau: <#references/> + +<#messageBody/> + +<#signature/> diff --git a/SoObjects/Mailer/SOGoMailWelshReply.wo/SOGoMailWelshReply.html b/SoObjects/Mailer/SOGoMailWelshReply.wo/SOGoMailWelshReply.html index 8a3cc62b2..10adf3075 100644 --- a/SoObjects/Mailer/SOGoMailWelshReply.wo/SOGoMailWelshReply.html +++ b/SoObjects/Mailer/SOGoMailWelshReply.wo/SOGoMailWelshReply.html @@ -1 +1,16 @@ -<#signaturePlacementOnTop> <#signature/> <#outlookMode>-------- Neges Wreiddiol -------- Testun: <#subject/> Dyddiad: <#date/> Oddi wrth: <#from/> <#hasReplyTo>Ymateb i: <#replyTo/><#hasOrganization>Sefydliad: <#organization/>I: <#to/> <#hasCc>CC: <#cc/><#hasNewsGroups>Grwpiau newyddion: <#newsgroups/><#hasReferences>Cyfeirnodau: <#references/> <#standardMode>Ar <#date/>, <#from/> ysgrifennodd: <#messageBody/> <#signaturePlacementOnBottom><#signature/> \ No newline at end of file +<#replyPlacementOnTop> + +<#signaturePlacementOnTop> +<#signature/> +<#outlookMode>-------- Neges Wreiddiol -------- +Testun: <#subject/> +Dyddiad: <#date/> +Oddi wrth: <#from/> +<#hasReplyTo>Ymateb i: <#replyTo/><#hasOrganization>Sefydliad: <#organization/>I: <#to/> +<#hasCc>CC: <#cc/><#hasNewsGroups>Grwpiau newyddion: <#newsgroups/><#hasReferences>Cyfeirnodau: <#references/> +<#standardMode>Ar <#date/>, <#from/> ysgrifennodd: + +<#messageBody/> +<#replyPlacementOnBottom> + +<#signaturePlacementOnBottom><#signature/> diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox index 52c97058b..4a593ec9f 100644 --- a/UI/Templates/MailerUI/UIxMailEditor.wox +++ b/UI/Templates/MailerUI/UIxMailEditor.wox @@ -72,7 +72,7 @@ />
- diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js index a9e31943e..c9f9c51d9 100644 --- a/UI/WebServerResources/UIxMailEditor.js +++ b/UI/WebServerResources/UIxMailEditor.js @@ -270,10 +270,10 @@ function clickedEditorSave(sender) { function onTextFocus(event) { if (MailEditor.textFirstFocus) { + // On first focus, position the caret at the proper position var content = this.getValue(); var replyPlacement = UserDefaults["ReplyPlacement"]; - if (replyPlacement == "above") { - this.insertBefore(document.createTextNode("\r\r"), this.lastChild); + if (replyPlacement == "above" || !mailIsReply) { // for forwards, place caret at top unconditionally this.setCaretTo(0); } else { @@ -281,7 +281,7 @@ function onTextFocus(event) { if (Prototype.Browser.IE) caretPosition -= lineBreakCount(this.getValue().substring(0, caretPosition)); if (hasSignature()) - caretPosition -= 1; + caretPosition -= 2; this.setCaretTo(caretPosition); } MailEditor.textFirstFocus = false; @@ -294,7 +294,7 @@ function onTextFocus(event) { function onTextKeyDown(event) { if (event.keyCode == Event.KEY_TAB) { - // Change behavior of tab key + // Change behavior of tab key in textarea if (event.shiftKey) { var subjectField = $$("div#subjectRow input").first(); subjectField.focus();