diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 57fd297778..425f1752b2 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -488,7 +488,7 @@ "senseCount": "Senses: {{ val }}", "wordId": "Id: {{ val }}", "wordModified": "Modified: {{ val }}", - "domainAdded": "Domain added: {{ val }}", + "domainAdded": "Added: {{ val }}", "user": "By user: {{ val }}" } } diff --git a/src/components/WordCard/index.tsx b/src/components/WordCard/index.tsx index 4e85db539f..715ee0d933 100644 --- a/src/components/WordCard/index.tsx +++ b/src/components/WordCard/index.tsx @@ -56,13 +56,13 @@ export default function WordCard(props: WordCardProps): ReactElement { {full ? ( } + icon={} onClick={() => setFull(false)} /> ) : ( } + icon={} onClick={() => setFull(true)} /> )} @@ -89,32 +89,6 @@ export default function WordCard(props: WordCardProps): ReactElement { ) : ( )} - {/*full || senses.length <= 2 ? ( - senses.map((s) => ( - - )) - ) : senses.length > 2 ? ( - <> - - - {`+${ - senses.length - 1 - } more senses`} - - - ) : null*/} {/* Timestamps */} {provenance && ( diff --git a/src/goals/ReviewEntries/ReviewEntriesComponent/CellComponents/HistoryCell.tsx b/src/goals/ReviewEntries/ReviewEntriesComponent/CellComponents/HistoryCell.tsx index 72eb0ec2a7..af382817ba 100644 --- a/src/goals/ReviewEntries/ReviewEntriesComponent/CellComponents/HistoryCell.tsx +++ b/src/goals/ReviewEntries/ReviewEntriesComponent/CellComponents/HistoryCell.tsx @@ -1,4 +1,4 @@ -import { History } from "@mui/icons-material"; +import { Close, History, Merge, Straight } from "@mui/icons-material"; import { Dialog, Grid } from "@mui/material"; import { Fragment, ReactElement, useState } from "react"; @@ -24,6 +24,14 @@ export default function HistoryCell(props: HistoryCellProps): ReactElement { onClick={getHistory} /> setHistory(undefined)} open={!!history}> + + } + onClick={() => setHistory(undefined)} + textId={"buttons.exit"} + /> + {history ? : } @@ -31,20 +39,46 @@ export default function HistoryCell(props: HistoryCellProps): ReactElement { } function WordTree(props: { tree: Pedigree }): ReactElement { + const [showParents, setShowParents] = useState(true); + const { word, parents } = props.tree; + const arrowStyle = { color: showParents ? "black" : "gray" }; return ( <> - + - {props.tree.parents ? ( - - {props.tree.parents.map((p) => ( - - + {parents.length > 0 && ( + <> + + 1 ? ( + + ) : ( + + ) + } + onClick={() => setShowParents(!showParents)} + text={parents.length} + /> + + {showParents && ( + + {parents.map((p) => ( + + + + ))} - ))} - - ) : null} + )} + + )} ); }