Add help view for keyboard shortcuts #91
Conversation
Gomez
force-pushed
the
shortcut_help
branch
from
5e54780
to
eb07347
Compare
js/templates/keyboard-shortcuts.html
Outdated
| @@ -0,0 +1,18 @@ | |||
| <tbody> | |||
| <tr> | |||
| <th>Keyboard shortcut</th> | |||
js/templates/settings.html
Outdated
| @@ -5,6 +5,8 @@ | |||
| class="button new-button" | |||
| href="{{addAccountUrl}}">{{ t 'Add mail account' }}</a> | |||
|
|
|||
| <p><a id="keyboard_shortcuts" | |||
| href="{{keyboardShortcutUrl}}">{{ t 'Keyboard shortcuts' }}</a></p> | |||
There was a problem hiding this comment.
closing tag should be in the next line
js/views/appview.js
Outdated
| @@ -159,6 +161,9 @@ define(function(require) { | |||
| })); | |||
| } | |||
| }, | |||
| showKeyboardShortcuts: function() { | |||
| this.content.show(new KeyboardShortcutView({})); | |||
There was a problem hiding this comment.
please also store which view is active (take a look at the other methods)
js/views/settings.js
Outdated
| }; | ||
| }, | ||
| regions: { | ||
| accountsList: '#settings-accounts' | ||
| }, | ||
| events: { | ||
| 'click #new_mail_account': 'addAccount' | ||
| 'click #new_mail_account': 'addAccount', | ||
| 'click #keyboard_shortcuts': 'showKeyboardShortcuts' |
Gomez
force-pushed
the
shortcut_help
branch
from
60ba6ea
to
ec49180
Compare
Gomez
force-pushed
the
shortcut_help
branch
2 times, most recently
from
61bf63b
to
2f12543
Compare
|
All tests pass, ready for review @nextcloud/mail |
js/tests/views/settings_spec.js
Outdated
| @@ -36,14 +36,6 @@ define(['views/settings', 'views/helper'], function(SettingsView) { | |||
| it('produces the correct HTML', function () { | |||
| settingsview.render(); | |||
|
|
|||
| html = settingsview.el.innerHTML.trim(); | |||
There was a problem hiding this comment.
Interesting approach to fix the failing tests 😜
There was a problem hiding this comment.
:) I know. HTML comparison is a pain. Lets check for the link text only. Should be good enough? Or?
|
Working on the design atm :) |
|
|
||
| }); | ||
| }); | ||
| }); |
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
|
Added a commit to improve the design, please also review core nextcloud/server#4183 (needs backports also) |
|
|
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
|
Fixed/added proper URL routing support. |
|
@nextcloud/mail please give this a quick test. This is ready to be integrated into master IMO. |
|
The major changes are from @Gomez which I've approved -> merging this now 🚀 |
|
This thread has been automatically locked since there has not been any recent activity after it was closed. Please open a new issue for related bugs and questions. |
No description provided.