Changes

condensing the singular simple ships & added notes
Line 1: Line 1:  
<includeonly>{{#switch:{{{secretary|{{{1|}}}}}}  
 
<includeonly>{{#switch:{{{secretary|{{{1|}}}}}}  
 +
<!-- basic types -->
 
|Torpedo = color:#EEF5FF;" {{!}} {{ToolTip|text-align=default;background-color:#EEF5FF|{{ToolTip|Torpedo|{{colour|red|Does '''NOT''' include '''SSV'''}}}}|'''Secretary: Category Torpedo'''<hr>'''Ship Types included:'''<br>DE, DD, CL, CLT, SS<!--, AP-->, CT or AO}}
 
|Torpedo = color:#EEF5FF;" {{!}} {{ToolTip|text-align=default;background-color:#EEF5FF|{{ToolTip|Torpedo|{{colour|red|Does '''NOT''' include '''SSV'''}}}}|'''Secretary: Category Torpedo'''<hr>'''Ship Types included:'''<br>DE, DD, CL, CLT, SS<!--, AP-->, CT or AO}}
 
|Heavy = color:#FFEEEE;" {{!}} {{ToolTip|text-align=default;background-color:#FFEEEE|{{ToolTip|Heavy|{{colour|red|Does '''NOT''' include '''CAV/BBV'''}}}}|'''Secretary: Category Heavy'''<hr>'''Ship Types included:'''<br>CA, FBB, BB<!--, XBB--> or AR}}
 
|Heavy = color:#FFEEEE;" {{!}} {{ToolTip|text-align=default;background-color:#FFEEEE|{{ToolTip|Heavy|{{colour|red|Does '''NOT''' include '''CAV/BBV'''}}}}|'''Secretary: Category Heavy'''<hr>'''Ship Types included:'''<br>CA, FBB, BB<!--, XBB--> or AR}}
 
|Aviation = color:#EEFFCC;" {{!}} {{ToolTip|text-align=default;background-color:#EEFFCC|{{ToolTip|Aviation|{{colour|red|Does '''NOT''' include '''LHA''' anymore}}}}|'''Secretary: Category Aviation'''<hr>'''Ship Types included:'''<br>CAV, CVL, BBV, CV, SSV, AV, CVB or AS}}
 
|Aviation = color:#EEFFCC;" {{!}} {{ToolTip|text-align=default;background-color:#EEFFCC|{{ToolTip|Aviation|{{colour|red|Does '''NOT''' include '''LHA''' anymore}}}}|'''Secretary: Category Aviation'''<hr>'''Ship Types included:'''<br>CAV, CVL, BBV, CV, SSV, AV, CVB or AS}}
    +
<!-- multiple ship classes -->
 
|Zara-class, Vittorio Veneto-class = color:#AAFFCC;" {{!}} {{ToolTip|[[:Category:Zara Class|Zara-class]]<br>[[:Category:Vittorio Veneto Class|Vittorio Veneto-class]]|'''Secretary: Zara-class, Vittorio Veneto-class'''<hr>'''[[:Category:Zara Class|''Zara''-class]]'''<br>{{Ship/Banner|Zara}}{{Ship/Banner|Pola}}<hr> '''[[:Category:Vittorio Veneto Class|''Vittorio Veneto''-class]]'''<br>{{Ship/Banner|Littorio}}{{Ship/Banner|Roma}}}}
 
|Zara-class, Vittorio Veneto-class = color:#AAFFCC;" {{!}} {{ToolTip|[[:Category:Zara Class|Zara-class]]<br>[[:Category:Vittorio Veneto Class|Vittorio Veneto-class]]|'''Secretary: Zara-class, Vittorio Veneto-class'''<hr>'''[[:Category:Zara Class|''Zara''-class]]'''<br>{{Ship/Banner|Zara}}{{Ship/Banner|Pola}}<hr> '''[[:Category:Vittorio Veneto Class|''Vittorio Veneto''-class]]'''<br>{{Ship/Banner|Littorio}}{{Ship/Banner|Roma}}}}
 
|Lexington-class, Yorktown-class = color:#AAFFCC;" {{!}} {{ToolTip|[[:Category:Lexington Class|Lexington-class]]<br>[[:Category:Yorktown Class|Yorktown-class]]|'''Secretary: Lexington-class, Yorktown-class'''<hr>'''[[:Category:Lexington Class|''Lexington''-class]]'''<br>{{Ship/Banner|Saratoga}}<hr>'''[[:Category:Yorktown Class|''Yorktown''-class]]'''<br>{{Ship/Banner|Hornet}} }}
 
|Lexington-class, Yorktown-class = color:#AAFFCC;" {{!}} {{ToolTip|[[:Category:Lexington Class|Lexington-class]]<br>[[:Category:Yorktown Class|Yorktown-class]]|'''Secretary: Lexington-class, Yorktown-class'''<hr>'''[[:Category:Lexington Class|''Lexington''-class]]'''<br>{{Ship/Banner|Saratoga}}<hr>'''[[:Category:Yorktown Class|''Yorktown''-class]]'''<br>{{Ship/Banner|Hornet}} }}
    +
<!-- singular ship classes -->
 
|Maestrale-class = color:#AAFFCC;" {{!}} {{ToolTip|[[:Category:Maestrale Class|Maestrale-class]]|'''Secretary: Maestrale-class'''<hr>'''[[:Category:Maestrale Class|''Maestrale''-class]]'''<br>{{Ship/Banner|Maestrale}}<br>{{Ship/Banner|Grecale}}<br>{{Ship/Banner|Libeccio}}<br>{{Ship/Banner|Scirocco}} }}
 
|Maestrale-class = color:#AAFFCC;" {{!}} {{ToolTip|[[:Category:Maestrale Class|Maestrale-class]]|'''Secretary: Maestrale-class'''<hr>'''[[:Category:Maestrale Class|''Maestrale''-class]]'''<br>{{Ship/Banner|Maestrale}}<br>{{Ship/Banner|Grecale}}<br>{{Ship/Banner|Libeccio}}<br>{{Ship/Banner|Scirocco}} }}
 
|Type 1934-class = color:#AAFFCC;" {{!}} {{ToolTip|[[:Category:Type 1934 Class|Type 1934-class]]|'''Secretary: Type 1934-class'''<hr>'''[[:Category:Type 1934 Class|''Type 1934''-class]]'''<br>{{Ship/Banner|Z1}}<br>{{Ship/Banner|Z3}} }}
 
|Type 1934-class = color:#AAFFCC;" {{!}} {{ToolTip|[[:Category:Type 1934 Class|Type 1934-class]]|'''Secretary: Type 1934-class'''<hr>'''[[:Category:Type 1934 Class|''Type 1934''-class]]'''<br>{{Ship/Banner|Z1}}<br>{{Ship/Banner|Z3}} }}
Line 15: Line 18:  
|Fubuki-class = color:#AAFFCC;" {{!}} {{ToolTip|[[:Category:Fubuki Class|Fubuki-class]]|'''Secretary: Fubuki-class'''<hr>'''[[:Category:Fubuki Class|''Fubuki''-class]]'''<br>{{Ship/Banner|Fubuki}}{{Ship/Banner|Shirayuki}}<br>{{Ship/Banner|Hatsuyuki}}{{Ship/Banner|Miyuki}}<br>{{Ship/Banner|Murakumo}}{{Ship/Banner|Usugumo}}<br>{{Ship/Banner|Isonami}}{{Ship/Banner|Uranami}} }}
 
|Fubuki-class = color:#AAFFCC;" {{!}} {{ToolTip|[[:Category:Fubuki Class|Fubuki-class]]|'''Secretary: Fubuki-class'''<hr>'''[[:Category:Fubuki Class|''Fubuki''-class]]'''<br>{{Ship/Banner|Fubuki}}{{Ship/Banner|Shirayuki}}<br>{{Ship/Banner|Hatsuyuki}}{{Ship/Banner|Miyuki}}<br>{{Ship/Banner|Murakumo}}{{Ship/Banner|Usugumo}}<br>{{Ship/Banner|Isonami}}{{Ship/Banner|Uranami}} }}
    +
<!-- multiple specific ships -->
 
|Warspite, Nelson = color:#AAFFCC;" {{!}} {{ToolTip|[[Warspite]]<br>[[Nelson]]|'''Secretary: [[Warspite]], [[Nelson]]'''<hr>{{Ship/Banner|Warspite}}<br>{{Ship/Banner|Nelson}} }}
 
|Warspite, Nelson = color:#AAFFCC;" {{!}} {{ToolTip|[[Warspite]]<br>[[Nelson]]|'''Secretary: [[Warspite]], [[Nelson]]'''<hr>{{Ship/Banner|Warspite}}<br>{{Ship/Banner|Nelson}} }}
 
|Jintsuu Kai Ni, Hiei Kai Ni (C) = color:#AAFFCC;" {{!}} {{ToolTip|[[Jintsuu Kai Ni]]<br>[[Hiei Kai Ni|Hiei Kai Ni (C)]]|'''Secretary: [[Jintsuu Kai Ni]], [[Hiei Kai Ni|Hiei Kai Ni (C)]]'''<hr>'''{{Ship/Banner|Jintsuu Kai Ni}}<br>{{Ship/Banner|Hiei Kai Ni}} }}
 
|Jintsuu Kai Ni, Hiei Kai Ni (C) = color:#AAFFCC;" {{!}} {{ToolTip|[[Jintsuu Kai Ni]]<br>[[Hiei Kai Ni|Hiei Kai Ni (C)]]|'''Secretary: [[Jintsuu Kai Ni]], [[Hiei Kai Ni|Hiei Kai Ni (C)]]'''<hr>'''{{Ship/Banner|Jintsuu Kai Ni}}<br>{{Ship/Banner|Hiei Kai Ni}} }}
 
|Akitsu Maru, Shinshuu Maru, Souya (AGS) = color:#AAFFCC;" {{!}} {{ToolTip|[[Akitsu Maru]]<br>[[Shinshuu Maru]]<br>[[Souya (AGS)]]<br>{{colour|red|(NOT AGL/AGB)}}|'''Secretary: [[Akitsu Maru]], [[Shinshuu Maru]],<br>[[Souya (AGS)]] {{colour|red|(NOT {{Ship/Link|Souya/(AGL)|text=AGL}}/{{Ship/Link|Souya/(AGB)|text=AGB}})}}'''<hr>'''{{Ship/Banner|Akitsu Maru}}<br>{{Ship/Banner|Shinshuu Maru}}<br>{{ItemStack|item={{Ship/Banner|Souya (AGS)}}|text=(AGS)}} }}
 
|Akitsu Maru, Shinshuu Maru, Souya (AGS) = color:#AAFFCC;" {{!}} {{ToolTip|[[Akitsu Maru]]<br>[[Shinshuu Maru]]<br>[[Souya (AGS)]]<br>{{colour|red|(NOT AGL/AGB)}}|'''Secretary: [[Akitsu Maru]], [[Shinshuu Maru]],<br>[[Souya (AGS)]] {{colour|red|(NOT {{Ship/Link|Souya/(AGL)|text=AGL}}/{{Ship/Link|Souya/(AGB)|text=AGB}})}}'''<hr>'''{{Ship/Banner|Akitsu Maru}}<br>{{Ship/Banner|Shinshuu Maru}}<br>{{ItemStack|item={{Ship/Banner|Souya (AGS)}}|text=(AGS)}} }}
    +
<!-- singular ships (with additional text) -->
 
|Ise Kai (Ni) = color:#AAFFCC;" {{!}} {{ToolTip|[[Ise Kai|Ise Kai (Ni)]]|'''Secretary: [[Ise Kai|Ise Kai (Ni)]]'''<hr>{{Ship/Banner|Ise Kai}} }}
 
|Ise Kai (Ni) = color:#AAFFCC;" {{!}} {{ToolTip|[[Ise Kai|Ise Kai (Ni)]]|'''Secretary: [[Ise Kai|Ise Kai (Ni)]]'''<hr>{{Ship/Banner|Ise Kai}} }}
 
|Hyuuga Kai (Ni) = color:#AAFFCC;" {{!}} {{ToolTip|[[Hyuuga Kai|Hyuuga Kai (Ni)]]|'''Secretary: [[Hyuuga Kai|Hyuuga Kai (Ni)]]'''<hr>{{Ship/Banner|Hyuuga Kai}} }}
 
|Hyuuga Kai (Ni) = color:#AAFFCC;" {{!}} {{ToolTip|[[Hyuuga Kai|Hyuuga Kai (Ni)]]|'''Secretary: [[Hyuuga Kai|Hyuuga Kai (Ni)]]'''<hr>{{Ship/Banner|Hyuuga Kai}} }}
|Commandant Teste = color:#AAFFCC;" {{!}} {{ToolTip|[[Commandant Teste]]|'''Secretary: [[Commandant Teste]]'''<hr>'''{{Ship/Banner|Commandant Teste}} }}
+
 
|Ark Royal = color:#AAFFCC;" {{!}} {{ToolTip|[[Ark Royal]]|'''Secretary: [[Ark Royal]]'''<hr>'''{{Ship/Banner|Ark Royal}} }}
+
<!-- singular ships -->
|Sendai Kai Ni = color:#AAFFCC;" {{!}} {{ToolTip|[[Sendai Kai Ni]]|'''Secretary: [[Sendai Kai Ni]]'''<hr>'''{{Ship/Banner|Sendai Kai Ni}} }}
+
|Commandant Teste|Ark Royal|Sendai Kai Ni|Helena Kai|Northampton Kai = color:#AAFFCC;" {{!}} {{ToolTip|[[{{{secretary|{{{1|}}}}}}]]|'''Secretary: [[{{{secretary|{{{1|}}}}}}]]'''<hr>'''{{Ship/Banner|{{{secretary|{{{1|}}}}}}}} }}
|Helena Kai = color:#AAFFCC;" {{!}} {{ToolTip|[[Helena Kai]]|'''Secretary: [[Helena Kai]]'''<hr>'''{{Ship/Banner|Helena Kai}} }}
  −
|Northampton Kai = color:#AAFFCC;" {{!}} {{ToolTip|[[Northampton Kai]]|'''Secretary: [[Northampton Kai]]'''<hr>'''{{Ship/Banner|Northampton Kai}} }}
      
|color:{{{secretarycolour|}}};" {{!}} {{ToolTip|text-align=default;background-color:{{{secretarycolour|}}}|{{#if:{{{secretary|}}}|{{{secretary|}}}|{{#if:{{{1|}}}|{{{1}}}|Empty Secretary}}}}|'''Secretary: {{#if:{{{secretary|}}}|{{{secretary|}}}|[[Template:DevelopmentSecretaryCol]]}}'''<hr>{{#if:{{{secretarydescription|}}}|{{{secretarydescription|}}}|Go here to find/edit/add secretaries<br>[[Template:DevelopmentSecretaryCol]]}}}}}}</includeonly><noinclude>
 
|color:{{{secretarycolour|}}};" {{!}} {{ToolTip|text-align=default;background-color:{{{secretarycolour|}}}|{{#if:{{{secretary|}}}|{{{secretary|}}}|{{#if:{{{1|}}}|{{{1}}}|Empty Secretary}}}}|'''Secretary: {{#if:{{{secretary|}}}|{{{secretary|}}}|[[Template:DevelopmentSecretaryCol]]}}'''<hr>{{#if:{{{secretarydescription|}}}|{{{secretarydescription|}}}|Go here to find/edit/add secretaries<br>[[Template:DevelopmentSecretaryCol]]}}}}}}</includeonly><noinclude>
Line 80: Line 83:  
|-
 
|-
 
! align="center" style="background-{{DevelopmentSecretaryCol|Hyuuga Kai (Ni)}}
 
! align="center" style="background-{{DevelopmentSecretaryCol|Hyuuga Kai (Ni)}}
 +
|-
 +
|
 +
|-
 
|-
 
|-
 
! align="center" style="background-{{DevelopmentSecretaryCol|Commandant Teste}}
 
! align="center" style="background-{{DevelopmentSecretaryCol|Commandant Teste}}
advmod, cssedit, Interface administrators, janitor, Moderators, prechecked, Widget editors
7,361

edits