From 8f0cce23b8b85fb548e3b0ff41161949d46545a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Mon, 9 Mar 2009 18:54:53 +0000 Subject: [PATCH] + add Michael Meskes Patch; hide Task due date UI elements if they're not applicable. --- webcit/calendar.c | 10 +++--- webcit/calendar_tools.c | 9 ++++-- webcit/static/wclib.js | 69 ++++++++++++++++++----------------------- 3 files changed, 42 insertions(+), 46 deletions(-) diff --git a/webcit/calendar.c b/webcit/calendar.c index 720876021..9fcf8b7c8 100644 --- a/webcit/calendar.c +++ b/webcit/calendar.c @@ -675,6 +675,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, ch wprintf(_("No date")); wprintf(" "); + wprintf(""); wprintf(_("or")); wprintf(" "); if (p != NULL) { @@ -684,13 +685,13 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, ch IcalTime = icaltime_current_time_with_zone(get_default_icaltimezone()); display_icaltimetype_as_webform(&IcalTime, "dtstart", 0); - wprintf(""); wprintf(_("Time associated")); - wprintf("\n"); + wprintf("\n"); wprintf(""); wprintf(_("Due date:")); @@ -703,6 +704,7 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, ch wprintf(">"); wprintf(_("No date")); wprintf(" "); + wprintf("\n"); wprintf(_("or")); wprintf(" "); if (p != NULL) { @@ -712,13 +714,13 @@ void display_edit_individual_task(icalcomponent *supplied_vtodo, long msgnum, ch IcalTime = icaltime_current_time_with_zone(get_default_icaltimezone()); display_icaltimetype_as_webform(&IcalTime, "due", 0); - wprintf(""); wprintf(_("Time associated")); - wprintf("\n"); + wprintf("\n"); todoStatus = icalcomponent_get_status(vtodo); wprintf("\n"); wprintf(_("Completed:")); diff --git a/webcit/calendar_tools.c b/webcit/calendar_tools.c index 6cad617ff..95bae39f3 100644 --- a/webcit/calendar_tools.c +++ b/webcit/calendar_tools.c @@ -80,8 +80,11 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d wprintf("
"); } + wprintf(""); wprintf(_("Hour: ")); - wprintf("\n", prefix); for (i=0; i<=23; ++i) { if (time_format == WC_TIMEFORMAT_24) { @@ -101,7 +104,7 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d wprintf("\n"); wprintf(_("Minute: ")); - wprintf("\n", prefix); for (i=0; i<=59; ++i) { if ( (i % 5 == 0) || (tm.tm_min == i) ) { wprintf("\n", @@ -110,7 +113,7 @@ void display_icaltimetype_as_webform(struct icaltimetype *t, char *prefix, int d ); } } - wprintf("\n"); + wprintf("\n"); if (date_only) { wprintf("
"); diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js index 79df4271e..70977af77 100644 --- a/webcit/static/wclib.js +++ b/webcit/static/wclib.js @@ -649,52 +649,42 @@ function HandleRSVP(question_divname, title_divname, msgnum, cal_partnum, sc) { // TODO: Collapse into one function function toggleTaskDtStart(event) { var checkBox = $('nodtstart'); - var checkBoxTime = $('dtstart_time'); - dtStart = document.getElementById("dtstart"); - dtStartHour = document.getElementById("dtstart_hour"); - dtStartMinute = document.getElementById("dtstart_minute"); + var checkBoxTime = $('dtstart_time_assoc'); + var dtstart = document.getElementById("dtstart"); + var dtstart_date = document.getElementById("dtstart_date"); + var dtstart_time = document.getElementById("dtstart_time"); if (checkBox.checked) { - dtStart.disabled = true; - dtStartHour.disabled = true; - dtStartMinute.disabled = true; - dtStart.style.textDecoration = "line-through"; + dtstart_date.style.visibility = "hidden"; + dtstart_time.style.visibility = "hidden"; } else { - dtStart.disabled = false; if (checkBoxTime.checked) { - dtStartHour.disabled = false; - dtStartMinute.disabled = false; + dtstart_time.style.visibility = "visible"; } else { - dtStartHour.disabled = true; - dtStartMinute.disabled = true; + dtstart_time.style.visibility = "hidden"; } - dtStart.style.textDecoration = ""; - if (dtStart.value.length == 0) - dtStart.dpck._initCurrentDate(); + dtstart_date.style.visibility = "visible"; + if (dtstart.value.length == 0) + dtstart.dpck._initCurrentDate(); } } function toggleTaskDue(event) { var checkBox = $('nodue'); - var checkBoxTime = $('due_time'); - dueField = document.getElementById("due"); - dueFieldHour = document.getElementById("due_hour"); - dueFieldMinute = document.getElementById("due_minute"); + var checkBoxTime = $('due_time_assoc'); + var due = document.getElementById("due"); + var due_date = document.getElementById("due_date"); + var due_time = document.getElementById("due_time"); if (checkBox.checked) { - dueField.disabled = true; - dueFieldHour.disabled = true; - dueFieldMinute.disabled = true; - dueField.style.textDecoration = "line-through"; + due_date.style.visibility = "hidden"; + due_time.style.visibility = "hidden"; } else { - dueField.disabled = false; if (checkBoxTime.checked) { - dueFieldHour.disabled = false; - dueFieldMinute.disabled = false; + due_time.style.visibility = "visible"; } else { - dueFieldHour.disabled = true; - dueFieldMinute.disabled = true; + due_time.style.visibility = "hidden"; } - dueField.style.textDecoration = ""; - if (dueField.value.length == 0) - dueField.dpck._initCurrentDate(); + due_date.style.visibility = "visible"; + if (due.value.length == 0) + due.dpck._initCurrentDate(); } } function ToggleTaskDateOrNoDateActivate(event) { @@ -703,9 +693,9 @@ function ToggleTaskDateOrNoDateActivate(event) { toggleTaskDtStart(null); toggleTaskDue(null); $('nodtstart').observe('click', toggleTaskDtStart); - $('dtstart_time').observe('click', toggleTaskDtStart); + $('dtstart_time_assoc').observe('click', toggleTaskDtStart); $('nodue').observe('click', toggleTaskDue); - $('due_time').observe('click', toggleTaskDue); + $('due_time_assoc').observe('click', toggleTaskDue); } } function TaskViewGatherCategoriesFromTable() { @@ -724,13 +714,14 @@ function attachDatePicker(relative) { } function eventEditAllDay() { var allDayCheck = document.getElementById("alldayevent"); - var dtend= document.getElementById("dtendcell"); + var dtend = document.getElementById("dtendcell"); + var dtstart_time = document.getElementById("dtstart_time"); if(allDayCheck.checked) { - //dtend.disabled = true; - dtend.style.textDecoration = "line-through"; + dtstart_time.style.visibility = "hidden"; + dtend.style.visibility = "hidden"; } else { - //dtend_day.disabled = false; - dtend.style.textDecoration = ""; + dtstart_time.style.visibility = "visible"; + dtend.style.visibility = "visible"; } } -- 2.30.2