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

merge of 'aa5015ff0079b6856954284a0b566fd85c428a93'

Browse source 
and 'd894e5477e189d935a994c87418e92db405deacb'

Monotone-Parent: aa5015ff0079b6856954284a0b566fd85c428a93
Monotone-Parent: d894e5477e189d935a994c87418e92db405deacb
Monotone-Revision: ec44ffcb951f3db4e0041a44e56a9f0d5df4ef3b

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-08-06T14:24:02
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2010-08-06 14:24:02 +00:00
parent 4a1c8d3753 1aedf2b67d
commit 44a7a9b099
11 changed files with 199 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
ChangeLog
View file

@ -1,9 +1,26 @@
2010-08-06 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoDomainDefaults.m
(-mailAuxiliaryUserAccountsEnabled): new method returning a BOOL
describing whether the domain users can access auxiliary mail
accounts.
* SoObjects/SOGo/SOGoUserDefaults.m (-setAuxiliaryMailAccounts:)
(auxiliaryMailAccounts): new methods that receives and returns an
NSArray of NSDictionary describing the user's auxiliary mail
accounts.
* UI/WebServerResources/HTMLElement.js: (deselectAll): if the
container has a "selectedElements" attribute, then it's no longer
required to wander through the "selectedIds" attribute. This fixes
a strange bug on IE when modifying the selection on LI lists.
2010-08-05 Francis Lachapelle <flachapelle@inverse.ca> 2010-08-05 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/SOGoResizableTable.js * UI/WebServerResources/SOGoResizableTable.js
(computeColumnsWidths): was previous part of saveColumnsState. (computeColumnsWidths): was previous part of saveColumnsState.
Used when the user hasn't modify the columns widths but the local "ratios" Used when the user hasn't modify the columns widths but the local
hash still need to be built. "ratios" hash still need to be built.
2010-08-04 Francis Lachapelle <flachapelle@inverse.ca> 2010-08-04 Francis Lachapelle <flachapelle@inverse.ca>

2
SoObjects/SOGo/SOGoDomainDefaults.h
View file

@ -37,6 +37,8 @@
- (NSArray *) userSources; - (NSArray *) userSources;
- (BOOL) mailAuxiliaryUserAccountsEnabled;
- (NSString *) mailDomain; - (NSString *) mailDomain;
- (NSString *) imapServer; - (NSString *) imapServer;
- (NSString *) imapAclStyle; - (NSString *) imapAclStyle;

5
SoObjects/SOGo/SOGoDomainDefaults.m
View file

