From 8e4380a170c815ac5642eb14f70d6bbb458b22c3 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Wed, 22 Jul 2015 14:51:29 +0200
Subject: [PATCH] [ticket/641] Use correct aria roles for elements

B3P-641
---
 .../event/overall_footer_page_body_after.html | 32 +++++++++----------
 .../template/portal/_block_config.html        |  6 ++--
 .../template/portal/portal_body.html          | 10 +++---
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/styles/prosilver/template/event/overall_footer_page_body_after.html b/styles/prosilver/template/event/overall_footer_page_body_after.html
index aa3136fb..e7c7b347 100644
--- a/styles/prosilver/template/event/overall_footer_page_body_after.html
+++ b/styles/prosilver/template/event/overall_footer_page_body_after.html
@@ -20,21 +20,21 @@
 
     <!-- [+] right module area -->
     <!-- IF S_RIGHT_COLUMN -->
-<div id="portal-right" style="width: {S_PORTAL_RIGHT_COLUMN}px; margin-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->: -{S_PORTAL_RIGHT_COLUMN}px;" data-width="{S_PORTAL_RIGHT_COLUMN}" role="gridcell">
-     <!-- BEGIN modules_right -->
-     <!-- DEFINE $TEMPLATE_FILE = '{modules_right.TEMPLATE_FILE}' -->
-     <!-- DEFINE $IMAGE_SRC = '{modules_right.IMAGE_SRC}' -->
-     <!-- DEFINE $IMAGE_WIDTH = '{modules_right.IMAGE_WIDTH}' -->
-     <!-- DEFINE $IMAGE_HEIGHT = '{modules_right.IMAGE_HEIGHT}' -->
-     <!-- DEFINE $CUSTOM_CODE = '{modules_right.CODE}' -->
-     <!-- DEFINE $TITLE = '{modules_right.TITLE}' -->
-     <!-- DEFINE $MODULE_ID = '{modules_right.MODULE_ID}' -->
-     <!-- INCLUDE {$TEMPLATE_FILE} -->
-     <!-- END modules_right -->
+    <div id="portal-right" style="width: {S_PORTAL_RIGHT_COLUMN}px; margin-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->: -{S_PORTAL_RIGHT_COLUMN}px;" data-width="{S_PORTAL_RIGHT_COLUMN}" role="gridcell">
+         <!-- BEGIN modules_right -->
+         <!-- DEFINE $TEMPLATE_FILE = '{modules_right.TEMPLATE_FILE}' -->
+         <!-- DEFINE $IMAGE_SRC = '{modules_right.IMAGE_SRC}' -->
+         <!-- DEFINE $IMAGE_WIDTH = '{modules_right.IMAGE_WIDTH}' -->
+         <!-- DEFINE $IMAGE_HEIGHT = '{modules_right.IMAGE_HEIGHT}' -->
+         <!-- DEFINE $CUSTOM_CODE = '{modules_right.CODE}' -->
+         <!-- DEFINE $TITLE = '{modules_right.TITLE}' -->
+         <!-- DEFINE $MODULE_ID = '{modules_right.MODULE_ID}' -->
+         <!-- INCLUDE {$TEMPLATE_FILE} -->
+         <!-- END modules_right -->
+        </div>
+        <!-- ENDIF -->
+        <!-- [-] right module area -->
+        <br class="portal-clear" />
+        </div>
     </div>
-    <!-- ENDIF -->
-    <!-- [-] right module area -->
-    <br class="portal-clear" />
-    </div>
-</div>
 <!-- ENDIF -->
diff --git a/styles/prosilver/template/portal/_block_config.html b/styles/prosilver/template/portal/_block_config.html
index 3929d4de..1ded7d7f 100644
--- a/styles/prosilver/template/portal/_block_config.html
+++ b/styles/prosilver/template/portal/_block_config.html
@@ -1,17 +1,17 @@
 <!-- Config for the left and right blocks //-->
-<!-- DEFINE $LR_BLOCK_H_L = '<div class="forabg"><div class="inner"><ul class="topiclist"><li class="header"><dl><dt style="padding: 0px 0px 2px; white-space: nowrap; margin-bottom: 0px; margin-top: 0px;">' -->
+<!-- DEFINE $LR_BLOCK_H_L = '<div class="forabg" role="row"><div class="inner"><ul class="topiclist"><li class="header"><dl><dt style="padding: 0px 0px 2px; white-space: nowrap; margin-bottom: 0px; margin-top: 0px;">' -->
 <!-- DEFINE $LR_BLOCK_H_R = '</dt><dd></dd></dl></li></ul><ul class="topiclist forums"><li><dl><dt></dt><dd class="portal-side-wrapper"><div class="portal-side">' -->
 <!-- DEFINE $LR_BLOCK_F_L = '</div></dd></dl></li></ul>' -->
 <!-- DEFINE $LR_BLOCK_F_R = '</div></div><br class="portal-clear" />' -->
 
 <!-- Config for the center blocks //-->
