Skip to content

Commit

Permalink
Merge remote-tracking branch 'wxt/master' into feature-chart-graph
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
@duboisp
duboisp committed Aug 8, 2012
2 parents f09da35 + 53477ca commit 5eb515b
Show file tree
Hide file tree
Showing 20 changed files with 653 additions and 2,153 deletions.
6 changes: 5 additions & 1 deletion build/js/css/pe-ap-ie-min.css
View file

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion build/js/css/pe-ap-min.css
View file

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion build/js/pe-ap-min.js
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions build/js/polyfills/datepicker-min.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions demos/datepicker/datepicker-eng.html
View file
Expand Up @@ -101,11 +101,11 @@ <h1 id="wb-cont">Date picker - Calendar interface - Web Experience Toolkit (WET)
<form method="get">
<div>
<label for="startdate">Start Date (<abbr title="Four digits year">YYYY</abbr>-<abbr title="Two digits month">MM</abbr>-<abbr title="Two digits day">DD</abbr>):</label>
<input type="text" id="startdate" name="startdate" class="wet-boew-datepicker" />
<input type="date" id="startdate" name="startdate" data-min-date="2012-07-27" data-max-date="2012-09-07" />
</div>
<div>
<label for="enddate">End Date (<abbr title="Two digits day">DD</abbr>-<abbr title="Two digits month">MM</abbr>-<abbr title="Four digits year">YYYY</abbr>):</label>
<input type="text" id="enddate" name="enddate" class="wet-boew-datepicker" data-date-format="DD-MM-YYYY" />
<label for="enddate">End Date (<abbr title="Four digits year">YYYY</abbr>-<abbr title="Two digits month">MM</abbr>-<abbr title="Two digits day">DD</abbr>):</label>
<input type="date" id="enddate" name="enddate" data-min-date="2011-07-27" data-max-date="2014-09-07" />
</div>
<div>
<input type="submit" value="Submit" />
Expand Down
6 changes: 3 additions & 3 deletions demos/datepicker/datepicker-fra.html
View file
Expand Up @@ -100,11 +100,11 @@ <h1 id="wb-cont">Sélecteur de date - Interface du calendrier - Boîte à outils
<form method="get">
<div>
<label for="startdate">Date de début (<abbr title="Les quatres chiffres de l'année">AAAA</abbr>-<abbr title="Les deux chiffres du mois">MM</abbr>-<abbr title="Les deux chiffres du jour">JJ</abbr>) :</label>
<input type="text" id="startdate" name="startdate" class="wet-boew-datepicker" />
<input type="date" id="startdate" name="startdate" data-min-date="2012-07-27" data-max-date="2012-09-07" />
</div>
<div>
<label for="enddate">Date de fin (<abbr title="Les deux chiffres du jour">JJ</abbr>-<abbr title="Les deux chiffres du mois">MM</abbr>-<abbr title="Les quatres chiffres de l'année">AAAA</abbr>) :</label>
<input type="text" id="enddate" name="enddate" class="wet-boew-datepicker" data-date-format="DD-MM-YYYY" />
<label for="enddate">Date de fin (<abbr title="Les quatres chiffres de l'année">AAAA</abbr>-<abbr title="Les deux chiffres du mois">MM</abbr>-<abbr title="Les deux chiffres du jour">JJ</abbr>) :</label>
<input type="date" id="enddate" name="enddate" data-min-date="2011-07-27" data-max-date="2014-09-07" />
</div>
<div>
<input type="submit" value="Soumettre" />
Expand Down
2 changes: 1 addition & 1 deletion demos/eventscalendar/eventscalendar-eng.html
View file
Expand Up @@ -210,7 +210,7 @@ <h5><a href="http://canada.gc.ca">Event 7</a></h5>
<li class="calendar-display-onshow">
<section>
<h5><a href="http://canada.gc.ca">Event 17</a></h5>
<p><time datetime="2012-04-23">April 23rd 2012</time></p>
<p><time datetime="2011-04-23">April 23rd 2011</time></p>
</section>
</li>
</ol>
Expand Down
2 changes: 1 addition & 1 deletion demos/eventscalendar/eventscalendar-fra.html
View file
Expand Up @@ -209,7 +209,7 @@ <h5><a href="http://canada.gc.ca">Événement 7</a></h5>
<li class="calendar-display-onshow">
<section>
<h5><a href="http://canada.gc.ca">Événement 17</a></h5>
<p><time datetime="2012-04-23">23 avril 2012</time></p>
<p><time datetime="2011-04-23">23 avril 2011</time></p>
</section>
</li>
</ol>
Expand Down
6 changes: 3 additions & 3 deletions demos/index-eng.html
View file
Expand Up @@ -122,10 +122,10 @@ <h1 id="wb-cont">Working examples</h1>
</ul>
</section>

<section><h2 id="cal">Calendar interface (Alpha)</h2>
<section><h2 id="cal">Calendar interface</h2>
<ul>
<li><a href="datepicker/datepicker-eng.html"><span class="wb-invisible">Calendar interface - </span>Date picker - English example</a></li>
<li><a href="datepicker/datepicker-fra.html"><span class="wb-invisible">Calendar interface - </span>Date picker - French example</a></li>
<li><a href="datepicker/datepicker-eng.html"><span class="wb-invisible">Calendar interface - </span>Date picker (<code>input type="date"</code> polyfill) - English example</a></li>
<li><a href="datepicker/datepicker-fra.html"><span class="wb-invisible">Calendar interface - </span>Date picker (<code>input type="date"</code> polyfill) - French example</a></li>
<li><a href="eventscalendar/eventscalendar-eng.html"><span class="wb-invisible">Calendar interface - </span>Events calendar - English example</a></li>
<li><a href="eventscalendar/eventscalendar-fra.html"><span class="wb-invisible">Calendar interface - </span>Events calendar - French example</a></li>
</ul>
Expand Down
6 changes: 3 additions & 3 deletions demos/index-fra.html
View file
Expand Up @@ -168,10 +168,10 @@ <h1 id="wb-cont">Exemples pratiques</h1>
</ul>
</section>

<section><h2 id="cal">Interface du calendrier (Alpha)</h2>
<section><h2 id="cal">Interface du calendrier</h2>
<ul>
<li><a href="eventscalendar/eventscalendar-eng.html"><span class="wb-invisible">Interface du calendrier - </span>Événements - Exemple en anglais</a></li>
<li><a href="eventscalendar/eventscalendar-fra.html"><span class="wb-invisible">Interface du calendrier- </span>Événements - Exemple en français</a></li>
<li><a href="eventscalendar/eventscalendar-eng.html"><span class="wb-invisible">Interface du calendrier (correctif pour <code lang="en">input type="date"</code>) - </span>Événements - Exemple en anglais</a></li>
<li><a href="eventscalendar/eventscalendar-fra.html"><span class="wb-invisible">Interface du calendrier (correctif pour <code lang="en">input type="date"</code>) - </span>Événements - Exemple en français</a></li>
<li><a href="datepicker/datepicker-eng.html"><span class="wb-invisible">Interface du calendrier - </span>Sélecteur de date - Exemple en anglais</a></li>
<li><a href="datepicker/datepicker-fra.html"><span class="wb-invisible">Interface du calendrier - </span>Sélecteur de date - Exemple en français</a></li>
</ul>
Expand Down

0 comments on commit 5eb515b

Please sign in to comment.