Template:Soldier: Difference between revisions

VisualWikitext

@@ Line 17: / Line 17: @@
 |Enlistment_place=String
 |State=String
-|Assignment=String
 |IPW_German=String
 |IPW_Italian=String
-|Overseas=String
 |Rank_final=String
 |Match_confidence=String
 }}
-This template stores one Camp Ritchie soldier and renders the infobox. Edit the soldier article, not this page, unless you are changing the data schema.
+This template stores one Camp Ritchie soldier, renders a Wikipedia-style infobox (Personal details and Military service), and writes the opening biography paragraph from those fields. Edit the soldier article to add a photo: upload a file named like <code>Firstname surname.jpg</code> and the infobox will use it automatically, or set <code>|photo=Filename.jpg</code> explicitly.
 [[Category:Templates]]
-</noinclude><includeonly>{{#cargo_store:_table=Soldiers
+</noinclude><includeonly><!-- infobox trim: no State/Certificate display (Module:Soldier) -->{{#cargo_store:_table=Soldiers
 |ASN={{{asn|}}}
 |Surname={{{surname|}}}
@@ Line 34: / Line 32: @@
 |Alias={{{alias|}}}
 |Class_number={{{class_number|}}}
-|Class_section={{{class_section|}}}
+|Class_section={{uc:{{{class_section|}}}}}
 |Class_rank={{{class_rank|}}}
 |Class_branch={{{class_branch|}}}
@@ Line 43: / Line 41: @@
 |Enlistment_place={{{enlistment_place|}}}
 |State={{{state|}}}
-|Assignment={{{assignment|}}}
 |IPW_German={{{ipw_ge|}}}
 |IPW_Italian={{{ipw_it|}}}
-|Overseas={{{overseas|}}}
 |Rank_final={{{rank_final|}}}
 |Match_confidence={{{confidence|}}}
-}}{{#if:{{{confidence|}}}|{{#ifeq:{{{confidence}}}|high||<div class="unconfirmed-banner">'''Record status: unconfirmed.''' The class-roster match confidence is ''{{{confidence}}}''. Correct the infobox if you have a source, and mention it in [[{{TALKPAGENAME}}|talk]].</div>}}}}
+}}{{DISPLAYTITLE:{{#invoke:Soldier|displayName}}}}{{#if:{{{confidence|}}}|{{#ifeq:{{{confidence}}}|high||<div class="hatnote unconfirmed-banner">''Record status: unconfirmed.'' Class-roster match confidence is ''{{{confidence}}}''. Correct the infobox if you have a source, and note it on [[{{TALKPAGENAME}}|talk]].</div>}}}}{{#invoke:Soldier|infobox}}{{#ifeq:{{{lede_on_page|}}}|1||
-{| class="soldier-infobox"
+{{#invoke:Soldier|lead}}}}{{#invoke:Soldier|storyCue}}{{#invoke:Soldier|mediaCue}}{{#invoke:Soldier|awardsSection}}{{#invoke:Soldier|relatedSoldiers}}<div class="hatnote research-notes-disclaimer">''Research notes'' on this page are compiled from the source file and later edits. They may be unverified, incomplete, or incorrect, and should not be treated as established fact. Please [[Contribute|correct the article]] or add sources on the [[{{TALKPAGENAME}}|talk page]]. For class-roster terms, see [[About the data]].</div>{{Source confidence}}[[Category:Soldiers]]{{#invoke:SplitCats|letterCategory}}{{#invoke:SplitCats|categories|{{{class_number|}}}|Class }}{{#if:{{{nativity|}}}|[[Category:Nativity {{{nativity}}}]]}}{{#invoke:SplitCats|categories|{{{ipw_ge|}}}|Team IPW }}{{#invoke:SplitCats|categories|{{{ipw_it|}}}|Team IPW Italian }}{{#invoke:Soldier|noteTeamCategories}}
-|-
-! colspan="2" | {{#if:{{{first|}}}|{{{first}}} }}{{{surname|Soldier}}}
-{{#if:{{{photo|}}}|
-{{!}}-
-{{!}} colspan="2" style="text-align:center" {{!}} [[File:{{{photo}}}|250px]]
-}}
-{{#if:{{{alias|}}}|
-{{!}}-
-! class="label" {{!}} Alias
-{{!}} {{{alias}}}
-}}
-{{#if:{{{asn|}}}|
-{{!}}-
-! class="label" {{!}} ASN
-{{!}} {{{asn}}}
-}}
-{{#if:{{{class_number|}}}|
-{{!}}-
-! class="label" {{!}} Class
-{{!}} {{{class_display|{{{class_number|}}}}}}
-}}
-{{#if:{{{class_section|}}}|
-{{!}}-
-! class="label" {{!}} Section
-{{!}} {{{class_section}}}
-}}
-{{#if:{{{class_rank|}}}|
-{{!}}-
-! class="label" {{!}} Class rank
-{{!}} {{{class_rank}}}
-}}
-{{#if:{{{class_branch|}}}|
-{{!}}-
-! class="label" {{!}} Class branch
-{{!}} {{{class_branch}}}
-}}
-{{#if:{{{rank_final|}}}|
-{{!}}-
-! class="label" {{!}} Final rank
-{{!}} {{{rank_final}}}
-}}
-{{#if:{{{birth_year|}}}|
-{{!}}-
-! class="label" {{!}} Birth year
-{{!}} {{{birth_year}}}
-}}
-{{#if:{{{death_year|}}}|
-{{!}}-
-! class="label" {{!}} Death year
-{{!}} {{{death_year}}}
-}}
-{{#if:{{{nativity|}}}|
-{{!}}-
-! class="label" {{!}} Nativity
-{{!}} {{{nativity}}}
-}}
-{{#if:{{{religion|}}}|
-{{!}}-
-! class="label" {{!}} Religion
-{{!}} {{{religion}}}
-}}
-{{#if:{{{state|}}}|
-{{!}}-
-! class="label" {{!}} State
-{{!}} {{{state}}}
-}}
-{{#if:{{{enlistment_place|}}}|
-{{!}}-
-! class="label" {{!}} Place of enlistment
-{{!}} {{{enlistment_place}}}
-}}
-{{#if:{{{assignment|}}}|
-{{!}}-
-! class="label" {{!}} Assignment
-{{!}} {{{assignment}}}
-}}
-{{#if:{{{ipw_ge|}}}|
-{{!}}-
-! class="label" {{!}} IPW (German)
-{{!}} {{{ipw_ge}}}
-}}
-{{#if:{{{ipw_it|}}}|
-{{!}}-
-! class="label" {{!}} IPW (Italian)
-{{!}} {{{ipw_it}}}
-}}
-{{#if:{{{overseas|}}}|
-{{!}}-
-! class="label" {{!}} Overseas
-{{!}} {{{overseas}}}
-}}
-{{#if:{{{other_class|}}}|
-{{!}}-
-! class="label" {{!}} Other class
-{{!}} {{{other_class}}}
-}}
-{{#if:{{{division|}}}|
-{{!}}-
-! class="label" {{!}} Division
-{{!}} {{{division}}}
-}}
-{{#if:{{{special|}}}|
-{{!}}-
-! class="label" {{!}} Special
-{{!}} {{{special}}}
-}}
-{{#if:{{{loc|}}}|
-{{!}}-
-! class="label" {{!}} LOC
-{{!}} {{{loc}}}
-}}
-{{#if:{{{date_arrive|}}}|
-{{!}}-
-! class="label" {{!}} Date arrive
-{{!}} {{{date_arrive}}}
-}}
-{{#if:{{{date_depart|}}}|
-{{!}}-
-! class="label" {{!}} Date depart
-{{!}} {{{date_depart}}}
-}}
-{{#if:{{{certificate|}}}|
-{{!}}-
-! class="label" {{!}} Certificate
-{{!}} {{{certificate}}}
-}}
-{{#if:{{{education|}}}|
-{{!}}-
-! class="label" {{!}} Education
-{{!}} {{{education}}}
-}}
-{{#if:{{{occupation|}}}|
-{{!}}-
-! class="label" {{!}} Civilian occupation
-{{!}} {{{occupation}}}
-}}
-{{#if:{{{marital|}}}|
-{{!}}-
-! class="label" {{!}} Marital status
-{{!}} {{{marital}}}
-}}
-|}
-[[Category:Soldiers]]
-{{#invoke:SplitCats|categories|{{{class_number|}}}|Class }}
-{{#if:{{{nativity|}}}|[[Category:Nativity {{{nativity}}}]]}}
-{{#if:{{{assignment|}}}|[[Category:Assignment {{{assignment}}}]]}}
 </includeonly>