diff --git a/docs/upgrades/templates-7.3.4/calendar_day.tmpl b/docs/upgrades/templates-7.3.4/calendar_day.tmpl new file mode 100644 index 000000000..821d64049 --- /dev/null +++ b/docs/upgrades/templates-7.3.4/calendar_day.tmpl @@ -0,0 +1,268 @@ +#CalendarDay00000000001 + +

+
+ + +

+
+ + +

+
+ + + + + + + + + + + + + + +
+ Day + Week + Month + Search + +
+ Add Event + Print +
+
+
+ « Previous Day + • + + , . • + Next Day » +
+
+
+ , , +
+
+ + + + + +
+
:00
+
+
    +
  • + +
  • +
+
+
+~~~ + + diff --git a/docs/upgrades/templates-7.3.4/calendar_month.tmpl b/docs/upgrades/templates-7.3.4/calendar_month.tmpl new file mode 100644 index 000000000..f0c5056dd --- /dev/null +++ b/docs/upgrades/templates-7.3.4/calendar_month.tmpl @@ -0,0 +1,319 @@ +#CalendarMonth000000001 + +

+
+ + +

+
+ + + + + + + + + + + + + + + + + + +
+ Day + Week + Month + Search + +
Add EventPrint + +
+
+
+ « • + + + + • + » +
+
+
+ +
+
+ + + + + + + + + + + + +
+ + + + + + + + + + + +
+
+~~~ + + + diff --git a/docs/upgrades/templates-7.3.4/calendar_search.tmpl b/docs/upgrades/templates-7.3.4/calendar_search.tmpl new file mode 100644 index 000000000..4215433bb --- /dev/null +++ b/docs/upgrades/templates-7.3.4/calendar_search.tmpl @@ -0,0 +1,319 @@ +#CalendarSearch00000001 + +

+
+ + +

+
+ + + + + + + + + + + + + + + + + + + + +
+ Day + Week + Month + Search +
+   +
+ + + + + + + + + + + + + + + + +
+
Keyword
+
+
+
Start Date
+
+
+
End Date
+
+
+
+ +
+ + + + + + + + + + + + + + + + + + +
+
+ Search Results + Displaying page of +
+
+
+ + + +
+
+ + + + + +
+
+
+ +
+
+
+ + + +
+
+
+~~~ + + diff --git a/lib/WebGUI/Asset/Event.pm b/lib/WebGUI/Asset/Event.pm index 2298d93c1..f93d44785 100644 --- a/lib/WebGUI/Asset/Event.pm +++ b/lib/WebGUI/Asset/Event.pm @@ -1284,7 +1284,8 @@ sub getTemplateVars : ""); # Make some friendly URLs - $dtStart->truncate(to=>"day"); + $var{"url"} = $self->getUrl; + $dtStart->truncate(to=>"day"); $var{"urlDay"} = $self->getParent->getUrl("type=day;start=".$dtStart->toMysql); $var{"urlWeek"} = $self->getParent->getUrl("type=week;start=".$dtStart->toMysql); $var{"urlMonth"} = $self->getParent->getUrl("type=month;start=".$dtStart->toMysql); diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm index 12e0ca052..d7114a2d5 100644 --- a/lib/WebGUI/Asset/Wobject/Calendar.pm +++ b/lib/WebGUI/Asset/Wobject/Calendar.pm @@ -1608,7 +1608,7 @@ sub www_search my $perpage = $form->param("perpage"); my $var = $self->get; - + $var->{url} = $self->getUrl; # If there is a search to perform if ($keywords || $startDate || $endDate)