Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Latest changes to UAT/PROD #968

Merged
merged 17 commits into from
Nov 22, 2024
Merged

Latest changes to UAT/PROD #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2882975
Hub-91 Connect Page includes Buy BC
andrelashley Sep 19, 2024
f79ca73
Merge branch 'bcgov:develop' into develop
andrelashley Oct 15, 2024
dfab1d2
hotfix
andrelashley Nov 19, 2024
3d2239c
HUB-158 and HUB-3
andrelashley Nov 20, 2024
192c055
HUB-158 and HUB-3 (#963)
andrelashley Nov 20, 2024
135b659
Merge branch 'bcgov:develop' into develop
andrelashley Nov 20, 2024
7ebc01a
Update Jenkinsfile-develop-full
andrelashley Nov 20, 2024
73fc0b4
remove banner
AlessiaYChen Nov 21, 2024
2f38982
Merge branch 'develop' of https://github.com/bcgov/gcpe-news-webapp i…
AlessiaYChen Nov 21, 2024
9adc912
Merge pull request #964 from AlessiaYChen/develop
AlessiaYChen Nov 21, 2024
bbaabbc
Merge branch 'master' of https://github.com/bcgov/gcpe-news-webapp in…
AlessiaYChen Nov 21, 2024
ce7d111
Merge branch 'develop' of https://github.com/bcgov/gcpe-news-webapp i…
AlessiaYChen Nov 21, 2024
8921313
Merge pull request #965 from AlessiaYChen/develop
AlessiaYChen Nov 21, 2024
d11d5e3
Merge to clean up fork commits (#967)
andrelashley Nov 21, 2024
bd83976
Add padding on Contacts page header
andrelashley Nov 21, 2024
cd7d634
Update CommContacts.cshtml
andrelashley Nov 21, 2024
0226bb8
Merge branch 'develop' of https://github.com/bcgov/gcpe-news-webapp i…
andrelashley Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 55 additions & 36 deletions Gov.News.WebApp/Views/Default/CommContacts.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@
@model BaseViewModel

<div class="comm-contacts">
<div style="padding-top: 15px; font-size:16px; background-color: #d4d4d4; padding:16px; margin-top: 16px; border-radius: 8px;" class="text-center">
<p><strong>Public inquiries for medical queries related to COVID-19: 8-1-1</strong></p>
<p><strong>Public inquiries for non-medical queries related to COVID-19: 1-888-COVID-19</strong></p>
<p><strong>Media inquiries related to COVID-19 (not for public queries): 250-952-1887</strong></p>
</div>

<h3 class="hidden-xs">Government Communications and Public Engagement</h3>

<h3 class="hidden-xs" style="padding-top:10px;">Government Communications and Public Engagement</h3>
<div class="clear"></div>
<div class="header">
<h4>24 hours Media Relations Contact Line</h4>
Expand All @@ -30,58 +23,84 @@
<h4 class="col-xs-12 col-sm-4 col-md col-lg col-xl">Primary Contact</h4>
<h4 class="col-xs-12 col-sm-4 col-md col-lg col-xl">Alternate Contact</h4>
</div>

@foreach (var categoryModel in Model.Ministries)
{
var ministry = categoryModel.Index as Ministry;
if (ministry.ContactUser != null)
{
<div class="row" style="padding-bottom:10px;">
<div class="col-xs-12 col-sm-4">
<a style="color: #003366; text-decoration: none;">Media Relations</a>
<div>Chinese Media</div>
</div>
<div class="col-xs-12 col-sm-4">
<span class="contact-name">Catherine Chan</span>
<div>
<span>Cell: 778-686-7925</span>
</div>
<a href="mailto:[email protected]">[email protected]</a>
</div>
</div>
<div class="row" style="padding-bottom:10px;">
<div class="col-xs-12 col-sm-4">
<a>South Asian Media</a>
</div>
<div class="col-xs-12 col-sm-4">
<span class="contact-name">Haroon Ghaffar</span>
<div>
<span>Cell: 604-312-6470</span>
</div>
<a href="mailto:[email protected]">[email protected]</a>
</div>
</div>
@foreach (var categoryModel in Model.Ministries)
{
var ministry = categoryModel.Index as Ministry;
if (ministry.ContactUser != null)
{
<div class="row" style="padding-bottom:10px;">
<div class="col-xs-12 col-sm-4">
<a style="@(ministry.ParentMinistryKey != null ? "margin-left: 25px; display:inline-block;" : "")" href="@ministry.GetUri()">@ministry.Name</a>
@if (!string.IsNullOrEmpty(ministry.DisplayAdditionalName))
{
@if (!string.IsNullOrEmpty(ministry.DisplayAdditionalName))
{
<div style="@(ministry.ParentMinistryKey != null ? "margin-left: 25px;" : "")"><i>(@ministry.DisplayAdditionalName)</i></div>
}
@if (ministry.Name != "Intergovernmental Relations Secretariat")
{
}
@if (ministry.Name != "Intergovernmental Relations Secretariat")
{
<div style="@(ministry.ParentMinistryKey != null ? "margin-left: 25px;" : "")">@ministry.MinisterName</div>
}
}
</div>
<div class="col-xs-12 col-sm-4">
<partial name="CommContact" model="ministry.ContactUser" />
</div>
@if (ministry.SecondContactUser != null)
{
@if (ministry.SecondContactUser != null)
{
<div class="col-xs-12 col-sm-4">
<partial name="CommContact" model="ministry.SecondContactUser" />
</div>
}
@if (!string.IsNullOrEmpty(ministry.WeekendContactNumber))
{
}
@if (!string.IsNullOrEmpty(ministry.WeekendContactNumber))
{
<div class="text-center">
<div><span style="padding-left:200px;">
<strong>After hours:</strong> @ministry.WeekendContactNumber</span>
<div>
<span style="padding-left:200px;">
<strong>After hours:</strong> @ministry.WeekendContactNumber
</span>
</div>
</div>
}
}
</div>
}
if (ministry.Name == "Education and Child Care")
{
}
if (ministry.Name == "Education and Child Care")
{
<div class="row" style="padding-bottom:10px;">
<div class="col-xs-12 col-sm-4">
<a style="text-decoration: none; color: #2d2d2d; display:inline-block; margin-left: 25px;">Child Care</a>
</div>

<div class="col-xs-12 col-sm-4">
<span class="contact-name">Esme Mills</span>
<div>
<span>Direct: 250-896-4891</span>
</div>
<a href="mailto:[email protected]">[email protected]</a><br />
</div>

<div class="col-xs-12 col-sm-4">
<span class="contact-name">Clay Suddaby</span>
<div>
Expand All @@ -90,8 +109,8 @@
<a href="mailto:[email protected]">[email protected]</a><br />
</div>
</div>
}
}
}
}
<div class="row" style="margin-bottom:20px;padding-bottom:10px;">
<div class="col-xs-12 col-sm-4">
<a style="" href="https://news.gov.bc.ca/office-of-the-premier">Office of the Premier</a>
Expand All @@ -104,6 +123,6 @@
</div>
</div>
</div>

<div class="clear"></div>
</div>
2 changes: 1 addition & 1 deletion Gov.News.WebApp/Views/Shared/_Layout.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
<body>
<!--googleoff: all-->
<!--banner-->
<partial name="_Banner.cshtml" />
<!-- <partial name="_Banner.cshtml" /> -->
<!--end of banner-->
<header class="container-fluid sm-g-0 header nav-border" id="main-nav">
<div class="container-xl sm-g-0" id="main-nav-contaier">
Expand Down
1 change: 0 additions & 1 deletion Jenkinsfile-develop-full
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,3 @@ stage('Deploy on Test') {
sh 'sleep 3m'
}
}