Skip to content

Commit 26a7e6f

Browse files
committed
refactor: reverse to sound-to-letter
#1769
1 parent 9f7b8d4 commit 26a7e6f

File tree

3 files changed

+20
-20
lines changed

3 files changed

+20
-20
lines changed

src/main/webapp/WEB-INF/jsp/content/word/create.jsp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
<i class="close material-icons">clear</i>
4040
</a>
4141
<a href="<spring:url value='/content/letter-sound/edit/${letterSound.id}' />">
42-
" <c:forEach var="letter" items="${letterSound.letters}">
43-
${letter.text}<c:out value=" " />
44-
</c:forEach> "<br />
45-
↓<br />
4642
/ <c:forEach var="sound" items="${letterSound.sounds}">
4743
${sound.valueIpa}<c:out value=" " />
48-
</c:forEach> /
44+
</c:forEach> /<br />
45+
↓<br />
46+
" <c:forEach var="letter" items="${letterSound.letters}">
47+
${letter.text}<c:out value=" " />
48+
</c:forEach> "
4949
</a>
5050
</div>
5151
</c:forEach>

src/main/webapp/WEB-INF/jsp/content/word/edit.jsp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@
5959
<i class="close material-icons">clear</i>
6060
</a>
6161
<a href="<spring:url value='/content/letter-sound/edit/${letterSound.id}' />">
62-
" <c:forEach var="letter" items="${letterSound.letters}">
63-
${letter.text}<c:out value=" " />
64-
</c:forEach> "<br />
65-
↓<br />
6662
/ <c:forEach var="sound" items="${letterSound.sounds}">
6763
${sound.valueIpa}<c:out value=" " />
68-
</c:forEach> /
64+
</c:forEach> /<br />
65+
↓<br />
66+
" <c:forEach var="letter" items="${letterSound.letters}">
67+
${letter.text}<c:out value=" " />
68+
</c:forEach> "
6969
</a>
7070
</div>
7171
</c:forEach>

src/main/webapp/WEB-INF/jsp/content/word/list.jsp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -40,29 +40,29 @@
4040
</td>
4141
<td>
4242
<div style="float: right; text-align: right;">
43-
<label>word.toString()</label>
43+
<label>word.getText()</label>
4444
<div style="font-size: 2em;">
45-
${word}
45+
"${word.text}"
4646
</div>
4747
</div>
4848

49-
<label>word.getText()</label>
49+
<label>word.toString()</label>
5050
<div style="font-size: 2em;">
51-
${word.text}
51+
"${word}"
5252
</div>
5353

5454
<div id="letterSoundsContainer">
55+
<label>Sound-to-letter correspondences</label><br />
5556
<c:forEach var="letterSound" items="${word.letterSounds}">
56-
<input name="letterSounds" type="hidden" value="${letterSound.id}" />
5757
<div class="chip">
5858
<a href="<spring:url value='/content/letter-sound/edit/${letterSound.id}' />">
59-
" <c:forEach var="letter" items="${letterSound.letters}">
60-
${letter.text}<c:out value=" " />
61-
</c:forEach> "<br />
62-
↓<br />
6359
/ <c:forEach var="sound" items="${letterSound.sounds}">
6460
${sound.valueIpa}<c:out value=" " />
65-
</c:forEach> /
61+
</c:forEach> /<br />
62+
↓<br />
63+
" <c:forEach var="letter" items="${letterSound.letters}">
64+
${letter.text}<c:out value=" " />
65+
</c:forEach> "
6666
</a>
6767
</div>
6868
</c:forEach>

0 commit comments

Comments
 (0)