Template:Schedule week header - Revision history

Volrak at 09:36, 1 April 2019

2019-04-01T09:36:18Z

Volrak at 09:36, 1 April 2019

2019-04-01T09:36:03Z

Volrak at 10:27, 29 March 2019

2019-03-29T10:27:16Z

Volrak at 10:31, 26 March 2019

2019-03-26T10:31:22Z

Volrak at 03:24, 4 March 2019

2019-03-04T03:24:03Z

Volrak at 03:20, 4 March 2019

2019-03-04T03:20:04Z

Volrak at 03:06, 3 March 2019

2019-03-03T03:06:13Z

Volrak at 11:08, 2 March 2019

2019-03-02T11:08:27Z

Volrak at 11:06, 2 March 2019

2019-03-02T11:06:45Z

Volrak at 10:04, 2 March 2019

2019-03-02T10:04:31Z

@@ Line 47: / Line 47: @@
 {{Schedule week row|          Return of the God-Pharaoh    |6,2}}
 {{Schedule week row|          Tour de Ravnica              |1,1}}
 |}

@@ Line 47: / Line 47: @@
 {{Schedule week row|          Return of the God-Pharaoh    |6,2}}
 {{Schedule week row|          Tour de Ravnica              |1,1}}
 |}
@@ Line 64: / Line 67: @@
 |-
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 0 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 0 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
+-->{{#ifeq:{{Date after date|{{{3}}}|{{{1}}}|{{{2}}}|1}}|{{CURRENTYEAR}},{{CURRENTMONTHNAME}},{{CURRENTDAY}}|<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|1}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|1}}</small>}}
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 1 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 1 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
+-->{{#ifeq:{{Date after date|{{{3}}}|{{{1}}}|{{{2}}}|2}}|{{CURRENTYEAR}},{{CURRENTMONTHNAME}},{{CURRENTDAY}}|<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|2}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|2}}</small>}}
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 2 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 2 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
+-->{{#ifeq:{{Date after date|{{{3}}}|{{{1}}}|{{{2}}}|3}}|{{CURRENTYEAR}},{{CURRENTMONTHNAME}},{{CURRENTDAY}}|<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|3}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|3}}</small>}}
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 3 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 3 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
+-->{{#ifeq:{{Date after date|{{{3}}}|{{{1}}}|{{{2}}}|4}}|{{CURRENTYEAR}},{{CURRENTMONTHNAME}},{{CURRENTDAY}}|<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|4}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|4}}</small>}}
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 4 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 4 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
+-->{{#ifeq:{{Date after date|{{{3}}}|{{{1}}}|{{{2}}}|5}}|{{CURRENTYEAR}},{{CURRENTMONTHNAME}},{{CURRENTDAY}}|<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|5}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|5}}</small>}}
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 5 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 5 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
+-->{{#ifeq:{{Date after date|{{{3}}}|{{{1}}}|{{{2}}}|6}}|{{CURRENTYEAR}},{{CURRENTMONTHNAME}},{{CURRENTDAY}}|<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|6}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|6}}</small>}}
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 6 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 6 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
+-->{{#ifeq:{{Date after date|{{{3}}}|{{{1}}}|{{{2}}}|7}}|{{CURRENTYEAR}},{{CURRENTMONTHNAME}},{{CURRENTDAY}}|<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|7}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|7}}</small>}}

@@ Line 64: / Line 64: @@
 |-
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 0 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} |<!--
+-->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 0 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 0 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|1}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|1}}</small>}}
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 1 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} |<!--
+-->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 1 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 1 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|2}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|2}}</small>}}
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 2 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} |<!--
+-->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 2 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 2 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|3}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|3}}</small>}}
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 3 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} |<!--
+-->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 3 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 3 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|4}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|4}}</small>}}
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 4 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} |<!--
+-->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 4 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 4 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|5}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|5}}</small>}}
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 5 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} |<!--
+-->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 5 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 5 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|6}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|6}}</small>}}
 ! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
