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

Merge branch 'master' of github.com:inverse-inc/sogo

maint-2.0.2
Wolfgang Sourdeau 2012-09-27 10:14:29 -04:00
parent 2711e0a0db 1cf972074c
commit a353b6e4ed
11 changed files with 43 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Documentation/SOGo Native Microsoft Outlook Configuration.odt
View File

Binary file not shown.

8
UI/Scheduler/UIxAppointmentActions.m
View File

@ -67,12 +67,8 @@
co = [self clientObject];
event = (iCalEvent *) [[self clientObject] occurence];
ud = [[context activeUser] userDefaults];
tz = [ud timeZone];
start = [event startDate];
[start setTimeZone: tz];
end = [event endDate];
[end setTimeZone: tz];
if ([event isAllDay])
{
@ -87,6 +83,10 @@
}
else
{
ud = [[context activeUser] userDefaults];
tz = [ud timeZone];
[start setTimeZone: tz];
[end setTimeZone: tz];
newStart = [start dateByAddingYears: 0 months: 0
days: [daysDelta intValue]
hours: 0 minutes: [startDelta intValue]

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

@ -16,7 +16,7 @@
<table class="mailer_fieldtable">
<tr class="mailer_fieldrow">
<td class="mailer_fieldname" ><var:string label:value="Subject"/>:</td>
<td class="mailer_subjectfieldvalue"><var:string value="messageSubject"/></td>
<td class="mailer_subjectfieldvalue" id="subject"><var:string value="messageSubject"/></td>
</tr>
<tr class="mailer_fieldrow">
<td class="mailer_fieldname" ><var:string label:value="From"/>:</td>

2
UI/Templates/MainUI/SOGoRootPage.wox
View File

@ -46,7 +46,7 @@
<var:popup const:id="language" const:name="language"
list="languages"
item="item"
var:selection="item"
var:selection="locale.NSLanguageName"
var:value="item"
string="languageText"
label:noSelectionString="choose"

2
UI/Templates/SchedulerUI/UIxComponentEditor.wox
View File

@ -101,7 +101,7 @@
><var:string label:value="Edit"/></a></span></label>
<hr />
<label id="commentArea"><var:string label:value="Description:"
/><textarea rows="20" name="comment" var:value="comment" /></label>
/><span class="content"><textarea rows="20" name="comment" var:value="comment" /></span></label>
<label id="documentLabel" style="display: none;"><var:string label:value="Document:"
/><span class="content"
><a href="#" id="documentHref"><!-- space --></a

30
UI/WebServerResources/ContactsUI.js
View File

@ -257,14 +257,16 @@ function _onContactMenuAction(folderItem, action, refresh) {
}
}
var url = ApplicationBaseURL + selectedFolderId + "/" + action
+ "?folder=" + folderId + "&uid="
+ contactIds.join("&uid=");
var url = ApplicationBaseURL + selectedFolderId + "/" + action;
if (refresh)
triggerAjaxRequest(url, actionContactCallback, selectedFolderId);
triggerAjaxRequest(url, actionContactCallback, selectedFolderId,
('folder='+ folderId + '&uid=' + contactIds.join('&uid=')),
{ "Content-type": "application/x-www-form-urlencoded" });
else
triggerAjaxRequest(url, actionContactCallback);
triggerAjaxRequest(url, actionContactCallback, null,
('folder='+ folderId + '&uid=' + contactIds.join('&uid=')),
{ "Content-type": "application/x-www-form-urlencoded" });
}
}
@ -313,7 +315,7 @@ function actionContactCallback(http) {
if (parseInt(http.status) == 403)
showAlertDialog(_("You don't have the required privileges to perform the operation."));
else if (error)
showAlertDialog(labels[error]);
showAlertDialog(_(error));
refreshCurrentFolder();
}
}
@ -1516,7 +1518,7 @@ function currentFolderIsRemote() {
var selectedFolders = $("contactFolders").getSelectedNodes();
if (selectedFolders.length > 0) {
var fromObject = $(selectedFolders[0]);
rc = fromObject.hasClassName ("remote");
rc = fromObject.hasClassName("remote");
}
return rc;
}
@ -1571,19 +1573,19 @@ function dropSelectedContacts(action, toId) {
if (selectedFolders.length > 0) {
var contactIds = $('contactsList').getSelectedRowsId();
for (var i = 0; i < contactIds.length; i++) {
if (contactIds[i].endsWith ("vlf")) {
if (contactIds[i].endsWith("vlf")) {
showAlertDialog(_("Lists can't be moved or copied."));
return false;
}
}
var fromId = $(selectedFolders[0]).id;
if ((!currentFolderIsRemote () || action != "move")
if ((!currentFolderIsRemote() || action != "move")
&& fromId.substring(1) != toId) {
var url = ApplicationBaseURL + fromId + "/" + action
+ "?folder=" + toId + "&uid="
+ contactIds.join("&uid=");
triggerAjaxRequest(url, actionContactCallback, fromId);
var url = ApplicationBaseURL + fromId + "/" + action;
triggerAjaxRequest(url, actionContactCallback, fromId,
('folder='+ toId + '&uid=' + contactIds.join('&uid=')),
{ "Content-type": "application/x-www-form-urlencoded" });
}
}
}

5
UI/WebServerResources/UIxAppointmentEditor.css
View File

@ -53,7 +53,7 @@ LABEL, SPAN.checkBoxList
SELECT
{ margin-left: 1px; }
LABEL#commentArea
n0LABEL#commentArea
{ height: 17em; }
LABEL#commentArea textarea
@ -105,7 +105,8 @@ SPAN#categoriesCB LABEL
margin-right: 1em; }
SPAN.content > INPUT.textField
{ width: 380px; }
{ n0width: 380px;
width: 97%; }
LABEL#urlArea INPUT
{ position: static; }

19
UI/WebServerResources/UIxComponentEditor.css
View File

@ -30,13 +30,10 @@ SPAN.content
line-height: 2em;
top: -.25em;
left: 8em;
right: 1em;
right: 0em;
text-overflow: ellipsis;
overflow: hidden; }
SPAN.content > INPUT.textField,
LABEL#commentArea textarea
{ max-width: 380px; }
overflow: hidden;
min-height: 22px; }
LABEL, SPAN.checkBoxList
{ display: block;
@ -48,20 +45,12 @@ LABEL, SPAN.checkBoxList
width: 100%; }
LABEL#commentArea textarea
{ position: absolute;
top: 0;
width: 100%;
left: 8em;
right: 1em;
margin: 0px;
margin: auto;
margin-left: 1px; }
{ width: 97%; }
SPAN.headerContent
{
width: 80%;
height: 1px;
background: #aaaaaa;
top: 0.9em;
}
LABEL.title

