Skip to content

Commit 8532438

Browse files
author
j-corry
committed
- Tidy up object page claw layout
- (WIP) format EDM amendments using description list - Adjust layout of early day motion object page as a prototype for all object page layouts: -- Debug panel given wrapping div with debug-panel class & aria-hidden -- h1 and p tags for main content -- Preliminary sentence is a p tag with bootstrap sub-heading formatting applied -- section tags containing h2 and p tags for additional content (this has meant we're back to having secondary information heading, probably needs discussing) -- Everything has a reading-width class to restrict the width within the container.
1 parent c12b7e3 commit 8532438

File tree

4 files changed

+103
-94
lines changed

4 files changed

+103
-94
lines changed

‎app/views/content_type_objects/fragments/_about_this_result.html.erb‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,37 @@
1-
<section hidden data-controller="claw" data-action="keydown@document->claw#handleKeyDown" id="about-this-result" class="row my-4 py-3 border border-dark claw">
2-
<div class="col">
3-
<h3>Librarians' tools</h3>
4-
<dl>
5-
<% unless object.date.blank? %>
6-
<dt>Timestamp</dt>
7-
<dd><%= object.timestamp[:value] %></dd>
8-
<% end %>
1+
<section hidden data-controller="claw" data-action="keydown@document->claw#handleKeyDown" id="about-this-result" class="my-4 py-3 claw reading-width">
2+
<h2>Librarians' tools</h2>
3+
<dl>
4+
<% unless object.date.blank? %>
5+
<dt>Timestamp</dt>
6+
<dd><%= object.timestamp[:value] %></dd>
7+
<% end %>
98

10-
<% unless object.object_uri.blank? %>
11-
<dt>URI</dt>
12-
<dd>
13-
<%= object.object_uri[:value] %>
14-
<span data-controller="clipboard" class="font-size-milli">
9+
<% unless object.object_uri.blank? %>
10+
<dt>URI</dt>
11+
<dd>
12+
<%= object.object_uri[:value] %>
13+
<span data-controller="clipboard">
1514
<span hidden data-clipboard-target="source" data-clipboard-text="<%= object.object_uri[:value] %>"></span>
16-
<button data-action="click->clipboard#copy" title="Copy text to clipboard" class="btn btn-secondary">
17-
Copy URI to clipboard
18-
</button>
15+
<button data-action="click->clipboard#copy" title="Copy text to clipboard" class="btn btn-sm btn-secondary">
16+
Copy URI to clipboard
17+
</button>
1918
</span>
20-
</dd>
21-
<% end %>
19+
</dd>
20+
<% end %>
2221

23-
<% unless object.indexing_link.blank? %>
24-
<dt>In Indexing</dt>
25-
<dd><%= link_to object.indexing_link, object.indexing_link, target: :_blank %></dd>
26-
<% end %>
22+
<% unless object.indexing_link.blank? %>
23+
<dt>In Indexing</dt>
24+
<dd><%= link_to object.indexing_link, object.indexing_link, target: :_blank %></dd>
25+
<% end %>
2726

28-
<% unless object.solr_deep_link.blank? %>
29-
<dt>In Solr</dt>
30-
<dd><%= link_to object.solr_deep_link, object.solr_deep_link, target: :_blank %></dd>
31-
<% end %>
27+
<% unless object.solr_deep_link.blank? %>
28+
<dt>In Solr</dt>
29+
<dd><%= link_to object.solr_deep_link, object.solr_deep_link, target: :_blank %></dd>
30+
<% end %>
3231

33-
<% unless object.internal_location_uri.blank? %>
34-
<dt>Internal location</dt>
35-
<dd><%= link_to object.internal_location_uri[:value], object.internal_location_uri[:value], target: :_blank %></dd>
36-
<% end %>
37-
</dl>
38-
</div>
32+
<% unless object.internal_location_uri.blank? %>
33+
<dt>Internal location</dt>
34+
<dd><%= link_to object.internal_location_uri[:value], object.internal_location_uri[:value], target: :_blank %></dd>
35+
<% end %>
36+
</dl>
3937
</section>

‎app/views/content_type_objects/fragments/_edm_amendments.haml‎

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,44 @@
1-
- amendments.each_with_index do |amendment, index|
2-
.my-3
3-
.content-prelim-inner
4-
.content-prelim-text#prelim-text
5-
%span= " The Early day motion has received"
6-
- if index.zero?
7-
%span= " an amendment"
8-
- else
9-
%span= " a "
10-
%span= ordinal_text(index)
11-
%span>= " amendment"
12-
- if amendment[:primary_sponsor][:value].blank?
13-
- unless amendment[:date_tabled][:value].blank?
14-
%span= "Tabled on "
15-
%span>= format_date(amendment[:date_tabled])
16-
%span= "."
17-
- else
18-
%span= " sponsored by "
19-
%span= search_link(amendment[:primary_sponsor])
20-
%span= " (primary, "
21-
%span>= search_link(amendment[:primary_sponsor_party])
22-
%span>= ")"
23-
- unless amendment[:date_tabled][:value].blank?
24-
%span= " and tabled on "
25-
%span>= format_date(amendment[:date_tabled])
26-
%span= "."
27-
- unless amendment[:number_of_signatures][:value].blank?
28-
%span= "It has been signed by "
29-
%span= amendment[:number_of_signatures][:value]
30-
- if amendment[:number_of_signatures][:value] == 1
31-
%span>= " member in total"
32-
- else
33-
%span>= " members in total"
34-
%span= "."
1+
%dl
2+
- amendments.each_with_index do |amendment, index|
3+
%dt
4+
%span= "Amendment "
5+
%span= amendment[:index] + 1
6+
%span= " - "
7+
%span= title
8+
%span= " ("
9+
%span>= amendment[:reference][:value]
10+
%span= ") "
3511

36-
.content-text
37-
%strong= "Amendment "
38-
%strong= amendment[:index] + 1
39-
%strong= " - "
40-
%strong= title
41-
%span= " ("
42-
%span>= amendment[:reference][:value]
43-
%span= ") "
44-
.amendment-text= amendment[:text][:value]
12+
%dd
13+
%span= " The Early day motion has received"
14+
- if index.zero?
15+
%span= " an amendment"
16+
- else
17+
%span= " a "
18+
%span= ordinal_text(index)
19+
%span>= " amendment"
20+
- if amendment[:primary_sponsor][:value].blank?
21+
- unless amendment[:date_tabled][:value].blank?
22+
%span= "Tabled on "
23+
%span>= format_date(amendment[:date_tabled])
24+
%span= "."
25+
- else
26+
%span= " sponsored by "
27+
%span= search_link(amendment[:primary_sponsor])
28+
%span= " (primary, "
29+
%span>= search_link(amendment[:primary_sponsor_party])
30+
%span>= ")"
31+
- unless amendment[:date_tabled][:value].blank?
32+
%span= " and tabled on "
33+
%span>= format_date(amendment[:date_tabled])
34+
%span= "."
35+
- unless amendment[:number_of_signatures][:value].blank?
36+
%span= "It has been signed by "
37+
%span= amendment[:number_of_signatures][:value]
38+
- if amendment[:number_of_signatures][:value] == 1
39+
%span>= " member in total"
40+
- else
41+
%span>= " members in total"
42+
%span= "."
43+
44+
%dd= amendment[:text][:value]

‎app/views/content_type_objects/object_pages/edm.html.erb‎

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,44 @@
11
<% if Rails.env.development? %>
2-
<%#= render 'content_type_objects/fragments/data', data: object.content_type_object_data, title: 'SOLR Data' %>
3-
<%#= render 'content_type_objects/fragments/data', data: @ses_data, title: 'SES Data' %>
2+
<div class="debug-panel" aria-hidden="true">
3+
<%#= render 'content_type_objects/fragments/data', data: object.content_type_object_data, title: 'SOLR Data' %>
4+
<%#= render 'content_type_objects/fragments/data', data: @ses_data, title: 'SES Data' %>
5+
</div>
46
<% end %>
57

6-
<h1>
8+
<h1 class="reading-width">
79
<%= format_object_title(object.object_title, @ses_data) %>
810
</h1>
911

1012
<%= render 'content_type_objects/preliminary_sentences/edm', object: object %>
1113

1214
<% unless object.motion_text.blank? %>
13-
<p>
15+
<p class="reading-width">
1416
<%= object.motion_text[:value] %>
15-
<%= render 'content_type_objects/fragments/edm_amendments', title: format_object_title(@page_title, @ses_data), amendments: object.amendments unless object.amendments.blank? %>
1617
</p>
1718
<% end %>
1819

19-
<dl>
20-
<%= render 'content_type_objects/fragments/type', type: object.type %>
21-
<%= render 'content_type_objects/fragments/reference', reference: object.reference %>
22-
<%= render 'content_type_objects/fragments/session', session: object.parliamentary_session %>
23-
<%= render 'content_type_objects/fragments/other_sponsors', sponsors: object.other_sponsors %>
24-
<%= render 'content_type_objects/fragments/related_items', related_item_ids: object.related_item_ids %>
25-
<%= render 'content_type_objects/fragments/registered_interest_declared', registered_interest: object.registered_interest_declared %>
26-
<%= render 'content_type_objects/fragments/notes', notes: object.notes %>
27-
<%= render 'content_type_objects/fragments/pills', pills_heading: 'Subjects', pills: object.subjects %>
28-
<%= render 'content_type_objects/fragments/legislation', legislation: object.legislation %>
29-
<%= render 'content_type_objects/fragments/contains_statistics', contains_statistics: object.contains_statistics %>
30-
<%= render 'content_type_objects/fragments/link', object: object %>
31-
</dl>
20+
<% unless object.amendments.blank? %>
21+
<section class="reading-width">
22+
<h2>Amendments</h2>
23+
<%= render 'content_type_objects/fragments/edm_amendments', title: format_object_title(object.object_title, @ses_data), amendments: object.amendments %>
24+
</section>
25+
<% end %>
26+
27+
<section class="reading-width">
28+
<h2>Secondary information</h2>
29+
<dl>
30+
<%= render 'content_type_objects/fragments/type', type: object.type %>
31+
<%= render 'content_type_objects/fragments/reference', reference: object.reference %>
32+
<%= render 'content_type_objects/fragments/session', session: object.parliamentary_session %>
33+
<%= render 'content_type_objects/fragments/other_sponsors', sponsors: object.other_sponsors %>
34+
<%= render 'content_type_objects/fragments/related_items', related_item_ids: object.related_item_ids %>
35+
<%= render 'content_type_objects/fragments/registered_interest_declared', registered_interest: object.registered_interest_declared %>
36+
<%= render 'content_type_objects/fragments/notes', notes: object.notes %>
37+
<%= render 'content_type_objects/fragments/pills', pills_heading: 'Subjects', pills: object.subjects %>
38+
<%= render 'content_type_objects/fragments/legislation', legislation: object.legislation %>
39+
<%= render 'content_type_objects/fragments/contains_statistics', contains_statistics: object.contains_statistics %>
40+
<%= render 'content_type_objects/fragments/link', object: object %>
41+
</dl>
42+
</section>
3243

3344
<%= render '/content_type_objects/fragments/about_this_result', object: object %>

‎app/views/content_type_objects/preliminary_sentences/_edm.haml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.my-3
1+
%p.sub-heading.reading-width
22
%span>= object_display_name_link(object.object_name)
33
- unless object.primary_sponsor.blank?
44
%span=" tabled by primary sponsor "

0 commit comments

Comments
 (0)