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

added last changes from cgx

Browse source
This commit is contained in:
Alexandre Cloutier 2014-05-16 10:04:37 -04:00
parent b5319446db
commit 2794425a3f
2 changed files with 97 additions and 87 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
UI/WebServerResources/UIxCalViewPrint.css
View file

@ -113,6 +113,16 @@ DIV#rightSide {
float:right;
}
DIV#rightFrame TH {
text-align: left;
}
DIV#rightFrame TD.label {
color: #666;
text-align: right;
width: 30%;
}
/********** Overriding SchedulerUI.css **********/
DIV#calendarHeader {

28
UI/WebServerResources/UIxCalViewPrint.js
View file

@ -387,13 +387,13 @@ function _parseEvent(event) {
var parsedEvent;
var startDate = new Date(event[5] *1000);
var endDate = new Date(event[6] *1000);
parsedEvent = "<div class=divEventsPreview><table>";
parsedEvent += "<tr class=\"eventsTitle\"><td colspan=\"2\"><b>"+ event[4] +"</b></td></tr>";
parsedEvent += "<tr><td style=\"text-align:right;\"><i>" + start + ":</i></td><td>" + startDate.toLocaleString() + "</td></tr>";
parsedEvent += "<tr><td style=\"text-align:right;\"><i>" + end + ":</i></td><td>" + endDate.toLocaleString() + "</td></tr>";
parsedEvent = "<div class=\"divEventsPreview\"><table>";
parsedEvent += "<tr><th></th><th>"+ event[4] +"</th></tr>";
parsedEvent += "<tr><td class=\"label\">" + start + ":</td><td>" + startDate.toLocaleString() + "</td></tr>";
parsedEvent += "<tr><td class=\"label\">" + end + ":</td><td>" + endDate.toLocaleString() + "</td></tr>";
if (event[7] != "")
parsedEvent += "<tr><td style=\"text-align:right;\"><i>"+ Location +": </i></td><td>" + event[7] + "</td></tr>";
parsedEvent += "<tr><td style=\"text-align:right;\"><i>"+ Calendar +": </i></td><td>" + event[2] + "</td></tr>";
parsedEvent += "<tr><td class=\"label\">"+ Location +": </td><td>" + event[7] + "</td></tr>";
parsedEvent += "<tr><td class=\"label\">"+ Calendar +": </td><td>" + event[2] + "</td></tr>";
parsedEvent += "</table></div>";
return parsedEvent;
}
@ -405,25 +405,25 @@ function _parseTask(task) {
var Calendar = _("Calendar");
var Location = _("Location");
parsedTask = "<div class=divTasksPreview><table>";
parsedTask = "<div class=\"divTasksPreview\"><table>";
if (task[12] == "overdue")
parsedTask += "<tr><td colspan=\"2\" class=\"overdueTasks\"><b>"+ task[4] +"</b></td></tr>";
parsedTask += "<tr><th></th><th class=\"overdueTasks\">"+ task[4] +"</th></tr>";
else if (task[12] == "completed") {
parsedTask += "<tr><td colspan=\"2\" class=\"completedTasks\"><b>"+ task[4] +"</b></td></tr>";
parsedTask += "<tr><th></th><th class=\"completedTasks\">"+ task[4] +"</th></tr>";
}
else
parsedTask += "<tr class=\"tasksTitle\"><td colspan=\"2\"><b>"+ task[4] +"</b></td></tr>";
parsedTask += "<tr class=\"tasksTitle\"><th></th><th>"+ task[4] +"</th></tr>";
if (task[5] != null && task[6] != null) {
var startDate = new Date(task[5] *1000);
var endDate = new Date(task[6] *1000);
parsedTask += "<tr><td style=\"text-align:right;\"><i>"+ start +": </i></td><td>"+ startDate.toLocaleString() + "</td></tr>";
parsedTask += "<tr><td style=\"text-align:right;\"><i>"+ end +": </i></td><td>"+ endDate.toLocaleString() + "</td></tr>";
parsedTask += "<tr><td class=\"label\">"+ start +": </td><td>"+ startDate.toLocaleString() + "</td></tr>";
parsedTask += "<tr><td class=\"label\">"+ end +": </td><td>"+ endDate.toLocaleString() + "</td></tr>";
}
if (task[7] != "") {
parsedTask += "<tr><td style=\"text-align:right;\"><i>"+ Location +": </i></td><td>" + task[7] + "</td></tr>";
parsedTask += "<tr><td class=\"label\">"+ Location +": </td><td>" + task[7] + "</td></tr>";
}
parsedTask += "<tr><td style=\"text-align:right;\"><i>" + Calendar + ": </i></td><td>" + task[2] + "</td></tr>";
parsedTask += "<tr><td class=\"label\">" + Calendar + ": </td><td>" + task[2] + "</td></tr>";
parsedTask += "</table></div>";
return parsedTask;