page payload get parent's sibling

event calendar formatting improvement
ninianne98 · Apr 28, 2024 · 9f2d666 · 9f2d666
1 parent 84de3f7
commit 9f2d666
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 41 deletions.
diff --git a/CMSCore/MVC/PagePayload.cs b/CMSCore/MVC/PagePayload.cs
@@ -256,6 +256,21 @@ public class PagePayload {
 			}
 		}
 
+		private List<SiteNav> _parentsib = null;
+
+		public List<SiteNav> ParentSiblingNav {
+			get {
+				if (_parentsib == null) {
+					using (ISiteNavHelper navHelper = SiteNavFactory.GetSiteNavHelper()) {
+						_parentsib = navHelper.GetSiblingNavigation(this.TheSite.SiteID, this.ThePage.Parent_ContentID ?? Guid.Empty, !SecurityData.IsAuthEditor);
+					}
+					_parentsib = TweakData(_parentsib);
+				}
+
+				return _parentsib;
+			}
+		}
+
 		private SiteNav _parentnav = null;
 
 		public SiteNav ParentNav {

diff --git a/PluginEventCalendarModule/Views/Home/EventCalendarDisplay.cshtml b/PluginEventCalendarModule/Views/Home/EventCalendarDisplay.cshtml
@@ -1,4 +1,4 @@
-@model  CalendarViewModel
+@model CalendarViewModel
 
 <div id="divCalendarResults">
 	<style type="text/css">
@@ -50,6 +50,11 @@
 		.calendarEventDetailList table {
 			border: 0;
 		}
+
+		.divCalendarDetailText {
+			text-align: left;
+			margin: 0.1em;
+		}
 	</style>
 
 	<script type="text/javascript">
@@ -119,40 +124,42 @@
 		grid.ConfigName(Html.NameFor(x => x.MonthDates));
 
 		grid
-		.AddColumn(x => x.EventDate, new CarrotGridColumn { HasHeadingText = false, CellFormatString = WebHelper.ShortDateFormatPattern })
-		.AddColumn(new CarrotGridTemplateColumn<ViewCalendarEvent> {
-			HasHeadingText = false,
-			BodyAttributes = new { @class = "leftAlignCell" },
-			FormatTemplate = @<text>
-				@if (!item.IsAllDayEvent) {
-					if (item.EventStartTime.HasValue && item.EventEndTime.HasValue) {
-						@item.EventDate.ToString(WebHelper.ShortTimePattern)
-						<span> - </span>
-						@item.EventEndDate.ToString(WebHelper.ShortTimePattern)
-					} else if (item.EventStartTime.HasValue) {
-						@item.EventDate.ToString(WebHelper.ShortTimePattern)
+			.AddColumn(x => x.EventDate, new CarrotGridColumn { HasHeadingText = false, CellFormatString = WebHelper.ShortDateFormatPattern })
+			.AddColumn(new CarrotGridTemplateColumn<ViewCalendarEvent> {
+				HasHeadingText = false,
+				BodyAttributes = new { @class = "leftAlignCell" },
+				FormatTemplate = @<text>
+			@if (!item.IsAllDayEvent) {
+		if (item.EventStartTime.HasValue && item.EventEndTime.HasValue) {
+			@item.EventDate.ToString(WebHelper.ShortTimePattern)
+			<span> - </span>
+			@item.EventEndDate.ToString(WebHelper.ShortTimePattern)
+		} else if (item.EventStartTime.HasValue) {
+			@item.EventDate.ToString(WebHelper.ShortTimePattern)
+		}
+		}
+		</text>
+	})
+	.AddColumn(new CarrotGridTemplateColumn<ViewCalendarEvent> {
+		HasHeadingText = false,
+		BodyAttributes = new { @class = "leftAlignCell" },
+		FormatTemplate = @<text>
+			<div style="border: solid 1px @item.CategoryBGColor; background-color: @item.CategoryFGColor; padding: 1px;">
+				<div style="border: solid 2px @item.CategoryFGColor; color: @item.CategoryFGColor; background-color: @item.CategoryBGColor; padding: 5px; margin: 1px;">
+					<b>
+						@item.EventTitle
+						@if (item.IsCancelledSeries || item.IsCancelledEvent) {
+						<span> (CANCELLED) </span>
 					}
-				}
-			</text>
-		})
-		.AddColumn(new CarrotGridTemplateColumn<ViewCalendarEvent> {
-			HasHeadingText = false,
-			BodyAttributes = new { @class = "leftAlignCell" },
-			FormatTemplate = @<text>
-				<div style="border: solid 1px @item.CategoryBGColor; background-color: @item.CategoryFGColor; padding: 1px;">
-					<div style="border: solid 2px @item.CategoryFGColor; color: @item.CategoryFGColor; background-color: @item.CategoryBGColor; padding: 5px; margin: 1px;">
-						<b>
-							@item.EventTitle
-							@if (item.IsCancelledSeries || item.IsCancelledEvent) {
-								<span> (CANCELLED) </span>
-							}
-						</b>
-					</div>
+					</b>
 				</div>
+			</div>
+			<div class="divCalendarDetailText">
 				@Html.Raw(item.EventSeriesDetail)
 				@Html.Raw(item.EventDetail)
-			</text>
-		});
+			</div>
+		</text>
+	});
 	}
 
 	@if (Model.GenerateCss) {

diff --git a/PluginEventCalendarModule/Views/Home/EventCalendarDisplay2.cshtml b/PluginEventCalendarModule/Views/Home/EventCalendarDisplay2.cshtml
@@ -1,4 +1,4 @@
-@model  CalendarViewModel
+@model CalendarViewModel
 
 <div id="divCalendarResults2">
 
@@ -55,6 +55,11 @@
 		.calendarEventDetailList table {
 			border: 0;
 		}
+
+		.divCalendarDetail2Text {
+			text-align: left;
+			margin: 0.1em;
+		}
 	</style>
 
 	<script type="text/javascript">
@@ -162,23 +167,25 @@
 								@item.EventTitle
 								@if (!item.IsAllDayEvent) {
 									if (item.EventStartTime.HasValue && item.EventEndTime.HasValue) {
-								<span> at </span>
-								@item.EventDate.ToString(WebHelper.ShortTimePattern)
-								<span> - </span>
-								@item.EventEndDate.ToString(WebHelper.ShortTimePattern)
+										<span> at </span>
+										@item.EventDate.ToString(WebHelper.ShortTimePattern)
+										<span> - </span>
+										@item.EventEndDate.ToString(WebHelper.ShortTimePattern)
 									} else if (item.EventStartTime.HasValue) {
-								<span> at </span>
-								@item.EventDate.ToString(WebHelper.ShortTimePattern)
+										<span> at </span>
+										@item.EventDate.ToString(WebHelper.ShortTimePattern)
 									}
 								}
 								@if (item.IsCancelledSeries || item.IsCancelledEvent) {
-								<span> (CANCELLED) </span>
+									<span> (CANCELLED) </span>
 								}
 							</b>
 						</div>
 					</div>
-					@Html.Raw(item.EventSeriesDetail)
-					@Html.Raw(item.EventDetail)
+					<div class="divCalendarDetail2Text">
+						@Html.Raw(item.EventSeriesDetail)
+						@Html.Raw(item.EventDetail)
+					</div>
 				</div>
 			}