From 8a03f3bd631ae53e5d5c111886cd27275cf69644 Mon Sep 17 00:00:00 2001 From: Alexandre Cloutier Date: Fri, 16 May 2014 14:36:51 -0400 Subject: [PATCH] remove start date in tasks --- .../English.lproj/Localizable.strings | 8 ++--- UI/WebServerResources/UIxCalViewPrint.js | 35 +++++++++---------- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/UI/Scheduler/English.lproj/Localizable.strings b/UI/Scheduler/English.lproj/Localizable.strings index 8a67933e9..6423b95da 100644 --- a/UI/Scheduler/English.lproj/Localizable.strings +++ b/UI/Scheduler/English.lproj/Localizable.strings @@ -154,17 +154,17 @@ "What to Print" = "What to Print"; "Events" = "Events"; "Tasks" = "Tasks"; -"Current view" = "Current view"; +"Current view" = "Current View"; "Selected events and tasks" = "Selected events and tasks"; -"Custom date range" = "Custom date range"; +"Custom Date Range" = "Custom Date Range"; "From:" = "From:"; "To:" = "To:"; "Options" = "Options"; "Locale" = "Locale"; "GMT" = "GMT"; "Tasks with no due date" = "Tasks with no due date"; -"Completed tasks" = "Completed tasks"; -"Display time:" = "Display time:"; +"Completed tasks" = "Completed Tasks"; +"Display time:" = "Display Time:"; "Calendar:" = "Calendar:"; diff --git a/UI/WebServerResources/UIxCalViewPrint.js b/UI/WebServerResources/UIxCalViewPrint.js index 9698a0ae6..f6bf2a00b 100644 --- a/UI/WebServerResources/UIxCalViewPrint.js +++ b/UI/WebServerResources/UIxCalViewPrint.js @@ -378,10 +378,10 @@ function newBaseEventDIV(eventRep, event, eventText) { function _parseEvent(event) { // Localized strings : - var start = _("Start"); - var end = _("End"); - var Location = _("Location"); - var Calendar = _("Calendar"); + var start = _("Start:"); + var end = _("End:"); + var Location = _("Location:"); + var Calendar = _("Calendar:"); var parsedEvent; @@ -389,21 +389,20 @@ function _parseEvent(event) { var endDate = new Date(event[6] *1000); parsedEvent = "
"; parsedEvent += ""; - parsedEvent += ""; - parsedEvent += ""; + parsedEvent += ""; + parsedEvent += ""; if (event[7] != "") - parsedEvent += ""; - parsedEvent += ""; + parsedEvent += ""; + parsedEvent += ""; parsedEvent += "
"+ event[4] +"
" + start + ":" + startDate.toLocaleString() + "
" + end + ":" + endDate.toLocaleString() + "
" + start + "" + startDate.toLocaleString() + "
" + end + "" + endDate.toLocaleString() + "
"+ Location +": " + event[7] + "
"+ Calendar +": " + event[2] + "
"+ Location +"" + event[7] + "
"+ Calendar +"" + event[2] + "
"; return parsedEvent; } function _parseTask(task) { var parsedTask; - var start = _("Start"); - var end = _("End"); - var Calendar = _("Calendar"); - var Location = _("Location"); + var end = _("Due Date:"); + var Calendar = _("Calendar:"); + var Location = _("Location:"); parsedTask = "
"; if (task[12] == "overdue") @@ -414,16 +413,14 @@ function _parseTask(task) { else parsedTask += ""; - if (task[5] != null && task[6] != null) { - var startDate = new Date(task[5] *1000); - var endDate = new Date(task[6] *1000); - parsedTask += ""; - parsedTask += ""; + if (task[5] != null) { + var endDate = new Date(task[5] *1000); + parsedTask += ""; } if (task[7] != "") { - parsedTask += ""; + parsedTask += ""; } - parsedTask += ""; + parsedTask += ""; parsedTask += "
"+ task[4] +"
"+ start +": "+ startDate.toLocaleString() + "
"+ end +": "+ endDate.toLocaleString() + "
"+ end +""+ endDate.toLocaleString() + "
"+ Location +": " + task[7] + "
"+ Location +"" + task[7] + "
" + Calendar + ": " + task[2] + "
" + Calendar + "" + task[2] + "
"; return parsedTask;