diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 731e77ba7..cbbd928c7 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -14,6 +14,10 @@ - fix - Unable to add EventsCalendar - fix - Some functions in InOutBoard not internationalized - fix: Calendar/Event not handling gateway properly. + - fix: Calendar templates crushing other styles. + - fix: Using YUI to add the appropriate events when loading the Add/Edit Event + page. Should fix the strange IE bugs. + 7.3.0 diff --git a/docs/upgrades/templates-7.3.1/CalendarDay.tmpl b/docs/upgrades/templates-7.3.1/CalendarDay.tmpl new file mode 100755 index 000000000..3f036de4c --- /dev/null +++ b/docs/upgrades/templates-7.3.1/CalendarDay.tmpl @@ -0,0 +1,271 @@ +#CalendarDay00000000001 + +

+ + + +

+ + + +

+ + + + + + + + + + + + + + + +
+ Day + Week + Month + Search + +
+ Add Event + +
+
+
+ « Previous Day + • + + , . • + Next Day » +
+
+
+ , , +
+
+ + + + + +
+
:00
+ 		+
    +
  • + +
    • +
+
+
+~~~ + diff --git a/docs/upgrades/templates-7.3.1/CalendarEvent.tmpl b/docs/upgrades/templates-7.3.1/CalendarEvent.tmpl new file mode 100755 index 000000000..2cb1282b5 --- /dev/null +++ b/docs/upgrades/templates-7.3.1/CalendarEvent.tmpl @@ -0,0 +1,212 @@ +#CalendarEvent000000001 + + + + + + + + + + + + + +
+ Day + Week + Month + Search + +
+ Edit • Delete +
+
+
<< Previous Event
+
Next Event >>
+
+ Event Details +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
Event Title
+ 		+
+ +
+
+
Location
+ 		+
+ +
+
+
Description
+ 		+
+
+
Scheduled
+ 		+
+ , + + + : • , + + + : +
+
+
Related Material
+
+
+
+
+
+~~~ + diff --git a/docs/upgrades/templates-7.3.1/CalendarEventEdit.tmpl b/docs/upgrades/templates-7.3.1/CalendarEventEdit.tmpl new file mode 100755 index 000000000..45bb326bf --- /dev/null +++ b/docs/upgrades/templates-7.3.1/CalendarEventEdit.tmpl @@ -0,0 +1,164 @@ +#CalendarEventEdit00001 + + + +

Errors!

+ + + + + + + +
+ Event + Recurrence + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Event Title
Short Title
Location
Description
Start Date
End Date
Time
 
Related Links
+
+ + + + + + + + + + + + + + + + +~~~ + + + + + + + + + + + + + + diff --git a/docs/upgrades/templates-7.3.1/CalendarMonth.tmpl b/docs/upgrades/templates-7.3.1/CalendarMonth.tmpl new file mode 100755 index 000000000..792d60054 --- /dev/null +++ b/docs/upgrades/templates-7.3.1/CalendarMonth.tmpl @@ -0,0 +1 @@ +# diff --git a/docs/upgrades/templates-7.3.1/CalendarSearch.tmpl b/docs/upgrades/templates-7.3.1/CalendarSearch.tmpl new file mode 100755 index 000000000..20d33c444 --- /dev/null +++ b/docs/upgrades/templates-7.3.1/CalendarSearch.tmpl @@ -0,0 +1,318 @@ +#CalendarSearch00000001 + +

+ + + +

+ + + + + + + + + + + + + + + + + + + + + +
+ Day + Week + Month + Search +
+   +
+ + + + + + + + + + + + + + + + +
+
Keyword
+ 		+
+
Start Date
+ 		+
+
End Date
+ 		+
+
+ +
+ + + + + + + + + + + + + + + + + + +
+
+ Search Results + Displaying page of +
+
+
+ + + +
+
+ + + + + +
+
+ 		+ +
+
+
+ + + +
+
+ +~~~ + diff --git a/docs/upgrades/templates-7.3.1/CalendarWeek.tmpl b/docs/upgrades/templates-7.3.1/CalendarWeek.tmpl new file mode 100755 index 000000000..66480700f --- /dev/null +++ b/docs/upgrades/templates-7.3.1/CalendarWeek.tmpl @@ -0,0 +1,263 @@ +#CalendarWeek0000000001 + +

+ + + +

+ + + + + + + + + + + + + + + + + + + +
+ Day Week Month Search +
+ Add Event +
+
+ +
+
+ , to , +
+
+ + + + + +
+
+ 		+ +
    +
    • +
+
+
+
+~~~ + diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm index cb0916ef4..c73fe4f1a 100644 --- a/lib/WebGUI/Asset/Event.pm +++ b/lib/WebGUI/Asset/Event.pm @@ -1747,12 +1747,12 @@ sub www_edit # time my $allday = ($form->param("allday") eq "yes" ? 1 : $self->isAllDay); $var->{"formTime"} = - q|
- @@ -1778,6 +1778,7 @@ sub www_edit $var->{"formRecurPattern"} = q| +

@@ -1901,6 +1902,7 @@ sub www_edit

+ |; @@ -1914,7 +1916,7 @@ sub www_edit # End $var->{"formRecurEnd"} = q| - +

@@ -1927,6 +1929,7 @@ sub www_edit occurences. +
|; @@ -1952,7 +1955,7 @@ sub www_edit }); - $var->{"script"} = <<'ENDJS'; + $var->{"formFooter"} .= <<'ENDJS'; ENDJS diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm index 06d1bc26b..2cfc8f0e4 100644 --- a/lib/WebGUI/Asset/Wobject/Calendar.pm +++ b/lib/WebGUI/Asset/Wobject/Calendar.pm @@ -201,7 +201,7 @@ sub definition fieldType =>"template", defaultValue =>'CalendarPrintEvent0001', tab =>"display", - namespace =>"Calendar/Print/Day", + namespace =>"Calendar/Print/Event", hoverHelp =>$i18n->get('templateIdPrintEvent description'), label =>$i18n->get('templateIdPrintEvent label'), },