merge of '40158dc91b545a299c42231ee687029a4bf2e718'

and 'a7b68a3656aaebe8e9a421997de4d311b04b9e13'

Monotone-Parent: 40158dc91b545a299c42231ee687029a4bf2e718
Monotone-Parent: a7b68a3656aaebe8e9a421997de4d311b04b9e13
Monotone-Revision: ef30367c8b75538cf7607ce41aba7151c3667d37

Monotone-Author: crobert@inverse.ca
Monotone-Date: 2009-07-23T12:45:37
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2009-07-23 12:45:37 +00:00
17 changed files with 104 additions and 4 deletions
+34
View File
@@ -362,3 +362,37 @@ DIV.copy
background-image: url(add-contact.gif) !important;
background-position: 1px -2px !important;
}
@media print
{
div#linkBanner,
div#toolbar,
div#contactFoldersList,
div#dragHandle,
div#rightDragHandle,
div.menu,
div#filterPanel,
div#contactsListContent
{
display: none;
}
div#contactView,
div#rightPanel
{
color: black;
top: 0px;
left: 0px;
margin: 0px;
border: none;
display: block;
visibility: visible;
width: 100%;
height: 100%;
}
div.contactColumn h4 {
background: none;
}
}
+3 -1
View File
@@ -664,12 +664,14 @@ function tasksListCallback(http) {
var cname = escape(data[i][0]);
listItem.setAttribute("id", calendar + "-" + cname);
//listItem.addClassName(data[i][5]); // Classification
listItem.addClassName(data[i][6]);
listItem.addClassName(data[i][7]);
listItem.calendar = calendar;
listItem.addClassName("calendarFolder" + calendar);
listItem.cname = cname;
var input = $(document.createElement("input"));
input.setAttribute("type", "checkbox");
if (parseInt(data[i][6]) == 0)
input.setAttribute ("disabled", true);
listItem.appendChild(input);
input.observe("click", updateTaskStatus, true);
input.setAttribute("value", "1");
+1
View File
@@ -744,6 +744,7 @@ function onWindowResize(event) {
setTimeout ('onWindowResize ()', 100);
return;
}
editor.absolutize ();
var content = $("cke_contents_text");
var height = Math.floor(window.height() - editor.offsetTop);
+2 -1
View File
@@ -64,7 +64,6 @@ function resetTableActions () {
for (var i = 0; i < r.length; i++) {
var row = $(r[i]);
row.observe("mousedown", onRowClick);
row.observe("selectstart", listRowMouseDownHandler);
var tds = row.childElements ();
tds[0].observe("mousedown", endAllEditables);
tds[0].observe ("dblclick", onNameEdit);
@@ -75,6 +74,7 @@ function resetTableActions () {
function makeEditable (element) {
element.addClassName ("editing");
element.removeClassName ("categoryListCell");
var tmp = element.innerHTML;
element.innerHTML = "";
var textField = new Element ("input", {"type": "text",
@@ -98,6 +98,7 @@ function endEditable (element) {
var tmp = element.childElements ().first ().value;
element.innerHTML = tmp;
element.removeClassName ("editing");
element.addClassName ("categoryListCell");
}
function endAllEditables (e) {