diff --git a/core/language/en-GB/SideBar.multids b/core/language/en-GB/SideBar.multids index b109f3a9b..c4fda9c81 100644 --- a/core/language/en-GB/SideBar.multids +++ b/core/language/en-GB/SideBar.multids @@ -1,5 +1,6 @@ title: $:/language/SideBar/ +Caption: Sidebar All/Caption: All Contents/Caption: Contents Drafts/Caption: Drafts diff --git a/core/modules/widgets/button.js b/core/modules/widgets/button.js index 107977ac0..a32820e8b 100644 --- a/core/modules/widgets/button.js +++ b/core/modules/widgets/button.js @@ -46,7 +46,8 @@ ButtonWidget.prototype.render = function(parent,nextSibling) { isPoppedUp = (this.popup || this.popupTitle) && this.isPoppedUp(); if(this.selectedClass) { if((this.set || this.setTitle) && this.setTo && this.isSelected()) { - $tw.utils.pushTop(classes,this.selectedClass.split(" ")); + $tw.utils.pushTop(classes, this.selectedClass.split(" ")); + domNode.setAttribute("aria-checked", "true"); } if(isPoppedUp) { $tw.utils.pushTop(classes,this.selectedClass.split(" ")); @@ -66,6 +67,9 @@ ButtonWidget.prototype.render = function(parent,nextSibling) { if(this["aria-label"]) { domNode.setAttribute("aria-label",this["aria-label"]); } + if (this.role) { + domNode.setAttribute("role", this.role); + } if(this.popup || this.popupTitle) { domNode.setAttribute("aria-expanded",isPoppedUp ? "true" : "false"); } @@ -206,6 +210,7 @@ ButtonWidget.prototype.execute = function() { this.popup = this.getAttribute("popup"); this.hover = this.getAttribute("hover"); this["aria-label"] = this.getAttribute("aria-label"); + this.role = this.getAttribute("role"); this.tooltip = this.getAttribute("tooltip"); this.style = this.getAttribute("style"); this["class"] = this.getAttribute("class",""); diff --git a/core/templates/server/static.sidebar.wikitext.tid b/core/templates/server/static.sidebar.wikitext.tid index 5ac53703e..b0cf553f6 100644 --- a/core/templates/server/static.sidebar.wikitext.tid +++ b/core/templates/server/static.sidebar.wikitext.tid @@ -1,7 +1,7 @@ title: $:/core/templates/server/static.sidebar.wikitext \whitespace trim -