LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 6df5fda5f5dd4cf08493fa5086b30a1bbf5c0b2d 

Monotone-Revision: 1306f5dc489a510d74accc34d99229210cecdb1e

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-06-17T16:22:26
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2009-06-17 16:22:26 +00:00
parent fd399be4c0
commit 82234dfb87
17 changed files with 85 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SoObjects/Mailer/SOGoMailDutchForward.wo/SOGoMailDutchForward.html
View File

@ -1,3 +1,6 @@
-------- Original Message --------
Subject: <#subject/>
Date: <#date/>

11
SoObjects/Mailer/SOGoMailDutchReply.wo/SOGoMailDutchReply.html
View File

@ -1,9 +1,8 @@
<#signaturePlacementOnTop>
<#replyPlacementOnTop>
</#replyPlacementOnTop><#signaturePlacementOnTop>
<#signature/>
</#signaturePlacementOnTop>
<#outlookMode>-------- Original Message --------
</#signaturePlacementOnTop><#outlookMode>-------- Original Message --------
Subject: <#subject/>
Date: <#date/>
From: <#from/>
@ -12,6 +11,6 @@ From: <#from/>
<#standardMode>On <#date/>, <#from/> wrote:</#standardMode>
<#messageBody/>
<#replyPlacementOnBottom>
<#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>

3
SoObjects/Mailer/SOGoMailEnglishForward.wo/SOGoMailEnglishForward.html
View File

@ -1,3 +1,6 @@
-------- Original Message --------
Subject: <#subject/>
Date: <#date/>

11
SoObjects/Mailer/SOGoMailEnglishReply.wo/SOGoMailEnglishReply.html
View File

@ -1,9 +1,8 @@
<#signaturePlacementOnTop>
<#replyPlacementOnTop>
</#replyPlacementOnTop><#signaturePlacementOnTop>
<#signature/>
</#signaturePlacementOnTop>
<#outlookMode>-------- Original Message --------
</#signaturePlacementOnTop><#outlookMode>-------- Original Message --------
Subject: <#subject/>
Date: <#date/>
From: <#from/>
@ -12,6 +11,6 @@ From: <#from/>
<#standardMode>On <#date/>, <#from/> wrote:</#standardMode>
<#messageBody/>
<#replyPlacementOnBottom>
<#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>

3
SoObjects/Mailer/SOGoMailFrenchForward.wo/SOGoMailFrenchForward.html
View File

@ -1,3 +1,6 @@
-------- Message original --------
Sujet: <#subject/>
Date: <#date/>

11
SoObjects/Mailer/SOGoMailFrenchReply.wo/SOGoMailFrenchReply.html
View File

@ -1,9 +1,8 @@
<#signaturePlacementOnTop>
<#replyPlacementOnTop>
</#replyPlacementOnTop><#signaturePlacementOnTop>
<#signature/>
</#signaturePlacementOnTop>
<#outlookMode>-------- Message original --------
</#signaturePlacementOnTop><#outlookMode>-------- Message original --------
Sujet: <#subject/>
Date: <#date/>
De: <#from/>
@ -12,6 +11,6 @@ De: <#from/>
<#standardMode>Le <#date/>, <#from/> a écrit:</#standardMode>
<#messageBody/>
<#replyPlacementOnBottom>
<#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>

3
SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html
View File

@ -1,3 +1,6 @@
-------- Original-Nachricht --------
Betreff: <#subject/>
Datum: <#date/>

11
SoObjects/Mailer/SOGoMailGermanReply.wo/SOGoMailGermanReply.html
View File

@ -1,9 +1,8 @@
<#signaturePlacementOnTop>
<#replyPlacementOnTop>
</#replyPlacementOnTop><#signaturePlacementOnTop>
<#signature/>
</#signaturePlacementOnTop>
<#outlookMode>-------- Original-Nachricht --------
</#signaturePlacementOnTop><#outlookMode>-------- Original-Nachricht --------
Betreff: <#subject/>
Datum: <#date/>
Von: <#from/>
@ -12,6 +11,6 @@ Von: <#from/>
<#standardMode>Am <#date/>, <#from/> schrieb:</#standardMode>
<#messageBody/>
<#replyPlacementOnBottom>
<#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>

3
SoObjects/Mailer/SOGoMailItalianForward.wo/SOGoMailItalianForward.html
View File

