Skip to content

Commit d310014

Browse files
author
j-corry
committed
- Add meta controller
- Move examples to sit within meta controller - Add routes & templates (blank) for various meta pages (except cookies, which loads design system page) - Add background colour to body ('Westminster White') - Adjust layout to add vertical margin to container (so that background shows correctly)
1 parent 3af5016 commit d310014

File tree

7 files changed

+18
-256
lines changed

7 files changed

+18
-256
lines changed

‎app/assets/stylesheets/application.css‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
/* set grey background colour */
2+
body {
3+
background-color: #EBE9E8;
4+
}
5+
16
/*override margins set by design system*/
27
/* reset bottom margin for last child paragraph */
38
p:last-child {

‎app/controllers/examples_controller.rb‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎app/views/examples/index.html.erb‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎app/views/layouts/application.html.erb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<body class="brand-bicameral">
99
<%= render 'layouts/header/header' %>
1010
<main id="main-content">
11-
<div class="block block-page">
12-
<div class="container-sm">
11+
<div class="container my-3">
12+
<div class="block block-page">
1313
<%#= render 'library_design/debug/debug' %>
1414
<%= yield %>
1515
</div>

‎app/views/shared/_examples.html.erb‎

Lines changed: 0 additions & 227 deletions
This file was deleted.

‎app/views/welcome/index.html.erb‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
1-
<% content_for(:before_title) do %>
2-
<%= link_to('UK Parliament', root_path) %> / <%= link_to('Open data', root_path) %><br/>
3-
<div id="top"></div>
4-
<% end %>
5-
61
<%= render '/shared/search_bar' %>
72

83
<div class="row">
94
<div class="col reading-width">
105
<h2>About this website</h2>
116
<p>This website is under development and may be unavailable at times.</p>
12-
<p>We're working on a replacement for <%= link_to 'Parliamentary Search', 'https://search.parliament.uk/search' %>
7+
<p>We're working on a replacement
8+
for <%= link_to 'Parliamentary Search', 'https://search.parliament.uk/search' %>
139
(available to users on the Parliamentary network)
14-
and <%= link_to 'Search Parliamentary Material', 'https://search-material.parliament.uk/' %> (the public-facing
10+
and <%= link_to 'Search Parliamentary Material', 'https://search-material.parliament.uk/' %> (the
11+
public-facing
1512
version of Parliamentary Search).</p>
1613
<p>Details of what we are working on can be found on
1714
our <%= link_to 'Trello Board', 'https://trello.com/b/hP5FLFHA/search-frontend' %>.</p>

‎config/routes.rb‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,17 @@
66
# Defines the root path route ("/")
77
root 'welcome#index'
88
get 'welcome' => 'welcome#index', as: :home
9-
get 'examples' => 'examples#index', as: :examples
9+
1010
get 'search' => 'search#index'
1111
get 'objects' => 'content_type_objects#show', as: 'object_show'
12+
1213
get 'errors/500' => 'errors#internal_server_error'
1314
get 'errors/404' => 'errors#not_found'
1415
get 'errors/401' => 'errors#not_authorized'
1516

16-
17-
18-
get 'meta' => 'meta#index', as: :meta_list # nothing here yet
19-
get 'meta/cookies' => 'meta#cookies', as: :meta_cookies # nothing here yet
17+
get 'examples' => 'meta#examples', as: :examples
18+
get 'meta' => 'meta#index', as: :meta_list
19+
get 'cookies' => 'meta#cookies', as: :meta_cookies
20+
get 'coverage' => 'meta#coverage', as: :coverage
21+
get 'backlog' => 'meta#backlog', as: :backlog
2022
end

0 commit comments

Comments
 (0)