-
Notifications
You must be signed in to change notification settings - Fork 187
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Calendar: modify template to pull month and year out of the <table>.
If users have custom CSS for Calendar, they may need to modify it. Also, although the tundra CSS was specifying a border between the days and the years, it wasn't appearing for some reason (before this change). Thererfore, I removed that line of CSS so there's no border after this change either. Fixes #16210.
- Loading branch information
Showing
8 changed files
with
60 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,35 +1,30 @@ | ||
<table cellspacing="0" cellpadding="0" class="dijitCalendarContainer" role="grid" aria-labelledby="${id}_mddb ${id}_year" data-dojo-attach-point="gridNode"> | ||
<thead> | ||
<tr class="dijitReset dijitCalendarMonthContainer" valign="top"> | ||
<th class='dijitReset dijitCalendarArrow' data-dojo-attach-point="decrementMonth" scope="col"> | ||
<span class="dijitInline dijitCalendarIncrementControl dijitCalendarDecrease" role="presentation"></span> | ||
<span data-dojo-attach-point="decreaseArrowNode" class="dijitA11ySideArrow">-</span> | ||
</th> | ||
<th class='dijitReset' colspan="5" scope="col"> | ||
<div data-dojo-attach-point="monthNode"> | ||
</div> | ||
</th> | ||
<th class='dijitReset dijitCalendarArrow' scope="col" data-dojo-attach-point="incrementMonth"> | ||
<span class="dijitInline dijitCalendarIncrementControl dijitCalendarIncrease" role="presentation"></span> | ||
<span data-dojo-attach-point="increaseArrowNode" class="dijitA11ySideArrow">+</span> | ||
</th> | ||
</tr> | ||
<tr role="row"> | ||
${!dayCellsHtml} | ||
</tr> | ||
</thead> | ||
<tbody data-dojo-attach-point="dateRowsNode" data-dojo-attach-event="ondijitclick: _onDayClick" class="dijitReset dijitCalendarBodyContainer"> | ||
${!dateRowsHtml} | ||
</tbody> | ||
<tfoot class="dijitReset dijitCalendarYearContainer"> | ||
<tr> | ||
<td class='dijitReset' valign="top" colspan="7" role="presentation"> | ||
<div class="dijitCalendarYearLabel"> | ||
<span data-dojo-attach-point="previousYearLabelNode" class="dijitInline dijitCalendarPreviousYear" role="button"></span> | ||
<span data-dojo-attach-point="currentYearLabelNode" class="dijitInline dijitCalendarSelectedYear" role="button" id="${id}_year"></span> | ||
<span data-dojo-attach-point="nextYearLabelNode" class="dijitInline dijitCalendarNextYear" role="button"></span> | ||
</div> | ||
</td> | ||
</tr> | ||
</tfoot> | ||
</table> | ||
<div class="dijitCalendarContainer dijitInline" role="presentation"> | ||
<div class="dijitReset dijitCalendarMonthContainer" role="presentation"> | ||
<div class='dijitReset dijitCalendarArrow dijitCalendarDecrementArrow' data-dojo-attach-point="decrementMonth"> | ||
<img src="${_blankGif}" alt="" class="dijitCalendarIncrementControl dijitCalendarDecrease" role="presentation"/> | ||
<span data-dojo-attach-point="decreaseArrowNode" class="dijitA11ySideArrow">-</span> | ||
</div> | ||
<div class='dijitReset dijitCalendarArrow dijitCalendarIncrementArrow' data-dojo-attach-point="incrementMonth"> | ||
<img src="${_blankGif}" alt="" class="dijitCalendarIncrementControl dijitCalendarIncrease" role="presentation"/> | ||
<span data-dojo-attach-point="increaseArrowNode" class="dijitA11ySideArrow">+</span> | ||
</div> | ||
<div data-dojo-attach-point="monthNode" class="dijitInline"></div> | ||
</div> | ||
<table cellspacing="0" cellpadding="0" class="dijitCalendarContainer" role="grid" data-dojo-attach-point="gridNode" aria-labelledby="${id}_mddb ${id}_year"> | ||
<thead> | ||
<tr role="row"> | ||
${!dayCellsHtml} | ||
</tr> | ||
</thead> | ||
<tbody data-dojo-attach-point="dateRowsNode" data-dojo-attach-event="ondijitclick: _onDayClick" class="dijitReset dijitCalendarBodyContainer"> | ||
${!dateRowsHtml} | ||
</tbody> | ||
</table> | ||
<div class="dijitReset dijitCalendarYearContainer" role="presentation"> | ||
<div class="dijitCalendarYearLabel"> | ||
<span data-dojo-attach-point="previousYearLabelNode" class="dijitInline dijitCalendarPreviousYear" role="button"></span> | ||
<span data-dojo-attach-point="currentYearLabelNode" class="dijitInline dijitCalendarSelectedYear" role="button" id="${id}_year"></span> | ||
<span data-dojo-attach-point="nextYearLabelNode" class="dijitInline dijitCalendarNextYear" role="button"></span> | ||
</div> | ||
</div> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters