Skip to content

Commit

Permalink
Merge branch 'master' into feature-multimedia-player
Browse files Browse the repository at this point in the history
Conflicts:
	build/js/css/pe-ap-ie-min.css
	build/js/css/pe-ap-min.css
	build/js/pe-ap-min.js
  • Loading branch information
LaurentGoderre committed Aug 13, 2012
2 parents b749247 + 1313090 commit b72c8ec
Show file tree
Hide file tree
Showing 46 changed files with 6,769 additions and 1,115 deletions.
2 changes: 1 addition & 1 deletion build/js/css/pe-ap-ie-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/css/pe-ap-min.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/js/pe-ap-min.js

Large diffs are not rendered by default.

924 changes: 390 additions & 534 deletions demos/charts/complex-eng.html

Large diffs are not rendered by default.

767 changes: 767 additions & 0 deletions docs/tableparser/About-the-Table-Usability-Concept.html

Large diffs are not rendered by default.

Expand Up @@ -26,20 +26,30 @@

<script src="../../build/js/jquery.min.js"></script>

<!-- The following script are for the try it button -->
<script>
//<![CDATA[

$(document).ready(function(){
$('input.tryit').click(function(){
eval($(this).prev().val());
});

});

//]]>
</script>
<!-- END of Try it button -->
<style>

.wet-boew-zebra tr.table-even td.table-summarycol4, .wet-boew-zebra tr.table-odd td.table-summarycol4,
.wet-boew-zebra tr.table-even td.table-summaryrow4, .wet-boew-zebra tr.table-odd td.table-summaryrow4 {
background-color: yellow!important;
}

.wet-boew-zebra tr.table-even td.table-summarycol3, .wet-boew-zebra tr.table-odd td.table-summarycol3,
.wet-boew-zebra tr.table-even td.table-summaryrow3, .wet-boew-zebra tr.table-odd td.table-summaryrow3 {
background-color: lightgreen!important;
}

.wet-boew-zebra tr.table-even td.table-summarycol2, .wet-boew-zebra tr.table-odd td.table-summarycol2,
.wet-boew-zebra tr.table-even td.table-summaryrow2, .wet-boew-zebra tr.table-odd td.table-summaryrow2{
background-color: pink!important;
}

.wet-boew-zebra tr.table-even td.table-summarycol1, .wet-boew-zebra tr.table-odd td.table-summarycol1,
.wet-boew-zebra tr.table-even td.table-summaryrow1, .wet-boew-zebra tr.table-odd td.table-summaryrow1{
background-color: lightblue!important;
}


</style>

<link rel="stylesheet" href="../../build/grids/css/util-min.css" />
<!--[if lte IE 8]>
Expand Down Expand Up @@ -141,7 +151,7 @@ <h2>Data Cell</h2>
&lt;colgroup&gt;&lt;col /&gt;&lt;/colgroup&gt; &lt;colgroup span=&quot;2&quot;&gt;&lt;/colgroup&gt;
&lt;colgroup&gt;&lt;/colgroup&gt; &lt;colgroup&gt;&lt;/colgroup&gt;
</code></pre>
<table>
<table class="wet-boew-zebra">
<caption>Example Table: Number of PPH requests</caption>


Expand Down Expand Up @@ -246,13 +256,10 @@ <h2>Data Cell</h2>
</tbody>

</table>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(0):data').css('background-color', 'yellow');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(0):summary:collevel(1)').css('background-color', 'pink');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(0):summary:collevel(0)').css('background-color', 'cyan');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<details><summary>Source code</summary>
<pre><code>

&lt;table&gt;
&lt;table class=&quot;wet-boew-zebra&quot;&gt;
&lt;caption&gt;Example Table: Number of PPH requests&lt;/caption&gt;


Expand Down Expand Up @@ -384,7 +391,7 @@ <h3>Simple Column Grouping Example</h3>
&lt;colgroup&gt;&lt;/colgroup&gt; &lt;colgroup span=&quot;2&quot;&gt;&lt;/colgroup&gt;
&lt;colgroup&gt;&lt;/colgroup&gt; &lt;colgroup&gt;&lt;/colgroup&gt;
</code></pre>
<table>
<table class="wet-boew-zebra">
<caption>Example Table: Number of PPH requests</caption>


Expand Down Expand Up @@ -462,11 +469,10 @@ <h3>Simple Column Grouping Example</h3>
</tr>
</tbody>
</table>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(1):data').css('background-color', 'yellow');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<details><summary>Source code</summary>
<pre><code>

&lt;table&gt;
&lt;table class=&quot;wet-boew-zebra&quot;&gt;
&lt;caption&gt;Example Table: Number of PPH requests&lt;/caption&gt;


Expand Down Expand Up @@ -560,7 +566,7 @@ <h3>Multiple Column Group Level</h3>
&lt;colgroup&gt;&lt;/colgroup&gt; &lt;colgroup&gt;&lt;/colgroup&gt;
&lt;colgroup&gt;&lt;/colgroup&gt; &lt;colgroup&gt;&lt;/colgroup&gt;
</code></pre>
<table>
<table class="wet-boew-zebra">
<caption>
Caption
</caption>
Expand Down Expand Up @@ -625,11 +631,10 @@ <h3>Multiple Column Group Level</h3>

</tbody>
</table>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(2):data').css('background-color', 'yellow');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<details><summary>Source code</summary>
<pre><code>

&lt;table&gt;
&lt;table class=&quot;wet-boew-zebra&quot;&gt;
&lt;caption&gt;
Caption
&lt;/caption&gt;
Expand Down Expand Up @@ -702,7 +707,7 @@ <h3>Multiple Column Group Level</h3>