8
UI/WebServerResources/UIxMailEditor.js
View File

@ -108,7 +108,7 @@ function updateWindowTitleFromSubject(event) {
if (this.value) {
document.title = this.value;
}else{
document.title = _("Untitled");
document.title = '(' + _("Untitled") + ')';
}
}
@ -423,6 +423,12 @@ function initMailEditor() {
configureDragHandle();
// Set current subject as window title if not set, use '(Untitled)'
if (document.pageform.subject.value == "")
document.title = '(' + _("Untitled") + ')';
else
document.title = _(document.pageform.subject.value);
// Change the window title when typing the subject
$$("div#subjectRow input").first().on("keyup", updateWindowTitleFromSubject);

4
UI/WebServerResources/UIxMailPopupView.js
View File

@ -16,6 +16,10 @@ function initPopupMailer(event) {
window.messageUID = mailboxName + "/" + messageName;
handleReturnReceipt();
var td = $("subject");
if (td)
document.title = td.allTextContent();
}
function onICalendarButtonClick(event) {

32
UI/WebServerResources/UIxTaskEditor.css
View File

@ -13,20 +13,6 @@ DIV.appointmentRightLabel
{ display: inline;
vertical-align: middle; }
LABEL, SPAN.checkBoxList
{ display: block;
position: relative;
height: 1.5em;
margin-left: .5em;
margin-bottom: .5em;
width: 100%; }
LABEL#commentArea
{ height: 15em; }
LABEL#commentArea textarea
{ height: 15em; }
SPAN.checkBoxList#participantsCB
{ height: 7em; }
@ -39,21 +25,6 @@ DIV#participants UL.contactList
SPAN.checkBoxList SPAN.content LABEL
{ display: inline; }
SPAN.content
{ position: absolute;
top: -.25em;
left: 6em;
right: 1em; }
TEXTAREA
{ position: absolute;
top: 0px;
left: 6em;
vertical-align: bottom;
bottom: 1em;
right: 1em;
padding-bottom: 0em; }
A#changeUrlButton
{ margin-left: 1em; }
@ -91,7 +62,8 @@ SPAN#allDay > INPUT
{ position: static; }
SPAN.content > INPUT.textField
{ width: 390px; }
{ width: 390px;
width: 97%; }
INPUT#startDateCB,
INPUT#dueDateCB,