Merge remote-tracking branch 'wet-boew/master' into feature-table-parser

Conflicts: build/js/css/pe-ap-ie-min.css build/js/css/pe-ap-min.css build/js/pe-ap-min.js
wet-boew · Aug 14, 2012 · 3305730 · 3305730
2 parents 429e72f + ac583d5
commit 3305730
Show file tree

Hide file tree

Showing 25 changed files with 416 additions and 349 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,6 @@
+# Set default behaviour, in case users don't have core.autocrlf set.
+* text=auto
+
 # These files are text and should be normalized (convert crlf => lf)
 *.js      text
 *.css     text

diff --git a/build/grids/css/util-ie-min.css b/build/grids/css/util-ie-min.css
diff --git a/build/grids/css/util-min.css b/build/grids/css/util-min.css
diff --git a/build/js/css/pe-ap-ie-min.css b/build/js/css/pe-ap-ie-min.css
diff --git a/build/js/css/pe-ap-min.css b/build/js/css/pe-ap-min.css
diff --git a/build/js/pe-ap-min.js b/build/js/pe-ap-min.js
diff --git a/build/js/polyfills/progress-min.js b/build/js/polyfills/progress-min.js
diff --git a/build/theme-gcwu-fegc/css/theme-min.css b/build/theme-gcwu-fegc/css/theme-min.css
diff --git a/demos/index-eng.html b/demos/index-eng.html
@@ -200,10 +200,10 @@ <h1 id="wb-cont">Working examples</h1>
 </ul>
 </section>
 
-<section><h2 id="math">Mathematical/scientific formula display (Alpha)</h2>
+<section><h2 id="math">Mathematical/scientific formula display (MathML polyfill) (Alpha)</h2>
 <ul>
-<li><a href="mathlib/mathlib-eng.html"><span class="wb-invisible">Mathematical/scientific formula display - </span>English examples</a></li>
-<li><a href="mathlib/mathlib-fra.html"><span class="wb-invisible">Mathematical/scientific formula display - </span>French examples</a></li>
+<li><a href="mathlib/mathlib-eng.html"><span class="wb-invisible">Mathematical/scientific formula display (MathML polyfill) - </span>English examples</a></li>
+<li><a href="mathlib/mathlib-fra.html"><span class="wb-invisible">Mathematical/scientific formula display (MathML polyfill) - </span>French examples</a></li>
 </ul>
 </section>
 </div>

diff --git a/demos/index-fra.html b/demos/index-fra.html
@@ -98,10 +98,10 @@ <h1 id="wb-cont">Exemples pratiques</h1>
 
 <div class="span-4">
 
-<section><h2 id="math">Affichage des formules mathématiques ou scientifiques (Alpha)</h2>
+<section><h2 id="math">Affichage des formules mathématiques ou scientifiques (correctif pour MathML) (Alpha)</h2>
 <ul>
-<li><a href="mathlib/mathlib-eng.html"><span class="wb-invisible">Affichage des formules mathématiques ou scientifiques - </span>Exemples en anglais</a></li>
-<li><a href="mathlib/mathlib-fra.html"><span class="wb-invisible">Affichage des formules mathématiques ou scientifiques - </span>Exemples en français</a></li>
+<li><a href="mathlib/mathlib-eng.html"><span class="wb-invisible">Affichage des formules mathématiques ou scientifiques (correctif pour MathML) - </span>Exemples en anglais</a></li>
+<li><a href="mathlib/mathlib-fra.html"><span class="wb-invisible">Affichage des formules mathématiques ou scientifiques (correctif pour MathML) - </span>Exemples en français</a></li>
 </ul>
 </section>
 

diff --git a/demos/mathlib/mathlib-eng.html b/demos/mathlib/mathlib-eng.html
@@ -8,7 +8,7 @@
 <meta charset="utf-8" />
 <!-- Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
 www.tbs.gc.ca/ws-nw/wet-boew/terms / www.sct.gc.ca/ws-nw/wet-boew/conditions -->
-<title>Mathematical/scientific formula display - Working examples - Web Experience Toolkit (WET)</title>
+<title>Mathematical/scientific formula display (MathML polyfill) - Working examples - Web Experience Toolkit (WET)</title>
 
 <link rel="shortcut icon" href="../../build/theme-gcwu-fegc/images/favicon.ico" />
 <meta name="description" content="English description / Description en anglais" />
@@ -86,7 +86,7 @@
 <ol>
 <li><a href="../../docs/index-eng.html">Home</a></li>
 <li><a href="../index-eng.html">Working examples</a></li>
-<li>Mathematical/scientific formula display</li>
+<li>Mathematical/scientific formula display (MathML polyfill)</li>
 </ol>
 </div></div>
 </nav>
@@ -96,9 +96,8 @@
 <div id="wb-core"><div id="wb-core-in" class="equalize">
 <div id="wb-main" role="main"><div id="wb-main-in">
 <!-- MainContentStart -->
