jody/joplin
1
0 Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2026-10-25 02:47:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Desktop, Mobile: Resolves #16724: Label the note list padlock on desktop and match its colour to the title on mobile (#16725)

Browse Source
This commit is contained in:
Keshav authored and GitHub committed 2026-10-02 16:49:21 +01:00
1 parent b1c43ccce9
commit 7fb04b0a11
4 files changed
+7 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

packages/lib/services/noteList/defaultLeftToRightListRenderer.ts
+2 -1
View File
@@ -190,7 +190,7 @@ const defaultLeftToRightItemRenderer: ListRenderer = {
{{/note.is_todo}}
{{#note.syncDisabled}}<i class="syncdisabledicon" role="img" aria-label="{{note.syncDisabledLabel}}"></i>{{/note.syncDisabled}}
<i class="watchedicon fa fa-share-square"></i>
{{#note.is_locked}}<i class="lockedicon fa fa-lock"></i>{{/note.is_locked}}
{{#note.is_locked}}<i class="lockedicon fa fa-lock" role="img" aria-label="{{note.lockedLabel}}"></i>{{/note.is_locked}}
<div class="titlecontent">{{note.title}}</div>
</div>
<div class="preview">{{notePreview}}</div>
@@ -206,6 +206,7 @@ const defaultLeftToRightItemRenderer: ListRenderer = {
note: {
...props.note,
is_locked: isLocked,
lockedLabel: _('Locked'),
syncDisabled: isSyncDisabledConflict(props.note),
syncDisabledLabel: _('Local only'),
},
packages/lib/services/noteList/defaultListRenderer.ts
+2 -1
View File
@@ -205,7 +205,7 @@ const renderer: ListRenderer = {
<div class="title" data-id="{{note.id}}">
{{#note.syncDisabled}}<i class="syncdisabledicon" role="img" aria-label="{{note.syncDisabledLabel}}"></i>{{/note.syncDisabled}}
<i class="watchedicon fa fa-share-square"></i>
{{#note.is_locked}}<i class="lockedicon fa fa-lock"></i>{{/note.is_locked}}
{{#note.is_locked}}<i class="lockedicon fa fa-lock" role="img" aria-label="{{note.lockedLabel}}"></i>{{/note.is_locked}}
<span>{{note.title}}</span>
</div>
{{#checkboxStats}}
@@ -227,6 +227,7 @@ const renderer: ListRenderer = {
note: {
...props.note,
is_locked: isNoteLockEnabled() ? props.note.is_locked : 0,
lockedLabel: _('Locked'),
syncDisabled: isSyncDisabledConflict(props.note),
syncDisabledLabel: _('Local only'),
},
packages/lib/services/noteList/defaultMultiColumnsRenderer.ts
+2 -1
View File
@@ -140,7 +140,7 @@ const renderer: ListRenderer = {
{{#cells}}
<div data-name="{{name}}" class="item" style="{{{styleHtml}}}">
<div class="content">
<i class="syncdisabledicon" role="img" aria-label="{{note.syncDisabledLabel}}"></i><i class="watchedicon fa fa-share-square"></i><i class="lockedicon fa fa-lock"></i>{{{contentHtml}}}
<i class="syncdisabledicon" role="img" aria-label="{{note.syncDisabledLabel}}"></i><i class="watchedicon fa fa-share-square"></i><i class="lockedicon fa fa-lock" role="img" aria-label="{{note.lockedLabel}}"></i>{{{contentHtml}}}
</div>
</div>
{{/cells}}
@@ -183,6 +183,7 @@ const renderer: ListRenderer = {
note: {
...props.note,
is_locked: isNoteLockEnabled() ? props.note.is_locked : 0,
lockedLabel: _('Locked'),
syncDisabled: isSyncDisabledConflict(props.note),
syncDisabledLabel: _('Local only'),
},