@ -1,3 +1,6 @@
-------- Messaggio originale --------
Oggetto: <#subject/>
Data: <#date/>

11
SoObjects/Mailer/SOGoMailItalianReply.wo/SOGoMailItalianReply.html
View File

@ -1,9 +1,8 @@
<#signaturePlacementOnTop>
<#replyPlacementOnTop>
</#replyPlacementOnTop><#signaturePlacementOnTop>
<#signature/>
</#signaturePlacementOnTop>
<#outlookMode>-------- Messaggio originale --------
</#signaturePlacementOnTop><#outlookMode>-------- Messaggio originale --------
Oggetto: <#subject/>
Data: <#date/>
Da: <#from/>
@ -12,6 +11,6 @@ Da: <#from/>
<#standardMode>Il giorno <#date/>, <#from/> ha scritto:</#standardMode>
<#messageBody/>
<#replyPlacementOnBottom>
<#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>
</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>

3
SoObjects/Mailer/SOGoMailRussianForward.wo/SOGoMailRussianForward.html
View File

@ -1,3 +1,6 @@
-------- Original Message --------
Subject: <#subject/>
Date: <#date/>

10
SoObjects/Mailer/SOGoMailRussianReply.wo/SOGoMailRussianReply.html
View File

@ -1,9 +1,8 @@
<#signaturePlacementOnTop>
<#replyPlacementOnTop>
</#replyPlacementOnTop><#signaturePlacementOnTop>
<#signature/>
</#signaturePlacementOnTop>
<#outlookMode>-------- Original Message --------
</#signaturePlacementOnTop><#outlookMode>-------- Original Message --------
Subject: <#subject/>
Date: <#date/>
From: <#from/>
@ -12,5 +11,6 @@ From: <#from/>
<#standardMode>On <#date/>, <#from/> wrote:</#standardMode>
<#messageBody/>
<#replyPlacementOnBottom>
<#signature/>
</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>

3
SoObjects/Mailer/SOGoMailSpanishForward.wo/SOGoMailSpanishForward.html
View File

@ -1,3 +1,6 @@
-------- Original Message --------
Subject: <#subject/>
Date: <#date/>

14
SoObjects/Mailer/SOGoMailWelshForward.wo/SOGoMailWelshForward.html
View File

@ -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/>
-------- Original Message --------
Testun: <#subject/>
Dyddiad: <#date/>
Oddi wrth: <#from/>
<#hasReplyTo>Ymateb i: <#replyTo/><#hasOrganization>Sefydliad: <#organization/></#hasOrganization>I: <#to/>
<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Grwpiau newyddion: <#newsgroups/></#hasNewsGroups><#hasReferences>Cyfeirnodau: <#references/></#hasReferences>
<#messageBody/>
<#signature/>

17
SoObjects/Mailer/SOGoMailWelshReply.wo/SOGoMailWelshReply.html
View File

@ -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/>
<#replyPlacementOnTop>
</#replyPlacementOnTop><#signaturePlacementOnTop>
<#signature/>
</#signaturePlacementOnTop><#outlookMode>-------- Neges Wreiddiol --------
Testun: <#subject/>
Dyddiad: <#date/>
Oddi wrth: <#from/>
<#hasReplyTo>Ymateb i: <#replyTo/></#hasReplyTo><#hasOrganization>Sefydliad: <#organization/></#hasOrganization>I: <#to/>
<#hasCc>CC: <#cc/></#hasCc><#hasNewsGroups>Grwpiau newyddion: <#newsgroups/></#hasNewsGroups><#hasReferences>Cyfeirnodau: <#references/></#hasReferences></#outlookMode>
<#standardMode>Ar <#date/>, <#from/> ysgrifennodd:</#standardMode>
<#messageBody/>
<#replyPlacementOnBottom>
</#replyPlacementOnBottom><#signaturePlacementOnBottom><#signature/></#signaturePlacementOnBottom>

2
UI/Templates/MailerUI/UIxMailEditor.wox
View File

@ -72,7 +72,7 @@
/></div>
<!-- separator line --><hr/>
</div>
<textarea id="text" name="text" rows="30" var:value="text"/>
<textarea id="text" name="text" rows="30" var:value="text"></textarea>
<!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->
</form>
</var:component>

8
UI/WebServerResources/UIxMailEditor.js
View File

@ -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();