diff --git a/app/assets/stylesheets/components/_publisher-metadata.scss b/app/assets/stylesheets/components/_publisher-metadata.scss deleted file mode 100644 index 99cb7b232..000000000 --- a/app/assets/stylesheets/components/_publisher-metadata.scss +++ /dev/null @@ -1,28 +0,0 @@ -@import "govuk_publishing_components/individual_component_support"; -@import "../mixins/margins"; - -.app-c-publisher-metadata { - @include responsive-bottom-margin; - direction: ltr; - padding-top: govuk-spacing(3); -} - -.app-c-publisher-metadata__other { - .govuk-link { - font-weight: bold; - } -} - -.app-c-publisher-metadata__term { - float: left; - padding-right: govuk-spacing(1); -} - -.app-c-publisher-metadata__toggle, -.app-c-publisher-metadata__definition-others { - display: none; - - .js-enabled & { - display: inline-block; - } -} diff --git a/app/views/components/_publisher_metadata.html.erb b/app/views/components/_publisher_metadata.html.erb deleted file mode 100644 index ddf0503b3..000000000 --- a/app/views/components/_publisher_metadata.html.erb +++ /dev/null @@ -1,58 +0,0 @@ -<% add_app_component_stylesheet("publisher-metadata") %> -<% - published ||= false - last_updated ||= false - link_to_history ||= false - other ||= {} - other_has_values = other.values.compact.reject(&:blank?).any? - metadata = [published, last_updated] -%> -<% if metadata.any? || other_has_values %> -
-<% end %> diff --git a/app/views/components/docs/important_metadata.yml b/app/views/components/docs/important_metadata.yml index 689422991..5b290489a 100644 --- a/app/views/components/docs/important_metadata.yml +++ b/app/views/components/docs/important_metadata.yml @@ -1,7 +1,7 @@ name: Important metadata description: List of document-type specific metadata body: | - A replacement for the [metadata component](https://govuk-static.herokuapp.com/component-guide/metadata) with only the format specific details. This component separates facet metadata from [publisher metadata](/component-guide/publisher_metadata). + A replacement for the [metadata component](https://govuk-static.herokuapp.com/component-guide/metadata) with only the format specific details. Part of the universal navigation design. diff --git a/app/views/components/docs/publisher_metadata.yml b/app/views/components/docs/publisher_metadata.yml deleted file mode 100644 index fdb6a79a2..000000000 --- a/app/views/components/docs/publisher_metadata.yml +++ /dev/null @@ -1,91 +0,0 @@ -name: Publisher metadata -description: Lists publication dates and publishers. -body: | - A replacement for the [metadata component](https://govuk-static.herokuapp.com/component-guide/metadata) with only the publisher details. - Dates are rendered by the [published dates component](/component-guide/published_dates). - - Part of the universal navigation design. -shared_accessibility_criteria: -- link - -examples: - default: - data: - published: 31 July 2017 - last_updated: 20 September 2017 - other: - from: - - Ministry of Defence - with_history_link: - data: - published: 31 July 2017 - last_updated: 20 September 2017 - link_to_history: true - other: - from: - - Ministry of Defence - no_last_updated: - data: - published: 31 July 2017 - no_publishers: - data: - published: 31 July 2017 - last_updated: 20 September 2017 - link_to_history: true - two_publishers: - data: - published: 31 July 2017 - last_updated: 20 September 2017 - other: - from: - - Department for Education - - Education Funding Agency - multiple_publishers_and_no_link_to_history: - data: - published: 31 July 2017 - last_updated: 20 September 2017 - other: - from: - - Department for Education - - Education Funding Agency - - Department for Work and Pensions - one_collection: - data: - other: - collections: - - Tribunals statistics - two_collections: - data: - other: - collections: - - Tribunals statistics - - Civil justice statistics quarterly - more_than_two_collections: - data: - other: - collections: - - Tribunals statistics - - Civil justice statistics quarterly - - Offender management statistics quarterly - nothing: - description: | - If an `other` object is provided with keys that have no values the component does not render. - data: - other: - From: - Another: [] - "Empty thing": false - "Also empty": {} - national_applicability: - data: - other: - Applies to: "England, Scotland, and Wales (see detailed guidance for Northern Ireland)" - right_to_left: - data: - published: 31 July 2017 - last_updated: 20 September 2017 - other: - from: - - Ministry of Defence - context: - right_to_left: true diff --git a/config/initializers/dartsass.rb b/config/initializers/dartsass.rb index 8dfe080c6..e2cadc570 100644 --- a/config/initializers/dartsass.rb +++ b/config/initializers/dartsass.rb @@ -7,7 +7,6 @@ "components/_figure.scss" => "components/_figure.css", "components/_important-metadata.scss" => "components/_important-metadata.css", "components/_published-dates.scss" => "components/_published-dates.css", - "components/_publisher-metadata.scss" => "components/_publisher-metadata.css", "views/_guide.scss" => "views/_guide.css", "views/_html-publication.scss" => "views/_html-publication.css", "views/_manual.scss" => "views/_manual.css", diff --git a/config/locales/ar.yml b/config/locales/ar.yml index 3113b647c..9760893c4 100644 --- a/config/locales/ar.yml +++ b/config/locales/ar.yml @@ -40,9 +40,6 @@ ar: published: تاريخ النشر %{date} see_all_updates: اطلع على كل التحديثات show_all_updates: إظهار كل التحديثات - publisher_metadata: - hide_all: إخفاء الكل - show_all: إظهار الكل share_links: share_this_page: شارك هذه الصفحة consultation: diff --git a/config/locales/az.yml b/config/locales/az.yml index d46b42a50..c2ae8eb33 100644 --- a/config/locales/az.yml +++ b/config/locales/az.yml @@ -40,9 +40,6 @@ az: published: 'Dərc edilib: %{date}' see_all_updates: bütün yeniləmələrə baxın show_all_updates: bütün yeniləmələri göstər - publisher_metadata: - hide_all: hamısını gizlət - show_all: hamısını göstər share_links: share_this_page: Bu səhifəni paylaşın consultation: diff --git a/config/locales/be.yml b/config/locales/be.yml index 61a92f5d0..b88d497aa 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -40,9 +40,6 @@ be: published: Апублікавана %{date} see_all_updates: паглядзець усе абнаўленні show_all_updates: паказаць усе абнаўленні - publisher_metadata: - hide_all: 'схаваць усе ' - show_all: 'паказаць усе ' share_links: share_this_page: Падзяліцца гэтай старонкай consultation: diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 842326ce3..deb9ef541 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -40,9 +40,6 @@ bg: published: Публикувано на %{date} see_all_updates: вижте всички актуализации show_all_updates: показване на всички актуализации - publisher_metadata: - hide_all: скриване на всички - show_all: показване на всички share_links: share_this_page: Споделяне на тази страница consultation: diff --git a/config/locales/bn.yml b/config/locales/bn.yml index 940066f89..4792d8e68 100644 --- a/config/locales/bn.yml +++ b/config/locales/bn.yml @@ -40,9 +40,6 @@ bn: published: প্রকাশিত হওয়ার তারিখ %{date} see_all_updates: সকল আপডেট দেখুন show_all_updates: সকল আপডেট দেখান - publisher_metadata: - hide_all: সবগুলো লুকান - show_all: সবগুলো দেখান share_links: share_this_page: এই পেজটি শেয়ার করুন consultation: diff --git a/config/locales/cs.yml b/config/locales/cs.yml index b7c955641..185183678 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -40,9 +40,6 @@ cs: published: Zveřejněno %{date} see_all_updates: vidět všechny aktualizace show_all_updates: zobrazit všechny aktualizace - publisher_metadata: - hide_all: skrýt vše - show_all: zobrazit vše share_links: share_this_page: Sdílet tuto stránku consultation: diff --git a/config/locales/cy.yml b/config/locales/cy.yml index d38d346f9..034d96eab 100644 --- a/config/locales/cy.yml +++ b/config/locales/cy.yml @@ -40,9 +40,6 @@ cy: published: Cyhoeddwyd ar %{date} see_all_updates: gweld pob diweddariad show_all_updates: dangos pob diweddariad - publisher_metadata: - hide_all: cuddio popeth - show_all: dangos popeth share_links: share_this_page: Rhannu'r dudalen hon consultation: diff --git a/config/locales/da.yml b/config/locales/da.yml index 6f3631779..9fd2e5b54 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -40,9 +40,6 @@ da: published: Udgivet %{date} see_all_updates: se alle opdateringer show_all_updates: vis alle opdateringer - publisher_metadata: - hide_all: skjule alle - show_all: se alle share_links: share_this_page: Del denne side consultation: diff --git a/config/locales/de.yml b/config/locales/de.yml index a40b04930..5d0be6610 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -40,9 +40,6 @@ de: published: Veröffentlicht am %{date} see_all_updates: alle Aktualisierungen ansehen show_all_updates: alle Aktualisierungen anzeigen - publisher_metadata: - hide_all: alle ausblenden - show_all: alle anzeigen share_links: share_this_page: Diese Seite teilen consultation: diff --git a/config/locales/dr.yml b/config/locales/dr.yml index 1ad99a552..0b8537e9e 100644 --- a/config/locales/dr.yml +++ b/config/locales/dr.yml @@ -40,9 +40,6 @@ dr: published: منتشر شده%{date} see_all_updates: تمام آپدیت ها را مشاهده نمایید show_all_updates: تمام آپدیت ها را نمایش دهید - publisher_metadata: - hide_all: همه را مخفی نمایید - show_all: همه را نمایش دهید share_links: share_this_page: این صفحه را به اشتراک بگذارید consultation: diff --git a/config/locales/el.yml b/config/locales/el.yml index 5502b9ac1..28ab7a236 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -40,9 +40,6 @@ el: published: Δημοσιεύτηκε %{date} see_all_updates: δείτε όλες τις ενημερώσεις show_all_updates: εμφάνιση όλων των ενημερώσεων - publisher_metadata: - hide_all: απόκρυψη όλων - show_all: εμφάνιση όλων share_links: share_this_page: Κοινοποιήστε αυτή τη σελίδα consultation: diff --git a/config/locales/en.yml b/config/locales/en.yml index 1113a778f..c22d0b907 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -40,9 +40,6 @@ en: published: Published %{date} see_all_updates: See all updates show_all_updates: show all updates - publisher_metadata: - hide_all: hide all - show_all: show all share_links: share_this_page: Share this page consultation: diff --git a/config/locales/es-419.yml b/config/locales/es-419.yml index f72e6bc19..a81429422 100644 --- a/config/locales/es-419.yml +++ b/config/locales/es-419.yml @@ -40,9 +40,6 @@ es-419: published: Publicado %{date} see_all_updates: ver todas las novedades show_all_updates: mostrar todas las actualizaciones - publisher_metadata: - hide_all: ocultar todo - show_all: mostrar todo share_links: share_this_page: Compartir esta página consultation: diff --git a/config/locales/es.yml b/config/locales/es.yml index 2394e820c..5ca49a759 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -40,9 +40,6 @@ es: published: Publicado %{date} see_all_updates: ver todas las actualizaciones show_all_updates: mostrar todas las actualizaciones - publisher_metadata: - hide_all: ocultar todo - show_all: mostrar todo share_links: share_this_page: Compartir esta página consultation: diff --git a/config/locales/et.yml b/config/locales/et.yml index 7a163e7e7..1de53bffc 100644 --- a/config/locales/et.yml +++ b/config/locales/et.yml @@ -40,9 +40,6 @@ et: published: Avaldatud %{date} see_all_updates: vt kõiki värskendusi show_all_updates: kuva kõik värskendused - publisher_metadata: - hide_all: peida kõik - show_all: kuva kõik share_links: share_this_page: Jaga seda lehte consultation: diff --git a/config/locales/fa.yml b/config/locales/fa.yml index 87a1b4d95..26dbe89ca 100644 --- a/config/locales/fa.yml +++ b/config/locales/fa.yml @@ -40,9 +40,6 @@ fa: published: منشتر شده %{date} see_all_updates: مشاهده تمام بروزرسانیها show_all_updates: نمایش تمام بروزرسانیها - publisher_metadata: - hide_all: مخفی کردن همه - show_all: نمایش همه share_links: share_this_page: اشتراکگذاری این صفحه consultation: diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 114335a9d..3333bf847 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -40,9 +40,6 @@ fi: published: Julkaistu %{date} see_all_updates: katso kaikki palvelut show_all_updates: näytä kaikki päivitykset - publisher_metadata: - hide_all: Piilota kaikki - show_all: näytä kaikki share_links: share_this_page: Jaa tämä sivu consultation: diff --git a/config/locales/fr.yml b/config/locales/fr.yml index 656f7b05f..af908c87e 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -40,9 +40,6 @@ fr: published: Publié le %{date} see_all_updates: afficher toutes les mises à jour show_all_updates: afficher toutes les mises à jour - publisher_metadata: - hide_all: masquer tout - show_all: afficher tout share_links: share_this_page: Partagez cette page consultation: diff --git a/config/locales/gd.yml b/config/locales/gd.yml index 1a27ef98c..c7cc0a985 100644 --- a/config/locales/gd.yml +++ b/config/locales/gd.yml @@ -40,9 +40,6 @@ gd: published: Arna chur suas ar %{date} see_all_updates: féach gach nuashonrú show_all_updates: Taispeáin gach nuashonrú - publisher_metadata: - hide_all: gach rud a cheilt - show_all: Taispeáin go léir share_links: share_this_page: Comhroinn an leathanach seo consultation: diff --git a/config/locales/gu.yml b/config/locales/gu.yml index 8d450739d..5ec7fa647 100644 --- a/config/locales/gu.yml +++ b/config/locales/gu.yml @@ -40,9 +40,6 @@ gu: published: પ્રકાશિત થયો %{date} see_all_updates: બધા અપડેટ્સ જુઓ show_all_updates: બધા અપડેટ્સ બતાવો - publisher_metadata: - hide_all: બધા હાઈડ કરો - show_all: બધા બતાવો share_links: share_this_page: આ પેજ શેર કરો consultation: diff --git a/config/locales/he.yml b/config/locales/he.yml index 3747aa2e7..860179bfb 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -40,9 +40,6 @@ he: published: פורסם %{date} see_all_updates: ראה כל העדכונים show_all_updates: הצג כל עדכונים - publisher_metadata: - hide_all: הסתר הכל - show_all: הצג הכל share_links: share_this_page: שתף דף זה consultation: diff --git a/config/locales/hi.yml b/config/locales/hi.yml index c8b68e1bc..585fd8c30 100644 --- a/config/locales/hi.yml +++ b/config/locales/hi.yml @@ -40,9 +40,6 @@ hi: published: प्रकाशित %{date} see_all_updates: सभी अपडेट देखें show_all_updates: सभी अपडेट दिखाएं - publisher_metadata: - hide_all: सब छिपाएं - show_all: सब दिखाएं share_links: share_this_page: यह पेज शेयर करें consultation: diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 4cb68a58d..41fc332f1 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -40,9 +40,6 @@ hr: published: Objavljeno %{date} see_all_updates: pogledajte sva ažuriranja show_all_updates: prikaži sva ažuriranja - publisher_metadata: - hide_all: sakrij sve - show_all: prikaži sve share_links: share_this_page: Podijelite ovu stranicu consultation: diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 9c46a5d3c..3d4d9f948 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -40,9 +40,6 @@ hu: published: 'közzététel dátuma: %{date}' see_all_updates: minden frissítés megtekintése show_all_updates: minden frissítés megjelenítése - publisher_metadata: - hide_all: összes elrejtése - show_all: összes megjelenítése share_links: share_this_page: Oldal megosztása consultation: diff --git a/config/locales/hy.yml b/config/locales/hy.yml index c103f99bd..ff6861d92 100644 --- a/config/locales/hy.yml +++ b/config/locales/hy.yml @@ -40,9 +40,6 @@ hy: published: Հրապարակվել է՝ %{date} see_all_updates: դիտել բոլոր թարմացումները show_all_updates: ցույց տալ բոլոր թարմացումները - publisher_metadata: - hide_all: թաքցնել բոլորը - show_all: ցույց տալ բոլորը share_links: share_this_page: Կիսվել այս էջով consultation: diff --git a/config/locales/id.yml b/config/locales/id.yml index 3aae71b5e..0b21277be 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -40,9 +40,6 @@ id: published: Diterbitkan %{date} see_all_updates: lihat semua pembaruan show_all_updates: Tampilkan semua pembaruan - publisher_metadata: - hide_all: sembunyikan semua - show_all: tampilkan semua share_links: share_this_page: Bagikan halaman ini consultation: diff --git a/config/locales/is.yml b/config/locales/is.yml index 626ee99c1..bbe51874f 100644 --- a/config/locales/is.yml +++ b/config/locales/is.yml @@ -40,9 +40,6 @@ is: published: Birt %{date} see_all_updates: sjá allar uppfærslur show_all_updates: sýna allar uppfærslur - publisher_metadata: - hide_all: fela allt - show_all: sýna allt share_links: share_this_page: Deila þessari síðu consultation: diff --git a/config/locales/it.yml b/config/locales/it.yml index e0e8aa814..6d7c81418 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -40,9 +40,6 @@ it: published: Pubblicato %{date} see_all_updates: vedi tutti gli aggiornamenti show_all_updates: mostra tutti gli aggiornamenti - publisher_metadata: - hide_all: nascondi tutto - show_all: mostra tutto share_links: share_this_page: Condividi questa pagina consultation: diff --git a/config/locales/ja.yml b/config/locales/ja.yml index fe8e2cde5..a9fdbc5c3 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -40,9 +40,6 @@ ja: published: 公開日:%{date} see_all_updates: すべての更新を見る show_all_updates: すべての更新を表示 - publisher_metadata: - hide_all: すべて非表示 - show_all: すべて表示 share_links: share_this_page: このページを共有 consultation: diff --git a/config/locales/ka.yml b/config/locales/ka.yml index 4da92d4eb..450a6bc15 100644 --- a/config/locales/ka.yml +++ b/config/locales/ka.yml @@ -40,9 +40,6 @@ ka: published: გამოქვეყნდა %{date} see_all_updates: ყველა ცვლილების ნახვა show_all_updates: ყველა ცვლილების ჩვენება - publisher_metadata: - hide_all: ყველას დაფარვა - show_all: ყველას ჩვენება share_links: share_this_page: ამ გვერდის გაზიარება consultation: diff --git a/config/locales/kk.yml b/config/locales/kk.yml index ed0d529ab..acfa67bf7 100644 --- a/config/locales/kk.yml +++ b/config/locales/kk.yml @@ -40,9 +40,6 @@ kk: published: "%{date} күні жарияланды" see_all_updates: барлық жаңартуларды қарау show_all_updates: барлық жаңартуларды көрсету - publisher_metadata: - hide_all: барлығын жасыру - show_all: барлығын көрсету share_links: share_this_page: Осы бетпен бөлісу consultation: diff --git a/config/locales/ko.yml b/config/locales/ko.yml index eec252790..13dad7179 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -40,9 +40,6 @@ ko: published: 발행일 %{date} see_all_updates: 모든 업데이트 보기 show_all_updates: 모든 업데이트 보기 - publisher_metadata: - hide_all: 모두 숨기기 - show_all: 모두 보기 share_links: share_this_page: 이 페이지 공유하기 consultation: diff --git a/config/locales/lt.yml b/config/locales/lt.yml index ee539f7ac..b2394c3e7 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -40,9 +40,6 @@ lt: published: Publikuota %{date} see_all_updates: matyti visą naują informaciją show_all_updates: rodyti visą naują informaciją - publisher_metadata: - hide_all: slėpti visus - show_all: rodyti visus share_links: share_this_page: Bendrinti šį puslapį consultation: diff --git a/config/locales/lv.yml b/config/locales/lv.yml index a4270148f..ce482728b 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -40,9 +40,6 @@ lv: published: Publicēts %{date} see_all_updates: skatīt visus atjauninājumus show_all_updates: rādīt visus atjauninājumus - publisher_metadata: - hide_all: paslēpt visu - show_all: rādīt visu share_links: share_this_page: Kopīgot šo lapu consultation: diff --git a/config/locales/ms.yml b/config/locales/ms.yml index e139cc321..cb7cbf39e 100644 --- a/config/locales/ms.yml +++ b/config/locales/ms.yml @@ -40,9 +40,6 @@ ms: published: Diterbitkan %{date} see_all_updates: lihat semua kemas kini show_all_updates: tunjuk semua kemas kini - publisher_metadata: - hide_all: sorok semua - show_all: tunjuk semua share_links: share_this_page: Kongsi laman ini consultation: diff --git a/config/locales/mt.yml b/config/locales/mt.yml index 98531f800..41c870dbf 100644 --- a/config/locales/mt.yml +++ b/config/locales/mt.yml @@ -40,9 +40,6 @@ mt: published: Ippubblikat %{date} see_all_updates: ara l-aġġornamenti kollha show_all_updates: uri l-aġġornamenti kollha - publisher_metadata: - hide_all: aħbi kollox - show_all: uri kollox share_links: share_this_page: Aqsam din il-paġna ma' consultation: diff --git a/config/locales/ne.yml b/config/locales/ne.yml index 86e34016e..bbe39fdbe 100644 --- a/config/locales/ne.yml +++ b/config/locales/ne.yml @@ -40,9 +40,6 @@ ne: published: प्रकाशित %{date} see_all_updates: सबै अद्यावधिक हेर्नुहोस् show_all_updates: सबै अद्यावधिक देखाउनुहोस् - publisher_metadata: - hide_all: सबै लुकाउनुहोस् - show_all: सबै देखाउनुहोस् share_links: share_this_page: यो पृष्ठ साझा गर्नुहोस् consultation: diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 294bc9d73..74a915589 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -40,9 +40,6 @@ nl: published: Gepubliceerd %{date} see_all_updates: zie alle updates show_all_updates: toon alle updates - publisher_metadata: - hide_all: alles verbergen - show_all: alles tonen share_links: share_this_page: Deel deze pagina consultation: diff --git a/config/locales/no.yml b/config/locales/no.yml index 9ee7626c5..f9cad7bb5 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -40,9 +40,6 @@ published: Publisert %{date} see_all_updates: se alle oppdateringer show_all_updates: vis alle oppdateringer - publisher_metadata: - hide_all: Skjul alle - show_all: Vis alt share_links: share_this_page: Del denne siden consultation: diff --git a/config/locales/pa-pk.yml b/config/locales/pa-pk.yml index a9ec275d3..9745de5af 100644 --- a/config/locales/pa-pk.yml +++ b/config/locales/pa-pk.yml @@ -40,9 +40,6 @@ pa-pk: published: شائع ہویا {date} % see_all_updates: ساری تازہ ترین صورتِ حال show_all_updates: ساری تازہ ترین صورتِ حال وکھاؤ - publisher_metadata: - hide_all: سارا لُکاؤ - show_all: سارا وکھاؤ share_links: share_this_page: ایہ ورقہ تقسیم کرو consultation: diff --git a/config/locales/pa.yml b/config/locales/pa.yml index 23b291988..f0d131a54 100644 --- a/config/locales/pa.yml +++ b/config/locales/pa.yml @@ -40,9 +40,6 @@ pa: published: ਪ੍ਰਕਾਸ਼ਿਤ %{date} see_all_updates: ਸਾਰੇ ਅਪਡੇਟਸ ਵੇਖੋ show_all_updates: ਸਾਰੇ ਅਪਡੇਟ ਦਿਖਾਉ - publisher_metadata: - hide_all: ਸਭ ਨੂੰ ਲੁਕਾਓ - show_all: ਸਾਰੇ ਦਿਖਾਓ share_links: share_this_page: ਇਸ ਪੇਜ ਨੂੰ ਸ਼ੇਅਰ ਕਰੋ consultation: diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 9a22b8cb0..b1619a397 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -40,9 +40,6 @@ pl: published: Opublikowano %{date} see_all_updates: zobacz wszystkie aktualizacje show_all_updates: pokaż wszystkie aktualizacje - publisher_metadata: - hide_all: ukryj wszystkie - show_all: pokaż wszystkie share_links: share_this_page: Udostępnij tę stronę consultation: diff --git a/config/locales/ps.yml b/config/locales/ps.yml index 22850de63..214d7677d 100644 --- a/config/locales/ps.yml +++ b/config/locales/ps.yml @@ -40,9 +40,6 @@ ps: published: خپور شوی%{date} see_all_updates: ټول تازه معلومات وګورئ show_all_updates: ټول تازه معلومات وښایاست - publisher_metadata: - hide_all: ټول پټ کړئ - show_all: ټول ښکاره کړه share_links: share_this_page: دا پاه شریکه کړئ consultation: diff --git a/config/locales/pt.yml b/config/locales/pt.yml index c351f0530..305ef46bb 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -40,9 +40,6 @@ pt: published: Publicado a %{date} see_all_updates: ver todas as atualizações show_all_updates: mostrar todas as atualizações - publisher_metadata: - hide_all: ocultar tudo - show_all: mostrar tudo share_links: share_this_page: Partilhar esta página consultation: diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 09b573a4f..c501cccc9 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -40,9 +40,6 @@ ro: published: Publicat pe %{date} see_all_updates: vedeți toate actualizările show_all_updates: afișați toate actualizările - publisher_metadata: - hide_all: ascundeți tot - show_all: afișați tot share_links: share_this_page: Distribuiți această pagină consultation: diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 97e4a1802..69d8d88e9 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -40,9 +40,6 @@ ru: published: Опубликовано %{date} see_all_updates: Посмотреть всю поледнюю информацию show_all_updates: Показать всю поледнюю информацию - publisher_metadata: - hide_all: Скрыть всё - show_all: Показать всё share_links: share_this_page: 'Поделиться данной страницей ' consultation: diff --git a/config/locales/si.yml b/config/locales/si.yml index 347c2796e..b210e49a5 100644 --- a/config/locales/si.yml +++ b/config/locales/si.yml @@ -40,9 +40,6 @@ si: published: පළ කළේ %{date} see_all_updates: සියලුම යාවත්කාලීනයන් බලන්න show_all_updates: සියලු යාවත්කාලීනයන් පෙන්වන්න - publisher_metadata: - hide_all: සියල්ල සැඟවන්න - show_all: සියල්ල පෙන්වන්න share_links: share_this_page: මෙම පිටුව බෙදාගන්න consultation: diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 9cb9e9d1c..b41aec908 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -40,9 +40,6 @@ sk: published: Zverejnené %{date} see_all_updates: pozrite si všetky aktualizácie show_all_updates: zobraziť všetky aktualizácie - publisher_metadata: - hide_all: skryť všetko - show_all: zobraziť všetko share_links: share_this_page: Zdieľať túto stránku consultation: diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 11825be57..0a57165d6 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -40,9 +40,6 @@ sl: published: Objavljeno %{date} see_all_updates: poglej vse posodobitve show_all_updates: prikaži vse posodobitve - publisher_metadata: - hide_all: skrij vse - show_all: prikaži vse share_links: share_this_page: Deli to stran consultation: diff --git a/config/locales/so.yml b/config/locales/so.yml index 8eb659525..1c950013a 100644 --- a/config/locales/so.yml +++ b/config/locales/so.yml @@ -40,9 +40,6 @@ so: published: La daabacay %{date} see_all_updates: eeg dhamaan cusboonaysiinaha show_all_updates: muuji dhamaan cusboonaysiinaha - publisher_metadata: - hide_all: qari dhamaan - show_all: Muuji dhamaan share_links: share_this_page: Lawadaag bogan consultation: diff --git a/config/locales/sq.yml b/config/locales/sq.yml index 3be4dd58f..c59137f61 100644 --- a/config/locales/sq.yml +++ b/config/locales/sq.yml @@ -40,9 +40,6 @@ sq: published: Publikuar %{date} see_all_updates: shih të gjitha përditësimet show_all_updates: shfaq të gjitha përditësimet - publisher_metadata: - hide_all: fshih të gjitha - show_all: shfaq të gjitha share_links: share_this_page: Shpërdaj këtë faqe consultation: diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 93fd305ab..503119b08 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -40,9 +40,6 @@ sr: published: Objavljeno %{date} see_all_updates: pogledajte sva ažuriranja show_all_updates: prikaži sva ažuriranja - publisher_metadata: - hide_all: sakrij sve - show_all: prikaži sve share_links: share_this_page: Podeli ovu stranicu consultation: diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 4ba9c39c4..cb8f68d3e 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -40,9 +40,6 @@ sv: published: Publicerad %{date} see_all_updates: se alla uppdateringar show_all_updates: Visa alla uppdateringar - publisher_metadata: - hide_all: dölja alla - show_all: visa alla share_links: share_this_page: Dela den här sidan consultation: diff --git a/config/locales/sw.yml b/config/locales/sw.yml index b531cefb7..1fcd3597f 100644 --- a/config/locales/sw.yml +++ b/config/locales/sw.yml @@ -40,9 +40,6 @@ sw: published: Ulichapishwa tarehe %{date} see_all_updates: angalia taarifa zote show_all_updates: Onyesha taarifa zote - publisher_metadata: - hide_all: ficha zote - show_all: onyesha zote share_links: share_this_page: Shiriki ukurasa huu consultation: diff --git a/config/locales/ta.yml b/config/locales/ta.yml index b87813ab9..6df58c83c 100644 --- a/config/locales/ta.yml +++ b/config/locales/ta.yml @@ -40,9 +40,6 @@ ta: published: வெளியிடப்பட்ட தேதி %{date} see_all_updates: அனைத்து புதுப்பித்தல்களையும் பார்க்க show_all_updates: அனைத்து புதுப்பித்தல்களையும் காட்டு - publisher_metadata: - hide_all: அனைத்தையும் மறை - show_all: அனைத்தையும் காட்டு share_links: share_this_page: இந்தப் பக்கத்தைப் பகிர்க consultation: diff --git a/config/locales/th.yml b/config/locales/th.yml index de3fa9919..f24709c5e 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -40,9 +40,6 @@ th: published: เผยแพร่เมื่อ %{date} see_all_updates: ดูอัปเดตทั้งหมด show_all_updates: แสดงอัปเดตทั้งหมด - publisher_metadata: - hide_all: ซ่อนทั้งหมด - show_all: แสดงทั้งหมด share_links: share_this_page: แชร์หน้านี้ consultation: diff --git a/config/locales/tk.yml b/config/locales/tk.yml index 8ff8562fe..a9d8f16f9 100644 --- a/config/locales/tk.yml +++ b/config/locales/tk.yml @@ -40,9 +40,6 @@ tk: published: Çap edilen %{date} see_all_updates: ähli täzelenmelere serediň show_all_updates: ähli täzelenmeleri görkez - publisher_metadata: - hide_all: ählisini gizle - show_all: ählisini görkez share_links: share_this_page: Bu sahypany paýlaşyň consultation: diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 91e778a08..8e78554cd 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -40,9 +40,6 @@ tr: published: Yayınlama %{date} see_all_updates: tüm güncellemeleri görün show_all_updates: tüm güncellemeleri göster - publisher_metadata: - hide_all: hepsini gizle - show_all: hepsini göster share_links: share_this_page: Bu sayfayı paylaş consultation: diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 1e96a8390..559a80872 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -40,9 +40,6 @@ uk: published: Опубліковано %{date} see_all_updates: переглянути всі оновлення show_all_updates: показати всі оновлення - publisher_metadata: - hide_all: приховати всі - show_all: показати всі share_links: share_this_page: Поділіться цією сторінкою consultation: diff --git a/config/locales/ur.yml b/config/locales/ur.yml index eafaa4221..04788e033 100644 --- a/config/locales/ur.yml +++ b/config/locales/ur.yml @@ -40,9 +40,6 @@ ur: published: شائع کردہ %{date} see_all_updates: تمام اپ ڈیٹس دیکھیں show_all_updates: تمام اپ ڈیٹس دکھائیں - publisher_metadata: - hide_all: تمام کو پوشیدہ کریں - show_all: تمام دکھائیں share_links: share_this_page: اس صفحے کو شیئر کریں consultation: diff --git a/config/locales/uz.yml b/config/locales/uz.yml index b32df7592..69065a367 100644 --- a/config/locales/uz.yml +++ b/config/locales/uz.yml @@ -40,9 +40,6 @@ uz: published: Нашр қилинган %{date} see_all_updates: Барча янгиланишларни кўриш show_all_updates: янгиланишларни барчасини кўрсатиш - publisher_metadata: - hide_all: барчасини яшириш - show_all: барчасини кўрсатиш share_links: share_this_page: Саҳифа билан бўлишиш consultation: diff --git a/config/locales/vi.yml b/config/locales/vi.yml index da05118cc..4d84fba15 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -40,9 +40,6 @@ vi: published: Ngày xuất bản %{date} see_all_updates: xem tất cả nội dung cập nhật show_all_updates: hiển thị tất cả nội dung cập nhật - publisher_metadata: - hide_all: ẩn tất cả - show_all: hiển thị tất cả share_links: share_this_page: Chia sẻ trang này consultation: diff --git a/config/locales/yi.yml b/config/locales/yi.yml index 4440a5074..cbe029e98 100644 --- a/config/locales/yi.yml +++ b/config/locales/yi.yml @@ -40,9 +40,6 @@ yi: published: see_all_updates: show_all_updates: - publisher_metadata: - hide_all: - show_all: share_links: share_this_page: consultation: diff --git a/config/locales/zh-hk.yml b/config/locales/zh-hk.yml index df32ebf51..c0c273281 100644 --- a/config/locales/zh-hk.yml +++ b/config/locales/zh-hk.yml @@ -40,9 +40,6 @@ zh-hk: published: 已發佈 %{date} see_all_updates: 查看所有更新 show_all_updates: 顯示所有更新 - publisher_metadata: - hide_all: 全部隱藏 - show_all: 全部顯示 share_links: share_this_page: 轉載此一頁面 consultation: diff --git a/config/locales/zh-tw.yml b/config/locales/zh-tw.yml index 397ca3267..659c372e9 100644 --- a/config/locales/zh-tw.yml +++ b/config/locales/zh-tw.yml @@ -40,9 +40,6 @@ zh-tw: published: 發布於 %{date} see_all_updates: 查看所有更新 show_all_updates: 展開所有更新 - publisher_metadata: - hide_all: 隱藏全部 - show_all: 展開全部 share_links: share_this_page: 分享此頁面 consultation: diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 647457321..6472b9be4 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -40,9 +40,6 @@ zh: published: 发布 %{date} see_all_updates: 查看全部更新 show_all_updates: 显示全部更新 - publisher_metadata: - hide_all: 隐藏全部 - show_all: 显示全部 share_links: share_this_page: 分享本页面 consultation: diff --git a/test/components/publisher_metadata_test.rb b/test/components/publisher_metadata_test.rb deleted file mode 100644 index 5c77138f4..000000000 --- a/test/components/publisher_metadata_test.rb +++ /dev/null @@ -1,75 +0,0 @@ -require "component_test_helper" - -class PublisherMetadataTest < ComponentTestCase - def component_name - "publisher_metadata" - end - - test "does not render metadata when no data is given" do - assert_empty render_component({}) - end - - test "does not render when an 'other' object is provided without any values" do - assert_empty render_component(other: { from: [] }) - assert_empty render_component(other: { a: false, b: "", c: [], d: {}, e: nil }) - end - - test "renders a from link when from data is given" do - render_component(other: { From: ["Ministry of Defence"] }) - assert_select ".app-c-publisher-metadata__other a[href='/government/organisations/ministry-of-defence']", text: "Ministry of Defence" - assert_select ".app-c-publisher-metadata__other dt", text: "From:" - assert_select ".app-c-publisher-metadata__other dd", text: "Ministry of Defence" - end - - test "renders two from links when two publishers are given" do - render_component(other: { from: ["Ministry of Defence", "Education Funding Agency"] }) - assert_select ".app-c-publisher-metadata__other a[href='/government/organisations/ministry-of-defence']", text: "Ministry of Defence" - assert_select ".app-c-publisher-metadata__other a[href='/government/organisations/education-funding-agency']", text: "Education Funding Agency" - end - - test "renders a sentence when multiple publishers are given" do - render_component(other: { from: ["Department for Education", "Education Funding Agency"] }) - assert_select ".app-c-publisher-metadata__other dt", text: "From:" - assert_select ".app-c-publisher-metadata__other dd", text: "Department for Education and Education Funding Agency" - end - - test "renders published dates component when only published date is given" do - render_component(published: "31 July 2017") - assert_select ".app-c-published-dates" - end - - test "renders published dates component when only last updated date is given" do - render_component(last_updated: "20 September 2017") - assert_select ".app-c-published-dates" - end - - test "renders full metadata component when all parameters are given" do - render_component(other: { from: ["Ministry of Defence"] }, published: "31 July 2017", last_updated: "20 September 2017", link_to_history: true) - assert_select ".app-c-published-dates" - assert_select ".app-c-publisher-metadata__other a[href='/government/organisations/ministry-of-defence']", text: "Ministry of Defence" - assert_select ".app-c-publisher-metadata__other dt", text: "From:" - assert_select ".app-c-publisher-metadata__other dd", text: "Ministry of Defence" - end - - test "link tracking is enabled" do - render_component(other: { from: ["Ministry of Defence"] }) - assert_select ".app-c-publisher-metadata__other dl[data-module='gem-track-click']" - end - - test "renders two collection links when two collections are given" do - render_component(other: { collections: ["Tribunals statistics", "Civil justice statistics quarterly"] }) - assert_select ".app-c-publisher-metadata__other dt", text: "Collections:" - assert_select ".app-c-publisher-metadata__other dd a[href='/government/collections/tribunals-statistics']", text: "Tribunals statistics" - assert_select ".app-c-publisher-metadata__other dd a[href='/government/collections/civil-justice-statistics-quarterly']", text: "Civil justice statistics quarterly" - end - - test "renders the first collection and a toggle link when more than two collections are given" do - render_component(other: { collections: ["Tribunals statistics", "Civil justice statistics quarterly", "Offender management statistics quarterly"] }) - assert_select ".app-c-publisher-metadata__other dt", text: "Collections:" - assert_select ".app-c-publisher-metadata__other .app-c-publisher-metadata__definition-sentence", text: "Tribunals statistics, and 2 others" - assert_select ".app-c-publisher-metadata__other a", text: "+ show all" - assert_select ".app-c-publisher-metadata__other a[href='/government/collections/tribunals-statistics']", text: "Tribunals statistics" - assert_select ".app-c-publisher-metadata__other a[href='/government/collections/civil-justice-statistics-quarterly']", text: "Civil justice statistics quarterly" - assert_select ".app-c-publisher-metadata__other a[href='/government/collections/offender-management-statistics-quarterly']", text: "Offender management statistics quarterly" - end -end diff --git a/test/test_helper.rb b/test/test_helper.rb index 2fc49add9..64e0938d1 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -133,13 +133,6 @@ def assert_has_metadata_local(metadata, term_selector, definition_selector) end end - def assert_has_publisher_metadata(options) - within(".app-c-publisher-metadata") do - assert_has_published_dates(options[:first_published], options[:last_updated], history_link: options[:history_link]) - assert_has_publisher_metadata_other(options[:metadata]) - end - end - def assert_has_important_metadata(metadata) within(".app-c-important-metadata") do assert_has_metadata_local(