diff --git a/app-src/index.html b/app-src/index.html index 3f3b826eee..89bee32b38 100644 --- a/app-src/index.html +++ b/app-src/index.html @@ -109,6 +109,7 @@ TODO configure more restrictive Content-Security-Policy + diff --git a/app-src/scripts/dialogs/help/help-c.html b/app-src/scripts/dialogs/help/help-c.html index 15ecdbb4b2..54d8b0fb1f 100644 --- a/app-src/scripts/dialogs/help/help-c.html +++ b/app-src/scripts/dialogs/help/help-c.html @@ -4,7 +4,7 @@

- + Help

diff --git a/app-src/scripts/dialogs/help/help-settings.html b/app-src/scripts/dialogs/help/help-settings.html index 30c04144b6..787a13b24c 100644 --- a/app-src/scripts/dialogs/help/help-settings.html +++ b/app-src/scripts/dialogs/help/help-settings.html @@ -1,5 +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/help-section/_help-section-d.scss b/app-src/scripts/help-section/_help-section-d.scss new file mode 100644 index 0000000000..67380ae691 --- /dev/null +++ b/app-src/scripts/help-section/_help-section-d.scss @@ -0,0 +1,25 @@ +help-section { + display: block; + + .help-text { + margin-bottom: 40px; + border-bottom: 2px solid $c-accent; + border-top: 2px solid $c-accent; + } + + .help-btn { + position: absolute; + top: -8px; + right: -8px; + } + + .help-icon-wrapper { + margin-top: 8px; + margin-bottom: 8px; + color: $c-accent; + text-align: center; + } + + body.dark-theme & { + } +} \ No newline at end of file diff --git a/app-src/scripts/help-section/help-section-d.html b/app-src/scripts/help-section/help-section-d.html new file mode 100644 index 0000000000..7e26b8ee77 --- /dev/null +++ b/app-src/scripts/help-section/help-section-d.html @@ -0,0 +1,17 @@ + + + + +
+
+ +
+ +
+ +
+
+ diff --git a/app-src/scripts/help-section/help-section-d.js b/app-src/scripts/help-section/help-section-d.js new file mode 100644 index 0000000000..8de3b85be4 --- /dev/null +++ b/app-src/scripts/help-section/help-section-d.js @@ -0,0 +1,33 @@ +/** + * @ngdoc directive + * @name superProductivity.directive:helpSection + * @description + * # helpSection + */ + +(function () { + 'use strict'; + + angular + .module('superProductivity') + .directive('helpSection', helpSection); + + /* @ngInject */ + function helpSection() { + return { + templateUrl: 'scripts/help-section/help-section-d.html', + bindToController: true, + controller: HelpSectionCtrl, + controllerAs: 'vm', + transclude: true, + restrict: 'E', + scope: {} + }; + } + + /* @ngInject */ + function HelpSectionCtrl() { + const vm = this; + } + +})(); diff --git a/app-src/scripts/help-section/help-section-d.spec.js b/app-src/scripts/help-section/help-section-d.spec.js new file mode 100644 index 0000000000..7077c27308 --- /dev/null +++ b/app-src/scripts/help-section/help-section-d.spec.js @@ -0,0 +1,21 @@ +'use strict'; + +describe('Directive: helpSection', function () { + + // load the directive's module + beforeEach(module('superProductivity')); + beforeEach(module('templates')); + + var element, + scope; + + beforeEach(inject(function ($rootScope) { + scope = $rootScope.$new(); + })); + + it('should do something', inject(function ($compile) { + element = $compile('')(scope); + scope.$digest(); + expect(true).toBe(true); + })); +}); \ No newline at end of file diff --git a/app-src/scripts/main-header/main-header-d.html b/app-src/scripts/main-header/main-header-d.html index 96c77455ca..4ecfd334a4 100644 --- a/app-src/scripts/main-header/main-header-d.html +++ b/app-src/scripts/main-header/main-header-d.html @@ -98,7 +98,7 @@ Open help for current view - +
diff --git a/app-src/scripts/routes/settings/_settings-c.scss b/app-src/scripts/routes/settings/_settings-c.scss index 744582fe44..f80fc61724 100644 --- a/app-src/scripts/routes/settings/_settings-c.scss +++ b/app-src/scripts/routes/settings/_settings-c.scss @@ -20,6 +20,8 @@ padding: 15px; margin-bottom: 10px; background: #ffffff; + position: relative; + body.dark-theme & { background-color: $dark-theme-bg-lighter; } diff --git a/app-src/scripts/settings/backup-settings/_backup-settings-d.scss b/app-src/scripts/settings/backup-settings/_backup-settings-d.scss index dd2f4f002c..621ee3d670 100644 --- a/app-src/scripts/settings/backup-settings/_backup-settings-d.scss +++ b/app-src/scripts/settings/backup-settings/_backup-settings-d.scss @@ -1,3 +1,4 @@ backup-settings { - + display: block; + position: relative; } \ No newline at end of file diff --git a/app-src/scripts/settings/backup-settings/backup-settings-d.html b/app-src/scripts/settings/backup-settings/backup-settings-d.html index 6e4562b386..494613c85c 100644 --- a/app-src/scripts/settings/backup-settings/backup-settings-d.html +++ b/app-src/scripts/settings/backup-settings/backup-settings-d.html @@ -2,6 +2,13 @@ Make/Restore Backup + + +

Here you can download all your data as JSON export for backups, but also to use it in a different context (e.g. you might want to export your projects in the browser and import them into the desktop version).

+

The import expects valid json to be copied into the text area. + NOTE: Once you hit the import button all your current settings and data will be overwritten!

+
+ @@ -28,6 +35,10 @@ md-auto-focus rows="3"> + +
NOTE: Once you hit the import button all your current settings and data will be overwritten! +
+ Import settings diff --git a/app-src/scripts/settings/jira-settings/_jira-settings-d.scss b/app-src/scripts/settings/jira-settings/_jira-settings-d.scss index 7db4f920d7..c1ce41887e 100644 --- a/app-src/scripts/settings/jira-settings/_jira-settings-d.scss +++ b/app-src/scripts/settings/jira-settings/_jira-settings-d.scss @@ -1,3 +1,4 @@ jira-settings { - + display: block; + position: relative; } \ No newline at end of file diff --git a/app-src/scripts/settings/jira-settings/jira-settings-d.html b/app-src/scripts/settings/jira-settings/jira-settings-d.html index 531dc79bff..9174d0b965 100644 --- a/app-src/scripts/settings/jira-settings/jira-settings-d.html +++ b/app-src/scripts/settings/jira-settings/jira-settings-d.html @@ -3,6 +3,28 @@ Enable Jira Integration + +
Basic configuration
+

Basic configuration for Jira. You also need to specify a JQL query which is used for the suggestions to add tasks from jira. If you need help check out this link + https://confluence.atlassian.com/jirasoftwarecloud/advanced-searching-764478330.html.

+ +
Worklog settings
+

There are several options to determine when and how you want to submit a worklog. Enabling + 'Open worklog dialog for adding a worklog to jira when task is done' opens a dialog to add an worklog every time you mark a Jira Task as done. So keep in mind that worklogs will be added on top of everything tracked so far. So if you mark a task as done for a second time, you might not want to submit the complete worked time for the task again. +

+

+ 'Open worklog dialog when sub task is done and not for tasks with sub tasks themselves' opens a worklog dialog every time when you mark a sub task of a jira issue as done. Because you already track your time via the sub tasks, no dialog is opened once you mark the Jira task itself as done,. +

+

+ 'Send updates to worklog automatically without dialog' does what it says. Because marking a task as done several times leads to the whole worked time being tracked twice, this is not recommended. +

+ +
Default transitions
+

Here you can reconfigure your default transitions. Because Jira enables a wide configuration of transitions usually coming into action as different columns on your jira agile board we can't make assumptions about where and when to transition your tasks and you need to set it manually.

+ +

Jira-Integration

diff --git a/app-src/scripts/settings/keyboard-settings/_keyboard-settings-d.scss b/app-src/scripts/settings/keyboard-settings/_keyboard-settings-d.scss index 5944171c42..28ba373ff6 100644 --- a/app-src/scripts/settings/keyboard-settings/_keyboard-settings-d.scss +++ b/app-src/scripts/settings/keyboard-settings/_keyboard-settings-d.scss @@ -1,3 +1,4 @@ keyboard-settings { - + display: block; + position: relative; } \ No newline at end of file diff --git a/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.html b/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.html index 7d617d2427..e504bf38bc 100644 --- a/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.html +++ b/app-src/scripts/settings/keyboard-settings/keyboard-settings-d.html @@ -3,6 +3,23 @@ Keyboard Shortcuts + +

Here you can configure all keyboard shortcuts.

+

Click on the text input and enter the desired keyboard combination. Hit enter to save and Escape to abort.

+

There are three types of shortcuts:

+
    +
  • + Global shortcuts: When the app is running it will trigger the action from every other application. +
  • +
  • + Application level shortcuts: Will trigger from every screen of the application, but not if you're currently editing a text field. +
  • +
  • + Task level shortcuts: They will only trigger if you have selected a task via mouse or keyboard and usually trigger an action specifically related to that one task. +
  • +
+
+

Global Shortcuts (system wide)

diff --git a/app-src/scripts/settings/misc-settings/_misc-settings-d.scss b/app-src/scripts/settings/misc-settings/_misc-settings-d.scss index 8392ff0e71..07121405d4 100644 --- a/app-src/scripts/settings/misc-settings/_misc-settings-d.scss +++ b/app-src/scripts/settings/misc-settings/_misc-settings-d.scss @@ -1,3 +1,4 @@ misc-settings { - + display: block; + position: relative; } \ No newline at end of file diff --git a/app-src/scripts/settings/misc-settings/misc-settings-d.html b/app-src/scripts/settings/misc-settings/misc-settings-d.html index d75c30f854..8ddd834bcf 100644 --- a/app-src/scripts/settings/misc-settings/misc-settings-d.html +++ b/app-src/scripts/settings/misc-settings/misc-settings-d.html @@ -2,6 +2,17 @@ Misc Settings + + +
Use short syntax
+

The short syntax can be enabled to quickly create tasks with an estimation already set. If you enter 'TaskTitleBla t:30m' a task with the name 'TaskTitleBla' will be created with the estimation set to 30 minutes.

+ +
+
Enable take a break reminder
+

Allows you to configure a reoccurring reminder when you have worked for a specified amount of time without taking a break.

+
+
+
diff --git a/app-src/scripts/settings/project-settings/_project-settings-d.scss b/app-src/scripts/settings/project-settings/_project-settings-d.scss index dd52fb7ea8..7f7b10f65f 100644 --- a/app-src/scripts/settings/project-settings/_project-settings-d.scss +++ b/app-src/scripts/settings/project-settings/_project-settings-d.scss @@ -1,3 +1,4 @@ project-settings { - + display: block; + position: relative; } \ No newline at end of file diff --git a/app-src/scripts/settings/project-settings/project-settings-d.html b/app-src/scripts/settings/project-settings/project-settings-d.html index eadae9958e..9507e79adb 100644 --- a/app-src/scripts/settings/project-settings/project-settings-d.html +++ b/app-src/scripts/settings/project-settings/project-settings-d.html @@ -3,6 +3,10 @@ Project + +

Here you can add, edit, switch and delete different projects.

+
+
diff --git a/app-src/scripts/settings/theme-settings/_theme-settings-d.scss b/app-src/scripts/settings/theme-settings/_theme-settings-d.scss index 5bd3c41b09..354003ecdb 100644 --- a/app-src/scripts/settings/theme-settings/_theme-settings-d.scss +++ b/app-src/scripts/settings/theme-settings/_theme-settings-d.scss @@ -1,3 +1,4 @@ theme-settings { - + display: block; + position: relative; } \ No newline at end of file diff --git a/app-src/scripts/settings/theme-settings/theme-settings-d.html b/app-src/scripts/settings/theme-settings/theme-settings-d.html index 694f2c02d8..8c5e64e941 100644 --- a/app-src/scripts/settings/theme-settings/theme-settings-d.html +++ b/app-src/scripts/settings/theme-settings/theme-settings-d.html @@ -2,6 +2,11 @@ Select Theme + + +

Select the theme you want to use. Themes are always saved on project level, which means that you can use different themes for different projects.

+
+