amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-06-27 12:54:17 +00:00
Code Issues Projects Releases Wiki Activity

merge of '30ec73924173f30cac8edaa24abb0d6e6dfdeac1'

Browse Source 
and '3a0c58bfa60eceb8b04e37505a605d15b3d2b1af'

Monotone-Parent: 30ec73924173f30cac8edaa24abb0d6e6dfdeac1
Monotone-Parent: 3a0c58bfa60eceb8b04e37505a605d15b3d2b1af
Monotone-Revision: a9acd9019d1a4eac616803c0f5ee8fe8af50cf15

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-27T21:57:57
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2007-11-27 21:57:57 +00:00
parent 348af28568 fea5eb9d53
commit 5447d83d4b
19 changed files with 179 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/ContactsUI.js
+53 -39
View File
@@ -74,45 +74,45 @@ function openContactsFolderAtIndex(element) {
}
function contactsListCallback(http) {
if (http.readyState == 4
&& http.status == 200) {
document.contactsListAjaxRequest = null;
if (http.readyState == 4) {
if (http.status == 200) {
document.contactsListAjaxRequest = null;
var table = $("contactsList");
if (table) {
// Update table
var data = http.responseText;
var html = data.replace(/^(.*\n)*.*(<table(.*\n)*)$/, "$2");
var tbody = table.tBodies[0];
var tmp = document.createElement('div');
$(tmp).update(html);
table.replaceChild(tmp.firstChild.tBodies[0], tbody);
}
else {
// Add table (doesn't happen .. yet)
var div = $("contactsListContent");
div.update(http.responseText);
table = $("contactsList");
configureSortableTableHeaders(table);
TableKit.Resizable.init(table, {'trueResize' : true, 'keepWidth' : true});
}
var table = $("contactsList");
if (table) {
// Update table
var data = http.responseText;
var html = data.replace(/^(.*\n)*.*(<table(.*\n)*)$/, "$2");
var tbody = table.tBodies[0];
var tmp = document.createElement('div');
$(tmp).update(html);
table.replaceChild(tmp.firstChild.tBodies[0], tbody);
}
else {
// Add table (doesn't happen .. yet)
var div = $("contactsListContent");
div.update(http.responseText);
table = $("contactsList");
configureSortableTableHeaders(table);
TableKit.Resizable.init(table, {'trueResize' : true, 'keepWidth' : true});
}
if (sorting["attribute"] && sorting["attribute"].length > 0) {
var sortHeader;
if (sorting["attribute"] == "displayName")
if (sorting["attribute"] && sorting["attribute"].length > 0) {
var sortHeader;
if (sorting["attribute"] == "displayName")
sortHeader = $("nameHeader");
else if (sorting["attribute"] == "mail")
else if (sorting["attribute"] == "mail")
sortHeader = $("mailHeader");
else if (sorting["attribute"] == "screenName")
else if (sorting["attribute"] == "screenName")
sortHeader = $("screenNameHeader");
else if (sorting["attribute"] == "org")
else if (sorting["attribute"] == "org")
sortHeader = $("orgHeader");
else if (sorting["attribute"] == "phone")
else if (sorting["attribute"] == "phone")
sortHeader = $("phoneHeader");
else
else
sortHeader = null;
if (sortHeader) {
if (sortHeader) {
var sortImages = $(table.tHead).getElementsByClassName("sortImage");
$(sortImages).each(function(item) {
item.remove();
@@ -121,19 +121,33 @@ function contactsListCallback(http) {
var sortImage = createElement("img", "messageSortImage", "sortImage");
sortHeader.insertBefore(sortImage, sortHeader.firstChild);
if (sorting["ascending"])
sortImage.src = ResourcesURL + "/title_sortdown_12x12.png";
sortImage.src = ResourcesURL + "/title_sortdown_12x12.png";
else
sortImage.src = ResourcesURL + "/title_sortup_12x12.png";
}
}
sortImage.src = ResourcesURL + "/title_sortup_12x12.png";
}
}
var selected = http.callbackData;
if (selected) {
for (var i = 0; i < selected.length; i++) {
var selected = http.callbackData;
if (selected) {
for (var i = 0; i < selected.length; i++) {
var row = $(selected[i]);
if (row)
row.select();
}
row.select();
}
}
}
else {
var table = $("contactsList");
if (table) {
var sortImages = $(table.tHead).getElementsByClassName("sortImage");
$(sortImages).each(function(item) {
item.remove();
});
var tBody = $(table.tBodies[0]);
var length = tBody.rows.length;
for (var i = length - 1; i > -1; i--)
tBody.removeChild(tBody.rows[i]);
}
}
}
else
UI/WebServerResources/UIxContactsUserFolders.js
+2 -2
View File
@@ -36,8 +36,8 @@ function addLineToTree(tree, parent, line) {
icon += 'calendar-folder-16x16.png';
var folderId = userInfos[0] + ":" + folderInfos[1];
var name = folderInfos[0]; // name has the format "Folername (Firstname Lastname <email>)"
var pos = name.indexOf(' (')
if (pos !== -1)
var pos = name.lastIndexOf(' (')
if (pos != -1)
name = name.substring(0, pos); // strip the part with fullname and email
tree.add(parent + i, parent, name, 0, '#', folderId,
folderInfos[2] + '-folder', '', '', icon, icon);