diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index c2aa7d3..fd62fc3 100644 --- a/app/assets/stylesheets/application.css +++ b/app/assets/stylesheets/application.css @@ -1,3 +1,8 @@ +/* set grey background colour */ +body { + background-color: #EBE9E8; +} + /*override margins set by design system*/ /* reset bottom margin for last child paragraph */ p:last-child { diff --git a/app/controllers/examples_controller.rb b/app/controllers/examples_controller.rb deleted file mode 100644 index 201e55e..0000000 --- a/app/controllers/examples_controller.rb +++ /dev/null @@ -1,7 +0,0 @@ -class ExamplesController < ApplicationController - - def index - @page_title = 'Parliamentary Search' - end - -end \ No newline at end of file diff --git a/app/views/examples/index.html.erb b/app/views/examples/index.html.erb deleted file mode 100644 index 6564ea7..0000000 --- a/app/views/examples/index.html.erb +++ /dev/null @@ -1,8 +0,0 @@ -<% content_for(:before_title) do %> - <%= link_to('UK Parliament', root_path) %> / <%= link_to('Open data', root_path) %>
-
-<% end %> - -<%= render '/shared/search_bar' %> - -<%= render '/shared/examples' %> \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 227e6cf..4b559bf 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -8,8 +8,8 @@ <%= render 'layouts/header/header' %>
-
-
+
+
<%#= render 'library_design/debug/debug' %> <%= yield %>
diff --git a/app/views/shared/_examples.html.erb b/app/views/shared/_examples.html.erb deleted file mode 100644 index 2d3f01d..0000000 --- a/app/views/shared/_examples.html.erb +++ /dev/null @@ -1,227 +0,0 @@ -

Example object pages

- -

- Acts -

-
-
Public
-
- <%= link_to('http://data.parliament.uk/publicgeneralact/2023/19', object_show_url(object: 'http://data.parliament.uk/publicgeneralact/2023/19')) %> -
-
Private
-
- <%= link_to('http://data.parliament.uk/localgeneralact/2016/2', object_show_url(object: 'http://data.parliament.uk/localgeneralact/2016/2')) %> -
-
- -

- Bills -

-

- <%= link_to('http://data.parliament.uk/bills/58255', object_show_url(object: 'http://data.parliament.uk/bills/58255')) %> -

- -

- Church measures -

-

- <%= link_to('http://data.parliament.uk/churchmeasure/2021/3', object_show_url(object: 'http://data.parliament.uk/churchmeasure/2021/3')) %> -

- -

- Deposited papers -

-

- <%= link_to('http://data.parliament.uk/depositedpapers/2285506', object_show_url(object: 'http://data.parliament.uk/depositedpapers/2285506')) %> -

- -

- Early day motions -

-
-
- <%= link_to('http://data.parliament.uk/edms/22468', object_show_url(object: 'http://data.parliament.uk/edms/22468')) %> -
-
- <%= link_to('http://data.parliament.uk/edms/47841', object_show_url(object: 'http://data.parliament.uk/edms/47841')) %> -
-
- -

- Impact assessments -

-

- <%= link_to('http://data.parliament.uk/pimsdata/ImpactAssessment/13131', object_show_url(object: 'http://data.parliament.uk/pimsdata/ImpactAssessment/13131')) %> -

- -

- Ministerial corrections -

-
-
- <%= link_to('http://data.parliament.uk/pimsdata/hansard/PROCEEDING_67029', object_show_url(object: 'http://data.parliament.uk/pimsdata/hansard/PROCEEDING_67029')) %> -
-
- <%= link_to('http://hansard.intranet.data.parliament.uk/Commons/2013-12-19/13121970000003', object_show_url(object: 'http://hansard.intranet.data.parliament.uk/Commons/2013-12-19/13121970000003')) %> -
-
- <%= link_to('http://hansard.intranet.data.parliament.uk/Commons/2022-12-20/22122049000024', object_show_url(object: 'http://hansard.intranet.data.parliament.uk/Commons/2022-12-20/22122049000024')) %> -
-
- -

- Observations on petitions -

-

- <%= link_to('http://hansard.intranet.data.parliament.uk/Commons/2022-12-19/2212199000020', object_show_url(object: 'http://hansard.intranet.data.parliament.uk/Commons/2022-12-19/2212199000020')) %> -

- -

- Oral answers -

-

- <%= link_to('http://hansard.intranet.data.parliament.uk/Lords/2022-12-21/2212217000022', object_show_url(object: 'http://hansard.intranet.data.parliament.uk/Lords/2022-12-21/2212217000022')) %> -

- -

- Oral questions -

-
-
Answered
-
- <%= link_to('http://data.parliament.uk/pimsdata/Hansard/PARLIAMENTARY_QUESTION_366351/-question', object_show_url(object: 'http://data.parliament.uk/pimsdata/Hansard/PARLIAMENTARY_QUESTION_366351/-question')) %> -
-
Corrected
-
- <%= link_to('http://hansard.intranet.data.parliament.uk/Lords/2021-05-19/21051926000130', object_show_url(object: 'http://hansard.intranet.data.parliament.uk/Lords/2021-05-19/21051926000130')) %> -
-
Tabled
-
- <%= link_to('http://tabledpq.indexing.parliament.uk/commons/2015-16/903692', object_show_url(object: 'http://tabledpq.indexing.parliament.uk/commons/2015-16/903692')) %> -
-
Withdrawn
-
- <%= link_to('http://tabledpq.indexing.parliament.uk/commons/2022-23/900744', object_show_url(object: 'http://tabledpq.indexing.parliament.uk/commons/2022-23/900744')) %> -
-
- -

- Oral question time interventions -

-

- <%= link_to('http://data.parliament.uk/pimsdata/hansard/CONTRIBUTION_241033', object_show_url(object: 'http://data.parliament.uk/pimsdata/hansard/CONTRIBUTION_241033')) %> -

- -

- Research briefings -

-

- <%= link_to('http://data.parliament.uk/resources/1786714', object_show_url(object: 'http://data.parliament.uk/resources/1786714')) %> -

- -

- Papers ordered to be printed -

-

- <%= link_to('http://data.parliament.uk/papers/64712', object_show_url(object: 'http://data.parliament.uk/papers/64712')) %> -

- -

- Paper petitions -

-
-
Single member
-
- <%= link_to('http://hansard.intranet.data.parliament.uk/Commons/2022-12-07/22120755000101', object_show_url(object: 'http://hansard.intranet.data.parliament.uk/Commons/2022-12-07/22120755000101')) %> -
-
Multiple members
-
- <%= link_to('http://hansard.intranet.data.parliament.uk/Commons/2022-07-13/220713107000568', object_show_url(object: 'http://hansard.intranet.data.parliament.uk/Commons/2022-07-13/220713107000568')) %> -
-
- -

- Papers submitted -

-

- <%= link_to('http://data.parliament.uk/papers/57365', object_show_url(object: 'http://data.parliament.uk/papers/57365')) %> -

- -

- Parliamentary papers -

-
-
Laid
-
- <%= link_to('http://services.paperslaid.parliament.uk/papers/paper/37057', object_show_url(object: 'http://services.paperslaid.parliament.uk/papers/paper/37057')) %> -
-
Reported
-
- <%= link_to('http://data.parliament.uk/selectcommittees/54929', object_show_url(object: 'http://data.parliament.uk/selectcommittees/54929')) %> -
-
- -

- Parliamentary proceedings -

-

- <%= link_to('http://hansard.intranet.data.parliament.uk/Lords/2022-12-21/2212217000100', object_show_url(object: 'http://hansard.intranet.data.parliament.uk/Lords/2022-12-21/2212217000100')) %> -

- -

- Proceeding contributions -

-

- <%= link_to('http://hansard.intranet.data.parliament.uk/Lords/2022-12-21/2212217000041', object_show_url(object: 'http://hansard.intranet.data.parliament.uk/Lords/2022-12-21/2212217000041')) %> -

- -

- Statutory instruments -

-

- <%= link_to('http://paperslaidpoller.parliament.uk/2015-16/2016-05-11/64828', object_show_url(object: 'http://paperslaidpoller.parliament.uk/2015-16/2016-05-11/64828')) %> -

- -

- Transport and works act order applications -

-

- <%= link_to('http://data.parliament.uk/twas/59276', object_show_url(object: 'http://data.parliament.uk/twas/59276')) %> -

- -

- Written questions -

-
-
Answered
-
- <%= link_to('http://hansard.intranet.data.parliament.uk/Lords/2012-12-10/1212106000156', object_show_url(object: 'http://hansard.intranet.data.parliament.uk/Lords/2012-12-10/1212106000156')) %> -
-
Answered, was holding
-
- <%= link_to('http://data.parliament.uk/writtenparliamentaryquestion/commons/2015-16/28407', object_show_url(object: 'http://data.parliament.uk/writtenparliamentaryquestion/commons/2015-16/28407')) %> -
-
Corrected
-
- <%= link_to('http://data.parliament.uk/pimsdata/Hansard/PARLIAMENTARY_QUESTION_1395367', object_show_url(object: 'http://data.parliament.uk/pimsdata/Hansard/PARLIAMENTARY_QUESTION_1395367')) %> -
-
Holding
-
- <%= link_to('http://data.parliament.uk/writtenparliamentaryquestion/commons/2021-22/78384', object_show_url(object: 'http://data.parliament.uk/writtenparliamentaryquestion/commons/2021-22/78384')) %> -
-
Tabled
-
- <%= link_to('http://tabledpq.indexing.parliament.uk/commons/2015-16/21659', object_show_url(object: 'http://tabledpq.indexing.parliament.uk/commons/2015-16/21659')) %> -
-
Withdrawn
-
- <%= link_to('http://tabledpq.indexing.parliament.uk/commons/2022-23/11562', object_show_url(object: 'http://tabledpq.indexing.parliament.uk/commons/2022-23/11562')) %> -
-
- -

- Written statements -

-

- <%= link_to('http://hansard.intranet.data.parliament.uk/Commons/2012-12-18/12121863000016', object_show_url(object: 'http://hansard.intranet.data.parliament.uk/Commons/2012-12-18/12121863000016')) %> -

\ No newline at end of file diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 1a4846a..1cfa725 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -1,17 +1,14 @@ -<% content_for(:before_title) do %> - <%= link_to('UK Parliament', root_path) %> / <%= link_to('Open data', root_path) %>
-
-<% end %> - <%= render '/shared/search_bar' %>

About this website

This website is under development and may be unavailable at times.

-

We're working on a replacement for <%= link_to 'Parliamentary Search', 'https://search.parliament.uk/search' %> +

We're working on a replacement + for <%= link_to 'Parliamentary Search', 'https://search.parliament.uk/search' %> (available to users on the Parliamentary network) - and <%= link_to 'Search Parliamentary Material', 'https://search-material.parliament.uk/' %> (the public-facing + and <%= link_to 'Search Parliamentary Material', 'https://search-material.parliament.uk/' %> (the + public-facing version of Parliamentary Search).

Details of what we are working on can be found on our <%= link_to 'Trello Board', 'https://trello.com/b/hP5FLFHA/search-frontend' %>.

diff --git a/config/routes.rb b/config/routes.rb index d8872c3..392ff2f 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -6,15 +6,17 @@ # Defines the root path route ("/") root 'welcome#index' get 'welcome' => 'welcome#index', as: :home - get 'examples' => 'examples#index', as: :examples + get 'search' => 'search#index' get 'objects' => 'content_type_objects#show', as: 'object_show' + get 'errors/500' => 'errors#internal_server_error' get 'errors/404' => 'errors#not_found' get 'errors/401' => 'errors#not_authorized' - - - get 'meta' => 'meta#index', as: :meta_list # nothing here yet - get 'meta/cookies' => 'meta#cookies', as: :meta_cookies # nothing here yet + get 'examples' => 'meta#examples', as: :examples + get 'meta' => 'meta#index', as: :meta_list + get 'cookies' => 'meta#cookies', as: :meta_cookies + get 'coverage' => 'meta#coverage', as: :coverage + get 'backlog' => 'meta#backlog', as: :backlog end