From 2882975824efd0b7c5098cc979ceff6f8fbf96d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Lashley?= Date: Thu, 19 Sep 2024 15:27:01 -0700 Subject: [PATCH 1/8] Hub-91 Connect Page includes Buy BC --- Gov.News.WebApp/Controllers/DefaultController.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gov.News.WebApp/Controllers/DefaultController.cs b/Gov.News.WebApp/Controllers/DefaultController.cs index 41f3caf9..8769c3a3 100644 --- a/Gov.News.WebApp/Controllers/DefaultController.cs +++ b/Gov.News.WebApp/Controllers/DefaultController.cs @@ -350,6 +350,7 @@ public async Task GetConnectModel() new Link() { Url = "https://www.facebook.com/AgriService-BC-103287979487810", Title = "AgriService BC" }, new Link() { Url = "https://www.facebook.com/RoadSafetyBC", Title = "Road Safety BC" }, new Link() { Url = "https://www.facebook.com/HealthyBritishColumbia", Title = "HealthyBC" }, + new Link() { Url = "https://www.facebook.com/EatDrinkBuyBC", Title = "Buy BC" }, }.OrderBy(t => t.Title).Prepend(new Link() { Url = "http://www.facebook.com/BCProvincialGovernment", Title = "Government of British Columbia", Summary = "Join us for BC news, information and updates" }).ToArray(); @@ -422,6 +423,7 @@ public async Task GetConnectModel() new Link() { Url = "https://x.com/_BCCOS", Title = "@_BCCOS", Summary = "Conservation Officer Service" }, new Link() { Url = "https://x.com/SpillsInfoBC", Title = "@SpillsInfoBC", Summary = "B.C. Spill Response" }, new Link() { Url = "https://x.com/BCProsecution", Title = "@BCProsecution", Summary = "BC Prosecution Service" }, + new Link() { Url = "https://x.com/EatDrinkBuyBC", Title = "@EatDrinkBuyBC", Summary = "Buy BC helps you choose fresh-tasting food and beverage products that are grown, raised and made right here in BC" }, }.OrderBy(t => t.Title).Prepend(new Link() { Url = "https://x.com/BCGovNews", Title = "@BCGovNews", Summary = "Read daily news tweets from the Government of British Columbia" }).ToArray(); model.InstagramLinks = new Link[] @@ -435,6 +437,7 @@ public async Task GetConnectModel() new Link() { Url = "https://www.instagram.com/prepared_bc/", Title = "Prepared BC", Summary = "" }, new Link() { Url = "https://www.instagram.com/roadsafetybc/", Title = "Road Safety BC", Summary = "" }, new Link() { Url = "https://www.instagram.com/_healthy_bc/", Title = "HealthyBC", Summary = "" }, + new Link() { Url = "https://www.instagram.com/EatDrinkBuyBC/", Title = "Buy BC", Summary = "" }, }.OrderBy(t => t.Title).Prepend(new Link() { Url = "https://www.instagram.com/governmentofbc/", Title = "Government of BC", Summary = "" }).ToArray(); model.BlogsLinks = new Link[] From 3d2239c72debcee6c3ed64bdf9fbe890db3e31ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Lashley?= Date: Tue, 19 Nov 2024 17:18:45 -0800 Subject: [PATCH 2/8] HUB-158 and HUB-3 --- .../Views/Default/CommContacts.cshtml | 89 +++++++++++-------- 1 file changed, 54 insertions(+), 35 deletions(-) diff --git a/Gov.News.WebApp/Views/Default/CommContacts.cshtml b/Gov.News.WebApp/Views/Default/CommContacts.cshtml index 6b6655f6..ebcb806a 100644 --- a/Gov.News.WebApp/Views/Default/CommContacts.cshtml +++ b/Gov.News.WebApp/Views/Default/CommContacts.cshtml @@ -4,14 +4,7 @@ @model BaseViewModel
-
-

Public inquiries for medical queries related to COVID-19: 8-1-1

-

Public inquiries for non-medical queries related to COVID-19: 1-888-COVID-19

-

Media inquiries related to COVID-19 (not for public queries): 250-952-1887

-
- -

24 hours Media Relations Contact Line

@@ -30,50 +23,76 @@

Primary Contact

Alternate Contact

