Redesigning Saimiar anciliary information

This commit is contained in:
Greg Shuflin 2021-09-15 04:32:47 -07:00
parent cbfcb762e7
commit 20d3cb3084
2 changed files with 44 additions and 29 deletions

View File

@ -41,6 +41,19 @@ input {
padding-bottom: 1em;
}
.synclass {
.additionalNotes {
color: #a63333;
}
.semField {
font-variant: small-caps;
color: #6a3131;
}
.saimiarNounMorpho {
color: #a63333;
i {
color: #6a3131;
}
}

View File

@ -54,16 +54,11 @@ const EntryBase = (props: BaseProps) => {
: <a href="" onClick={edit}>Edit</a>);
};
const expand = (evt) => {
evt.preventDefault();
};
return (
<div className="searchResult" key={ props.id }>
<div style={mainEntryStyle}>
<span><b>{ props.conlangEntry }</b> { engTranslation }</span>
<span style={controlStyle}>
<a href="" onClick={expand}>Expand</a>
<EditControls onSave={save} />
</span>
</div>
@ -77,38 +72,45 @@ const SaiEntry = (props: {entry: SaiEntryProps}) => {
const synCategory = entry.syn_category;
const isNominal = synCategory === "nominal";
const barStyle = {
display: "inline-flex",
gap: "1em",
};
let morphology = null;
if (isNominal) {
const decl = declineSaimiar(entry);
if (decl) {
morphology = (<span className="saimiarNounMorpho">
Abs: <i>{decl.abs}</i>, Erg: <i>{decl.erg}</i>, Adp: <i>{decl.adp}</i>,
All: <i>{decl.all}</i>, Loc: <i>{decl.loc}</i>, Ell: <i>{decl.ell}</i>,
Inst: <i>{decl.inst}</i>, Rel: <i>{decl.rel}</i>
</span>);
}
}
const langSpecific = (
<div>
<span className="synclass">
<i>{ entry.syn_category }</i>
{ entry.morph_type ? `\t\t${entry.morph_type}` : null }
<br/>
{ isNominal ? formatMorphology(entry) : null }
<div className="additionalNotes">
<span style={barStyle}>
<span className="synCategory">
<i>{ entry.syn_category }</i>
</span>
<span className="morphType">
{ entry.morph_type ? `\t\t${entry.morph_type}` : null }
</span>
{ entry.etym ? <span className="etym">etym.: <i>{entry.etym}</i></span>
: null
}
{ entry.semantic_field ? <span className="semField">{entry.semantic_field}</span> : null }
</span>
<br/>
{ morphology }
</div>
);
return <EntryBase id={entry.id} conlang={Conlang.Saimiar} conlangEntry={entry.sai} english={entry.eng} langSpecific={langSpecific} />;
};
function formatMorphology(entry) {
const decl = declineSaimiar(entry);
if (!decl) {
return "";
}
return (<span style={ {fontSize: "medium", color: "#6a3131"} } >
Abs: <i>{decl.abs}</i>, Erg: <i>{decl.erg}</i>,
Adp: <i>{decl.adp}</i>,
All: <i>{decl.all}</i>,
Loc: <i>{decl.loc}</i>,
Ell: <i>{decl.ell}</i>,
Inst: <i>{decl.inst}</i>,
Rel: <i>{decl.rel}</i>
</span>);
}
const JutEntry = (props: {entry: JutEntryProps}) => {
const {entry} = props;