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

UI fixes

Browse Source
This commit is contained in:
Mo Bitar
2020-04-13 18:39:25 -05:00
parent 82f71aa923
commit ef66170ba4
10 changed files with 134 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/templates/directives/editor-menu.pug
View File

@@ -19,10 +19,10 @@
label='editor.name',
)
.sk-menu-panel-column(
ng-if='editor.content.conflict_of'
ng-if='editor.conflictOf'
)
.info(
ng-if='editor.content.conflict_of'
ng-if='editor.conflictOf'
) Conflicted copy
a.no-decoration(
href='https://standardnotes.org/extensions',

12
app/assets/templates/editor.pug
View File

@@ -81,7 +81,7 @@
action='self.selectedMenuItem(true); self.toggleProtectNote()',
desc=`'Protecting a note will require credentials to view
it (Manage Privileges via Account menu)'`,
label="self.state.note.content.protected ? 'Unprotect' : 'Protect'"
label="self.state.note.protected ? 'Unprotect' : 'Protect'"
)
menu-row(
action='self.selectedMenuItem(true); self.toggleNotePreview()',
@@ -94,22 +94,22 @@
action='self.selectedMenuItem(); self.deleteNote()',
desc="'Send this note to the trash'",
label="'Move to Trash'",
ng-show='!self.state.altKeyDown && !self.state.note.content.trashed && !self.state.note.errorDecrypting',
ng-show='!self.state.altKeyDown && !self.state.note.trashed && !self.state.note.errorDecrypting',
stylekit-class="'warning'"
)
menu-row(
action='self.selectedMenuItem(); self.deleteNotePermanantely()',
desc="'Delete this note permanently from all your devices'",
label="'Delete Permanently'",
ng-show='!self.state.note.content.trashed && self.state.note.errorDecrypting',
ng-show='!self.state.note.trashed && self.state.note.errorDecrypting',
stylekit-class="'danger'"
)
div(ng-if='self.state.note.content.trashed || self.state.altKeyDown')
div(ng-if='self.state.note.trashed || self.state.altKeyDown')
menu-row(
action='self.selectedMenuItem(true); self.restoreTrashedNote()',
desc="'Undelete this note and restore it back into your notes'",
label="'Restore'",
ng-show='self.state.note.content.trashed',
ng-show='self.state.note.trashed',
stylekit-class="'info'"
)
menu-row(
@@ -122,7 +122,7 @@
action='self.selectedMenuItem(true); self.emptyTrash()',
desc="'Permanently delete all notes in the trash'",
label="'Empty Trash'",
ng-show='self.state.note.content.trashed || !self.state.altKeyDown',
ng-show='self.state.note.trashed || !self.state.altKeyDown',
stylekit-class="'danger'",
subtitle="self.getTrashCount() + ' notes in trash'"
)

12
app/assets/templates/notes.pug
View File

@@ -109,7 +109,7 @@
)
.note(
ng-repeat='note in self.state.renderedNotes track by note.uuid'
ng-class="{'selected' : self.state.selectedNote == note}"
ng-class="{'selected' : self.selectedNote == note}"
ng-click='self.selectNote(note, true)'
)
.note-flags(ng-show='self.noteFlags[note.uuid].length > 0')
@@ -124,14 +124,14 @@
!note.protected`
)
.html-preview(
ng-bind-html='note.content.preview_html',
ng-show='note.content.preview_html'
ng-bind-html='note.preview_html',
ng-show='note.preview_html'
)
.plain-preview(
ng-show='!note.content.preview_html && note.content.preview_plain'
) {{note.content.preview_plain}}
ng-show='!note.preview_html && note.preview_plain'
) {{note.preview_plain}}
.default-preview(
ng-show='!note.content.preview_html && !note.content.preview_plain'
ng-show='!note.preview_html && !note.preview_plain'
) {{note.text}}
.date.faded(ng-show='!self.state.hideDate')
span(ng-show="self.state.sortBy == 'client_updated_at'")

8
app/assets/templates/tags.pug
View File

@@ -18,7 +18,7 @@
.scrollable
.infinite-scroll
.tag(
ng-class="{'selected' : self.state.selectedTag == tag, 'faded' : !tag.content.isAllTag}",
ng-class="{'selected' : self.state.selectedTag == tag, 'faded' : !tag.isAllTag}",
ng-click='self.selectTag(tag)',
ng-repeat='tag in self.state.smartTags track by tag.uuid'
)
@@ -26,9 +26,9 @@
input.title(
ng-disabled='true',
ng-change='self.onTagTitleChange(tag)'
ng-model='self.titles[tag.uuid]'
ng-model='tag.title'
)
.count(ng-show='tag.content.isAllTag') {{self.state.noteCounts[tag.uuid]}}
.count(ng-show='tag.isAllTag') {{self.state.noteCounts[tag.uuid]}}
.tags-title-section.section-title-bar
.section-title-bar-header
.sk-h3.title
@@ -53,7 +53,7 @@
spellcheck='false'
)
.count {{self.state.noteCounts[tag.uuid]}}
.danger.small-text.bold(ng-show='tag.content.conflict_of') Conflicted Copy
.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
.menu(ng-show='self.state.selectedTag == tag')