diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/umbkeyboardshortcutsoverview.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbkeyboardshortcutsoverview.directive.js new file mode 100644 index 0000000000..408f698d49 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/umbkeyboardshortcutsoverview.directive.js @@ -0,0 +1,31 @@ +(function() { + 'use strict'; + + function KeyboardShortcutsOverview() { + + function link(scope, el, attr, ctrl) { + + scope.shortcutOverlay = false; + + scope.toggleShortcutsOverlay = function() { + scope.shortcutOverlay = !scope.shortcutOverlay; + }; + + } + + var directive = { + restrict: 'E', + replace: true, + templateUrl: 'views/components/umb-keyboard-shortcuts-overview.html', + link: link, + scope: { + model: "=" + } + }; + + return directive; + } + + angular.module('umbraco.directives').directive('umbKeyboardShortcutsOverview', KeyboardShortcutsOverview); + +})(); diff --git a/src/Umbraco.Web.UI.Client/src/less/belle.less b/src/Umbraco.Web.UI.Client/src/less/belle.less index 8fe11f6292..bacc73a8f3 100644 --- a/src/Umbraco.Web.UI.Client/src/less/belle.less +++ b/src/Umbraco.Web.UI.Client/src/less/belle.less @@ -98,6 +98,7 @@ @import "components/umb-group-builder.less"; @import "components/umb-list-view.less"; @import "components/umb-confirm-delete.less"; +@import "components/umb-keyboard-shortcuts-overview.less"; @import "components/umb-file-dropzone.less"; diff --git a/src/Umbraco.Web.UI.Client/src/less/components/umb-keyboard-shortcuts-overview.less b/src/Umbraco.Web.UI.Client/src/less/components/umb-keyboard-shortcuts-overview.less new file mode 100644 index 0000000000..3368100922 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/less/components/umb-keyboard-shortcuts-overview.less @@ -0,0 +1,77 @@ + +/* ---------- OVERLAY ---------- */ + +.umb-keyboard-shortcuts-overview__overlay { + position: fixed; + width: 100%; + height: 100%; + top: 0; + left: 0; + background: rgb(255, 255, 255); + z-index: 1000; + animation: fadeIn 0.2s; + box-sizing: border-box; + padding-left: 440px; +} + +.umb-keyboard-shortcuts-overview__overlay-close { + position: absolute; + top: 10px; + right: 10px; +} + +.umb-keyboard-shortcuts-overview__overlay-content { + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; + width: 100%; + height: 100%; +} + +.umb-keyboard-shortcuts-overview__keyboard-shortcuts-group { + width: 50%; + margin-bottom: 10px; +} + +.umb-keyboard-shortcuts-overview__keyboard-shortcuts-group-name { + margin-bottom: 0; +} + +.umb-keyboard-shortcuts-overview__keyboard-shortcut { + display: flex; + justify-content: space-between; + align-items: center; + padding: 7px 0; + border-bottom: 1px solid @grayLight; +} + +.umb-keyboard-shortcuts-overview__description { + font-weight: bold; + font-size: 13px; + margin-right: 10px; +} + +/* ---------- KEYBOARD KEYS ---------- */ + +.umb-keyboard-keys { + list-style: none; + display: flex; + font-size: 12px; + align-items: center; +} + +.umb-keyboard-key-wrapper { + display: flex; + margin-right: 5px; + align-items: center; +} + +.umb-keyboard-key { + background: #ffffff; + border: 1px solid @grayLight; + color: @gray; + border-radius: 5px; + margin-right: 5px; + padding: 1px 7px; +} diff --git a/src/Umbraco.Web.UI.Client/src/less/panel.less b/src/Umbraco.Web.UI.Client/src/less/panel.less index efde321e79..9c0384127c 100644 --- a/src/Umbraco.Web.UI.Client/src/less/panel.less +++ b/src/Umbraco.Web.UI.Client/src/less/panel.less @@ -444,4 +444,8 @@ input.umb-panel-header-description { } } - +.umb-editor-drawer-content { + display: flex; + align-items: center; + justify-content: space-between; +} diff --git a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer.html b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer.html index 8b798b5c77..3052636851 100644 --- a/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer.html +++ b/src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-footer.html @@ -1,7 +1,7 @@ 
- - -
- + +
+
-
\ No newline at end of file + +
diff --git a/src/Umbraco.Web.UI.Client/src/views/components/umb-keyboard-shortcuts-overview.html b/src/Umbraco.Web.UI.Client/src/views/components/umb-keyboard-shortcuts-overview.html new file mode 100644 index 0000000000..c6cf159f50 --- /dev/null +++ b/src/Umbraco.Web.UI.Client/src/views/components/umb-keyboard-shortcuts-overview.html @@ -0,0 +1,51 @@ +
+ +
+
show shortcuts
+
+
+
alt
+
+
+
+
+
shift
+
+
+
+
+
k
+
+
+
+ +
+ + + + + +
+ +
+ +
{{ keyboardShortcutGroup.name }}
+ +
+ +
+
{{ keyboardShortcut.description }}
+
+
+
{{ key.key }}
+
+
+
+
+
+ +
+ +
+ +
+
+ +
diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/documenttype/edit.controller.js index 26689fdf86..fa103aa52f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttype/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/edit.controller.js @@ -42,6 +42,47 @@ } ]; + vm.page.keyboardShortcutsOverview = [ + { + "name": "Design", + "shortcuts": [ + { + "description": "Add tab", + "keys": [{"key": "alt"},{"key": "shift"},{"key": "t"}] + }, + { + "description": "Add property", + "keys": [{"key": "alt"},{"key": "shift"},{"key": "p"}] + }, + { + "description": "Add editor", + "keys": [{"key": "alt"},{"key": "shift"},{"key": "e"}] + }, + { + "description": "Edit data type", + "keys": [{"key": "alt"},{"key": "shift"},{"key": "d"}] + } + ] + }, + { + "name": "List view", + "shortcuts": [ + { + "description": "Toggle list view", + "keys": [{"key": "alt"},{"key": "shift"},{"key": "l"}] + } + ] + }, + { + "name": "Permissions", + "shortcuts": [ + { + "description": "Toggle allow as root", + "keys": [{"key": "alt"},{"key": "shift"},{"key": "r"}] + } + ] + } + ]; if ($routeParams.create) { //we are creating so get an empty data type item diff --git a/src/Umbraco.Web.UI.Client/src/views/documenttype/edit.html b/src/Umbraco.Web.UI.Client/src/views/documenttype/edit.html index 38b7e5a3e1..e00eea65e7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/documenttype/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/documenttype/edit.html @@ -26,9 +26,17 @@ + + + + +
+
+