summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
4020369)
* Only create CtdlDragDrop in summaryview, restores notes functionality for now
* Check to see if iconbar wholist exists before calling Ajax.Updater->fixes error on logon screen
* Fix double id definition for search form
* Restore date format to yyyy-mm-dd i.e pre r6912
if (havebstr("is_summary") && (1 == (ibstr("is_summary"))))
WCC->wc_view = VIEW_MAILBOX;
if (havebstr("is_summary") && (1 == (ibstr("is_summary"))))
WCC->wc_view = VIEW_MAILBOX;
+ if (!WCC->is_ajax) {
+ output_headers(1, 1, 1, 0, 0, 0);
+ } else if (WCC->wc_view == VIEW_MAILBOX) {
+ jsonMessageListHdr();
+ }
+
switch (WCC->wc_view) {
case VIEW_WIKI:
sprintf(buf, "wiki?room=%s&page=home", ChrPtr(WCC->wc_roomname));
switch (WCC->wc_view) {
case VIEW_WIKI:
sprintf(buf, "wiki?room=%s&page=home", ChrPtr(WCC->wc_roomname));
- if (!WCC->is_ajax) {
- output_headers(1, 1, 1, 0, 0, 0);
- } else if (WCC->wc_view == VIEW_MAILBOX) {
- jsonMessageListHdr();
- }
nummsgs = load_msg_ptrs(cmd, with_headers);
if (nummsgs == 0) {
if (care_for_empty_list) {
nummsgs = load_msg_ptrs(cmd, with_headers);
if (nummsgs == 0) {
if (care_for_empty_list) {
/** Note: wDumpContent() will output one additional </div> tag. */
if (WCC->wc_view != VIEW_MAILBOX) {
/* We ought to move this out into template */
/** Note: wDumpContent() will output one additional </div> tag. */
if (WCC->wc_view != VIEW_MAILBOX) {
/* We ought to move this out into template */
- wprintf("</div>\n"); /** end of 'content' div */
wDumpContent(1);
} else {
end_burst();
wDumpContent(1);
} else {
end_burst();
}
/* Spit out the new summary view. This is basically a static page, so clients can cache the layout, all the dirty work is javascript :) */
void new_summary_view(void) {
}
/* Spit out the new summary view. This is basically a static page, so clients can cache the layout, all the dirty work is javascript :) */
void new_summary_view(void) {
- output_headers(1,1,1,0,0,1);
begin_burst();
DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
DoTemplate(HKEY("trailing"),NULL,&NoCtx);
begin_burst();
DoTemplate(HKEY("msg_listview"),NULL,&NoCtx);
DoTemplate(HKEY("trailing"),NULL,&NoCtx);
{
wprintf("<form name=\"searchomatic\" action=\"do_search\">\n");
wprintf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
{
wprintf("<form name=\"searchomatic\" action=\"do_search\">\n");
wprintf("<div style=\"display: inline;\"><input type=\"hidden\" name=\"nonce\" value=\"%d\">\n", WC->nonce);
- wprintf("<label for=\"search_name\">");
+ wprintf("<label for=\"srchquery\">");
wprintf(_("Search: "));
wprintf("</label><input ");
wprintf("%s", serv_info.serv_fulltext_enabled ? "" : "disabled ");
wprintf(_("Search: "));
wprintf("</label><input ");
wprintf("%s", serv_info.serv_fulltext_enabled ? "" : "disabled ");
- wprintf("type=\"text\" name=\"query\" id=\"srchquery\" size=\"15\" maxlength=\"128\" "
- "id=\"search_name\" class=\"inputbox\">\n"
+ wprintf("type=\"text\" name=\"query\" id=\"srchquery\" size=\"15\" maxlength=\"128\" class=\"inputbox\">\n"
);
wprintf("</div></form>\n");
}
);
wprintf("</div></form>\n");
}
-document.observe("dom:loaded", setupDragDrop);
function setupDragDrop() {
if (document.addEventListener != undefined) {
$(document.body).observe('mousedown', mouseDownHandler);
function setupDragDrop() {
if (document.addEventListener != undefined) {
$(document.body).observe('mousedown', mouseDownHandler);
Event.observe(document.onresize ? document : window, "resize", sizePreviewPane);
$('summpage').observe('change', getPage);
takeOverSearchOMatic();
Event.observe(document.onresize ? document : window, "resize", sizePreviewPane);
$('summpage').observe('change', getPage);
takeOverSearchOMatic();
+ setupDragDrop(); // here for now
}
function getMessages() {
if (loadingMsg.parentNode == null) {
}
function getMessages() {
if (loadingMsg.parentNode == null) {
var classStmt = "col"+x;
tdElement.setAttribute("class", classStmt);
} catch (e) {
var classStmt = "col"+x;
tdElement.setAttribute("class", classStmt);
} catch (e) {
- if (!!window.console) {
+ if (!!window.console && !!console.log) {
console.log("Error on #"+msgId +" col"+j+":"+e);
}
}
console.log("Error on #"+msgId +" col"+j+":"+e);
}
}
rowArray[i] = trElement;
}
var end = new Date();
rowArray[i] = trElement;
}
var end = new Date();
- if (!!window.console) {
+ if (!!window.console && !!console.log) {
var delta = end.getTime() - start.getTime();
console.log("loadMessages construct: " + delta);
}
var delta = end.getTime() - start.getTime();
console.log("loadMessages construct: " + delta);
}
}
message_view.appendChild(fragment);
var end = new Date();
}
message_view.appendChild(fragment);
var end = new Date();
- if (!!window.console) {
+ if (!!window.console && !!console.log) {
var delta = end.getTime() - start.getTime();
console.log("resortAndDisplay sort and append: " + delta);
}
var delta = end.getTime() - start.getTime();
console.log("resortAndDisplay sort and append: " + delta);
}
var target = event.target ? event.target: event.srcElement; // and again..
var parent = target.parentNode;
var msgId = parent.ctdlMsgId;
var target = event.target ? event.target: event.srcElement; // and again..
var parent = target.parentNode;
var msgId = parent.ctdlMsgId;
- // If the shift key modifier wasn't used, unmark all rows and load the message
- if (!event.shiftKey) {
+ // If the ctrl key modifier wasn't used, unmark all rows and load the message
+ if (!event.shiftKey && !event.ctrlKey) {
unmarkAllRows();
new Ajax.Updater('preview_pane', 'msg/'+msgId, {method: 'get'});
markRow(parent);
unmarkAllRows();
new Ajax.Updater('preview_pane', 'msg/'+msgId, {method: 'get'});
markRow(parent);
Event.observe(window, 'load', taskViewActivate);
//document.observe("dom:loaded", setupPrefEngine);
document.observe("dom:loaded", setupIconBar);
Event.observe(window, 'load', taskViewActivate);
//document.observe("dom:loaded", setupPrefEngine);
document.observe("dom:loaded", setupIconBar);
-document.observe('dom:loaded', function() { $('ib_chat_launch').observe('click', launchChat);});
+document.observe('dom:loaded', function() { if (!!document.getElementById("ib_chat_launch")) { $('ib_chat_launch').observe('click', launchChat); } });
function CtdlRandomString() {
return((Math.random()+'').substr(3));
}
function CtdlRandomString() {
return((Math.random()+'').substr(3));
}
function attachDatePicker(relative) {
var dpck = new DatePicker({
relative: relative,
function attachDatePicker(relative) {
var dpck = new DatePicker({
relative: relative,
- language: 'en', // fix please
- disableFutureDate: false
+ language: 'en', //wclang.substr(0,2),
+ disableFutureDate: false,
+ dateFormat: [ ["yyyy", "mm", "dd"], "-"],
+ showDuration: 0.2
});
document.getElementById(relative).dpck = dpck; // attach a ref to it
}
});
document.getElementById(relative).dpck = dpck; // attach a ref to it
}