11 files changed, 24 insertions, 24 deletions
diff --git a/lib/dijit/templates/Calendar.html b/lib/dijit/templates/Calendar.html
index a3428f5c7..b4405ed84 100644
--- a/lib/dijit/templates/Calendar.html
+++ b/lib/dijit/templates/Calendar.html
@@ -14,7 +14,7 @@
 				<span data-dojo-attach-point="increaseArrowNode" class="dijitA11ySideArrow">+</span>
 			</th>
 		</tr>
-		<tr>
+		<tr role="row">
 			${!dayCellsHtml}
 		</tr>
 	</thead>
diff --git a/lib/dijit/templates/CheckedMenuItem.html b/lib/dijit/templates/CheckedMenuItem.html
index 8e1bf5773..71a0824d9 100644
--- a/lib/dijit/templates/CheckedMenuItem.html
+++ b/lib/dijit/templates/CheckedMenuItem.html
@@ -1,5 +1,4 @@
-<tr class="dijitReset dijitMenuItem" data-dojo-attach-point="focusNode" role="menuitemcheckbox" tabIndex="-1"
-		data-dojo-attach-event="onmouseenter:_onHover,onmouseleave:_onUnhover,ondijitclick:_onClick">
+<tr class="dijitReset dijitMenuItem" data-dojo-attach-point="focusNode" role="menuitemcheckbox" tabIndex="-1">
 	<td class="dijitReset dijitMenuItemIconCell" role="presentation">
 		<img src="${_blankGif}" alt="" class="dijitMenuItemIcon dijitCheckedMenuItemIcon" data-dojo-attach-point="iconNode"/>
 		<span class="dijitCheckedMenuItemIconChar">&#10003;</span>
diff --git a/lib/dijit/templates/Dialog.html b/lib/dijit/templates/Dialog.html
index 1e4a2237a..0de2225ab 100644
--- a/lib/dijit/templates/Dialog.html
+++ b/lib/dijit/templates/Dialog.html
@@ -1,9 +1,10 @@
 <div class="dijitDialog" role="dialog" aria-labelledby="${id}_title">
 	<div data-dojo-attach-point="titleBar" class="dijitDialogTitleBar">
-	<span data-dojo-attach-point="titleNode" class="dijitDialogTitle" id="${id}_title"></span>
-	<span data-dojo-attach-point="closeButtonNode" class="dijitDialogCloseIcon" data-dojo-attach-event="ondijitclick: onCancel" title="${buttonCancel}" role="button" tabIndex="-1">
-		<span data-dojo-attach-point="closeText" class="closeText" title="${buttonCancel}">x</span>
-	</span>
+		<span data-dojo-attach-point="titleNode" class="dijitDialogTitle" id="${id}_title"
+				role="heading" level="1"></span>
+		<span data-dojo-attach-point="closeButtonNode" class="dijitDialogCloseIcon" data-dojo-attach-event="ondijitclick: onCancel" title="${buttonCancel}" role="button" tabIndex="-1">
+			<span data-dojo-attach-point="closeText" class="closeText" title="${buttonCancel}">x</span>
+		</span>
 	</div>
-		<div data-dojo-attach-point="containerNode" class="dijitDialogPaneContent"></div>
+	<div data-dojo-attach-point="containerNode" class="dijitDialogPaneContent"></div>
 </div>
diff --git a/lib/dijit/templates/InlineEditBox.html b/lib/dijit/templates/InlineEditBox.html
index 75451e31f..d6c7096dc 100644
--- a/lib/dijit/templates/InlineEditBox.html
+++ b/lib/dijit/templates/InlineEditBox.html
@@ -1,10 +1,10 @@
-<span data-dojo-attach-point="editNode" role="presentation" style="position: absolute; visibility:hidden" class="dijitReset dijitInline"
+<span data-dojo-attach-point="editNode" role="presentation" class="dijitReset dijitInline dijitOffScreen"
 	data-dojo-attach-event="onkeypress: _onKeyPress"
 	><span data-dojo-attach-point="editorPlaceholder"></span
 	><span data-dojo-attach-point="buttonContainer"
