amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-06 07:36:24 +00:00
Code Issues Projects Releases Wiki Activity

merge of '637d4bc405444db20b4ed12bf09dd27c7780047b'

Browse Source 
and 'c8e16863bcabf9adf6b224c4a9922c0ace67917f'

Monotone-Parent: 637d4bc405444db20b4ed12bf09dd27c7780047b
Monotone-Parent: c8e16863bcabf9adf6b224c4a9922c0ace67917f
Monotone-Revision: 4f9cd9e4647b59cc1df48053efc611005b19b79c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-22T21:34:52
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2010-01-22 21:34:52 +00:00
parent 683ba2d520 dc41b95e0d
commit 59196a3e90
5 changed files with 31 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -8,6 +8,9 @@
2010-01-22 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/WebServerResources/MailerUI.js (composeNewMessage): fixed
potential js error in IE when no mailbox is selected.
* Tools/SOGoToolRestore.m (+initialize): we need to invoke
[iCalEntityObject+SOGo initializeSOGoExtensions], otherwise the
extraction of quick records will cause a crash because some global

7
UI/Templates/SchedulerUI/UIxCalendarProperties.wox
View File

@@ -52,13 +52,14 @@
/></label></div>
<var:if condition="mustSynchronize" const:negate="YES"
><div><label><var:string
label:value="Tag:"/><input type="text"
><div><span class="label"><var:string
label:value="Tag:"/></span
><span class="content"><input type="text"
name="calendarSyncTag"
id="calendarSyncTag"
class="textField"
var:value="calendarSyncTag"
/></label
/></span
><var:if condition="synchronizeCalendar"><input type="hidden"
name="originalCalendarSyncTag"
id="originalCalendarSyncTag"

14
UI/WebServerResources/MailerUI.js
View File

@@ -575,9 +575,17 @@ function onComposeMessage() {
}
function composeNewMessage() {
var account = Mailer.currentMailbox.split("/")[1];
var url = ApplicationBaseURL + "/" + encodeURI(account) + "/compose";
openMailComposeWindow(url);
var account;
if (Mailer.currentMailbox)
account = Mailer.currentMailbox.split("/")[1];
else if (mailAccounts.length)
account = mailAccounts[0][0];
else
account = null;
if (account) {
var url = ApplicationBaseURL + "/" + encodeURI(account) + "/compose";
openMailComposeWindow(url);
}
}
function openMailbox(mailbox, reload, idx, updateStatus) {

4
UI/WebServerResources/SchedulerUI.js
View File

@@ -1972,7 +1972,7 @@ function onCalendarModify(event) {
var url = ApplicationBaseURL + calendarID + "/properties";
var windowID = sanitizeWindowName(calendarID + " properties");
var width = 310;
var height = 260;
var height = 266;
var isWebCalendar = false;
if (UserSettings['Calendar']
&& UserSettings['Calendar']['WebCalendars']) {
@@ -1983,7 +1983,7 @@ function onCalendarModify(event) {
}
}
if (isWebCalendar)
height += 25;
height += 21;
else if (calendarID == "/personal")
height -= 25;

14
UI/WebServerResources/UIxCalendarProperties.css
View File

@@ -11,23 +11,28 @@ FIELDSET
border-top: 1px solid #909090;
border-left: 1px solid #909090; }
FIELDSET DIV
{ margin-left: 20px;
margin-right: 10px; }
SPAN.label
{ cursor: default;
width: 10em;
width: 60px;
text-align: right;
padding-right: 1em;
line-height: 2em;
float: left;
display: block; }
INPUT.checkBox
{ margin-left: 35px; }
SPAN.content
{ display: block;
line-height: 1.5em;
vertical-align: middle; }
SPAN.content INPUT.textField
{ width: 50%; }
{ width: 160px; }
BUTTON#colorButton
{ display: none;
@@ -45,6 +50,9 @@ DIV#buttons
INPUT#calendarSyncTag
{ width: 7em; }
LABEL
{ white-space: nowrap; }
#webCalendarUrl SPAN.content
{ white-space: nowrap;
overflow: hidden; }