Skip to content

Commit

Permalink
Merge pull request #205 from alphagov/migrate-to-govuk-frontend
Browse files Browse the repository at this point in the history 
Migrate to GOV.UK Frontend v3
  • Loading branch information
@robinmitra
robinmitra authored Aug 13, 2019
2 parents e438d84 + e37fd1c commit 4bb6968
Show file tree
Hide file tree
Showing 48 changed files with 1,049 additions and 1,637 deletions.
26 changes: 3 additions & 23 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@
"homepage": "https://github.com/alphagov/govwifi-product-page#readme",
"dependencies": {
"gaap-analytics": "^3.0.0",
"govuk-elements-sass": "^3.1.3",
"govuk-frontend": "^2.13.0",
"govuk_frontend_toolkit": "^8.2.0"
"govuk-frontend": "^3.0.0"
},
"devDependencies": {
"napa": "^3.0.0"
Expand Down
65 changes: 32 additions & 33 deletions source/about-govwifi.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,42 +3,41 @@ title: What is GovWifi? - GovWifi
description: GovWifi is an authentication service that makes all participating government and public sector guest wifi networks appear as one.
---

<div class="container">
<main class="govuk-width-container" role="main" id="main">
<%= partial "shared/product/breadcrumbs", locals: { page: "What is GovWifi" } %>

<div class="grid-row">
<div class="column-one-third">
<div>
<div class="govuk-main-wrapper">
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-third">
<%= partial 'shared/product/sidebar' %>
</div>
</div>
<div class="column-two-thirds">
<h1 class="heading-large">What is GovWifi?</h1>
<p>
GovWifi is a wifi authentication service running in the cloud that makes all the various participating public sector guest wifi networks appear as one.
</p>
<p>
The <%= link_to "Government Digital Service", "https://www.gov.uk/government/organisations/government-digital-service ", class: "govuk-link" %> operates the GovWifi service and supports public sector network administrators to set up and manage GovWifi in their organisations.
</p>
<h2 class="heading-medium">Unified public sector guest wifi</h2>
<p>
Public sector organisations often have several different
wifi networks across their various office locations. Each organisation
often designs, procures, deploys and operates separate guest wifi networks.
</p>
<p>
For staff and members of the public, visiting and working across these sites,
this typically means managing multiple wifi username/password combinations
for each site location.
</p>
<p>
GovWifi allows public sector staff and visitors to signup once and use
the same username and password to automatically connect to a single wifi service
across multiple public sector locations.
</p>
<div class="govuk-inset-text">
<%= link_to "Learn more about how to connect your device to GovWifi", "/about-govwifi/connect-to-govwifi", class: "bold" %>
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-l">What is GovWifi?</h1>
<p class="govuk-body">
GovWifi is a wifi authentication service running in the cloud that makes all the various participating public sector guest wifi networks appear as one.
</p>
<p class="govuk-body">
The <%= link_to "Government Digital Service", "https://www.gov.uk/government/organisations/government-digital-service ", class: "govuk-link" %> operates the GovWifi service and supports public sector network administrators to set up and manage GovWifi in their organisations.
</p>
<h2 class="govuk-heading-m">Unified public sector guest wifi</h2>
<p class="govuk-body">
Public sector organisations often have several different
wifi networks across their various office locations. Each organisation
often designs, procures, deploys and operates separate guest wifi networks.
</p>
<p class="govuk-body">
For staff and members of the public, visiting and working across these sites,
this typically means managing multiple wifi username/password combinations
for each site location.
</p>
<p class="govuk-body">
GovWifi allows public sector staff and visitors to signup once and use
the same username and password to automatically connect to a single wifi service
across multiple public sector locations.
</p>
<div class="govuk-inset-text">
<strong><%= link_to "Learn more about how to connect your device to GovWifi", "/about-govwifi/connect-to-govwifi", class: "govuk-link" %></strong>
</div>
</div>
</div>
</div>
</div>
</main>
73 changes: 34 additions & 39 deletions source/about-govwifi/connect-to-govwifi.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,55 +3,50 @@ title: Connect to GovWifi - GovWifi
description: Use your public sector staff email address to connect devices to GovWifi.
---

<div class="container">
<main class="govuk-width-container" role="main" id="main">
<%= partial "shared/product/breadcrumbs", locals: { page: "Connect to GovWifi" } %>

<div class="grid-row">
<div class="column-one-third">
<div>
<%= partial 'shared/product/sidebar' %>
</div>
</div>
<div class="column-two-thirds">
<h1 class="heading-large">Connect a device to GovWifi</h1>
<p>
You need a <%= link_to "public sector staff email address",
"/support/check-organisation-email-address" %> to sign up for a GovWifi account.
</p>
<p>
If you do not have a public sector staff email address, you can <%= link_to "connect to GovWifi as a visitor",
"/support/visitor-access-to-govwifi" %>.
</p>
<div class="govuk-inset-text">
If you manage IT services in a public sector organisation and would like to make GovWifi available in your buildings, please review our <%= link_to "network administrator guidance", "https://docs.wifi.service.gov.uk/"%>.
<div class="govuk-main-wrapper">
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-third">
<%= partial 'shared/product/sidebar' %>
</div>
<div>
<h2>1. Sign up for a GovWifi account</h2>
<p>Create a GovWifi account by using your public sector staff email address to:</p>
<ul class="list list-bullet">
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-l">Connect a device to GovWifi</h1>
<p class="govuk-body">
You need a <%= link_to "public sector staff email address",
"/support/check-organisation-email-address" %> to sign up for a GovWifi account.
</p>
<p class="govuk-body">
If you do not have a public sector staff email address, you can <%= link_to "connect to GovWifi as a visitor",
"/support/visitor-access-to-govwifi" %>.
</p>
<div class="govuk-inset-text">
If you manage IT services in a public sector organisation and would like to make GovWifi available in your buildings, please review our <%= link_to "network administrator guidance", "https://docs.wifi.service.gov.uk/"%>.
</div>
<h2 class="govuk-heading-m">1. Sign up for a GovWifi account</h2>
<p class="govuk-body">Create a GovWifi account by using your public sector staff email address to:</p>
<ul class="govuk-list govuk-list--bullet">
<li>send a blank email to <%= link_to "[email protected]", "mailto:[email protected]" %></li>
<li>leave the subject line blank</li>
</ul>
</div>
<p>We will email your username and password confirmation in reply.</p>
<p>If you do not receive the username and password confirmation e-mail within a few minutes of signing up, please check your spam/junk e-mail folder.</p>
<div>
<h2>2. Connect your device to GovWifi</h2>
<p>By connecting to GovWifi, you accept our <a href="https://www.wifi.service.gov.uk/privacy-notice">privacy notice</a> and <a href="https://www.wifi.service.gov.uk/terms-and-conditions">terms and conditions</a>.</p>
<p> When you are in a <%= link_to "organisation that offers GovWifi","/about-govwifi/organisations-using-govwifi" %>, follow the steps below to connect your device:</p>
<ul class="list list-bullet">
<p class="govuk-body">We will email your username and password confirmation in reply.</p>
<p class="govuk-body">If you do not receive the username and password confirmation e-mail within a few minutes of signing up, please check your spam/junk e-mail folder.</p>
<h2 class="govuk-heading-m">2. Connect your device to GovWifi</h2>
<p class="govuk-body">By connecting to GovWifi, you accept our <a class="govuk-link" href="https://www.wifi.service.gov.uk/privacy-notice">privacy notice</a> and <a href="https://www.wifi.service.gov.uk/terms-and-conditions">terms and conditions</a>.</p>
<p class="govuk-body"> When you are in a <%= link_to "organisation that offers GovWifi","/about-govwifi/organisations-using-govwifi" %>, follow the steps below to connect your device:</p>
<ul class="govuk-list govuk-list--bullet">
<li>go to your device wifi settings and select GovWifi.</li>
<li>enter the GovWifi username and password you received by email.</li>
<li>your password is case sensitive. It’s 3 words without spaces. The first letter of each word is capitalised.</li>
<li>you can use the same username and password on all the devices you connect to GovWifi.</li>
<li>enter the GovWifi username and password you received by email.</li>
<li>your password is case sensitive. It’s 3 words without spaces. The first letter of each word is capitalised.</li>
<li>you can use the same username and password on all the devices you connect to GovWifi.</li>
</ul>
<p class="govuk-body">
Please review our <a href="https://www.wifi.service.gov.uk/support" class="govuk-link">support guides</a> for device specific instructions.
</p>
</div>
<p>
Please review our <a href="https://www.wifi.service.gov.uk/support">support guides</a> for device specific instructions.
</p>
</div>
</div>
</div>
</main>

<script type="application/ld+json">
{
Expand Down
53 changes: 25 additions & 28 deletions source/about-govwifi/how-govwifi-works.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,37 +3,34 @@ title: How GovWifi works - GovWifi
description: Learn more about how the GovWifi authenication service works.
---

<div class="container">
<main class="govuk-width-container" role="main" id="main">
<%= partial "shared/product/breadcrumbs", locals: { page: "How GovWifi Works" } %>

<div class="grid-row">
<div class="column-one-third">
<div>
<%= partial 'shared/product/sidebar' %>
<div class="govuk-main-wrapper">
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-third">
<%= partial 'shared/product/sidebar' %>
</div>
</div>
<div class="column-two-thirds">
<h1 class="heading-large">How GovWifi works</h1>
<p>
Participating government and public organisations keep their existing wifi infrastructure and configure it to access the GovWifi authentication service.
</p>
<h2>Authentication</h2>
<p>
GovWifi uses RADIUS server technology to authenticate users’ usernames and passwords.
</p>
<p>
Each end user is protected with unique credentials and encryption keys when they log in to the wifi and access the internet.
These credentials are randomly generated so can’t be used to get into other systems if stolen.
</p>
<p>
Users’ devices are isolated from each other to stop the horizontal spread of malware and protect secure devices from less secure ones.
The network also identifies itself in a way that can’t be spoofed, adding to the safety measures that provide protection from potential attackers.
</p>
<div class="govuk-inset-text">
<p>
Follow our <%= link_to "sign up instructions", "/about-govwifi/connect-to-govwifi", class: "bold" %> to connect to GovWifi.
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-l">How GovWifi works</h1>
<p class="govuk-body">
Participating government and public organisations keep their existing wifi infrastructure and configure it to access the GovWifi authentication service.
</p>
<h2 class="govuk-heading-m">Authentication</h2>
<p class="govuk-body">
GovWifi uses RADIUS server technology to authenticate users’ usernames and passwords.
</p>
<p class="govuk-body">
Each end user is protected with unique credentials and encryption keys when they log in to the wifi and access the internet.
These credentials are randomly generated so can’t be used to get into other systems if stolen.
</p>
<p class="govuk-body">
Users’ devices are isolated from each other to stop the horizontal spread of malware and protect secure devices from less secure ones.
The network also identifies itself in a way that can’t be spoofed, adding to the safety measures that provide protection from potential attackers.
</p>
<div class="govuk-inset-text">
Follow our <strong><%= link_to "sign up instructions", "/about-govwifi/connect-to-govwifi", class: "govuk-link" %></strong> to connect to GovWifi.
</div>
</div>
</div>
</div>
</div>
</main>
77 changes: 37 additions & 40 deletions source/about-govwifi/organisations-using-govwifi.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,54 +3,51 @@ title: Organisations using GovWifi - GovWifi
description: Find all the public sector organisations where GovWifi is available
---

<div class="container">
<main class="govuk-width-container" role="main" id="main">
<%= partial "shared/product/breadcrumbs", locals: { page: "Organisations using GovWifi" } %>

<div class="grid-row">
<div class="column-one-third">
<div>
<div class="govuk-main-wrapper">
<div class="govuk-grid-row">
<div class="govuk-grid-column-one-third">
<%= partial 'shared/product/sidebar' %>
</div>
</div>
<div class="column-two-thirds">
<h1 class="heading-large">Organisations using GovWifi</h1>
<p>
GovWifi is currently available in a wide range of government and public
sector organisations.
</p>
<p>
If you manage IT services in your organisation and would like to make GovWifi available in your buildings,
please review our <%= link_to "technical requirements", "https://docs.wifi.service.gov.uk/"%>.
</p>
<div class="govuk-grid-column-two-thirds">
<h1 class="govuk-heading-l">Organisations using GovWifi</h1>
<p class="govuk-body">
GovWifi is currently available in a wide range of government and public sector organisations.
</p>
<p class="govuk-body">
If you manage IT services in your organisation and would like to make GovWifi available in your buildings,
please review our <%= link_to "technical requirements", "https://docs.wifi.service.gov.uk/"%>.
</p>
<div class="govuk-form-group govuk-!-margin-bottom-4">
<input class="govuk-input" aria-label="Search organisations using the service" id="search-table" type="text" placeholder="Search organisations">
</div>

<div class="govuk-form-group govuk-!-margin-bottom-4">
<input class="govuk-input" aria-label="Search organisations using the service" id="search-table" type="text" placeholder="Search organisations">
</div>
<% organisations = data.organisations.sort %>

<% organisations = data.organisations.sort %>

<table class="govuk-table">
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th class="govuk-table__header govuk-!-width-one-half table-header">Organisation</th>
</tr>
</thead>
<tbody class="govuk-table__body striped-table">
<% organisations.each do |organisation| %>
<tr class="govuk-table__row result-row result">
<td class="govuk-table__cell govuk-!-width-one-half result-text" scope="row">
<%= organisation %>
</td>
<table class="govuk-table">
<thead class="govuk-table__head">
<tr class="govuk-table__row">
<th class="govuk-table__header govuk-!-width-one-half table-header">Organisation</th>
</tr>
<% end %>
</tbody>
</table>
<p class="govuk-body govuk-!-margin-top-3" id="no-results" style="display: none">
<strong>No results found</strong>
</p>
</thead>
<tbody class="govuk-table__body striped-table">
<% organisations.each do |organisation| %>
<tr class="govuk-table__row result-row result">
<td class="govuk-table__cell govuk-!-width-one-half result-text" scope="row">
<%= organisation %>
</td>
</tr>
<% end %>
</tbody>
</table>
<p class="govuk-body govuk-!-margin-top-3" id="no-results" style="display: none">
<strong>No results found</strong>
</p>
</div>
</div>
</div>
</div>
</main>

<%= partial 'shared/dynamic_search_bar' %>
<%= partial 'shared/dynamic_search_bar_noscript' %>
Loading

0 comments on commit 4bb6968

Please sign in to comment.