-		><button data-dojo-type="dijit.form.Button" data-dojo-props="label: '${buttonSave}', 'class': 'saveButton'"
+		><button data-dojo-type="dijit/form/Button" data-dojo-props="label: '${buttonSave}', 'class': 'saveButton'"
 			data-dojo-attach-point="saveButton" data-dojo-attach-event="onClick:save"></button
-		><button data-dojo-type="dijit.form.Button"  data-dojo-props="label: '${buttonCancel}', 'class': 'cancelButton'"
+		><button data-dojo-type="dijit/form/Button"  data-dojo-props="label: '${buttonCancel}', 'class': 'cancelButton'"
 			data-dojo-attach-point="cancelButton" data-dojo-attach-event="onClick:cancel"></button
 	></span
 ></span>
diff --git a/lib/dijit/templates/Menu.html b/lib/dijit/templates/Menu.html
index 45e12a011..2c3cb53ba 100644
--- a/lib/dijit/templates/Menu.html
+++ b/lib/dijit/templates/Menu.html
@@ -1,3 +1,4 @@
-<table class="dijit dijitMenu dijitMenuPassive dijitReset dijitMenuTable" role="menu" tabIndex="${tabIndex}" data-dojo-attach-event="onkeypress:_onKeyPress" cellspacing="0">
+<table class="dijit dijitMenu dijitMenuPassive dijitReset dijitMenuTable" role="menu" tabIndex="${tabIndex}"
+	   data-dojo-attach-event="onkeypress:_onKeyPress" cellspacing="0">
 	<tbody class="dijitReset" data-dojo-attach-point="containerNode"></tbody>
 </table>
diff --git a/lib/dijit/templates/MenuBarItem.html b/lib/dijit/templates/MenuBarItem.html
index f5e262966..f236dfe01 100644
--- a/lib/dijit/templates/MenuBarItem.html
+++ b/lib/dijit/templates/MenuBarItem.html
@@ -1,4 +1,4 @@
-<div class="dijitReset dijitInline dijitMenuItem dijitMenuItemLabel" data-dojo-attach-point="focusNode" role="menuitem" tabIndex="-1"
-		data-dojo-attach-event="onmouseenter:_onHover,onmouseleave:_onUnhover,ondijitclick:_onClick">
+<div class="dijitReset dijitInline dijitMenuItem dijitMenuItemLabel" data-dojo-attach-point="focusNode"
+	 	role="menuitem" tabIndex="-1">
 	<span data-dojo-attach-point="containerNode"></span>
 </div>
diff --git a/lib/dijit/templates/MenuItem.html b/lib/dijit/templates/MenuItem.html
index b4fe7d603..920038435 100644
--- a/lib/dijit/templates/MenuItem.html
+++ b/lib/dijit/templates/MenuItem.html
@@ -1,5 +1,4 @@
-<tr class="dijitReset dijitMenuItem" data-dojo-attach-point="focusNode" role="menuitem" tabIndex="-1"
-		data-dojo-attach-event="onmouseenter:_onHover,onmouseleave:_onUnhover,ondijitclick:_onClick">
+<tr class="dijitReset dijitMenuItem" data-dojo-attach-point="focusNode" role="menuitem" tabIndex="-1">
 	<td class="dijitReset dijitMenuItemIconCell" role="presentation">
 		<img src="${_blankGif}" alt="" class="dijitIcon dijitMenuItemIcon" data-dojo-attach-point="iconNode"/>
 	</td>
diff --git a/lib/dijit/templates/TitlePane.html b/lib/dijit/templates/TitlePane.html
index 4e7aece4f..4990bfb1d 100644
--- a/lib/dijit/templates/TitlePane.html
+++ b/lib/dijit/templates/TitlePane.html
@@ -1,6 +1,6 @@
 <div>
-	<div data-dojo-attach-event="onclick:_onTitleClick, onkeypress:_onTitleKey"
-			class="dijitTitlePaneTitle" data-dojo-attach-point="titleBarNode">
+	<div data-dojo-attach-event="onclick:_onTitleClick, onkeydown:_onTitleKey"
+			class="dijitTitlePaneTitle" data-dojo-attach-point="titleBarNode" id="${id}_titleBarNode">
 		<div class="dijitTitlePaneTitleFocus" data-dojo-attach-point="focusNode">
 			<img src="${_blankGif}" alt="" data-dojo-attach-point="arrowNode" class="dijitArrowNode" role="presentation"
 			/><span data-dojo-attach-point="arrowNodeInner" class="dijitArrowNodeInner"></span
