diff --git a/app-src/scripts/_app.js b/app-src/scripts/_app.js index d1a43a5469..32b6b24999 100644 --- a/app-src/scripts/_app.js +++ b/app-src/scripts/_app.js @@ -96,11 +96,7 @@ /* @ngInject */ function initGlobalShortcuts($document, Dialogs, $localStorage, CheckShortcutKeyCombo, IS_ELECTRON) { - // we just use this single one as this usually does mess - // up with the default browser shortcuts - // better to use the global electron shortcuts here $document.bind('keypress', (ev) => { - // only trigger if not in typing mode if (ev.target.tagName !== 'INPUT' && ev.target.tagName !== 'TEXTAREA') { // on star diff --git a/app-src/scripts/dialogs/help/help-daily-agenda.html b/app-src/scripts/dialogs/help/help-daily-agenda.html new file mode 100644 index 0000000000..fba4e4a0b9 --- /dev/null +++ b/app-src/scripts/dialogs/help/help-daily-agenda.html @@ -0,0 +1,2 @@ +

Daily Agenda

+

The daily agenda view is meant to give you a rough overview of how your workday might look on a time scale.

\ No newline at end of file diff --git a/app-src/scripts/dialogs/help/help-done-tasks-backlog.html b/app-src/scripts/dialogs/help/help-done-tasks-backlog.html new file mode 100644 index 0000000000..e59162f09b --- /dev/null +++ b/app-src/scripts/dialogs/help/help-done-tasks-backlog.html @@ -0,0 +1,2 @@ +

Done tasks backlog

+

The done tasks backlog gives you an overview of all your done tasks.

\ No newline at end of file diff --git a/app-src/scripts/dialogs/help/help-settings.html b/app-src/scripts/dialogs/help/help-settings.html new file mode 100644 index 0000000000..30c04144b6 --- /dev/null +++ b/app-src/scripts/dialogs/help/help-settings.html @@ -0,0 +1,5 @@ +

Settings page

+

Here you can configure a lot of stuff. Click the + + -icons to learn more about a configuration section. +

diff --git a/app-src/scripts/dialogs/help/help-time-tracking-history.html b/app-src/scripts/dialogs/help/help-time-tracking-history.html new file mode 100644 index 0000000000..34d2e5db31 --- /dev/null +++ b/app-src/scripts/dialogs/help/help-time-tracking-history.html @@ -0,0 +1,10 @@ +

Time tracking history

+

The time tracking history gives you an overview over all tasks in your done backlog.

+

You click on the + + -icon to show the tasks worked on a specific day. +

+

Clicking on the + + -icon will open an export dialog for the current month. +

\ No newline at end of file diff --git a/app-src/scripts/dialogs/help/help-work-view.html b/app-src/scripts/dialogs/help/help-work-view.html index 2e04584cb5..cb89d11dbe 100644 --- a/app-src/scripts/dialogs/help/help-work-view.html +++ b/app-src/scripts/dialogs/help/help-work-view.html @@ -1,4 +1,12 @@

The work view

+

This is the work view. It's meant to help you to keep track of what you have to do today and to enable you to easily track the time spent on different tasks.

+

The page is divided into a list for your undone tasks + + and a list of you done tasks + + below. Tasks can be moved via drag and drop between the lists. +

+

Once you are done working for the day you can go to the daily summary page by clicking the 'Finish your work day' button.

\ No newline at end of file