From 76a690ea7a1ec67ab149fa3c18d1bc69f3533fb3 Mon Sep 17 00:00:00 2001 From: Rachel Breeze Date: Wed, 30 Oct 2019 17:24:59 +0000 Subject: [PATCH 1/4] Improved accessibility of the data type edit controller, by implementing the new header directive properties for screen reader only text, and for setting the page title --- .../src/views/datatypes/datatype.edit.controller.js | 6 +++++- src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html | 4 +++- src/Umbraco.Web.UI/Umbraco/config/lang/en.xml | 5 +++-- src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml | 5 +++-- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js index 15fb103ecda5..8b5ead00425d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/datatype.edit.controller.js @@ -10,7 +10,11 @@ function DataTypeEditController($scope, $routeParams, appState, navigationServic var evts = []; var vm = this; - + + vm.header = {}; + vm.header.editorfor = "visuallyHiddenTexts_newDataType"; + vm.header.setPageTitle = true; + //setup scope vars vm.page = {}; vm.page.loading = false; diff --git a/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html index 0bb2b01e31bd..2d481de852c3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/datatypes/edit.html @@ -8,7 +8,9 @@ hide-icon="true" hide-description="true" hide-alias="true" - navigation="vm.page.navigation"> + navigation="vm.page.navigation" + editorfor="vm.header.editorfor" + setpagetitle="vm.header.setPageTitle"> diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml index 9b049ca40a0b..bad8030a7608 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en.xml @@ -2167,7 +2167,8 @@ To manage your website, simply open the Umbraco back office and start adding con Create new folder Partial View Partial View Macro - Member + Member + Data type References @@ -2209,4 +2210,4 @@ To manage your website, simply open the Umbraco back office and start adding con Open - \ No newline at end of file + diff --git a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml index 56b9bb2d9bbd..8f6167d17f4d 100644 --- a/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml +++ b/src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml @@ -2183,7 +2183,8 @@ To manage your website, simply open the Umbraco back office and start adding con Create new folder Partial View Partial View Macro - Member + Member + Data type References @@ -2224,4 +2225,4 @@ To manage your website, simply open the Umbraco back office and start adding con Find Logs with Machine Name Open - \ No newline at end of file + From 9a8f069b38f02bc29e4b748e19ef8d78a3ec4a44 Mon Sep 17 00:00:00 2001 From: Rachel Breeze Date: Wed, 30 Oct 2019 17:29:29 +0000 Subject: [PATCH 2/4] Improved accessibility of the macro edit controller, by implementing the new header directive properties for screen reader only text, and for setting the page title --- src/Umbraco.Web.UI.Client/src/views/macros/edit.html | 3 ++- .../src/views/macros/macros.edit.controller.js | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/edit.html b/src/Umbraco.Web.UI.Client/src/views/macros/edit.html index ddb5f9878112..9640419ee2e5 100644 --- a/src/Umbraco.Web.UI.Client/src/views/macros/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/macros/edit.html @@ -6,7 +6,8 @@ alias="vm.macro.alias" hide-description="true" hide-icon="true" - navigation="vm.page.navigation"> + navigation="vm.page.navigation"editorfor="vm.header.editorfor" + setpagetitle="vm.header.setPageTitle"> diff --git a/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js index 272e5dd03ad0..3261739d362f 100644 --- a/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/macros/macros.edit.controller.js @@ -11,7 +11,10 @@ function MacrosEditController($scope, $q, $routeParams, macroResource, editorSta var vm = this; vm.promises = {}; - + vm.header = {}; + vm.header.editorfor = "general_macro"; + vm.header.setPageTitle = true; + vm.page = {}; vm.page.loading = false; vm.page.saveButtonState = "init"; From f1b9d7ae35299f76355e91fe4e1c557614c12574 Mon Sep 17 00:00:00 2001 From: Rachel Breeze Date: Wed, 30 Oct 2019 17:33:45 +0000 Subject: [PATCH 3/4] Improved accessibility of the relation type edit controller, by implementing the new header directive properties for screen reader only text, and for setting the page title --- .../src/views/relationtypes/edit.controller.js | 4 ++++ src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.html | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js index 138e3e90e2e0..ef77086343a4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.controller.js @@ -10,6 +10,10 @@ function RelationTypeEditController($scope, $routeParams, relationTypeResource, var vm = this; + vm.header = {}; + vm.header.editorfor = "relationType_tabRelationType"; + vm.header.setPageTitle = true; + vm.page = {}; vm.page.loading = false; vm.page.saveButtonState = "init"; diff --git a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.html b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.html index 2c86161bda00..35e7aa517618 100644 --- a/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/relationtypes/edit.html @@ -8,7 +8,9 @@ alias="vm.relationType.alias" hide-description="true" hide-icon="true" - navigation="vm.page.navigation"> + navigation="vm.page.navigation" + editorfor="vm.header.editorfor" + setpagetitle="vm.header.setPageTitle"> From cb32e5986f03956581e6de76a2f4be10d1c7fc8a Mon Sep 17 00:00:00 2001 From: Rachel Breeze Date: Wed, 30 Oct 2019 17:37:00 +0000 Subject: [PATCH 4/4] Added to do note for log viewer --- .../directives/components/editor/umbeditorheader.directive.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js index 5607251a7f36..b447529e089d 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorheader.directive.js @@ -223,7 +223,8 @@ Use this directive to construct a header inside the main editor window. if (editorState.current) { //to do make work for user create/edit // to do make it work for user group create/ edit - // to make it work for language edit/create + // to do make it work for language edit/create + // to do make it work for log viewer scope.isNew = editorState.current.id === 0 || editorState.current.id === "0" || editorState.current.id === -1 ||