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

merge of 'a153aa6c9c909c630997557d6a4fc13b92a1dbae'

Browse source 
and 'a1be1c2cefed5c886fe140f7ffc630e56b32dd08'

Monotone-Parent: a153aa6c9c909c630997557d6a4fc13b92a1dbae
Monotone-Parent: a1be1c2cefed5c886fe140f7ffc630e56b32dd08
Monotone-Revision: c35b4b523a503d3e04dc1985bf5db52acbdcf780

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-08T20:41:33
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2007-06-08 20:41:33 +00:00
parent 32f68a0f5e 8a6a9e2b23
commit a5819dbd47
8 changed files with 85 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
UI/Templates/MailerUI/UIxMailFilterPanel.wox
View file

@ -42,8 +42,7 @@
<var:popup list="filters"
item="filter" string="filterLabel" value="filter"
selection="selectedFilter"
const:name="filterpopup"
const:onchange="document.pageform.submit()" />
const:name="filterpopup" />
</var:if>
</div>
</container>

4
UI/Templates/MailerUI/UIxMailListView.wox
View file

@ -20,7 +20,7 @@
const:href="view"
var:queryDictionary="context.request.formValues"
/></td
><td class="tbtv_headercell"
><td class="tbtv_headercell tbtv_from_headercell"
><var:if condition="showToAddress" const:negate="YES"
><var:component className="UIxSortableTableHeader"
label:label="From"
@ -39,7 +39,7 @@
><td class="tbtv_headercell messageFlagColumn"
><img rsrc:src="title_read_14x14.png" width="14" height="14"
/></td
><td class="tbtv_headercell"
><td class="tbtv_headercell tbtv_date_headercell"
><var:component className="UIxSortableTableHeader"
label:label="Date"
const:sortKey="date"

1
UI/WebServerResources/ContactsUI.css
View file

@ -175,7 +175,6 @@ TABLE#contactsList
color: #000;
background: #fff;
width: 100%;
height: 100%;
}
TABLE#contactsList TD

21
UI/WebServerResources/HTMLElement.js
View file

