Skip to content

Commit

Permalink
Latest changes to UAT/PROD (#968)
Browse files Browse the repository at this point in the history
* Hub-91 Connect Page includes Buy BC

* HUB-158 and HUB-3

* HUB-158 and HUB-3 (#963)

* Hub-91 Connect Page includes Buy BC

* HUB-158 and HUB-3

* Update Jenkinsfile-develop-full

* remove banner

* Merge to clean up fork commits (#967)

* Hub-91 Connect Page includes Buy BC

* HUB-158 and HUB-3

* Add padding on Contacts page header

* Update CommContacts.cshtml

---------

Co-authored-by: AlessiaYChen <[email protected]>
Co-authored-by: AlessiaYChen <[email protected]>
  • Loading branch information
3 people authored Nov 22, 2024
1 parent 62d4ff5 commit a45ce02
Show file tree
Hide file tree
Showing 2 changed files with 55 additions and 37 deletions.
91 changes: 55 additions & 36 deletions Gov.News.WebApp/Views/Default/CommContacts.cshtml
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]">Catherine.Chan@gov.bc.ca</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]">Haroon.Ghaffar@gov.bc.ca</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]">Esme.Mills@gov.bc.ca</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]">Clay.Suddaby@gov.bc.ca</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>
1 change: 0 additions & 1 deletion Jenkinsfile-develop-full
Original file line number Diff line number Diff line change
Expand Up @@ -107,4 +107,3 @@ stage('Deploy on Test') {
sh 'sleep 3m'
}
}

0 comments on commit a45ce02

Please sign in to comment.