--->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 6 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} |<!--
+-->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 6 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} and {{{2}}} + 6 <= {{Days in month|{{{1}}}|{{{3}}}}} |<!--
 -->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|7}} |<!--
 -->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|7}}</small>}}

@@ Line 52: / Line 52: @@
 {| class="wikitable" style="border:2px solid black;"
 |-
-! rowspan="3" colspan="3" style="border:1.5px solid black; border-right:2px solid black;" | [[Events|Event]] schedule<br>{{{2}}}{{#switch:{{{2}}}|1=st|2=nd|3=rd|th}} {{{1}}} {{{3}}}
+! rowspan="3" colspan="3" style="border:1.5px solid black; border-right:2px solid black;" | [[Events|Event]] schedule<br>{{{2}}}{{#switch:{{{2}}}|1|21|31=st|2|22=nd|3|23=rd|th}} {{{1}}} {{{3}}}
 {{#ifexpr:{{{2}}} + 6 > {{Days in month|{{{1}}}|{{{3}}}}}|
 <!-- The week crosses into a new month. -->

@@ Line 52: / Line 52: @@
 {| class="wikitable" style="border:2px solid black;"
 |-
-! rowspan="3" colspan="3" style="border:1.5px solid black; border-right:2px solid black;" | [[Events|Event]] schedule<br>{{{2}}}{{#switch:{{{2}}}|1=st|2=nd|3=rd|th}} {{{1}}}
+! rowspan="3" colspan="3" style="border:1.5px solid black; border-right:2px solid black;" | [[Events|Event]] schedule<br>{{{2}}}{{#switch:{{{2}}}|1=st|2=nd|3=rd|th}} {{{1}}} {{{3}}}
 {{#ifexpr:{{{2}}} + 6 > {{Days in month|{{{1}}}|{{{3}}}}}|
 <!-- The week crosses into a new month. -->

@@ Line 6: / Line 6: @@
 * [[Template:Schedule week cell]] is invoked by [[Template:Schedule week row]] to generates a cell in the table representing an event instance.
-This template generates the header, and expects 8 unlabeled parameters:
+This template generates the header, and expects 3 unlabeled parameters representing the date on the first day of the week of the schedule:
-* The first parameter is the name of the month on the first day of the week.
+* The first parameter is the month name.
-* The next seven parameters are the day of the month numbers for the week.
+* The second parameter is the day number.
 This template opens a table, which must be closed in the usual way ("|}").
@@ Line 16: / Line 17: @@
 The following shorthand:
 <pre><nowiki>
-{{Schedule week header|February|24|25|26|27|28|1|2}}
+{{Schedule week header|February|24|2019}}
 |}
-{{Schedule week header|February|24|25|26|27|28|1|2}}
+{{Schedule week header|February|24|2019}}
 {{Schedule week row|pre=pvp,5|Rising Tensions              |2,1|3,1|4,1|5,1|6,1}}
 {{Schedule week row|          Training Grounds             |1,1|2,1|3,1|4,1|5,1|6,1|7,1}}
@@ Line 33: / Line 34: @@
 Produces:
-{{Schedule week header|February|24|25|26|27|28|1|2}}
+{{Schedule week header|February|24|2019}}
 |}
-{{Schedule week header|February|24|25|26|27|28|1|2}}
+{{Schedule week header|February|24|2019}}
 {{Schedule week row|pre=pvp,5|Rising Tensions              |2,1|3,1|4,1|5,1|6,1}}
 {{Schedule week row|          Training Grounds             |1,1|2,1|3,1|4,1|5,1|6,1|7,1}}
@@ Line 48: / Line 49: @@
 |}
-</noinclude><includeonly>{| class="wikitable" style="border:2px solid black;"
+</noinclude><includeonly>
 |-
 ! rowspan="3" colspan="3" style="border:1.5px solid black; border-right:2px solid black;" | [[Events|Event]] schedule<br>{{{2}}}{{#switch:{{{2}}}|1=st|2=nd|3=rd|th}} {{{1}}}
-{{#ifexpr:{{{8}}} < {{{2}}}|
+{{#ifexpr:{{{2}}} + 6 > {{Days in month|{{{1}}}|{{{3}}}}}|
 <!-- The week crosses into a new month. -->
-! style="padding:0px; border:1.5px solid black; background-color:#ffd966;" colspan="{{#ifexpr:{{{3}}} < {{{2}}}|1|<!--
+! style="padding:0px; border:1.5px solid black; background-color:#ffd966;" <!--
--->{{#ifexpr:{{{4}}} < {{{2}}}|2|<!--
+-->colspan="{{#expr: {{Days in month|{{{1}}}|{{{3}}}}} - {{{2}}} + 1}}" {{!}} <small><!--
--->{{#ifexpr:{{{5}}} < {{{2}}}|3|<!--
+-->{{#ifexpr: {{Days in month|{{{1}}}|{{{3}}}}} = {{{2}}}|{{#invoke:String|sub|{{{1}}}|1|3}}|{{{1}}}}}</small>
--->{{#ifexpr:{{{6}}} < {{{2}}}|4|<!--
+! style="padding:0px; border:1.5px solid black; background-color:#ffd966;" <!--
--->{{#ifexpr:{{{7}}} < {{{2}}}|5|6}} }} }} }} }}" {{!}} <small><!--
+-->colspan="{{#expr: 6 - {{Days in month|{{{1}}}|{{{3}}}}} + {{{2}}}}}" {{!}} <small><!--
--->{{#ifexpr:{{{3}}} < {{{2}}}|{{#invoke:String|sub|{{{1}}}|1|3}}|{{{1}}}}}</small>
+-->{{#ifexpr: {{Days in month|{{{1}}}|{{{3}}}}} = {{{2}}} + 5|{{#invoke:String|sub|{{Next month|{{{1}}}}}|1|3}}|{{Next month|{{{1}}}}}}}</small> |
 ! style="padding:0px; border:1.5px solid black; background-color:#ffd966;" colspan="7" {{!}} <small>{{{1}}}</small> }}
 |-
-! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{2}}}</small>
+! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
-! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{3}}}</small>
+-->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 0 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} |<!--
-! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{4}}}</small>
+-->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|1}} |<!--
-! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{5}}}</small>
+-->background-color:#ffd966;" {{!}} <small>{{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|1}}</small>}}
-! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{6}}}</small>
+! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; <!--
-! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{7}}}</small>
+-->{{#ifexpr:{{CURRENTYEAR}}={{{3}}} and {{CURRENTDAY}}={{{2}}} + 1 and {{#ifeq:|{{CURRENTMONTHNAME}}|{{{1}}}|1|0}} |<!--
-! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{8}}}</small>
+-->background-color:#e26b0a;" {{!}} {{Days after date|{{{3}}}|{{{1}}}|{{{2}}}|2}} |<!--
 |-
 ! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 1.5px; border-bottom:solid black 1.5px; background-color:#fff2cc;" | <small>Sun</small>

@@ Line 1: / Line 1: @@
 <noinclude>
 == Usage ==
-The '''Schedule week header''' template is used together with one or more invocations of '''Schedule week row''' in order to display an event schedule for a specific week, starting on a Sunday.
+Three templates work together to create a weekly event schedule, starting on a Sunday:
-The first parameter is the name of the month on the first day of the week.
+This template generates the header, and expects 8 unlabeled parameters:
+* The first parameter is the name of the month on the first day of the week.
-The next seven parameters are the day of the month numbers for the week.
+* The next seven parameters are the day of the month numbers for the week.
 This template opens a table, which must be closed in the usual way ("|}").
@@ Line 14: / Line 17: @@
 <pre><nowiki>
 {{Schedule week header|February|24|25|26|27|28|1|2}}
-{{Schedule week row|pre=pvp,5|Rising Tensions|2,1|3,1|4,1|5,1|6,1}}
+|}
 {{Schedule week row|Training Grounds|1,1|2,1|3,1|4,1|5,1|6,1|7,1}}
-{{Schedule week row|Trial of the Planes|2,1|3,1|4,1|5,1|6,1}}
+{{Schedule week header|February|24|25|26|27|28|1|2}}
-{{Schedule week row|Hour of Revelation|1,2}}
+{{Schedule week row|pre=pvp,5|Rising Tensions              |2,1|3,1|4,1|5,1|6,1}}
-{{Schedule week row|Terrors in the Shadows|2,3}}
+{{Schedule week row|          Training Grounds             |1,1|2,1|3,1|4,1|5,1|6,1|7,1}}
 {{Schedule week row|pre=pve,4|Oath of the Gatewatch: Part 1|3,3}}
-{{Schedule week row|Oath of the Gatewatch: Part 2|5,3}}
+{{Schedule week row|          Oath of the Gatewatch: Part 2|5,3}}
-{{Schedule week row|Return of the God-Pharaoh|6,2}}
+{{Schedule week row|          Return of the God-Pharaoh    |6,2}}
-{{Schedule week row|Tour de Ravnica|1,1}}
+{{Schedule week row|          Tour de Ravnica              |1,1}}
 |}
 </nowiki></pre>
@@ Line 28: / Line 34: @@
 Produces:
 {{Schedule week header|February|24|25|26|27|28|1|2}}
-{{Schedule week row|pre=pvp,5|Rising Tensions|2,1|3,1|4,1|5,1|6,1}}
+|}
 {{Schedule week row|Training Grounds|1,1|2,1|3,1|4,1|5,1|6,1|7,1}}
-{{Schedule week row|Trial of the Planes|2,1|3,1|4,1|5,1|6,1}}
+{{Schedule week header|February|24|25|26|27|28|1|2}}
-{{Schedule week row|Hour of Revelation|1,2}}
+{{Schedule week row|pre=pvp,5|Rising Tensions              |2,1|3,1|4,1|5,1|6,1}}
-{{Schedule week row|Terrors in the Shadows|2,3}}
+{{Schedule week row|          Training Grounds             |1,1|2,1|3,1|4,1|5,1|6,1|7,1}}
 {{Schedule week row|pre=pve,4|Oath of the Gatewatch: Part 1|3,3}}
-{{Schedule week row|Oath of the Gatewatch: Part 2|5,3}}
+{{Schedule week row|          Oath of the Gatewatch: Part 2|5,3}}
-{{Schedule week row|Return of the God-Pharaoh|6,2}}
+{{Schedule week row|          Return of the God-Pharaoh    |6,2}}
-{{Schedule week row|Tour de Ravnica|1,1}}
+{{Schedule week row|          Tour de Ravnica              |1,1}}
 |}

@@ Line 41: / Line 41: @@
 </noinclude><includeonly>{| class="wikitable" style="border:2px solid black;"
 |-
-! rowspan="3" colspan="3" style="border:2px solid black;" | Event schedule<br>{{{2}}}{{#switch:{{{2}}}|1=st|2=nd|3=rd|th}} {{{1}}}
+! rowspan="3" colspan="3" style="border:1.5px solid black; border-right:2px solid black;" | Event schedule<br>{{{2}}}{{#switch:{{{2}}}|1=st|2=nd|3=rd|th}} {{{1}}}
 {{#ifexpr:{{{8}}} < {{{2}}}|
 <!-- The week crosses into a new month. -->
-! style="padding:0px; border:2px solid black; background-color:#ffd966;" colspan="{{#ifexpr:{{{3}}} < {{{2}}}|1|<!--
+! style="padding:0px; border:1.5px solid black; background-color:#ffd966;" colspan="{{#ifexpr:{{{3}}} < {{{2}}}|1|<!--
 -->{{#ifexpr:{{{4}}} < {{{2}}}|2|<!--
 -->{{#ifexpr:{{{5}}} < {{{2}}}|3|<!--
@@ Line 50: / Line 50: @@
 -->{{#ifexpr:{{{7}}} < {{{2}}}|5|6}} }} }} }} }}" {{!}} <small><!--
 -->{{#ifexpr:{{{3}}} < {{{2}}}|{{#invoke:String|sub|{{{1}}}|1|3}}|{{{1}}}}}</small>
-! style="padding:0px; border:2px solid black; background-color:#ffd966;" colspan="{{#ifexpr:{{{3}}} < {{{2}}}|6|<!--
+! style="padding:0px; border:1.5px solid black; background-color:#ffd966;" colspan="{{#ifexpr:{{{3}}} < {{{2}}}|6|<!--
 -->{{#ifexpr:{{{4}}} < {{{2}}}|5|<!--
 -->{{#ifexpr:{{{5}}} < {{{2}}}|4|<!--
@@ Line 56: / Line 56: @@
 -->{{#ifexpr:{{{7}}} < {{{2}}}|2|1}} }} }} }} }}" {{!}}  <small><!--
 -->{{#ifexpr:{{{7}}} > {{{8}}}|{{#invoke:String|sub|{{Next month|{{{1}}}}}|1|3}}|{{Next month|{{{1}}}}}}}</small> |
-! style="padding:0px; border:2px solid black; background-color:#ffd966;" colspan="7" {{!}} <small>{{{1}}}</small> }}
+! style="padding:0px; border:1.5px solid black; background-color:#ffd966;" colspan="7" {{!}} <small>{{{1}}}</small> }}
 |-
-! style="padding:0px; border:1px solid black; border-left:solid black 2px; background-color:#ffd966;" | <small>{{{2}}}</small>
+! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{2}}}</small>
-! style="padding:0px; border:1px solid black; border-left:solid black 2px; background-color:#ffd966;" | <small>{{{3}}}</small>
+! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{3}}}</small>
-! style="padding:0px; border:1px solid black; border-left:solid black 2px; background-color:#ffd966;" | <small>{{{4}}}</small>
+! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{4}}}</small>
-! style="padding:0px; border:1px solid black; border-left:solid black 2px; background-color:#ffd966;" | <small>{{{5}}}</small>
+! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{5}}}</small>
-! style="padding:0px; border:1px solid black; border-left:solid black 2px; background-color:#ffd966;" | <small>{{{6}}}</small>
+! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{6}}}</small>
-! style="padding:0px; border:1px solid black; border-left:solid black 2px; background-color:#ffd966;" | <small>{{{7}}}</small>
+! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{7}}}</small>
-! style="padding:0px; border:1px solid black; border-left:solid black 2px; background-color:#ffd966;" | <small>{{{8}}}</small>
+! style="padding:0px; border:1px solid black; border-left:solid black 1.5px; background-color:#ffd966;" | <small>{{{8}}}</small>
 |-
-! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 2px; border-bottom:solid black 2px; background-color:#fff2cc;" | <small>Sun</small>
+! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 1.5px; border-bottom:solid black 1.5px; background-color:#fff2cc;" | <small>Sun</small>
-! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 2px; border-bottom:solid black 2px; background-color:#fff2cc;" | <small>Mon</small>
+! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 1.5px; border-bottom:solid black 1.5px; background-color:#fff2cc;" | <small>Mon</small>
-! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 2px; border-bottom:solid black 2px; background-color:#fff2cc;" | <small>Tue</small>
+! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 1.5px; border-bottom:solid black 1.5px; background-color:#fff2cc;" | <small>Tue</small>
-! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 2px; border-bottom:solid black 2px; background-color:#fff2cc;" | <small>Wed</small>
+! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 1.5px; border-bottom:solid black 1.5px; background-color:#fff2cc;" | <small>Wed</small>
-! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 2px; border-bottom:solid black 2px; background-color:#fff2cc;" | <small>Thu</small>
+! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 1.5px; border-bottom:solid black 1.5px; background-color:#fff2cc;" | <small>Thu</small>
-! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 2px; border-bottom:solid black 2px; background-color:#fff2cc;" | <small>Fri</small>
+! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 1.5px; border-bottom:solid black 1.5px; background-color:#fff2cc;" | <small>Fri</small>
-! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 2px; border-bottom:solid black 2px; background-color:#fff2cc;" | <small>Sat</small></includeonly>
+! style="width:32px; padding:0px; border:solid black 1px; border-left:solid black 1.5px; border-bottom:solid black 1.5px; background-color:#fff2cc;" | <small>Sat</small></includeonly>