-<!-- DEFINE $C_BLOCK_H_L = '<div class="forabg"><div class="inner"><ul class="topiclist"><li class="header"><dl class="icon"><dt>' -->
+<!-- DEFINE $C_BLOCK_H_L = '<div class="forabg" role="row"><div class="inner"><ul class="topiclist"><li class="header"><dl class="icon"><dt>' -->
 <!-- DEFINE $C_BLOCK_H_R = '</dt><dd></dd></dl></li></ul>' -->
 <!-- DEFINE $C_BLOCK_F_L = ' ' -->
 <!-- DEFINE $C_BLOCK_F_R = '</div></div><br class="portal-clear" />' -->
 
 <!-- Config for compact blocks //-->
-<!-- DEFINE $CC_BLOCK_H_L = '<div class="forabg"><div class="inner"><ul class="topiclist"><li class="header"><dl class="icon">' -->
+<!-- DEFINE $CC_BLOCK_H_L = '<div class="forabg" role="row"><div class="inner"><ul class="topiclist"><li class="header"><dl class="icon">' -->
 <!-- DEFINE $CC_BLOCK_H_R = '</dl></li></ul>' -->
 
 <!-- Images-URL //-->
diff --git a/styles/prosilver/template/portal/portal_body.html b/styles/prosilver/template/portal/portal_body.html
index cebf8698..64a74408 100644
--- a/styles/prosilver/template/portal/portal_body.html
+++ b/styles/prosilver/template/portal/portal_body.html
@@ -3,7 +3,7 @@
 
 <div id="portal-body" role="grid">
 	<!-- IF S_TOP_COLUMN -->	
-	<div id="portal-top" role="gridcell">
+	<div id="portal-top" role="rowgroup">
 	<!-- [+] top module area -->
 		<ul>
 			<li>
@@ -25,7 +25,7 @@
 	<!-- [+] center module area -->
 	<!-- IF S_CENTER_COLUMN -->
 	<div id="portal-center-wrapper">
-		<div id="portal-center" style="margin: 0 <!-- IF S_RIGHT_COLUMN -->{S_PORTAL_RIGHT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF --> 0 <!-- IF S_LEFT_COLUMN -->{S_PORTAL_LEFT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF -->; padding: 0 {$BLOCK_DISTANCE};" role="gridcell">
+		<div id="portal-center" style="margin: 0 <!-- IF S_RIGHT_COLUMN -->{S_PORTAL_RIGHT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF --> 0 <!-- IF S_LEFT_COLUMN -->{S_PORTAL_LEFT_COLUMN}px<!-- ELSE -->-{$BLOCK_DISTANCE}<!-- ENDIF -->; padding: 0 {$BLOCK_DISTANCE};" role="rowgroup">
 			<!-- BEGIN modules_center -->
 				<!-- DEFINE $TEMPLATE_FILE = '{modules_center.TEMPLATE_FILE}' -->
 				<!-- DEFINE $IMAGE_SRC = '{modules_center.IMAGE_SRC}' -->
@@ -46,7 +46,7 @@
 	<!-- [-] center module area -->
 	<!-- [+] left module area -->
 		<!-- IF S_LEFT_COLUMN -->
-		<div id="portal-left" style="width: {S_PORTAL_LEFT_COLUMN}px;" role="gridcell">
+		<div id="portal-left" style="width: {S_PORTAL_LEFT_COLUMN}px;" role="rowgroup">
 			<!-- BEGIN modules_left -->
 				<!-- DEFINE $TEMPLATE_FILE = '{modules_left.TEMPLATE_FILE}' -->
 				<!-- DEFINE $IMAGE_SRC = '{modules_left.IMAGE_SRC}' -->
@@ -63,7 +63,7 @@
 
 	<!-- [+] right module area -->
 		<!-- IF S_RIGHT_COLUMN -->
-		<div id="portal-right" style="width: {S_PORTAL_RIGHT_COLUMN}px; margin-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->: -{S_PORTAL_RIGHT_COLUMN}px;" data-width="{S_PORTAL_RIGHT_COLUMN}" role="gridcell">
+		<div id="portal-right" style="width: {S_PORTAL_RIGHT_COLUMN}px; margin-<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->right<!-- ELSE -->left<!-- ENDIF -->: -{S_PORTAL_RIGHT_COLUMN}px;" data-width="{S_PORTAL_RIGHT_COLUMN}" role="rowgroup">
 			<!-- BEGIN modules_right -->
 				<!-- DEFINE $TEMPLATE_FILE = '{modules_right.TEMPLATE_FILE}' -->
 				<!-- DEFINE $IMAGE_SRC = '{modules_right.IMAGE_SRC}' -->
@@ -79,7 +79,7 @@
 	<!-- [-] right module area -->
 	<br class="portal-clear" />
 	<!-- IF S_BOTTOM_COLUMN -->
-	<div id="portal-bottom" role="gridcell">
+	<div id="portal-bottom" role="rowgroup">
 	<!-- [+] bottom module area -->
 		<ul>
 			<li>