Template:Infobox officeholder/office: Difference between revisions

From Roses, Tulips, & Liberty
Content added Content deleted
(tidy governor_general param)
(tidy majority_leader param)
Line 24: Line 24:
}}
}}
}}
}}
{{#if:{{{majority_leader|}}}{{{majorityleader|}}}{{{minority_floor_leader|}}}{{{minority_leader|}}}{{{majority_floor_leader|}}}||
{{#if:{{{majority_leader|}}}{{{minority_floor_leader|}}}{{{minority_leader|}}}{{{majority_floor_leader|}}}||
{{#if:{{{jr/sr|}}}|
{{#if:{{{jr/sr|}}}|
! colspan=2 style="background-color: lavender; text-align: center" {{!}} [[United States Senate|<!--Changed code to eliminate "Junior/Senior" distinction for U.S. Senators per [[Template talk:Infobox Officeholder#Senior/Junior U.S. Senators]]{{{jr/sr}}}-->United States Senator{{#if:{{{succeeding|}}} |-elect}}]]<br />from {{{state}}}
! colspan=2 style="background-color: lavender; text-align: center" {{!}} [[United States Senate|<!--Changed code to eliminate "Junior/Senior" distinction for U.S. Senators per [[Template talk:Infobox Officeholder#Senior/Junior U.S. Senators]]{{{jr/sr}}}-->United States Senator{{#if:{{{succeeding|}}} |-elect}}]]<br />from {{{state}}}
Line 80: Line 80:
<!----------Majority Leader (State Senate)---------->
<!----------Majority Leader (State Senate)---------->
{{#if:{{{majority_leader|}}}|
{{#if:{{{majority_leader|}}}|
! colspan=2 style="background-color: lavender; text-align: center" {{!}} {{{majority_leader}}} [[Majority Leader of the {{{state_senate}}} Senate]]
! colspan=2 style="background-color: lavender; text-align: center" {{!}} {{{majority_leader}}} {{#if:{{{state_senate|}}}|[[Majority Leader of the {{{state_senate}}} Senate]]|[[United States Senate Majority Leader]]}}
{{!}}-
{{!}}-
}}
}}
Line 96: Line 96:
{{#if:{{{minority_floor_leader|}}}|
{{#if:{{{minority_floor_leader|}}}|
! colspan=2 style="background-color: lavender; text-align: center" {{!}} {{{minority_floor_leader}}} [[Minority Floor Leader of the {{{state_senate}}} Senate]]
! colspan=2 style="background-color: lavender; text-align: center" {{!}} {{{minority_floor_leader}}} [[Minority Floor Leader of the {{{state_senate}}} Senate]]
{{!}}-
}}
<!----------Majority Leader---------->
{{#if:{{{majorityleader|}}}|
! colspan=2 style="background-color: lavender; text-align: center" {{!}} {{{majorityleader}}} [[United States Senate Majority Leader]]
{{!}}-
{{!}}-
}}
}}