@ -23,21 +23,6 @@ Element.addMethods({
return matchingNodes;
},
removeClassName: function(element, className) {
element = $(element);
var classStr = '' + element.readAttribute('class');
position = classStr.indexOf(className, 0);
while (position > -1) {
classStr1 = classStr.substring(0, position);
classStr2 = classStr.substring(position + 10, classStr.length);
classStr = classStr1 + classStr2;
position = classStr.indexOf(className, 0);
}
element.setAttribute('class', classStr);
},
getParentWithTagName: function(element, tagName) {
element = $(element);
var currentElement = element;
@ -126,8 +111,8 @@ Element.addMethods({
for (var i = 0; i < element.childNodes.length; i++) {
node = element.childNodes.item(i);
if (node.nodeType == 1
&& isNodeSelected(node))
selArray.push(node.getAttribute("id"));
&& isNodeSelected(node)) {
selArray.push(node.getAttribute("id")); }
}
return selArray;
@ -181,7 +166,7 @@ Element.addMethods({
for (var i = 0; i < element.childNodes.length; i++) {
var node = element.childNodes.item(i);
if (node.nodeType == 1)
node.deselect();
$(node).deselect();
}
}

7
UI/WebServerResources/HTMLTableElement.js
View file

@ -4,7 +4,7 @@ Element.addMethods({
if (element.tagName == 'TABLE') {
var tbody = (element.getElementsByTagName('tbody'))[0];
return tbody.getSelectedNodes();
return $(tbody).getSelectedNodes();
}
else if (element.tagName == 'UL') {
return element.getSelectedNodes();
@ -16,7 +16,7 @@ Element.addMethods({
if (element.tagName == 'TABLE') {
var tbody = (element.getElementsByTagName('tbody'))[0];
return tbody.getSelectedNodesId();
return $(tbody).getSelectedNodesId();
}
else if (element.tagName == 'UL') {
return element.getSelectedNodesId();
@ -30,8 +30,7 @@ Element.addMethods({
var nodes = tbody.childNodes;
for (var i = 0; i < nodes.length; i++) {
var node = nodes.item(i);
if (node instanceof HTMLElement
&& node.hasClassName(className))
if (node.tagName && node.hasClassName(className))
node.select();
}
}

8
UI/WebServerResources/MailerUI.css
View file

@ -498,7 +498,13 @@ TABLE#messageList TD
}
TABLE#messageList TD.tbtv_subject_headercell
{ width: 30%; }
{ width: 40%; }
TABLE#messageList TD.tbtv_from_headercell
{ width: 35%; }
TABLE#messageList TD.tbtv_date_headercell
{ width: 25%; }
TABLE#messageList TR._selected TD
{

83
UI/WebServerResources/MailerUI.js
View file

@ -76,7 +76,7 @@ function clickedEditorSend(sender) {
if (!validateEditorInput(sender))
return false;
document.pageform.action="send";
document.pageform.action = "send";
document.pageform.submit();
// if everything is ok, close the window
return true;
@ -93,14 +93,14 @@ function clickedEditorAttach(sender) {
}
function clickedEditorSave(sender) {
document.pageform.action="save";
document.pageform.action = "save";
document.pageform.submit();
refreshOpener();
return true;
}
function clickedEditorDelete(sender) {
document.pageform.action="delete";
document.pageform.action = "delete";
document.pageform.submit();
refreshOpener();
window.close();
@ -418,7 +418,7 @@ function refreshMailbox() {
return false;
}
function openMailbox(mailbox, reload) {
function openMailbox(mailbox, reload) { log("openMailbox");
if (mailbox != currentMailbox || reload) {
currentMailbox = mailbox;
var url = ApplicationBaseURL + mailbox + "/view?noframe=1&desc=1";
@ -432,7 +432,7 @@ function openMailbox(mailbox, reload) {
if (document.messageAjaxRequest) {
document.messageAjaxRequest.aborted = true;
document.messageAjaxRequest.abort();
}
} log("messageCallback: " + url);
document.messageAjaxRequest
= triggerAjaxRequest(url, messageCallback);
mailboxContent.innerHTML = '';
@ -447,16 +447,16 @@ function openMailbox(mailbox, reload) {
if (currentMessages[mailbox]) {
loadMessage(currentMessages[mailbox]);
url += '&pageforuid=' + currentMessages[mailbox];
}
} log("messageListCallback: " + url);
document.messageListAjaxRequest
= triggerAjaxRequest(url, messageListCallback,
currentMessages[mailbox]);
if (mailboxContent.style.visibility == "hidden") {
mailboxContent.style.visibility = "visible;";
rightDragHandle.style.visibility = "visible;";
messageContent.style.top = (rightDragHandle.offsetTop
+ rightDragHandle.offsetHeight
+ 'px;');
if (mailboxContent.getStyle('visibility') == "hidden") {
mailboxContent.setStyle({ visibility: "visible" });
rightDragHandle.setStyle({ visibility: "visible" });
messageContent.setStyle({ top: (rightDragHandle.offsetTop
+ rightDragHandle.offsetHeight
+ 'px') });
}
}
}
@ -474,12 +474,12 @@ function openMailboxAtIndex(event) {
document.messageListAjaxRequest
= triggerAjaxRequest(url, messageListCallback);
event.preventDefault();
preventDefault(event);
}
function messageListCallback(http) {
var div = $('mailboxContent');
if (http.readyState == 4
&& http.status == 200) {
document.messageListAjaxRequest = null;
@ -493,7 +493,7 @@ function messageListCallback(http) {
configureSortableTableHeaders();
}
else
log("problem during ajax request");
log("messageListCallback: problem during ajax request (readyState = " + http.readyState + ", status = " + http.status + ")");
}
function onMessageContextMenu(event) {
@ -625,6 +625,7 @@ function storeCachedMessage(cachedMessage) {
function onMessageSelectionChange() {
var rows = this.getSelectedRowsId();
if (rows.length == 1) {
var idx = rows[0].substr(4);
@ -666,8 +667,8 @@ function configureLinksInMessage() {
var anchors = messageDiv.getElementsByTagName('a');
for (var i = 0; i < anchors.length; i++)
if (anchors[i].href.substring(0,7) == "mailto:") {
Event.observe(anchors[i], "click", onEmailAddressClick);
Event.observe(anchors[i], "contextmenu", onEmailAddressClick);
Event.observe(anchors[i], "click", onEmailAddressClick.bindAsEventListener(anchors[i]));
Event.observe(anchors[i], "contextmenu", onEmailAddressClick.bindAsEventListener(anchors[i]));
}
else
Event.observe(anchors[i], "click", onMessageAnchorClick);
@ -683,7 +684,7 @@ function onEmailAddressClick(event) {
function onMessageAnchorClick (event) {
window.open(this.href);
event.preventDefault();
preventDefault(event);
}
function messageCallback(http) {
@ -694,7 +695,7 @@ function messageCallback(http) {
document.messageAjaxRequest = null;
div.innerHTML = http.responseText;
configureLinksInMessage();
if (http.callbackData) {
var cachedMessage = new Array();
cachedMessage['idx'] = currentMailbox + '/' + http.callbackData;
@ -705,7 +706,7 @@ function messageCallback(http) {
}
}
else
log("problem during ajax request");
log("messageCallback: problem during ajax request");
}
function processMailboxMenuAction(mailbox) {
@ -935,23 +936,23 @@ var messageListData = function(type) {
function configureMessageListEvents() {
var messageList = $("messageList");
if (messageList) {
Event.observe(messageList, "selectionchange", onMessageSelectionChange);
Event.observe(messageList, "mousedown", onMessageSelectionChange.bindAsEventListener(messageList));
var rows = messageList.tBodies[0].rows;
var start = 0;
if (rows.length > 1) {
if (rows[start].cells[0].hasClassName("tbtv_headercell"))
if ($(rows[start].cells[0]).hasClassName("tbtv_headercell"))
start++;
if (rows[start].cells[0].hasClassName("tbtv_navcell")) {
if ($(rows[start].cells[0]).hasClassName("tbtv_navcell")) {
log("start:" + start);
var anchors = $(rows[start].cells[0]).childNodesWithTag("a");
log("nr anchors: " + anchors.length);
for (var i = 0; i < anchors.length; i++)
Event.observe(anchors[i], "click", openMailboxAtIndex);
Event.observe(anchors[i], "click", openMailboxAtIndex.bindAsEventListener(anchors[i]));
start++;
}
for (var i = start; i < rows.length; i++) {
Event.observe(rows[i], "mousedown", onRowClick);
Event.observe(rows[i], "contextmenu", onMessageContextMenu);
Event.observe(rows[i], "contextmenu", onMessageContextMenu.bindAsEventListener(rows[i]));
rows[i].dndTypes = function() { return new Array("mailRow"); };
rows[i].dndGhost = messageListGhost;
@ -962,7 +963,7 @@ function configureMessageListEvents() {
var cell = rows[i].cells[j];
Event.observe(cell, "mousedown", listRowMouseDownHandler);
if (j == 2 || j == 3 || j == 5)
Event.observe(cell, "dblclick", onMessageDoubleClick);
Event.observe(cell, "dblclick", onMessageDoubleClick.bindAsEventListener(cell));
else if (j == 4) {
var img = cell.childNodesWithTag("img")[0];
Event.observe(img, "click", mailListMarkMessage);
@ -1032,11 +1033,11 @@ function openInbox(node) {
function configureSearchField() {
var searchValue = $("searchValue");
Event.observe(searchValue, "mousedown", onSearchMouseDown);
Event.observe(searchValue, "click", popupSearchMenu);
Event.observe(searchValue, "blur", onSearchBlur);
Event.observe(searchValue, "focus", onSearchFocus);
Event.observe(searchValue, "keydown", onSearchKeyDown);
Event.observe(searchValue, "mousedown", onSearchMouseDown.bindAsEventListener(searchValue));
Event.observe(searchValue, "click", popupSearchMenu.bindAsEventListener(searchValue));
Event.observe(searchValue, "blur", onSearchBlur.bindAsEventListener(searchValue));
Event.observe(searchValue, "focus", onSearchFocus.bindAsEventListener(searchValue));
Event.observe(searchValue, "keydown", onSearchKeyDown.bindAsEventListener(searchValue));
}
function initMailer(event) {
@ -1110,7 +1111,7 @@ function mailboxMenuNode(type, name) {
function generateMenuForMailbox(mailbox, prefix, callback) {
var menuDIV = document.createElement("div");
menuDIV.addClassName("menu");
$(menuDIV).addClassName("menu");
menuDIV.setAttribute("id", prefix + "Submenu");
var menu = document.createElement("ul");
menuDIV.appendChild(menu);
@ -1159,15 +1160,19 @@ function updateMailboxMenus() {
var menuDIV = $(menuId);
if (menuDIV)
menuDIV.parentNode.removeChild(menuDIV);
menuDIV = document.createElement("div");
menuDIV.addClassName("menu");
menuDIV.setAttribute("id", menuId);
document.body.appendChild(menuDIV);
var menu = document.createElement("ul");
menuDIV.appendChild(menu);
$(menuDIV).addClassName("menu");
menuDIV.setAttribute("id", menuId);
var submenuIds = new Array();
for (var i = 0; i < mailAccounts.length; i++) {
var menuEntry = mailboxMenuNode("account", mailAccounts[i]);
var menuEntry = mailboxMenuNode("account", mailAccounts[i]);
menu.appendChild(menuEntry);
var mailbox = accounts[mailAccounts[i]];
var newSubmenu = generateMenuForMailbox(mailbox,
@ -1176,8 +1181,6 @@ function updateMailboxMenus() {
submenuIds.push(newSubmenu.getAttribute("id"));
}
initMenu(menuDIV, submenuIds);
document.body.appendChild(menuDIV);
}
}
@ -1190,8 +1193,8 @@ function onLoadMailboxesCallback(http) {
mailboxTree.addMailAccount(newAccount);
mailboxTree.pendingRequests--;
if (!mailboxTree.pendingRequests) {
updateMailboxTreeInPage();
updateMailboxMenus();
updateMailboxTreeInPage();
updateMailboxMenus();
}
}
@ -1324,7 +1327,7 @@ function getMenus() {
return menus;
}
Event.observe(window, "load", initMailer);
addEvent(window, 'load', initMailer);
function Mailbox(type, name) {
this.type = type;

40
UI/WebServerResources/generic.js
View file

@ -417,10 +417,7 @@ function deselectAll(parent) {
}
function isNodeSelected(node) {
var classStr = '' + node.getAttribute('class');
var position = classStr.indexOf('_selected', 0);
return (position > -1);
return $(node).hasClassName('_selected');
}
function acceptMultiSelect(node) {
@ -442,26 +439,25 @@ function onRowClick(event) {
if (node.tagName == 'TD')
node = node.parentNode;
var startSelection = $(node.parentNode).getSelectedNodes();
if (event.shiftKey == 1
&& (acceptMultiSelect(node.parentNode)
|| acceptMultiSelect(node.parentNode.parentNode))) {
if (isNodeSelected(node) == true) {
node.deselect();
$(node).deselect();
} else {
node.select();
$(node).select();
}
} else {
deselectAll(node.parentNode);
node.select();
$(node.parentNode).deselectAll();
$(node).select();
}
if (startSelection != node.parentNode.getSelectedNodes()) {
var parentNode = node.parentNode;
if (parentNode.tagName == 'TBODY')
parentNode = parentNode.parentNode;
// log("onRowClick: parentNode = " + parentNode.tagName);
//log("onRowClick: parentNode = " + parentNode.tagName);
// parentNode is UL or TABLE
if (document.createEvent) {
var onSelectionChangeEvent;
@ -966,9 +962,10 @@ function initTabs() {
if (!firstTab)
firstTab = i;
Event.observe(currentNode, "mousedown",
onTabMouseDown.bindAsEventListener(currentNode));
onTabMouseDown.bindAsEventListener(currentNode));
Event.observe(currentNode, "click",
onTabClick.bindAsEventListener(currentNode));
//$(currentNode.getAttribute("target")).hide();
}
}
@ -978,6 +975,7 @@ function initTabs() {
var target = $(nodes[firstTab].getAttribute("target"));
target.addClassName("active");
//target.show();
}
}
@ -1060,7 +1058,7 @@ function getTopWindow() {
}
function onTabClick(event) {
var node = getTarget(event);
var node = getTarget(event); // LI element
var target = node.getAttribute("target");
@ -1070,10 +1068,24 @@ function onTabClick(event) {
var oldContent = $(oldTarget);
oldContent.removeClassName("active");
container.activeTab.removeClassName("active");
container.activeTab.removeClassName("active"); // previous LI
container.activeTab = node;
container.activeTab.addClassName("active");
container.activeTab.addClassName("active"); // current LI
content.addClassName("active");
// Prototype alternative
//oldContent.removeClassName("active");
//container.activeTab.removeClassName("active"); // previous LI
//container.activeTab = node;
//container.activeTab.addClassName("active"); // current LI
//container.activeTab.hide();
//oldContent.hide();
//content.show();
//container.activeTab = node;
//container.activeTab.show();
return false;
}