- - @foreach (var categoryModel in Model.Ministries) - { - var ministry = categoryModel.Index as Ministry; - if (ministry.ContactUser != null) - { +
+
+ Media Relations +
Chinese Media
+
+
+ Catherine Chan +
+ Cell: 778-686-7925 +
+ Catherine.Chan@gov.bc.ca +
+
+
+
+ South Asian Media +
+
+ Haroon Ghaffar +
+ Cell: 604-312-6470 +
+ Haroon.Ghaffar@gov.bc.ca +
+
+ @foreach (var categoryModel in Model.Ministries) + { + var ministry = categoryModel.Index as Ministry; + if (ministry.ContactUser != null) + {
@ministry.Name - @if (!string.IsNullOrEmpty(ministry.DisplayAdditionalName)) - { + @if (!string.IsNullOrEmpty(ministry.DisplayAdditionalName)) + {
(@ministry.DisplayAdditionalName)
- } - @if (ministry.Name != "Intergovernmental Relations Secretariat") - { + } + @if (ministry.Name != "Intergovernmental Relations Secretariat") + {
@ministry.MinisterName
- } + }
- @if (ministry.SecondContactUser != null) - { + @if (ministry.SecondContactUser != null) + {
- } - @if (!string.IsNullOrEmpty(ministry.WeekendContactNumber)) - { + } + @if (!string.IsNullOrEmpty(ministry.WeekendContactNumber)) + {
-
- After hours: @ministry.WeekendContactNumber +
+ + After hours: @ministry.WeekendContactNumber +
- } + }
- } - if (ministry.Name == "Education and Child Care") - { + } + if (ministry.Name == "Education and Child Care") + {
Child Care
- +
Esme Mills
@@ -81,7 +100,7 @@
Esme.Mills@gov.bc.ca
- +
Clay Suddaby
@@ -90,8 +109,8 @@ Clay.Suddaby@gov.bc.ca
- } - } + } + }
Office of the Premier @@ -104,6 +123,6 @@
- +
From 192c055811bd67bc570a96550e40112d28a1c6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Lashley?= Date: Tue, 19 Nov 2024 17:21:38 -0800 Subject: [PATCH 3/8] HUB-158 and HUB-3 (#963) * Hub-91 Connect Page includes Buy BC * HUB-158 and HUB-3 --- .../Views/Default/CommContacts.cshtml | 89 +++++++++++-------- 1 file changed, 54 insertions(+), 35 deletions(-) diff --git a/Gov.News.WebApp/Views/Default/CommContacts.cshtml b/Gov.News.WebApp/Views/Default/CommContacts.cshtml index 6b6655f6..ebcb806a 100644 --- a/Gov.News.WebApp/Views/Default/CommContacts.cshtml +++ b/Gov.News.WebApp/Views/Default/CommContacts.cshtml @@ -4,14 +4,7 @@ @model BaseViewModel
-
-

Public inquiries for medical queries related to COVID-19: 8-1-1

-

Public inquiries for non-medical queries related to COVID-19: 1-888-COVID-19

-

Media inquiries related to COVID-19 (not for public queries): 250-952-1887

-
- -

24 hours Media Relations Contact Line

@@ -30,50 +23,76 @@

Primary Contact

Alternate Contact

- - @foreach (var categoryModel in Model.Ministries) - { - var ministry = categoryModel.Index as Ministry; - if (ministry.ContactUser != null) - { +
+
+ Media Relations +
Chinese Media
+
+
+ Catherine Chan +
+ Cell: 778-686-7925 +
+ Catherine.Chan@gov.bc.ca +
+
+
+
+ South Asian Media +
+
+ Haroon Ghaffar +
+ Cell: 604-312-6470 +
+ Haroon.Ghaffar@gov.bc.ca +
+
+ @foreach (var categoryModel in Model.Ministries) + { + var ministry = categoryModel.Index as Ministry; + if (ministry.ContactUser != null) + {
@ministry.Name - @if (!string.IsNullOrEmpty(ministry.DisplayAdditionalName)) - { + @if (!string.IsNullOrEmpty(ministry.DisplayAdditionalName)) + {
(@ministry.DisplayAdditionalName)
- } - @if (ministry.Name != "Intergovernmental Relations Secretariat") - { + } + @if (ministry.Name != "Intergovernmental Relations Secretariat") + {
@ministry.MinisterName
- } + }
- @if (ministry.SecondContactUser != null) - { + @if (ministry.SecondContactUser != null) + {
- } - @if (!string.IsNullOrEmpty(ministry.WeekendContactNumber)) - { + } + @if (!string.IsNullOrEmpty(ministry.WeekendContactNumber)) + {
-
- After hours: @ministry.WeekendContactNumber +
+ + After hours: @ministry.WeekendContactNumber +
- } + }
- } - if (ministry.Name == "Education and Child Care") - { + } + if (ministry.Name == "Education and Child Care") + {
Child Care
- +
Esme Mills
@@ -81,7 +100,7 @@
Esme.Mills@gov.bc.ca
- +
Clay Suddaby
@@ -90,8 +109,8 @@ Clay.Suddaby@gov.bc.ca
- } - } + } + }
Office of the Premier @@ -104,6 +123,6 @@
- +
From 7ebc01adcd37cb15101689af7b1911f10fd83bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Lashley?= Date: Wed, 20 Nov 2024 10:47:38 -0800 Subject: [PATCH 4/8] Update Jenkinsfile-develop-full --- Jenkinsfile-develop-full | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile-develop-full b/Jenkinsfile-develop-full index 5806a34c..09253875 100644 --- a/Jenkinsfile-develop-full +++ b/Jenkinsfile-develop-full @@ -107,4 +107,3 @@ stage('Deploy on Test') { sh 'sleep 3m' } } - From 73fc0b4a4872c74200b92f74964cec2a73d883ae Mon Sep 17 00:00:00 2001 From: AlessiaYChen Date: Thu, 21 Nov 2024 14:31:49 -0800 Subject: [PATCH 5/8] remove banner --- Gov.News.WebApp/Views/Shared/_Layout.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gov.News.WebApp/Views/Shared/_Layout.cshtml b/Gov.News.WebApp/Views/Shared/_Layout.cshtml index 55f13588..d3210042 100644 --- a/Gov.News.WebApp/Views/Shared/_Layout.cshtml +++ b/Gov.News.WebApp/Views/Shared/_Layout.cshtml @@ -128,7 +128,7 @@ - +