@@ -9,7 +9,7 @@
 	</div>
 	<div class="dijitTitlePaneContentOuter" data-dojo-attach-point="hideNode" role="presentation">
 		<div class="dijitReset" data-dojo-attach-point="wipeNode" role="presentation">
-			<div class="dijitTitlePaneContentInner" data-dojo-attach-point="containerNode" role="region" id="${id}_pane">
+			<div class="dijitTitlePaneContentInner" data-dojo-attach-point="containerNode" role="region" id="${id}_pane" aria-labelledby="${id}_titleBarNode">
 				<!-- nested divs because wipeIn()/wipeOut() doesn't work right on node w/padding etc.  Put padding on inner div. -->
 			</div>
 		</div>
diff --git a/lib/dijit/templates/TooltipDialog.html b/lib/dijit/templates/TooltipDialog.html
index 00a6022e2..52d26abb1 100644
--- a/lib/dijit/templates/TooltipDialog.html
+++ b/lib/dijit/templates/TooltipDialog.html
@@ -2,5 +2,5 @@
 	<div class="dijitTooltipContainer" role="presentation">
 		<div class ="dijitTooltipContents dijitTooltipFocusNode" data-dojo-attach-point="containerNode" role="dialog"></div>
 	</div>
-	<div class="dijitTooltipConnector" role="presentation"></div>
+	<div class="dijitTooltipConnector" role="presentation" data-dojo-attach-point="connectorNode"></div>
 </div>
diff --git a/lib/dijit/templates/Tree.html b/lib/dijit/templates/Tree.html
index 4e1b9432e..9d00191bf 100644
--- a/lib/dijit/templates/Tree.html
+++ b/lib/dijit/templates/Tree.html
@@ -1,4 +1,3 @@
-<div class="dijitTree dijitTreeContainer" role="tree"
-	data-dojo-attach-event="onkeypress:_onKeyPress">
+<div class="dijitTree dijitTreeContainer" role="tree">
 	<div class="dijitInline dijitTreeIndent" style="position: absolute; top: -9999px" data-dojo-attach-point="indentDetector"></div>
 </div>
diff --git a/lib/dijit/templates/TreeNode.html b/lib/dijit/templates/TreeNode.html
index f55450cc3..ae3e66a0d 100644
--- a/lib/dijit/templates/TreeNode.html
+++ b/lib/dijit/templates/TreeNode.html
@@ -1,12 +1,13 @@
 <div class="dijitTreeNode" role="presentation"
-	><div data-dojo-attach-point="rowNode" class="dijitTreeRow" role="presentation" data-dojo-attach-event="onmouseenter:_onMouseEnter, onmouseleave:_onMouseLeave, onclick:_onClick, ondblclick:_onDblClick"
+	><div data-dojo-attach-point="rowNode" class="dijitTreeRow dijitInline" role="presentation"
+		><div data-dojo-attach-point="indentNode" class="dijitInline"></div
 		><img src="${_blankGif}" alt="" data-dojo-attach-point="expandoNode" class="dijitTreeExpando" role="presentation"
 		/><span data-dojo-attach-point="expandoNodeText" class="dijitExpandoText" role="presentation"
 		></span
 		><span data-dojo-attach-point="contentNode"
 			class="dijitTreeContent" role="presentation">
 			<img src="${_blankGif}" alt="" data-dojo-attach-point="iconNode" class="dijitIcon dijitTreeIcon" role="presentation"
-			/><span data-dojo-attach-point="labelNode" class="dijitTreeLabel" role="treeitem" tabindex="-1" aria-selected="false" data-dojo-attach-event="onfocus:_onLabelFocus"></span>
+			/><span data-dojo-attach-point="labelNode" class="dijitTreeLabel" role="treeitem" tabindex="-1" aria-selected="false"></span>
 		</span
 	></div>
 	<div data-dojo-attach-point="containerNode" class="dijitTreeContainer" role="presentation" style="display: none;"></div>