diff --git a/src/app/content/__snapshots__/routes.spec.tsx.snap b/src/app/content/__snapshots__/routes.spec.tsx.snap index 1306db03b5..f17897d55f 100644 --- a/src/app/content/__snapshots__/routes.spec.tsx.snap +++ b/src/app/content/__snapshots__/routes.spec.tsx.snap @@ -997,7 +997,7 @@ Array [ If you are redistributing all or part of this book in a digital format, then you must include on every digital page view the following attribution:
- Access for free at https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units + Access for free at https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units
@@ -1025,10 +1025,10 @@ Array [ Location: Houston, Texas
  • - Book URL: https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units + Book URL: https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units
  • - Section URL: https://openstax.org/books/book-slug-1/pages/test-page-1 + Section URL: https://openstax.org/books/book-slug-1/pages/test-page-1
    • diff --git a/src/app/content/components/Attribution.tsx b/src/app/content/components/Attribution.tsx index e05145f7da..3abf0d1d1d 100644 --- a/src/app/content/components/Attribution.tsx +++ b/src/app/content/components/Attribution.tsx @@ -14,6 +14,7 @@ import { hasOSWebData } from '../guards'; import * as select from '../selectors'; import { Book, BookWithOSWebData, Page } from '../types'; import { findDefaultBookPage, getBookPageUrlAndParams } from '../utils'; +import { splitTitleParts } from '../utils/archiveTreeUtils'; import { contentTextStyle } from './Page/PageContent'; import { bookIdsWithSpecialAttributionText, compensateForUTC, getAuthors, getPublishDate, } from './utils/attributionValues'; import { disablePrint } from './utils/disablePrint'; @@ -158,8 +159,13 @@ class Attribution extends Component { ...book, loadOptions: {booksConfig: book.loadOptions.booksConfig}, }; + + const [, introTitlePart] = splitTitleParts(introPage.title); + const [, currentTitlePart] = splitTitleParts(page.title); + const introPageTitle = `${introTitlePart} - ${book.title} | OpenStax`; const introPageUrl = getBookPageUrlAndParams(bookWithoutExplicitVersions, introPage).url; const currentPageUrl = getBookPageUrlAndParams(bookWithoutExplicitVersions, page).url; + const currentPageTitle = `${currentTitlePart} - ${book.title} | OpenStax`; assertNotNull(book.publish_date, `BUG: Could not find publication date`); const bookPublishDate = getPublishDate(book); @@ -179,6 +185,8 @@ class Attribution extends Component { bookTitle: book.title, copyrightHolder: 'OpenStax', currentPath: currentPageUrl, + currentPageTitle, + introPageTitle, introPageUrl, originalMaterialLink: null, ...bookIdsWithSpecialAttributionText[book.id] || {}, diff --git a/src/app/content/components/__snapshots__/Attribution.spec.tsx.snap b/src/app/content/components/__snapshots__/Attribution.spec.tsx.snap index 6a98b9fb83..a6c9fbb626 100644 --- a/src/app/content/components/__snapshots__/Attribution.spec.tsx.snap +++ b/src/app/content/components/__snapshots__/Attribution.spec.tsx.snap @@ -1179,7 +1179,7 @@ exports[`Attribution in browser renders default attribution 1`] = ` If you are redistributing all or part of this book in a digital format, then you must include on every digital page view the following attribution:
    - Access for free at https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units + Access for free at https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units
    @@ -1207,10 +1207,10 @@ exports[`Attribution in browser renders default attribution 1`] = ` Location: Houston, Texas
  • - Book URL: https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units + Book URL: https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units
  • - Section URL: https://openstax.org/books/book-slug-1/pages/test-page-1 + Section URL: https://openstax.org/books/book-slug-1/pages/test-page-1
    • @@ -2568,7 +2568,7 @@ exports[`Attribution in browser renders special licensing and attribution for HS If you are redistributing all or part of this book in a digital format, then you must include on every digital page view the following attribution:
    - Access for free at https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units + Access for free at https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units
    @@ -2596,10 +2596,10 @@ exports[`Attribution in browser renders special licensing and attribution for HS Location: Houston, Texas
  • - Book URL: https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units + Book URL: https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units
  • - Section URL: https://openstax.org/books/book-slug-1/pages/test-page-1 + Section URL: https://openstax.org/books/book-slug-1/pages/test-page-1
    • @@ -4273,7 +4273,7 @@ exports[`Attribution in browser renders special licensing and attribution for In If you are redistributing all or part of this book in a digital format, then you must include on every digital page view the following attribution:
    - Access for free at https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units + Access for free at https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units
    @@ -4301,10 +4301,10 @@ exports[`Attribution in browser renders special licensing and attribution for In Location: Houston, Texas
  • - Book URL: https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units + Book URL: https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units
  • - Section URL: https://openstax.org/books/book-slug-1/pages/test-page-1 + Section URL: https://openstax.org/books/book-slug-1/pages/test-page-1
    • @@ -5821,7 +5821,7 @@ exports[`Attribution in browser renders special licensing and attribution for St If you are redistributing all or part of this book in a digital format, then you must include on every digital page view the following attribution:
    - Access for free at https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units + Access for free at https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units
    @@ -5849,10 +5849,10 @@ exports[`Attribution in browser renders special licensing and attribution for St Location: Houston, Texas
  • - Book URL: https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units + Book URL: https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units
  • - Section URL: https://openstax.org/books/book-slug-1/pages/test-page-1 + Section URL: https://openstax.org/books/book-slug-1/pages/test-page-1
    • diff --git a/src/app/content/components/__snapshots__/Content.spec.tsx.snap b/src/app/content/components/__snapshots__/Content.spec.tsx.snap index cc16a43b40..ddb459b632 100644 --- a/src/app/content/components/__snapshots__/Content.spec.tsx.snap +++ b/src/app/content/components/__snapshots__/Content.spec.tsx.snap @@ -4313,7 +4313,7 @@ li[aria-label="Current Page"] .c60 { If you are redistributing all or part of this book in a digital format, then you must include on every digital page view the following attribution:
    - Access for free at https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units + Access for free at https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units
    @@ -4341,10 +4341,10 @@ li[aria-label="Current Page"] .c60 { Location: Houston, Texas
  • - Book URL: https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units + Book URL: https://openstax.org/books/book-slug-1/pages/1-introduction-to-science-and-the-realm-of-physics-physical-quantities-and-units
  • - Section URL: https://openstax.org/books/book-slug-1/pages/3-test-page-4 + Section URL: https://openstax.org/books/book-slug-1/pages/3-test-page-4
    • diff --git a/src/app/messages/en/attributionText.ts b/src/app/messages/en/attributionText.ts index 32b94bc79f..1e37b6a091 100644 --- a/src/app/messages/en/attributionText.ts +++ b/src/app/messages/en/attributionText.ts @@ -28,7 +28,7 @@ export const defaultText = ` If you are redistributing all or part of this book in a digital format, then you must include on every digital page view the following attribution:
    - Access for free at https://openstax.org{introPageUrl} + Access for free at https://openstax.org{introPageUrl}
    @@ -56,10 +56,10 @@ export const defaultText = ` Location: Houston, Texas
  • - Book URL: https://openstax.org{introPageUrl} + Book URL: https://openstax.org{introPageUrl}
  • - Section URL: https://openstax.org{currentPath} + Section URL: https://openstax.org{currentPath}