Skip to content

Commit 0b62bf4

Browse files
committed
feat: compare word texts
#2194
1 parent f01386c commit 0b62bf4

3 files changed

Lines changed: 16 additions & 9 deletions

File tree

pom-dependency-tree.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ai.elimu:webapp:war:2.6.137-SNAPSHOT
1+
ai.elimu:webapp:war:2.6.138-SNAPSHOT
22
+- ai.elimu:model:jar:model-2.0.123:compile
33
| \- com.google.code.gson:gson:jar:2.13.1:compile
44
| \- com.google.errorprone:error_prone_annotations:jar:2.38.0:compile

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,17 +75,21 @@
7575
</div>
7676
</td>
7777
<td>
78-
<div style="float: right; text-align: right;">
79-
<label>word.getText()</label>
78+
<div class="wordTextStatus" data-status="${word == word.text}">
79+
<div style="float: right; text-align: right;">
80+
<label>word.getText()</label>
81+
<div style="font-size: 2em;">
82+
"${word.text}"
83+
</div>
84+
</div>
85+
86+
<label>word.toString()</label>
8087
<div style="font-size: 2em;">
81-
"${word.text}"
88+
<a class="editLink" href="<spring:url value='/content/word/edit/${word.id}' />">
89+
"${word}"
90+
</a>
8291
</div>
8392
</div>
84-
85-
<label>word.toString()</label>
86-
<div style="font-size: 2em;">
87-
<a class="editLink" href="<spring:url value='/content/word/edit/${word.id}' />">"${word}"</a>
88-
</div>
8993

9094
<div id="letterSoundsContainer">
9195
<label>Sound-to-letter correspondences</label><br />

src/main/webapp/static/css/content/styles.css

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,16 +101,19 @@ blockquote,
101101
font-weight: bold;
102102
}
103103

104+
.wordTextStatus,
104105
.peerReviewStatusContainer {
105106
color: #757575; /* grey darken-1 */
106107
background-color: #f5f5f5; /* grey lighten-4 */
107108
border-radius: 8px;
108109
padding: 0.5rem;
109110
}
111+
.wordTextStatus[data-status="true"],
110112
.peerReviewStatusContainer[data-status="APPROVED"] {
111113
color: #00897b; /* teal darken-1 */
112114
background-color: #e0f2f1; /* teal lighten-5 */
113115
}
116+
.wordTextStatus[data-status="false"],
114117
.peerReviewStatusContainer[data-status="NOT_APPROVED"] {
115118
color: #bf360c; /* deep-orange darken-4 */
116119
background-color: #ffccbc; /* deep-orange lighten-4 */

0 commit comments

Comments
 (0)