Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
:style="{ backgroundColor: $themePalette.grey.v_200 }"
frameBorder="0"
:src="rooturl"
:title="$tr('contentFrameTitle')"
allow="fullscreen"
>
</iframe>
Expand Down Expand Up @@ -173,6 +174,10 @@
context:
'Learners can use the full screen button in the upper right corner to open an html5 app in fullscreen view.\n',
},
contentFrameTitle: {
message: 'Content viewer',
context: 'Accessible title for the iframe that displays the content',
},
},
};

Expand Down
91 changes: 78 additions & 13 deletions kolibri/plugins/coach/frontend/views/CoachPrompts/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,24 @@
<p>Station 1</p>
<p>Kolibri learning</p>
</th>
<td><img src="./kolibri.png" ></td>
<td>
<img
src="./kolibri.png"
alt=""
>
</td>
</tr>
<tr>
<th>
<p>Station 2</p>
<p>Guided practice</p>
</th>
<td><img src="./guided.png" ></td>
<td>
<img
src="./guided.png"
alt=""
>
</td>
</tr>
</table>
</div>
Expand All @@ -146,21 +156,36 @@
<p>Station 1</p>
<p>Kolibri learning</p>
</th>
<td><img src="./kolibri.png" ></td>
<td>
<img
src="./kolibri.png"
alt=""
>
</td>
</tr>
<tr>
<th>
<p>Station 2</p>
<p>Guided practice</p>
</th>
<td><img src="./guided.png" ></td>
<td>
<img
src="./guided.png"
alt=""
>
</td>
</tr>
<tr>
<th>
<p>Station 3</p>
<p>Independent activity</p>
</th>
<td><img src="./independent.png" ></td>
<td>
<img
src="./independent.png"
alt=""
>
</td>
</tr>
</table>
</div>
Expand Down Expand Up @@ -364,14 +389,24 @@
<p>Option 1</p>
<p>Next to each other</p>
</th>
<td><img src="./pair.png" ></td>
<td>
<img
src="./pair.png"
alt=""
>
</td>
</tr>
<tr>
<th>
<p>Option 2</p>
<p>In a triangle</p>
</th>
<td><img src="./triangle.png" ></td>
<td>
<img
src="./triangle.png"
alt=""
>
</td>
</tr>
</table>
</div>
Expand Down Expand Up @@ -400,28 +435,48 @@
<p>Option 1</p>
<p>In a square</p>
</th>
<td><img src="./square.png" ></td>
<td>
<img
src="./square.png"
alt=""
>
</td>
</tr>
<tr>
<th>
<p>Option 2</p>
<p>In a rectangle</p>
</th>
<td><img src="./rectangle.png" ></td>
<td>
<img
src="./rectangle.png"
alt=""
>
</td>
</tr>
<tr>
<th>
<p>Option 2</p>
<p>In a circle</p>
</th>
<td><img src="./circle.png" ></td>
<td>
<img
src="./circle.png"
alt=""
>
</td>
</tr>
<tr>
<th>
<p>Option 2</p>
<p>In a horseshoe</p>
</th>
<td><img src="./horseshoe.png" ></td>
<td>
<img
src="./horseshoe.png"
alt=""
>
</td>
</tr>
</table>
</div>
Expand All @@ -448,14 +503,24 @@
<p>Option 2</p>
<p>In a circle</p>
</th>
<td><img src="./circle.png" ></td>
<td>
<img
src="./circle.png"
alt=""
>
</td>
</tr>
<tr>
<th>
<p>Option 2</p>
<p>In a horseshoe</p>
</th>
<td><img src="./horseshoe.png" ></td>
<td>
<img
src="./horseshoe.png"
alt=""
>
</td>
</tr>
</table>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,28 @@
<ul
ref="learnerList"
class="history-list"
role="listbox"
tabindex="0"
:aria-label="coreString('learnersLabel')"
@keydown.home="setSelectedLearner(0)"
@keydown.end="setSelectedLearner(learners.length - 1)"
@keydown.up.prevent="setSelectedLearner(previousLearner(selectedLearnerNumber))"
@keydown.down.prevent="setSelectedLearner(nextLearner(selectedLearnerNumber))"
>
<template v-for="(learner, index) in learners">
<li
:key="index"
class="clickable learner-item"
role="option"
:aria-selected="isSelected(index).toString()"
tabindex="-1"
:style="{
borderBottom: `2px solid ${$themeTokens.textDisabled}`,
backgroundColor: isSelected(index) ? $themeTokens.textDisabled : '',
}"
@click="setSelectedLearner(index)"
@keydown.enter="setSelectedLearner(index)"
@keydown.space.prevent="setSelectedLearner(index)"
>
<div class="title">
<KIcon
Expand Down Expand Up @@ -74,18 +86,27 @@
},
methods: {
setSelectedLearner(learnerNumber) {
const item = this.$refs.learnerList.children[learnerNumber];
if (item) {
item.focus();
}
this.$emit('select', learnerNumber);
this.scrollToSelectedLearner(learnerNumber);
this.scrollToSelectedLearner(learnerNumber, item);
},
isSelected(learnerNumber) {
return Number(this.selectedLearnerNumber) === learnerNumber;
},
scrollToSelectedLearner(learnerNumber) {
const selectedElement = this.$refs.learnerList.children[learnerNumber];
if (selectedElement) {
previousLearner(learnerNumber) {
return learnerNumber - 1 >= 0 ? learnerNumber - 1 : this.learners.length - 1;
},
nextLearner(learnerNumber) {
return learnerNumber + 1 < this.learners.length ? learnerNumber + 1 : 0;
},
scrollToSelectedLearner(learnerNumber, selectedElement) {
const el = selectedElement || this.$refs.learnerList.children[learnerNumber];
if (el) {
const parent = this.$el.parentElement;
parent.scrollTop =
selectedElement.offsetHeight * (learnerNumber + 1) - parent.offsetHeight / 2;
parent.scrollTop = el.offsetHeight * (learnerNumber + 1) - parent.offsetHeight / 2;
}
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
</div>

<div class="fieldset">
<label class="fieldset-label">{{ $tr('externalDeviceSettings') }}</label>
<span class="fieldset-label">{{ $tr('externalDeviceSettings') }}</span>
<KCheckbox
:label="$tr('unlistedChannels')"
:checked="allowPeerUnlistedChannelImport"
Expand All @@ -68,7 +68,7 @@
</div>

<div class="fieldset">
<label class="fieldset-label">{{ $tr('landingPageLabel') }}</label>
<span class="fieldset-label">{{ $tr('landingPageLabel') }}</span>
<KRadioButtonGroup>
<KRadioButton
data-testid="landingPageButton"
Expand Down Expand Up @@ -119,7 +119,7 @@
class="fieldset"
>
<h2>
<label>{{ $tr('allowDownloadOnMeteredConnection') }}</label>
{{ $tr('allowDownloadOnMeteredConnection') }}
</h2>
<p :class="InfoDescriptionColor">
{{ $tr('DownloadOnMeteredConnectionDescription') }}
Expand Down Expand Up @@ -205,7 +205,7 @@

<div class="fieldset">
<h2>
<label>{{ $tr('autoDownload') }}</label>
{{ $tr('autoDownload') }}
</h2>
<KCheckbox
:label="$tr('enableAutoDownload')"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
v-if="channel.thumbnail"
class="thumbnail"
:src="channel.thumbnail"
alt=""
loading="lazy"
>
<KIcon
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
v-if="channel.thumbnail"
class="thumbnail"
:src="channel.thumbnail"
alt=""
loading="lazy"
>
<div class="channel-name">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,10 @@
:itemValue="x => x.id"
/>

<label
class="select-button-label"
for="select-address-button"
>
<span class="select-button-label">
{{ selectDifferentDeviceLabel$() }}
</label>
</span>
<KButton
id="select-address-button"
appearance="basic-link"
:text="getCommonSyncString('addNewAddressAction')"
@click="showSelectAddressModal = true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

<div
class="epub-viewer-content"
role="presentation"
:style="{ 'border-color': $themeTokens.fineLine }"
:dir="contentDirection"
@mousedown.stop="handleMouseDown"
Expand Down
22 changes: 11 additions & 11 deletions kolibri/plugins/facility/frontend/views/ImportCsvPage/Init.vue
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
{{ $tr('beforeCommitting') }}
</p>
<p>
<label for="csv-file"> {{ $tr('proceed') }}</label>
</p>
<p>
<input
id="csv-file"
ref="fileInput"
type="file"
accept=".csv"
name="csv-file"
@change="filesChanged"
>
<label for="csv-file">
{{ $tr('proceed') }}
<input
id="csv-file"
ref="fileInput"
type="file"
accept=".csv"
name="csv-file"
@change="filesChanged"
>
</label>
</p>
<!-- Temporarily remove this functionality for MVP -->
<p v-if="false">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
:style="{ backgroundColor: $themePalette.grey.v_200 }"
frameBorder="0"
:src="rooturl"
:title="$tr('contentFrameTitle')"
allow="fullscreen"
>
</iframe>
Expand Down Expand Up @@ -208,6 +209,10 @@
context:
'Learners can use the full screen button in the upper right corner to open an html5 app in fullscreen view.\n',
},
contentFrameTitle: {
message: 'Content viewer',
context: 'Accessible title for the iframe that displays the content',
},
},
};

Expand Down
Loading
Loading