Compare commits

...

4 Commits

5 changed files with 21 additions and 20 deletions

View File

@ -54,14 +54,14 @@ export function renderDetails() {
const alphabeticalOrderHTML = `<p><strong>Alphabetical Order</strong><br>${ const alphabeticalOrderHTML = `<p><strong>Alphabetical Order</strong><br>${
(alphabeticalOrder.length > 0 ? alphabeticalOrder : ['English Alphabet']).map(letter => `<span class="tag">${letter}</span>`).join(' ') (alphabeticalOrder.length > 0 ? alphabeticalOrder : ['English Alphabet']).map(letter => `<span class="tag">${letter}</span>`).join(' ')
}</div>`; }</div>`;
const generalHTML = `<h3>General</h3>${partsOfSpeechHTML}${alphabeticalOrderHTML}`; const generalHTML = `<h2>General</h2>${partsOfSpeechHTML}${alphabeticalOrderHTML}`;
const { consonants, vowels, blends } = phonology const { consonants, vowels, blends } = phonology
const consonantHTML = `<p><strong>Consonants</strong><br>${consonants.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`; const consonantHTML = `<p><strong>Consonants</strong><br>${consonants.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`;
const vowelHTML = `<p><strong>Vowels</strong><br>${vowels.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`; const vowelHTML = `<p><strong>Vowels</strong><br>${vowels.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`;
const blendHTML = blends.length > 0 ? `<p><strong>Polyphthongs&nbsp;/&nbsp;Blends</strong><br>${blends.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>` : ''; const blendHTML = blends.length > 0 ? `<p><strong>Polyphthongs&nbsp;/&nbsp;Blends</strong><br>${blends.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>` : '';
const phonologyNotesHTML = phonology.notes.trim().length > 0 ? '<p><strong>Notes</strong></p><div>' + md(removeTags(phonology.notes)) + '</div>' : ''; const phonologyNotesHTML = phonology.notes.trim().length > 0 ? '<p><strong>Notes</strong></p><div>' + md(removeTags(phonology.notes)) + '</div>' : '';
const phonologyHTML = `<h3>Phonology</h3> const phonologyHTML = `<h2>Phonology</h2>
<div class="split two"> <div class="split two">
<div>${consonantHTML}</div> <div>${consonantHTML}</div>
<div>${vowelHTML}</div> <div>${vowelHTML}</div>
@ -75,7 +75,7 @@ export function renderDetails() {
const codaHTML = `<p><strong>Coda</strong><br>${coda.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`; const codaHTML = `<p><strong>Coda</strong><br>${coda.map(letter => `<span class="tag">${letter}</span>`).join(' ')}</p>`;
const phonotacticsNotesHTML = phonotactics.notes.trim().length > 0 ? '<p><strong>Notes</strong></p><div>' + md(removeTags(phonotactics.notes)) + '</div>' : ''; const phonotacticsNotesHTML = phonotactics.notes.trim().length > 0 ? '<p><strong>Notes</strong></p><div>' + md(removeTags(phonotactics.notes)) + '</div>' : '';
const phonotacticsHTML = onset.length + nucleus.length + coda.length + phonotacticsNotesHTML.length > 0 const phonotacticsHTML = onset.length + nucleus.length + coda.length + phonotacticsNotesHTML.length > 0
? `<h3>Phonotactics</h3> ? `<h2>Phonotactics</h2>
${onset.length > 0 || nucleus.length > 0 || coda.length > 0 ${onset.length > 0 || nucleus.length > 0 || coda.length > 0
? `<div class="split three"> ? `<div class="split three">
<div>${onsetHTML}</div> <div>${onsetHTML}</div>
@ -95,11 +95,11 @@ export function renderDetails() {
}).filter(html => html !== false).join(' ')}</p>` : ''; }).filter(html => html !== false).join(' ')}</p>` : '';
const orthographyNotesHTML = orthography.notes.trim().length > 0 ? '<p><strong>Notes</strong><br>' + md(removeTags(orthography.notes)) + '</div>' : ''; const orthographyNotesHTML = orthography.notes.trim().length > 0 ? '<p><strong>Notes</strong><br>' + md(removeTags(orthography.notes)) + '</div>' : '';
const orthographyHTML = translations.length + orthographyNotesHTML.length > 0 const orthographyHTML = translations.length + orthographyNotesHTML.length > 0
? `<h3>Orthography</h3> ? `<h2>Orthography</h2>
${translationsHTML} ${translationsHTML}
${orthographyNotesHTML}` ${orthographyNotesHTML}`
: ''; : '';
const grammarHTML = grammar.notes.trim().length > 0 ? '<h3>Grammar</h3><div>' const grammarHTML = grammar.notes.trim().length > 0 ? '<h2>Grammar</h2><div>'
+ (grammar.notes.trim().length > 0 ? md(removeTags(grammar.notes)) : '') + (grammar.notes.trim().length > 0 ? md(removeTags(grammar.notes)) : '')
+ '</div>' : ''; + '</div>' : '';

View File

@ -130,7 +130,7 @@ switch ($view) {
oldLoad && oldLoad(); oldLoad && oldLoad();
if (UpUp) { if (UpUp) {
UpUp.start({ UpUp.start({
'cache-version': '2.1.0', 'cache-version': '2.1.1',
'content-url': 'offline.html', 'content-url': 'offline.html',
'assets': [ 'assets': [
\"" . implode('","', $files) . "\" \"" . implode('","', $files) . "\"

View File

@ -8,6 +8,10 @@ p, span {
} }
} }
h2 {
margin-bottom: 5px;
}
input:not([type="checkbox"]), input:not([type="checkbox"]),
select, select,
textarea { textarea {
@ -19,10 +23,7 @@ label {
font-weight: bold; font-weight: bold;
line-height: 120%; line-height: 120%;
cursor: pointer; cursor: pointer;
margin-bottom: $general-padding;
&:not(:last-child) {
margin-bottom: $general-padding;
}
small { small {
font-weight: normal; font-weight: normal;

View File

@ -147,7 +147,7 @@
<section id="mainColumn"> <section id="mainColumn">
{{announcements}} {{announcements}}
<section id="detailsSection"> <section id="detailsSection">
<h2 id="dictionaryName">Dictionary Name</h2> <h1 id="dictionaryName">Dictionary Name</h1>
<nav> <nav>
<ul> <ul>
<li>Description</li><li>Details</li><li>Stats</li><li id="editDictionaryButton">Edit</li> <li>Description</li><li>Details</li><li>Stats</li><li id="editDictionaryButton">Edit</li>
@ -194,7 +194,7 @@
<section> <section>
<form class="split two"> <form class="split two">
<div> <div>
<h3>General Settings</h3> <h2>General Settings</h2>
<label>Use IPA Auto-Fill <label>Use IPA Auto-Fill
<input id="settingsUseIPA" type="checkbox" checked><br /> <input id="settingsUseIPA" type="checkbox" checked><br />
<small>Check this to use character combinations to input International Phonetic Alphabet characters into <small>Check this to use character combinations to input International Phonetic Alphabet characters into
@ -267,7 +267,7 @@
</a>&nbsp; </a>&nbsp;
<small>Leave blank for default (case-insensitive ASCII/Unicode sorting)</small> <small>Leave blank for default (case-insensitive ASCII/Unicode sorting)</small>
</label> </label>
<h3>Phonology</h3> <h2>Phonology</h2>
<div class="split three"> <div class="split three">
<div> <div>
<label>Consonants<br> <label>Consonants<br>
@ -294,10 +294,10 @@
</label> </label>
</div> </div>
</div> </div>
<label>Notes <small>(Markdown-enabled)</small><br> <label>Notes <small>(Markdown-enabled)</small><a class="label-button maximize-button">Maximize</a><br>
<textarea id="editPhonologyNotes"></textarea> <textarea id="editPhonologyNotes"></textarea>
</label> </label>
<h3>Phonotactics</h3> <h2>Phonotactics</h2>
<div class="split three"> <div class="split three">
<div> <div>
<label>Onset<br> <label>Onset<br>
@ -318,10 +318,10 @@
</label> </label>
</div> </div>
</div> </div>
<label>Notes <small>(Markdown-enabled)</small><br> <label>Notes <small>(Markdown-enabled)</small><a class="label-button maximize-button">Maximize</a><br>
<textarea id="editPhonotacticsNotes"></textarea> <textarea id="editPhonotacticsNotes"></textarea>
</label> </label>
<h3>Orthography</h3> <h2>Orthography</h2>
<label>Translations <small>(One translation per line)</small><a class="label-button maximize-button">Maximize</a><br> <label>Translations <small>(One translation per line)</small><a class="label-button maximize-button">Maximize</a><br>
<textarea id="editTranslations" placeholder="ai=I <textarea id="editTranslations" placeholder="ai=I
AA=ay AA=ay
@ -332,7 +332,7 @@ ou=ow"></textarea>
<label>Notes <small>(Markdown-enabled)</small><a class="label-button maximize-button">Maximize</a><br> <label>Notes <small>(Markdown-enabled)</small><a class="label-button maximize-button">Maximize</a><br>
<textarea id="editOrthography"></textarea> <textarea id="editOrthography"></textarea>
</label> </label>
<h3>Grammar</h3> <h2>Grammar</h2>
<label>Notes <small>(Markdown-enabled)</small><a class="label-button maximize-button">Maximize</a><br> <label>Notes <small>(Markdown-enabled)</small><a class="label-button maximize-button">Maximize</a><br>
<textarea id="editGrammar"></textarea> <textarea id="editGrammar"></textarea>
</label> </label>
@ -371,7 +371,7 @@ ou=ow"></textarea>
</section> </section>
<section id="editActionsTab" style="display:none;"> <section id="editActionsTab" style="display:none;">
<h3>Import&nbsp;/ Export</h3> <h2>Import&nbsp;/ Export</h2>
<div class="split two"> <div class="split two">
<div> <div>
<p> <p>

View File

@ -81,7 +81,7 @@
<label>Exact Words <label>Exact Words
<input type="checkbox" id="searchExactWords"> <input type="checkbox" id="searchExactWords">
</label> </label>
<label>Translations <label style="display:none;">Translations
<input type="checkbox" id="searchOrthography"> <input type="checkbox" id="searchOrthography">
</label> </label>
</div> </div>