-<h1 id="wb-cont">Mathematical/scientific formula display</h1>
+<h1 id="wb-cont">Mathematical/scientific formula display (MathML polyfill)</h1>
 
-<div class="wet-boew-mathlib">
 <section><h2>Examples of simple formulas</h2>
 
 <p>
@@ -1419,7 +1418,6 @@ <h1 id="wb-cont">Mathematical/scientific formula display</h1>
 </tbody>
 </table>
 </section>
-</div>
 
 <dl id="gcwu-date-mod" role="contentinfo">
 <dt>Date modified:</dt><dd><span><time>2011-10-31</time></span></dd>

diff --git a/demos/mathlib/mathlib-fra.html b/demos/mathlib/mathlib-fra.html
@@ -8,7 +8,7 @@
 <meta charset="utf-8" />
 <!-- Web Experience Toolkit (WET) / Boîte à outils de l'expérience Web (BOEW)
 www.tbs.gc.ca/ws-nw/wet-boew/terms / www.sct.gc.ca/ws-nw/wet-boew/conditions -->
-<title>Affichage des formules mathématiques ou scientifiques - Exemples pratiques - Boîte à outils de l'expérience Web (BOEW)</title>
+<title>Affichage des formules mathématiques ou scientifiques (correctif pour MathML) - Exemples pratiques - Boîte à outils de l'expérience Web (BOEW)</title>
 
 <link rel="shortcut icon" href="../../build/theme-gcwu-fegc/images/favicon.ico" />
 <meta name="description" content="French description / Description en français" />
@@ -86,7 +86,7 @@
 <ol>
 <li><a href="../../docs/index-fra.html">Accueil</a></li>
 <li><a href="../index-fra.html">Exemples pratiques</a></li>
-<li>Affichage des formules mathématiques ou scientifiques</li>
+<li>Affichage des formules mathématiques ou scientifiques (correctif pour MathML)</li>
 </ol></div></div>
 </nav>
 <!-- HeaderEnd -->
@@ -95,9 +95,8 @@
 <div id="wb-core"><div id="wb-core-in" class="equalize">
 <div id="wb-main" role="main"><div id="wb-main-in">
 <!-- MainContentStart -->
-<h1 id="wb-cont">Affichage des formules mathématiques ou scientifiques</h1>
+<h1 id="wb-cont">Affichage des formules mathématiques ou scientifiques (correctif pour MathML)</h1>
 
-<div class="wet-boew-mathlib">
 <section><h2>Exemples de formules simples</h2>
 
 <p>
@@ -1418,7 +1417,6 @@ <h1 id="wb-cont">Affichage des formules mathématiques ou scientifiques</h1>
 </tbody>
 </table>
 </section>
-</div>
 
 <dl id="gcwu-date-mod" role="contentinfo">
 <dt>Date de modification&#160;:</dt><dd><span><time>2011-10-31</time></span></dd>

diff --git a/demos/progress/progress-eng.html b/demos/progress/progress-eng.html
@@ -34,6 +34,11 @@
 <!--<![endif]-->
 
 <!-- CustomScriptsCSSStart -->
+<style>
+progress {
+	width: 10em;
+}
+</style>
 <!-- CustomScriptsCSSEnd -->
 </head>
 

diff --git a/demos/progress/progress-fra.html b/demos/progress/progress-fra.html
@@ -34,6 +34,11 @@
 <!--<![endif]-->
 
 <!-- CustomScriptsCSSStart -->
+<style>
+progress {
+	width: 10em;
+}
+</style>
 <!-- CustomScriptsCSSEnd -->
 </head>
 

diff --git a/pluginTemplate.js b/pluginTemplate.js
@@ -15,6 +15,8 @@
 		type: 'plugin',
 		// This is an example from tabbed interface, to show how to call required libraries when they are needed
 		depends: (pe.mobile ? [] : ['metadata', 'easytabs', 'equalheights']),
+		//Specifies polyfill needed by the plugin (for elements created at runtime)
+		polyfills:['progress','detailssummary'],
 		// Don't include a mobile function if your plugin shouldn't run in mobile mode.
 		mobile: function (elm) {
 			// If applicaple, convert html elements and attributes into the format that jQuery mobile expects.

diff --git a/src/grids/sass/includes/util-screen.scss b/src/grids/sass/includes/util-screen.scss
@@ -35,7 +35,7 @@
 		padding-left:19px;
 	}
 	a[href$='.docx'], a[href$='.dotx'], a[href$='.xlsx'], a[href$='.xltx'], a[href$='.pptx'], a[href$='.potx'], a[href$='.psd'], a[href$='.zip'], a[href$='.doc'], a[href$='.pdf'], a[href$='.xls'], a[href$='.xlt'], a[href$='.rtf'], a[href$='.txt']{
-		background:transparent url(../images/wb-icon-download.gif) no-repeat 0 0;
+		background:transparent url(../images/icon-download.gif) no-repeat 0 0;
 		padding-left:15px;
 	}
 }