Changes

primary resource column colours moved to css
Line 6: Line 6:  
{{!}} rowspan="{{#var:total_rowspan}}" {{!}} {{#ifeq: {{{Bauxite}}} | 0 | - | {{{Bauxite}}} }}
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}} {{#ifeq: {{{Bauxite}}} | 0 | - | {{{Bauxite}}} }}
 
{{#if: {{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}}|! {{DevelopmentSecretaryCol|secretary=Torpedo}}
 
{{#if: {{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}}|! {{DevelopmentSecretaryCol|secretary=Torpedo}}
{{!}} style="background-color:#AAFFAA;" {{!}}{{#if: {{{TorpeF/S|}}} | {{{TorpeF/S}}}% | - }}
+
{{!}} class="dev-f_s" {{!}}{{#if: {{{TorpeF/S|}}} | {{{TorpeF/S}}}% | - }}
{{!}} style="background-color:#FFAAAA;" {{!}}{{#if: {{{TorpeAmmo|}}} | {{{TorpeAmmo}}}% | - }}
+
{{!}} class="dev-a" {{!}}{{#if: {{{TorpeAmmo|}}} | {{{TorpeAmmo}}}% | - }}
{{!}} style="background-color:#FFFFAA;" {{!}}{{#if: {{{TorpeBaux|}}} | {{{TorpeBaux}}}% | - }}
+
{{!}} class="dev-b" {{!}}{{#if: {{{TorpeBaux|}}} | {{{TorpeBaux}}}% | - }}
 
{{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
Line 15: Line 15:  
{{!}}- | }}
 
{{!}}- | }}
 
! {{DevelopmentSecretaryCol|secretary=Heavy}}
 
! {{DevelopmentSecretaryCol|secretary=Heavy}}
{{!}} style="background-color:#AAFFAA;" {{!}}{{#if: {{{HeavyF/S|}}} | {{{HeavyF/S}}}% | - }}
+
{{!}} class="dev-f_s" {{!}}{{#if: {{{HeavyF/S|}}} | {{{HeavyF/S}}}% | - }}
{{!}} style="background-color:#FFAAAA;" {{!}}{{#if: {{{HeavyAmmo|}}} | {{{HeavyAmmo}}}% | - }}
+
{{!}} class="dev-a" {{!}}{{#if: {{{HeavyAmmo|}}} | {{{HeavyAmmo}}}% | - }}
{{!}} style="background-color:#FFFFAA;" {{!}}{{#if: {{{HeavyBaux|}}} | {{{HeavyBaux}}}% | - }}
+
{{!}} class="dev-b" {{!}}{{#if: {{{HeavyBaux|}}} | {{{HeavyBaux}}}% | - }}
 
{{#if: {{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}} | | {{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{#if: {{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}} | | {{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
Line 24: Line 24:  
{{!}}- | }}
 
{{!}}- | }}
 
! {{DevelopmentSecretaryCol|secretary=Aviation}}
 
! {{DevelopmentSecretaryCol|secretary=Aviation}}
{{!}} style="background-color:#AAFFAA;" {{!}}{{#if: {{{AviatF/S|}}} | {{{AviatF/S}}}% | - }}
+
{{!}} class="dev-f_s" {{!}}{{#if: {{{AviatF/S|}}} | {{{AviatF/S}}}% | - }}
{{!}} style="background-color:#FFAAAA;" {{!}}{{#if: {{{AviatAmmo|}}} | {{{AviatAmmo}}}% | - }}
+
{{!}} class="dev-a" {{!}}{{#if: {{{AviatAmmo|}}} | {{{AviatAmmo}}}% | - }}
{{!}} style="background-color:#FFFFAA;" {{!}}{{#if: {{{AviatBaux|}}} | {{{AviatBaux}}}% | - }}
+
{{!}} class="dev-b" {{!}}{{#if: {{{AviatBaux|}}} | {{{AviatBaux}}}% | - }}
 
{{#if: {{{HeavyF/S|}}}{{{HeavyAmmo|}}}{{{HeavyBaux|}}}{{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}} | | {{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{#if: {{{HeavyF/S|}}}{{{HeavyAmmo|}}}{{{HeavyBaux|}}}{{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}} | | {{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
Line 33: Line 33:  
{{!}}- | }}
 
{{!}}- | }}
 
! {{DevelopmentSecretaryCol|secretary=Submarine}}
 
! {{DevelopmentSecretaryCol|secretary=Submarine}}
{{!}} style="background-color:#AAFFAA;" {{!}}{{#if: {{{SubmaF/S|}}} | {{{SubmaF/S}}}% | - }}
+
{{!}} class="dev-f_s" {{!}}{{#if: {{{SubmaF/S|}}} | {{{SubmaF/S}}}% | - }}
{{!}} style="background-color:#FFAAAA;" {{!}}{{#if: {{{SubmaAmmo|}}} | {{{SubmaAmmo}}}% | - }}
+
{{!}} class="dev-a" {{!}}{{#if: {{{SubmaAmmo|}}} | {{{SubmaAmmo}}}% | - }}
{{!}} style="background-color:#FFFFAA;" {{!}}{{#if: {{{SubmaBaux|}}} | {{{SubmaBaux}}}% | - }}
+
{{!}} class="dev-b" {{!}}{{#if: {{{SubmaBaux|}}} | {{{SubmaBaux}}}% | - }}
 
{{#if: {{{HeavyF/S|}}}{{{HeavyAmmo|}}}{{{HeavyBaux|}}}{{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}}{{{AviatF/S|}}}{{{AviatAmmo|}}}{{{AviatBaux|}}} | | {{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{#if: {{{HeavyF/S|}}}{{{HeavyAmmo|}}}{{{HeavyBaux|}}}{{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}}{{{AviatF/S|}}}{{{AviatAmmo|}}}{{{AviatBaux|}}} | | {{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
Line 42: Line 42:  
{{!}}- | }}
 
{{!}}- | }}
 
! {{DevelopmentSecretaryCol|secretary={{{Custom1Secretary|}}}|secretarycolour={{{Custom1SecretaryColour|}}}|secretarydescription={{{Custom1SecretaryDescription|}}}}}
 
! {{DevelopmentSecretaryCol|secretary={{{Custom1Secretary|}}}|secretarycolour={{{Custom1SecretaryColour|}}}|secretarydescription={{{Custom1SecretaryDescription|}}}}}
{{!}} style="background-color:#AAFFAA;" {{!}}{{#if: {{{Custom1F/S|}}} | {{{Custom1F/S}}}% | - }}
+
{{!}} class="dev-f_s" {{!}}{{#if: {{{Custom1F/S|}}} | {{{Custom1F/S}}}% | - }}
{{!}} style="background-color:#FFAAAA;" {{!}}{{#if: {{{Custom1Ammo|}}} | {{{Custom1Ammo}}}% | - }}
+
{{!}} class="dev-a" {{!}}{{#if: {{{Custom1Ammo|}}} | {{{Custom1Ammo}}}% | - }}
{{!}} style="background-color:#FFFFAA;" {{!}}{{#if: {{{Custom1Baux|}}} | {{{Custom1Baux}}}% | - }}
+
{{!}} class="dev-b" {{!}}{{#if: {{{Custom1Baux|}}} | {{{Custom1Baux}}}% | - }}
 
{{#if: {{{HeavyF/S|}}}{{{HeavyAmmo|}}}{{{HeavyBaux|}}}{{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}}{{{AviatF/S|}}}{{{AviatAmmo|}}}{{{AviatBaux|}}}{{{SubmaF/S|}}}{{{SubmaAmmo|}}}{{{SubmaBaux|}}} | | {{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{#if: {{{HeavyF/S|}}}{{{HeavyAmmo|}}}{{{HeavyBaux|}}}{{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}}{{{AviatF/S|}}}{{{AviatAmmo|}}}{{{AviatBaux|}}}{{{SubmaF/S|}}}{{{SubmaAmmo|}}}{{{SubmaBaux|}}} | | {{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
Line 51: Line 51:  
{{!}}- | }}
 
{{!}}- | }}
 
! {{DevelopmentSecretaryCol|secretary={{{Custom2Secretary|}}}|secretarycolour={{{Custom2SecretaryColour|}}}|secretarydescription={{{Custom2SecretaryDescription|}}}}}
 
! {{DevelopmentSecretaryCol|secretary={{{Custom2Secretary|}}}|secretarycolour={{{Custom2SecretaryColour|}}}|secretarydescription={{{Custom2SecretaryDescription|}}}}}
{{!}} style="background-color:#AAFFAA;" {{!}}{{#if: {{{Custom2F/S|}}} | {{{Custom2F/S}}}% | - }}
+
{{!}} class="dev-f_s" {{!}}{{#if: {{{Custom2F/S|}}} | {{{Custom2F/S}}}% | - }}
{{!}} style="background-color:#FFAAAA;" {{!}}{{#if: {{{Custom2Ammo|}}} | {{{Custom2Ammo}}}% | - }}
+
{{!}} class="dev-a" {{!}}{{#if: {{{Custom2Ammo|}}} | {{{Custom2Ammo}}}% | - }}
{{!}} style="background-color:#FFFFAA;" {{!}}{{#if: {{{Custom2Baux|}}} | {{{Custom2Baux}}}% | - }}
+
{{!}} class="dev-b" {{!}}{{#if: {{{Custom2Baux|}}} | {{{Custom2Baux}}}% | - }}
 
{{#if: {{{HeavyF/S|}}}{{{HeavyAmmo|}}}{{{HeavyBaux|}}}{{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}}{{{AviatF/S|}}}{{{AviatAmmo|}}}{{{AviatBaux|}}}{{{Custom1F/S|}}}{{{Custom1Ammo|}}}{{{Custom1Baux|}}} | | {{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{#if: {{{HeavyF/S|}}}{{{HeavyAmmo|}}}{{{HeavyBaux|}}}{{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}}{{{AviatF/S|}}}{{{AviatAmmo|}}}{{{AviatBaux|}}}{{{Custom1F/S|}}}{{{Custom1Ammo|}}}{{{Custom1Baux|}}} | | {{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
Line 60: Line 60:  
{{!}}- | }}
 
{{!}}- | }}
 
! {{DevelopmentSecretaryCol|secretary={{{Custom3Secretary|}}}|secretarycolour={{{Custom3SecretaryColour|}}}|secretarydescription={{{Custom3SecretaryDescription|}}}}}
 
! {{DevelopmentSecretaryCol|secretary={{{Custom3Secretary|}}}|secretarycolour={{{Custom3SecretaryColour|}}}|secretarydescription={{{Custom3SecretaryDescription|}}}}}
{{!}} style="background-color:#AAFFAA;" {{!}}{{#if: {{{Custom3F/S|}}} | {{{Custom3F/S}}}% | - }}
+
{{!}} class="dev-f_s" {{!}}{{#if: {{{Custom3F/S|}}} | {{{Custom3F/S}}}% | - }}
{{!}} style="background-color:#FFAAAA;" {{!}}{{#if: {{{Custom3Ammo|}}} | {{{Custom3Ammo}}}% | - }}
+
{{!}} class="dev-a" {{!}}{{#if: {{{Custom3Ammo|}}} | {{{Custom3Ammo}}}% | - }}
{{!}} style="background-color:#FFFFAA;" {{!}}{{#if: {{{Custom3Baux|}}} | {{{Custom3Baux}}}% | - }}
+
{{!}} class="dev-b" {{!}}{{#if: {{{Custom3Baux|}}} | {{{Custom3Baux}}}% | - }}
 
{{#if: {{{HeavyF/S|}}}{{{HeavyAmmo|}}}{{{HeavyBaux|}}}{{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}}{{{AviatF/S|}}}{{{AviatAmmo|}}}{{{AviatBaux|}}}{{{SubmaF/S|}}}{{{SubmaAmmo|}}}{{{SubmaBaux|}}}{{{Custom1F/S|}}}{{{Custom1Ammo|}}}{{{Custom1Baux|}}}{{{Custom2F/S|}}}{{{Custom2Ammo|}}}{{{Custom2Baux|}}} | | {{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{#if: {{{HeavyF/S|}}}{{{HeavyAmmo|}}}{{{HeavyBaux|}}}{{{TorpeF/S|}}}{{{TorpeAmmo|}}}{{{TorpeBaux|}}}{{{AviatF/S|}}}{{{AviatAmmo|}}}{{{AviatBaux|}}}{{{SubmaF/S|}}}{{{SubmaAmmo|}}}{{{SubmaBaux|}}}{{{Custom1F/S|}}}{{{Custom1Ammo|}}}{{{Custom1Baux|}}}{{{Custom2F/S|}}}{{{Custom2Ammo|}}}{{{Custom2Baux|}}} | | {{!}} rowspan="{{#var:total_rowspan}}" {{Detail|target=minHQ}} {{!}}{{{minHQ}}}
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
 
{{!}} rowspan="{{#var:total_rowspan}}" {{!}}{{{Note}}}{{#if: {{{OutdatedDate|}}}{{{OutdatedNote|}}}|<nowiki />
advmod, cssedit, Interface administrators, janitor, Moderators, prechecked, Widget editors
7,372

edits