Resolved conflict.

wet-boew · Oct 3, 2012 · e1c6458 · e1c6458
2 parents 16c4fdf + fc560de
commit e1c6458
Show file tree

Hide file tree

Showing 27 changed files with 7,222 additions and 5,481 deletions.
diff --git a/src/build-css-head-release.txt → build/build-css-head-release.txt b/src/build-css-head-release.txt → build/build-css-head-release.txt
diff --git a/src/build-css-head.txt → build/build-css-head.txt b/src/build-css-head.txt → build/build-css-head.txt
diff --git a/src/build-js-head-release.txt → build/build-js-head-release.txt b/src/build-js-head-release.txt → build/build-js-head-release.txt
diff --git a/src/build-js-head.txt → build/build-js-head.txt b/src/build-js-head.txt → build/build-js-head.txt
diff --git a/build/js/dependencies/colorbox-min.js b/build/js/dependencies/colorbox-min.js
diff --git a/build/js/jquery.mobile/jquery.mobile.min.js b/build/js/jquery.mobile/jquery.mobile.min.js
diff --git a/build/theme-gcwu-fegc/css/jquery.mobile-min.css b/build/theme-gcwu-fegc/css/jquery.mobile-min.css
diff --git a/build/theme-gcwu-fegc/css/theme-ie-min.css b/build/theme-gcwu-fegc/css/theme-ie-min.css
diff --git a/build/theme-gcwu-fegc/css/theme-min.css b/build/theme-gcwu-fegc/css/theme-min.css
diff --git a/build/theme-gcwu-intranet/css/jquery.mobile-min.css b/build/theme-gcwu-intranet/css/jquery.mobile-min.css
diff --git a/build/theme-gcwu-intranet/css/theme-ie-min.css b/build/theme-gcwu-intranet/css/theme-ie-min.css
diff --git a/build/theme-gcwu-intranet/css/theme-min.css b/build/theme-gcwu-intranet/css/theme-min.css
diff --git a/demos/tableparser/headerrowgroupstructure-techniques.html b/demos/tableparser/headerrowgroupstructure-techniques.html
@@ -458,7 +458,7 @@ <h3>Expected Result</h3>
 </ul>
 
 <h3>Test File 1</h3>
-<p>This Test File 1 <strong>fail</strong> this technique</p>
+<p>This Test File 1 <strong>fail</strong> this technique. The HTML Table Validator would show a warning. See the Test File 6 for an example that would pass.</p>
 
 <table>
 	<caption>Table 3</caption>
@@ -478,6 +478,38 @@ <h3>Test File 1</h3>
 		<td>Data</td>
 		<td>Data</td>
 	</tr>
+	<tr>
+		<th>Row Header</th>
+		<th>Row Header</th>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+	</tr>
+	<tr>
+		<th>Row Header</th>
+		<th>Row Header</th>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+	</tr>
+	<tr>
+		<th>Row Header</th>
+		<th>Row Header</th>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+	</tr>
+	<tr>
+		<th>Row Header</th>
+		<th>Row Header</th>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+	</tr>
 </table>
 
 <details>
@@ -500,6 +532,38 @@ <h3>Test File 1</h3>
 		&lt;td&gt;Data&lt;/td&gt;
 		&lt;td&gt;Data&lt;/td&gt;
 	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+	&lt;/tr&gt;
 &lt;/table&gt;</code></pre>
 </details>
 
@@ -791,6 +855,117 @@ <h3>Test File 5</h3>
 </code></pre>
 </details>
 
+
+
+
+
+<h3>Test File 6</h3>
+<p>This Test File 6 <strong>pass</strong> this technique. Even if the HTML Table Validator show an warning, this test pass because the heading row structure patern are not the same for all row. So here the paralel heading don't have the same signification as the one illustrated in the Test File 1.</p>
+
+<table class="wet-boew-zebra">
+	<caption>Table 3</caption>
+	<tr>
+		<th>Row Header</th>
+		<th>Row Header</th>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+	</tr>
+	<tr>
+		<th>Row Header</th>
+		<th>Row Header</th>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+	</tr>
+	<tr>
+		<th rowspan="2">Row Header</th>
+		<th>Row Header</th>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+	</tr>
+	<tr>
+		<th>Row Header</th>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+	</tr>
+	<tr>
+		<th rowspan="2">Row Header</th>
+		<th>Row Header</th>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+	</tr>
+	<tr>
+		<th>Row Header</th>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+		<td>Data</td>
+	</tr>
+</table>
+
+<details>
+	<summary>Table Source Code</summary>
+<pre><code>&lt;table&gt;
+	&lt;caption&gt;Table 3&lt;/caption&gt;
+	&lt;tr&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;th rowspan=&quot;2&quot;&gt;Row Header&lt;/th&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;th rowspan=&quot;2&quot;&gt;Row Header&lt;/th&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+	&lt;/tr&gt;
+	&lt;tr&gt;
+		&lt;th&gt;Row Header&lt;/th&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+		&lt;td&gt;Data&lt;/td&gt;
+	&lt;/tr&gt;
+&lt;/table&gt;</code></pre>
+</details>
+
+
 <!--
 <h2>Additional Notes<h2>