Template:Raw Material - Revision history

Eleonore Silvermoon at 11:00, 8 June 2016

2016-06-08T11:00:30Z

Eleonore Silvermoon at 17:26, 4 February 2016

2016-02-04T17:26:30Z

Eleonore Silvermoon at 19:33, 18 January 2016

2016-01-18T19:33:20Z

Eleonore Silvermoon at 17:36, 16 January 2016

2016-01-16T17:36:43Z

Eleonore Silvermoon at 12:00, 16 January 2016

2016-01-16T12:00:01Z

Eleonore Silvermoon at 11:48, 16 January 2016

2016-01-16T11:48:05Z

Eleonore Silvermoon at 11:47, 16 January 2016

2016-01-16T11:47:44Z

Eleonore Silvermoon at 11:42, 16 January 2016

2016-01-16T11:42:00Z

Eleonore Silvermoon at 11:41, 16 January 2016

2016-01-16T11:41:11Z

Eleonore Silvermoon at 10:29, 16 January 2016

2016-01-16T10:29:30Z

@@ Line 1: / Line 1: @@
-<includeonly>{| class="wikitable" style="width:60%;margin-left:auto;margin-right:auto;"
+<includeonly>{| style="width:60em;margin-left:auto;margin-right:auto;margin-top:2ex;margin-bottom:2ex;border-spacing: 2px 5px;padding:0.2em;border: 1px solid grey;border-collapse: collapse;font-size:88%;"
-!colspan="5"|{{{name}}}
+!colspan="5" style="text-align:center;font-weight:bold;background:#3b4044;border: 1px solid grey;font-size:120%;padding-top:0.5ex;padding-bottom:0.5ex;color:white;"|{{{name}}}
 |-
-|rowspan="3" style="width:20%;vertical-align:middle"|{{#ifexist: File:Material {{{name}}}.png|[[File:Material {{{name}}}.png|100px|center|link={{{link}}}|alt={{{name}}}|{{{name}}}]]|[[File:Material {{{name}}}.jpg|center|100px|link={{{link}}}|alt={{{name}}}|{{{name}}}]]}}
+|rowspan="3" style="width:20%;vvertical-align:middle;border: 1px solid grey;"|{{#ifexist: File:Material {{{name}}}.png|[[File:Material {{{name}}}.png|100px|center|link={{{link}}}|alt={{{name}}}|{{{name}}}]]|[[File:Material {{{name}}}.jpg|center|100px|link={{{link}}}|alt={{{name}}}|{{{name}}}]]}}
-|style="width:20%;"|'''Used For:'''
+|style="width:20%;border: 1px solid grey;padding:0.25ex 0.5em 0.25ex 0.5em;text-align:center;font-weight:bold;text-align:left;"|Used For:
-|style="width:20%;text-align:right;"|{{{usedFor}}}
+|style="width:20%;border: 1px solid grey;padding:0.25ex 0.5em 0.25ex 0.5em;text-align:center;text-align:right;"|{{{usedFor}}}
-|style="width:20%;"|'''External Price:'''
+|style="width:20%;border: 1px solid grey;padding:0.25ex 0.5em 0.25ex 0.5em;text-align:center;font-weight:bold;text-align:left;"|External Price:
-|style="width:20%;text-align:right;"|{{Credit|{{#number_format:{{{price}}}}}}}
+|style="width:20%;border: 1px solid grey;padding:0.25ex 0.5em 0.25ex 0.5em;text-align:center;text-align:right;"|{{Price|{{{price}}}}}
 |-
-|style="width:20%;"|'''Weight:'''
+|style="width:20%;border: 1px solid grey;padding:0.25ex 0.5em 0.25ex 0.5em;text-align:center;font-weight:bold;text-align:left;"|Weight:
-|style="width:20%;text-align:right;"|{{{weight}}} T
+|style="width:20%;border: 1px solid grey;padding:0.25ex 0.5em 0.25ex 0.5em;text-align:center;text-align:right;"|{{{weight}}} T
-|style="width:20%;"|'''Supplier:'''
+|style="width:20%;border: 1px solid grey;padding:0.25ex 0.5em 0.25ex 0.5em;text-align:center;font-weight:bold;text-align:left;"|Supplier:
-|style="width:20%;text-align:right;"|[[{{{supplier}}}]]
+|style="width:20%;border: 1px solid grey;padding:0.25ex 0.5em 0.25ex 0.5em;text-align:center;text-align:right;"|[[{{{supplier}}}]]
 |-
-|style="width:20%;"|'''Available:'''
+|style="width:20%;border: 1px solid grey;padding:0.25ex 0.5em 0.25ex 0.5em;text-align:center;font-weight:bold;text-align:left;"|Available:
-|style="width:20%;text-align:right;"|{{#ifeq: {{{available}}}|true|Yes|Sales are currently closed}}
+|style="width:20%;border: 1px solid grey;padding:0.25ex 0.5em 0.25ex 0.5em;text-align:center;text-align:right;"|{{#ifeq: {{{available}}}|true|Yes|Sales are currently closed}}
-|style="width:20%;"|
+|style="width:20%;border: 1px solid grey;padding:0.25ex 0.5em 0.25ex 0.5em;text-align:center;font-weight:bold;text-align:left;"|
-|style="width:20%;text-align:right;"|
+|style="width:20%;border: 1px solid grey;padding:0.25ex 0.5em 0.25ex 0.5em;text-align:center;text-align:right;"|
 |}</includeonly><noinclude>
 ===Usage===

@@ Line 2: / Line 2: @@
 !colspan="5"|{{{name}}}
 |-
-|rowspan="4" style="width:20%;vertical-align:middle"|{{#ifexist: File:Material {{{name}}}.png|[[File:Material {{{name}}}.png|100px|center|link={{{link}}}|alt={{{name}}}|{{{name}}}]]|[[File:Material {{{name}}}.jpg|center|100px|link={{{link}}}|alt={{{name}}}|{{{name}}}]]}}
+|rowspan="3" style="width:20%;vertical-align:middle"|{{#ifexist: File:Material {{{name}}}.png|[[File:Material {{{name}}}.png|100px|center|link={{{link}}}|alt={{{name}}}|{{{name}}}]]|[[File:Material {{{name}}}.jpg|center|100px|link={{{link}}}|alt={{{name}}}|{{{name}}}]]}}
 |style="width:20%;"|'''Used For:'''
 |style="width:20%;text-align:right;"|{{{usedFor}}}
-|style="width:20%;"|'''GA Price:'''
+|style="width:20%;"|'''External Price:'''
-|style="width:20%;text-align:right;"|{{Credit|{{#number_format:{{#expr:{{{price}}}*(1-{{:Sales Discounts|discount=JMC GA}}/100)}}}}}}
+|style="width:20%;text-align:right;"|{{Credit|{{#number_format:{{{price}}}}}}}
 |-
 |style="width:20%;"|'''Weight:'''
 |style="width:20%;text-align:right;"|{{{weight}}} T
 |style="width:20%;"|'''Supplier:'''
 |style="width:20%;text-align:right;"|[[{{{supplier}}}]]
 |-
 |style="width:20%;"|'''Available:'''

@@ Line 13: / Line 13: @@
 |style="width:20%;text-align:right;"|{{Credit|{{#number_format:{{{price}}}}}}}
 |-
-|style="width:20%;"|'''Sold By:'''
+|style="width:20%;"|'''Supplier:'''
-|style="width:20%;text-align:right;"|[[{{{soldBy}}}]]
+|style="width:20%;text-align:right;"|[[{{{supplier}}}]]
 |style="width:20%;"|
 |style="width:20%;text-align:right;"|
@@ Line 27: / Line 27: @@
 {{Raw Material
 | name =
-| soldBy =
+| supplier =
 | link =
 | price =
@@ Line 38: / Line 38: @@
 <pre><nowiki>{{Raw Material
 | name = Quantum
-| soldBy = JUGANOTH Mining Corporation
+| supplier = JUGANOTH Mining Corporation
 | usedFor = Armour
 | price = 1100
@@ Line 46: / Line 46: @@
 {{Raw Material
 | name = Quantum
-| soldBy = JUGANOTH Mining Corporation
+| supplier = JUGANOTH Mining Corporation
 | usedFor = Armour
 | price = 1100

@@ Line 1: / Line 1: @@
-<includeonly>{| class="wikitable" style="width:90%;margin-left:auto;margin-right:auto;"
+<includeonly>{| class="wikitable" style="width:60%;margin-left:auto;margin-right:auto;"
 !colspan="5"|{{{name}}}
 |-

@@ Line 6: / Line 6: @@
 |style="width:20%;text-align:right;"|{{{usedFor}}}
 |style="width:20%;"|'''GA Price:'''
-|style="width:20%;text-align:right;"|{{Credit|{{#number_format:{{#expr:{{{price}}}*{{:Sales Discounts|discount=JMC GA}}}}}}}}
+|style="width:20%;text-align:right;"|{{Credit|{{#number_format:{{#expr:{{{price}}}*(1-{{:Sales Discounts|discount=JMC GA}}/100)}}}}}}
 |-
 |style="width:20%;"|'''Weight:'''

@@ Line 6: / Line 6: @@
 |style="width:20%;text-align:right;"|{{{usedFor}}}
 |style="width:20%;"|'''GA Price:'''
-|style="width:20%;text-align:right;"|{{Credit|{{#number_format:{{#expr:{{{externalPrice}}}*{{:JMC GA Discount}}}}}}}}
+|style="width:20%;text-align:right;"|{{Credit|{{#number_format:{{#expr:{{{externalPrice}}}*{{:Sales Discounts|discount=JMC GA}}}}}}}}
 |-
 |style="width:20%;"|'''Weight:'''
@@ Line 29: / Line 29: @@
 | soldBy =
 | link =
-| externalPrice =
+| price =
 | weight =
 | available = true|false (or empty)
@@ Line 41: / Line 40: @@
 | soldBy = JUGANOTH Mining Corporation
 | usedFor = Armour
-| externalPrice = 1100
+| price = 1100
 | weight = 12
 | available = true
@@ Line 49: / Line 48: @@
 | soldBy = JUGANOTH Mining Corporation
 | usedFor = Armour
-| externalPrice = 1100
+| price = 1100
 | weight = 12
 | available = true
 }}
 [[Category:Templates|{{PAGENAME}}]]</noinclude>

@@ Line 54: / Line 54: @@
 }}
-{{:Sales Discounts}}
+{{:Sales Discounts|transcludesection=test}}
 [[Category:Templates|{{PAGENAME}}]]</noinclude>