@ -98,6 +98,11 @@
return [self stringForKey: @"OCSFolderInfoURL"]; return [self stringForKey: @"OCSFolderInfoURL"];
} }
- (BOOL) mailAuxiliaryUserAccountsEnabled
{
return [self boolForKey: @"SOGoMailAuxiliaryUserAccountsEnabled"];
}
- (NSString *) mailDomain - (NSString *) mailDomain
{ {
return [self stringForKey: @"SOGoMailDomain"]; return [self stringForKey: @"SOGoMailDomain"];

3
SoObjects/SOGo/SOGoUserDefaults.h
View file

@ -122,6 +122,9 @@ extern NSString *SOGoWeekStartFirstFullWeek;
- (void) setMailUseOutlookStyleReplies: (BOOL) newValue; - (void) setMailUseOutlookStyleReplies: (BOOL) newValue;
- (BOOL) mailUseOutlookStyleReplies; - (BOOL) mailUseOutlookStyleReplies;
- (void) setAuxiliaryMailAccounts: (NSArray *) newAccounts;
- (NSArray *) auxiliaryMailAccounts;
- (void) setCalendarCategories: (NSArray *) newValues; - (void) setCalendarCategories: (NSArray *) newValues;
- (NSArray *) calendarCategories; - (NSArray *) calendarCategories;

10
SoObjects/SOGo/SOGoUserDefaults.m
View file

@ -511,6 +511,16 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
return [self boolForKey: @"SOGoMailUseOutlookStyleReplies"]; return [self boolForKey: @"SOGoMailUseOutlookStyleReplies"];
} }
- (void) setAuxiliaryMailAccounts: (NSArray *) newAccounts
{
[self setObject: newAccounts forKey: @"AuxiliaryMailAccounts"];
}
- (NSArray *) auxiliaryMailAccounts
{
return [self arrayForKey: @"AuxiliaryMailAccounts"];
}
- (void) setCalendarCategories: (NSArray *) newValues - (void) setCalendarCategories: (NSArray *) newValues
{ {
[self setObject: newValues forKey: @"SOGoCalendarCategories"]; [self setObject: newValues forKey: @"SOGoCalendarCategories"];

3
UI/WebServerResources/HTMLElement.js
View file

@ -229,8 +229,9 @@ Element.addMethods({
for (var i = 0; i < element.selectedElements.length; i++) for (var i = 0; i < element.selectedElements.length; i++)
element.selectedElements[i].removeClassName('_selected'); element.selectedElements[i].removeClassName('_selected');
element.selectedElements = null; element.selectedElements = null;
element.selectedIds = null;
} }
if (element.selectedIds) { else if (element.selectedIds) {
for (var i = 0; i < element.selectedIds.length; i++) { for (var i = 0; i < element.selectedIds.length; i++) {
var e = element.down('#' + element.selectedIds[i]); var e = element.down('#' + element.selectedIds[i]);
if (e && e.hasClassName('_selected')) if (e && e.hasClassName('_selected'))

120
UI/WebServerResources/MailerUIdTree.js
View file

@ -1,66 +1,64 @@
/* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
var MailerUIdTreeExtension = { var MailerUIdTreeExtension = {
elementCounter: 1, elementCounter: 1,
folderIcons: { account: "tbtv_account_17x17.png", folderIcons: { account: "tbtv_account_17x17.png",
inbox: "tbtv_inbox_17x17.png", inbox: "tbtv_inbox_17x17.png",
sent: "tbtv_sent_17x17.png", sent: "tbtv_sent_17x17.png",
draft: "tbtv_drafts_17x17.png", draft: "tbtv_drafts_17x17.png",
trash: "tbtv_trash_17x17.png" }, trash: "tbtv_trash_17x17.png" },
folderNames: { inbox: _("InboxFolderName"), folderNames: { inbox: _("InboxFolderName"),
sent: _("SentFolderName"), sent: _("SentFolderName"),
draft: _("DraftsFolderName"), draft: _("DraftsFolderName"),
trash: _("TrashFolderName") }, trash: _("TrashFolderName") },
_addFolderNode: function (parent, name, fullName, type, unseen) { _addFolderNode: function (parent, name, fullName, type, unseen) {
var icon = this.folderIcons[type]; var icon = this.folderIcons[type];
if (icon) if (icon)
icon = ResourcesURL + "/" + icon; icon = ResourcesURL + "/" + icon;
else else
icon = ""; icon = "";
var displayName = this.folderNames[type]; var displayName = this.folderNames[type];
var hasUnseen = false; var hasUnseen = false;
if (!displayName) if (!displayName)
displayName = name; displayName = name;
if (typeof unseen != "undefined") { if (typeof unseen != "undefined") {
hasUnseen = true; hasUnseen = true;
displayName += "<span id=\"unseenCount\"> (<span>" + parseInt(unseen) + "</span>)</span>"; displayName += "<span id=\"unseenCount\"> (<span>" + parseInt(unseen) + "</span>)</span>";
} }
this.add(this.elementCounter, parent, displayName, 1, '#', fullName, this.add(this.elementCounter, parent, displayName, 1, '#', fullName,
type, '', '', icon, icon, hasUnseen); type, '', '', icon, icon, hasUnseen);
this.elementCounter++; this.elementCounter++;
}, },
_addFolder: function (parent, folder) { _addFolder: function (parent, folder) {
var thisCounter = this.elementCounter; var thisCounter = this.elementCounter;
this._addFolderNode(parent, folder.displayName, folder.fullName(), folder.type, folder.unseen); this._addFolderNode(parent, folder.displayName, folder.fullName(), folder.type, folder.unseen);
for (var i = 0; i < folder.children.length; i++) for (var i = 0; i < folder.children.length; i++)
this._addFolder(thisCounter, folder.children[i]); this._addFolder(thisCounter, folder.children[i]);
}, },
addMailAccount: function (mailAccount) { addMailAccount: function (mailAccount) {
this._addFolder(0, mailAccount); this._addFolder(0, mailAccount);
}, },
setCookie: function(cookieName, cookieValue, expires, path, domain, secure) { setCookie: function(cookieName, cookieValue, expires, path, domain, secure) {
}, },
getCookie: function(cookieName) { getCookie: function(cookieName) {
return (""); return ("");
}, },
updateCookie: function () { updateCookie: function () {
if (Mailer.foldersStateTimer) if (Mailer.foldersStateTimer)
clearTimeout(Mailer.foldersStateTimer); clearTimeout(Mailer.foldersStateTimer);
Mailer.foldersStateTimer = setTimeout('saveFoldersState()', 3000); // 3 seconds Mailer.foldersStateTimer = setTimeout('saveFoldersState()', 3000); // 3 seconds
}, },
getFoldersState: function () { getFoldersState: function () {
var expandedFolders = new Array(); var expandedFolders = new Array();
for (var n = 0; n < this.aNodes.length; n++) { for (var n = 0; n < this.aNodes.length; n++) {
if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) { if (this.aNodes[n]._io && this.aNodes[n].pid != this.root.id) {
expandedFolders.push(this.aNodes[n].dataname); expandedFolders.push(this.aNodes[n].dataname);
} }
}
return expandedFolders.toJSON();
},
autoSync: function() {
this.config.useCookies = true;
} }
return expandedFolders.toJSON();
},
autoSync: function() {
this.config.useCookies = true;
}
}; };
Object.extend(dTree.prototype, MailerUIdTreeExtension); Object.extend(dTree.prototype, MailerUIdTreeExtension);

175
UI/WebServerResources/dtree.js
View file

@ -1,17 +1,16 @@
/* -*- Mode: java; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*--------------------------------------------------| /*--------------------------------------------------|
| dTree 2.05 | www.destroydrop.com/javascript/tree/ | | dTree 2.05 | www.destroydrop.com/javascript/tree/ |
|---------------------------------------------------| |---------------------------------------------------|
| Copyright (c) 2002-2003 Geir Landrö | | Copyright (c) 2002-2003 Geir Landrö |
| | | |
| This script can be used freely as long as all | | This script can be used freely as long as all |
| copyright messages are intact. | | copyright messages are intact. |
| | | |
| Updated: 17.04.2003 | | Updated: 17.04.2003 |
|--------------------------------------------------*/ |--------------------------------------------------*/
/* The content of attribute values should be quoted properly by using the /* The content of attribute values should be quoted properly by using the
equivalent entities. */ equivalent entities. */
function dTreeQuote(str) { function dTreeQuote(str) {
return (str return (str
.replace(/&/g, "&amp;") .replace(/&/g, "&amp;")
@ -23,48 +22,48 @@ function dTreeQuote(str) {
// Node object // Node object
function Node(id, pid, name, isParent, url, dataname, datatype, title, target, function Node(id, pid, name, isParent, url, dataname, datatype, title, target,
icon, iconOpen, open, hasUnseen) { icon, iconOpen, open, hasUnseen) {
this.isParent = isParent; this.isParent = isParent;
this.id = id; this.id = id;
this.pid = pid; this.pid = pid;
this.name = name; this.name = name;
this.url = url; this.url = url;
this.title = title; this.title = title;
this.target = target; this.target = target;
this.icon = icon; this.icon = icon;
this.iconOpen = iconOpen; this.iconOpen = iconOpen;
this.dataname = dataname; this.dataname = dataname;
this.datatype = datatype; this.datatype = datatype;
this.hasUnseen = hasUnseen; this.hasUnseen = hasUnseen;
this._io = open || false; this._io = open || false;
this._is = false; this._is = false;
this._ls = false; this._ls = false;
this._hc = false; this._hc = false;
this._ai = 0; this._ai = 0;
this._p; this._p;
}; };
// Tree object // Tree object
function dTree(objName) { function dTree(objName) {
this.obj = objName; this.obj = objName;
this.config = { this.config = {
target: null, target: null,
useCookies: false useCookies: false
}; };
this.icon = { this.icon = {
root: 'img/base.gif', root: 'img/base.gif',
folder: 'img/folder.gif', folder: 'img/folder.gif',
folderOpen: 'img/folderopen.gif', folderOpen: 'img/folderopen.gif',
node: 'img/page.gif', node: 'img/page.gif',
empty: 'img/empty.gif', empty: 'img/empty.gif',
line: 'img/line.gif', line: 'img/line.gif',
join: 'img/join.gif', join: 'img/join.gif',
joinBottom: 'img/joinbottom.gif', joinBottom: 'img/joinbottom.gif',
plus: 'img/plus.gif', plus: 'img/plus.gif',
plusBottom: 'img/plusbottom.gif', plusBottom: 'img/plusbottom.gif',
minus: 'img/minus.gif', minus: 'img/minus.gif',
minusBottom: 'img/minusbottom.gif', minusBottom: 'img/minusbottom.gif',
nlPlus: 'img/nolines_plus.gif', nlPlus: 'img/nolines_plus.gif',
nlMinus: 'img/nolines_minus.gif' nlMinus: 'img/nolines_minus.gif'
}; };
this.images = {}; this.images = {};
this.objects = {}; this.objects = {};
@ -74,7 +73,7 @@ function dTree(objName) {
this.selectedNode = null; this.selectedNode = null;
this.selectedFound = false; this.selectedFound = false;
this.completed = false; this.completed = false;
return this; return this;
}; };
@ -115,7 +114,7 @@ dTree.prototype = {
this.objects['namespan'] = new Element ("span", {"class": "nodeName"}); this.objects['namespan'] = new Element ("span", {"class": "nodeName"});
this.objects['image'] = new Element ("img"); this.objects['image'] = new Element ("img");
}, },
// Open/close all nodes // Open/close all nodes
openAll: function() { openAll: function() {
@ -131,7 +130,7 @@ dTree.prototype = {
div.id = this.obj; div.id = this.obj;
div.addClassName ("dtree"); div.addClassName ("dtree");
if (this.config.useCookies) if (this.config.useCookies)
this.selectedNode = this.getSelected(); this.selectedNode = this.getSelected();
this.addNode (this.root, div); this.addNode (this.root, div);
if (!this.selectedFound) this.selectedNode = null; if (!this.selectedFound) this.selectedNode = null;
this.completed = true; this.completed = true;
@ -166,26 +165,26 @@ dTree.prototype = {
this.aNodes[nodeId] = node; this.aNodes[nodeId] = node;
if (this.root.id != node.pid) { if (this.root.id != node.pid) {
var div = this.objects['nodediv'].cloneNode (true); var div = this.objects['nodediv'].cloneNode (true);
if (node.datatype) if (node.datatype)
div.writeAttribute ("datatype", dTreeQuote(node.datatype)); div.writeAttribute ("datatype", dTreeQuote(node.datatype));
if (node.dataname) if (node.dataname)
div.writeAttribute ("dataname", dTreeQuote(node.dataname)); div.writeAttribute ("dataname", dTreeQuote(node.dataname));
this.indent (node, nodeId, div); this.indent (node, nodeId, div);
var link = this.objects['nodelink'].cloneNode (true); var link = this.objects['nodelink'].cloneNode (true);
link.id = 's' + this.obj + nodeId; link.id = 's' + this.obj + nodeId;
link.href = dTreeQuote(node.url); link.href = dTreeQuote(node.url);
if (node.title) if (node.title)
link.writeAttribute ("title", dTreeQuote(node.title)); link.writeAttribute ("title", dTreeQuote(node.title));
if (node.target) if (node.target)
link.writeAttribute ("target", dTreeQuote(node.target)); link.writeAttribute ("target", dTreeQuote(node.target));
link.observe ("click", this.s.bindAsEventListener(this, parseInt(nodeId))); link.observe ("click", this.s.bindAsEventListener(this, parseInt(nodeId)));
if (!node.icon) if (!node.icon)
node.icon = (this.root.id == node.pid) ? node.icon = (this.root.id == node.pid) ?
this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node); this.icon.root : ((node._hc) ? this.icon.folder : this.icon.node);
if (!node.iconOpen) if (!node.iconOpen)
node.iconOpen = (node._hc) ? node.iconOpen = (node._hc) ?
this.icon.folderOpen : this.icon.node; this.icon.folderOpen : this.icon.node;
if (this.root.id == node.pid) { if (this.root.id == node.pid) {
@ -199,28 +198,28 @@ dTree.prototype = {
var span = this.objects['namespan'].cloneNode (true); var span = this.objects['namespan'].cloneNode (true);
if (!node.isParent) if (!node.isParent)
span.addClassName ("leaf"); span.addClassName ("leaf");
if (node.hasUnseen) if (node.hasUnseen)
span.addClassName ("unseen"); span.addClassName ("unseen");
span.update (node.name); span.update (node.name);
link.appendChild (img); link.appendChild (img);
link.appendChild (span); link.appendChild (span);
div.appendChild (link); div.appendChild (link);
if (container) if (container)
container.appendChild (div); container.appendChild (div);
else else
rc = div; rc = div;
} }
if (node._hc) { if (node._hc) {
var div = this.objects['clipdiv'].cloneNode (true); var div = this.objects['clipdiv'].cloneNode (true);
div.id = 'd' + this.obj + nodeId; div.id = 'd' + this.obj + nodeId;
div.setStyle ({"display": div.setStyle ({"display":
((this.root.id == node.pid || node._io) ? ((this.root.id == node.pid || node._io) ?
'block' : 'none')}); 'block' : 'none')});
this.addNode(node, div); this.addNode(node, div);
if (container) if (container)
container.appendChild (div); container.appendChild (div);
} }
this.aIndent.pop(); this.aIndent.pop();
return rc; return rc;
@ -230,8 +229,8 @@ dTree.prototype = {
indent: function(node, nodeId, container) { indent: function(node, nodeId, container) {
if (this.root.id != node.pid) { if (this.root.id != node.pid) {
for (var n=0; n<this.aIndent.length; n++) { for (var n=0; n<this.aIndent.length; n++) {
var img = (this.aIndent[n] == 1) ? var img = (this.aIndent[n] == 1) ?
this.images['line'] : this.images['empty']; this.images['line'] : this.images['empty'];
container.appendChild (img.cloneNode (true)); container.appendChild (img.cloneNode (true));
} }
(node._ls) ? this.aIndent.push(0) : this.aIndent.push(1); (node._ls) ? this.aIndent.push(0) : this.aIndent.push(1);
@ -241,9 +240,9 @@ dTree.prototype = {
link.observe ("click", this.o.bindAsEventListener(this, parseInt(nodeId))); link.observe ("click", this.o.bindAsEventListener(this, parseInt(nodeId)));
var img; var img;
if (node._io) if (node._io)
img = ((node._ls) ? this.images['minusbottom'] : this.images['minus']); img = ((node._ls) ? this.images['minusbottom'] : this.images['minus']);
else else
img = ((node._ls) ? this.images['plusbottom'] : this.images['plus']); img = ((node._ls) ? this.images['plusbottom'] : this.images['plus']);
img = img.cloneNode (true); img = img.cloneNode (true);
img.id = 'j' + this.obj + nodeId; img.id = 'j' + this.obj + nodeId;
link.appendChild (img); link.appendChild (img);
@ -275,7 +274,7 @@ dTree.prototype = {
// Highlights the selected node // Highlights the selected node
s: function(id, withEvent) { s: function(id, withEvent) {
if (withEvent) if (withEvent)
id = withEvent; id = withEvent;
var cn = this.aNodes[id]; var cn = this.aNodes[id];
if (this.selectedNode != id) { if (this.selectedNode != id) {
if (this.selectedNode || this.selectedNode==0) { if (this.selectedNode || this.selectedNode==0) {
@ -292,12 +291,12 @@ dTree.prototype = {
// Toggle Open or close // Toggle Open or close
o: function(id, withEvent) { o: function(id, withEvent) {
if (withEvent) if (withEvent)
id = withEvent; id = withEvent;
var cn = this.aNodes[id]; var cn = this.aNodes[id];
this.nodeStatus(!cn._io, id, cn._ls); this.nodeStatus(!cn._io, id, cn._ls);
cn._io = !cn._io; cn._io = !cn._io;
if (this.config.useCookies) this.updateCookie(); if (this.config.useCookies) this.updateCookie();
return false; return false;
}, },
@ -349,18 +348,18 @@ dTree.prototype = {
if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) { if (this.aNodes[n].pid == node.id && this.aNodes[n]._hc) {
if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls); if (this.aNodes[n]._io) this.nodeStatus(false, n, this.aNodes[n]._ls);
this.aNodes[n]._io = false; this.aNodes[n]._io = false;
this.closeAllChildren(this.aNodes[n]); this.closeAllChildren(this.aNodes[n]);
} }
} }
}, },
// Change the status of a node(open or closed) // Change the status of a node(open or closed)
nodeStatus: function(status, id, bottom) { nodeStatus: function(status, id, bottom) {
eDiv = document.getElementById('d' + this.obj + id); eDiv = document.getElementById('d' + this.obj + id);
if (eDiv) { if (eDiv) {
eJoin = $('j' + this.obj + id); eJoin = $('j' + this.obj + id);
eIcon = document.getElementById('i' + this.obj + id); eIcon = document.getElementById('i' + this.obj + id);
eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon; eIcon.src = (status) ? this.aNodes[id].iconOpen : this.aNodes[id].icon;
eJoin.src = ((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus)); eJoin.src = ((status)?((bottom)?this.icon.minusBottom:this.icon.minus):((bottom)?this.icon.plusBottom:this.icon.plus));
eDiv.style.display = (status) ? 'block': 'none'; eDiv.style.display = (status) ? 'block': 'none';
} }
@ -373,7 +372,7 @@ dTree.prototype = {
this.setCookie('co'+this.obj, 'cookieValue', yesterday); this.setCookie('co'+this.obj, 'cookieValue', yesterday);
this.setCookie('cs'+this.obj, 'cookieValue', yesterday); this.setCookie('cs'+this.obj, 'cookieValue', yesterday);
}, },
// [Cookie] Sets value in a cookie // [Cookie] Sets value in a cookie
setCookie: function(cookieName, cookieValue, expires, path, domain, secure) { setCookie: function(cookieName, cookieValue, expires, path, domain, secure) {
document.cookie = document.cookie =
@ -408,7 +407,7 @@ dTree.prototype = {
} }
this.setCookie('co' + this.obj, str); this.setCookie('co' + this.obj, str);
}, },
// [Cookie] Checks if a node id is in a cookie // [Cookie] Checks if a node id is in a cookie
isOpen: function(id) { isOpen: function(id) {
var aOpen = this.getCookie('co' + this.obj).split('.'); var aOpen = this.getCookie('co' + this.obj).split('.');
@ -420,18 +419,18 @@ dTree.prototype = {
// If Push and pop is not implemented by the browser // If Push and pop is not implemented by the browser
if (!Array.prototype.push) { if (!Array.prototype.push) {
Array.prototype.push = function array_push() { Array.prototype.push = function array_push() {
for(var i=0;i<arguments.length;i++) for(var i=0;i<arguments.length;i++)
this[this.length]=arguments[i]; this[this.length]=arguments[i];
return this.length; return this.length;
} }
}; };
if (!Array.prototype.pop) { if (!Array.prototype.pop) {
Array.prototype.pop = function array_pop() { Array.prototype.pop = function array_pop() {
lastElement = this[this.length-1]; lastElement = this[this.length-1];
this.length = Math.max(this.length-1,0); this.length = Math.max(this.length-1,0);
return lastElement; return lastElement;
} }
}; };

11
UI/WebServerResources/generic.css
View file

@ -591,12 +591,11 @@ DIV.dialog.none H3
DIV#bgDialogDiv DIV#bgDialogDiv
{ position: absolute; { position: absolute;
margin: auto; top: 0px; left: 0px;
top: 0; left: 0; bottom: 0px;
width: 100%; height: 100%; right: 0px;
z-index: 9999;
opacity: .3; opacity: .3;
background-color: #000!important; } background-color: #555 !important; }
DIV#uploadDialog, DIV#uploadDialog,
DIV#uploadResults DIV#uploadResults
@ -956,4 +955,4 @@ DIV.bottomToolbar A.bottomButton SPAN:active
/* modalbox */ /* modalbox */
DIV#modalbox SPAN DIV#modalbox SPAN
{ float: right; } { float: right; }

6
UI/WebServerResources/generic.js
View file

@ -566,9 +566,10 @@ function popupMenu(event, menuId, target) {
menuLeft -= (popup.offsetWidth + 1); menuLeft -= (popup.offsetWidth + 1);
var isVisible = true; var isVisible = true;
if (popup.prepareVisibility) if (popup.prepareVisibility) {
if (!popup.prepareVisibility()) if (!popup.prepareVisibility())
isVisible = false; isVisible = false;
}
Event.stop(event); Event.stop(event);
if (isVisible) { if (isVisible) {
@ -1010,8 +1011,9 @@ function popupToolbarMenu(node, menuId) {
hideMenu(document.currentPopupMenu); hideMenu(document.currentPopupMenu);
var popup = $(menuId); var popup = $(menuId);
if (popup.prepareVisibility) if (popup.prepareVisibility) {
popup.prepareVisibility(); popup.prepareVisibility();
}
var offset = $(node).cumulativeOffset(); var offset = $(node).cumulativeOffset();
var top = offset.top + node.offsetHeight; var top = offset.top + node.offsetHeight;

3
UI/WebServerResources/iefixes.css
View file

@ -7,6 +7,9 @@ FORM
margin: 0px; } margin: 0px; }
/* generic */ /* generic */
DIV#bgDialogDiv
{ filter: alpha(opacity=30); }
SPAN.disabledToolbarButton SPAN.disabledToolbarButton
{ filter: alpha(opacity=40); } { filter: alpha(opacity=40); }