rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Show SmartTag status in sidebar

Browse Source
This commit is contained in:
Baptiste Grob
2020-08-24 17:31:39 +02:00
parent 80ce5800a8
commit ee8b8fec4d
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/assets/javascripts/views/tags/tags-view.pug
View File

@@ -10,7 +10,7 @@
.sk-h3.title .sk-h3.title
span.sk-bold Views span.sk-bold Views
.sk-button.sk-secondary-contrast.wide( .sk-button.sk-secondary-contrast.wide(
ng-click='self.clickedAddNewTag()', ng-click='self.clickedAddNewTag()',
title='Create a new tag' title='Create a new tag'
) )
.sk-label .sk-label
@@ -18,38 +18,37 @@
.scrollable .scrollable
.infinite-scroll .infinite-scroll
.tag( .tag(
ng-class="{'selected' : self.state.selectedTag == tag, 'faded' : !tag.isAllTag}", ng-class="{'selected' : self.state.selectedTag == tag, 'faded' : !tag.isAllTag}",
ng-click='self.selectTag(tag)', ng-click='self.selectTag(tag)',
ng-repeat='tag in self.state.smartTags track by tag.uuid' ng-repeat='tag in self.state.smartTags track by tag.uuid'
) )
.tag-info .tag-info
input.title( .title(ng-if="!tag.errorDecrypting") {{tag.title}}
ng-disabled='true',
ng-change='self.onTagTitleChange(tag)'
ng-model='tag.title'
)
.count(ng-show='tag.isAllTag') {{self.state.noteCounts[tag.uuid]}} .count(ng-show='tag.isAllTag') {{self.state.noteCounts[tag.uuid]}}
.danger.small-text.bold(ng-show='tag.conflictOf') Conflicted Copy
.danger.small-text.bold(ng-show='tag.errorDecrypting && !tag.waitingForKey') Missing Keys
.info.small-text.bold(ng-show='tag.errorDecrypting && tag.waitingForKey') Waiting For Keys
.tags-title-section.section-title-bar .tags-title-section.section-title-bar
.section-title-bar-header .section-title-bar-header
.sk-h3.title .sk-h3.title
span.sk-bold Tags span.sk-bold Tags
.tag( .tag(
ng-class="{'selected' : self.state.selectedTag == tag}", ng-class="{'selected' : self.state.selectedTag == tag}",
ng-click='self.selectTag(tag)', ng-click='self.selectTag(tag)',
ng-repeat='tag in self.state.tags track by tag.uuid' ng-repeat='tag in self.state.tags track by tag.uuid'
) )
.tag-info .tag-info
.tag-icon # .tag-icon #
input.title( input.title(
ng-attr-id='tag-{{tag.uuid}}', ng-attr-id='tag-{{tag.uuid}}',
ng-blur='self.saveTag($event, tag)' ng-blur='self.saveTag($event, tag)'
ng-change='self.onTagTitleChange(tag)', ng-change='self.onTagTitleChange(tag)',
ng-model='self.titles[tag.uuid]', ng-model='self.titles[tag.uuid]',
ng-class="{'editing' : self.state.editingTag == tag}", ng-class="{'editing' : self.state.editingTag == tag}",
ng-click='self.selectTag(tag)', ng-click='self.selectTag(tag)',
ng-keyup='$event.keyCode == 13 && $event.target.blur()', ng-keyup='$event.keyCode == 13 && $event.target.blur()',
should-focus='self.state.templateTag || self.state.editingTag == tag', should-focus='self.state.templateTag || self.state.editingTag == tag',
sn-autofocus='true', sn-autofocus='true',
spellcheck='false' spellcheck='false'
) )
.count {{self.state.noteCounts[tag.uuid]}} .count {{self.state.noteCounts[tag.uuid]}}
@@ -63,10 +62,10 @@
.no-tags-placeholder(ng-show='self.state.tags.length == 0') .no-tags-placeholder(ng-show='self.state.tags.length == 0')
| No tags. Create one using the add button above. | No tags. Create one using the add button above.
panel-resizer( panel-resizer(
collapsable='true', collapsable='true',
control='self.panelPuppet', control='self.panelPuppet',
default-width='150', default-width='150',
hoverable='true', hoverable='true',
on-resize-finish='self.onPanelResize', on-resize-finish='self.onPanelResize',
panel-id="'tags-column'" panel-id="'tags-column'"
) )