<pre><code> &lt;colgroup span=&quot;6&quot;&gt;&lt;/colgroup&gt; </code></pre>
<table>
<table class="wet-boew-zebra">
<caption>
Caption
</caption>
Expand Down Expand Up @@ -762,11 +767,10 @@ <h3>Multiple Column Group Level</h3>

</tbody>
</table>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(3):data').css('background-color', 'yellow');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<details><summary>Source code</summary>
<pre><code>

&lt;table&gt;
&lt;table class=&quot;wet-boew-zebra&quot;&gt;
&lt;caption&gt;
Caption
&lt;/caption&gt;
Expand Down Expand Up @@ -832,7 +836,7 @@ <h3>Multiple Column Group Level</h3>


<pre><code> &lt;colgroup span=&quot;4&quot;&gt;&lt;/colgroup&gt; &lt;colgroup span=&quot;2&quot;&gt;&lt;/colgroup&gt;</code></pre>
<table>
<table class="wet-boew-zebra">
<caption>
Caption
</caption>
Expand Down Expand Up @@ -893,11 +897,10 @@ <h3>Multiple Column Group Level</h3>

</tbody>
</table>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(4):data').css('background-color', 'yellow');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<details><summary>Source code</summary>
<pre><code>

&lt;table&gt;
&lt;table class=&quot;wet-boew-zebra&quot;&gt;
&lt;caption&gt;
Caption
&lt;/caption&gt;
Expand Down Expand Up @@ -964,7 +967,7 @@ <h3>Multiple Column Group Level</h3>


<pre><code> &lt;colgroup span=&quot;4&quot;&gt;&lt;/colgroup&gt; &lt;colgroup&gt;&lt;/colgroup&gt; &lt;colgroup&gt;&lt;/colgroup&gt;</code></pre>
<table>
<table class="wet-boew-zebra">
<caption>
Caption
</caption>
Expand Down Expand Up @@ -1026,12 +1029,10 @@ <h3>Multiple Column Group Level</h3>

</tbody>
</table>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(5):data:collevel(1)').css('background-color', 'yellow');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(5):data:collevel(2)').css('background-color', 'lightgreen');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<details><summary>Source code</summary>
<pre><code>

&lt;table&gt;
&lt;table class=&quot;wet-boew-zebra&quot;&gt;
&lt;caption&gt;
Caption
&lt;/caption&gt;
Expand Down Expand Up @@ -1103,7 +1104,7 @@ <h3>Multiple Column Group Level</h3>
&lt;colgroup span=&quot;2&quot;&gt;&lt;/colgroup&gt; &lt;colgroup span=&quot;2&quot;&gt;&lt;/colgroup&gt;
&lt;colgroup span=&quot;2&quot;&gt;&lt;/colgroup&gt;
</code></pre>
<table>
<table class="wet-boew-zebra">
<caption>
Caption
</caption>
Expand Down Expand Up @@ -1164,11 +1165,10 @@ <h3>Multiple Column Group Level</h3>
</tr>
</tbody>
</table>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(6):data').css('background-color', 'yellow');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<details><summary>Source code</summary>
<pre><code>

&lt;table&gt;
&lt;table class=&quot;wet-boew-zebra&quot;&gt;
&lt;caption&gt;
Caption
&lt;/caption&gt;
Expand Down Expand Up @@ -1236,7 +1236,7 @@ <h3>Multiple Column Group Level</h3>


<pre><code> &lt;colgroup span=&quot;2&quot;&gt;&lt;/colgroup&gt; &lt;colgroup span=&quot;4&quot;&gt;&lt;/colgroup&gt;</code></pre>
<table>
<table class="wet-boew-zebra">
<caption>
Caption
</caption>
Expand Down Expand Up @@ -1296,11 +1296,10 @@ <h3>Multiple Column Group Level</h3>
</tr>
</tbody>
</table>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(7):data').css('background-color', 'yellow');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<details><summary>Source code</summary>
<pre><code>

&lt;table&gt;
&lt;table class=&quot;wet-boew-zebra&quot;&gt;
&lt;caption&gt;
Caption
&lt;/caption&gt;
Expand Down Expand Up @@ -1385,7 +1384,7 @@ <h4>Three Data Column Level and More</h4>
&lt;colgroup span=&quot;3&quot;&gt;&lt;/colgroup&gt; &lt;colgroup&gt;&lt;/colgroup&gt;
&lt;colgroup&gt;&lt;/colgroup&gt; &lt;colgroup&gt;&lt;/colgroup&gt; &lt;colgroup&gt;&lt;/colgroup&gt;
</code></pre>
<table>
<table class="wet-boew-zebra">
<caption>Caption</caption>

<colgroup>
Expand Down Expand Up @@ -1611,15 +1610,11 @@ <h4>Three Data Column Level and More</h4>
</tr>
</tbody>
</table>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(8):data').css('background-color', 'yellow');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(8):data:collevel(1)').css('background-color', 'cyan');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(8):data:collevel(2)').css('background-color', 'lightgreen');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(8):data:collevel(3)').css('background-color', 'orange');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>
<p><label for="tryit0">Try it:</label> <input id="tryit0" type="text" style="width:450px;" value="$('table:eq(8):data:collevel(4)').css('background-color', 'lightgray');" /> <input class="tryit" style="margin-top:0px;" type="button" value="Go" /></p>

<details><summary>Source code</summary>
<pre><code>

&lt;table&gt;
&lt;table class=&quot;wet-boew-zebra&quot;&gt;
&lt;caption&gt;Caption&lt;/caption&gt;

&lt;colgroup span=&quot;3&quot;&gt;&lt;/colgroup&gt;
Expand Down

0 comments on commit b72c8ec

Please sign in to comment.