Template:Infobox soldier-alt3: Difference between revisions

Content added Content deleted

VisualWikitext

Inline

@@ Line 25: / Line 25: @@
 {{#if:{{{nationality}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Nationality
 {{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{nationality}}}}}
+|-
+{{#if:{{{education}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Education
+{{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{education}}}}}
 |-
 {{#if:{{{residence}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Residence
@@ Line 97: / Line 100: @@
 {{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{period_of_service}}}}}
 |-
-{{#if:{{{service_records}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Service Records
+{{#if:{{{honours}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Honours
-{{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{service_records}}}}}
+{{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{honours}}}}}
 |-
-{{#if:{{{campaign_medals}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Campaign Medals
+{{#if:{{{decorations}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Decorations
-{{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{campaign_medals}}}}}
+{{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{decorations}}}}}
 |-
-{{#if:{{{awards}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Military Awards
+{{#if:{{{medals}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Medals
-{{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{awards}}}}}
+{{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{medals}}}}}
 |-
 {{#if:{{{mention_in_dispatches}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Mention in Dispatches
 {{!}}style="padding-left:5px; vertical-align:top; {{!}} {{{mention_in_dispatches}}}}}
+|-
+{{#if:{{{service_records}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Service Records
+{{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{service_records}}}}}
+|-
+{{#if:{{{other_records}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Other Records
+{{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{other_records}}}}}
 |}{{reflist}}{{clear}}
 |-|
@@ Line 132: / Line 142: @@
 {{#if:{{{commemorations}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Commemorations
 {{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{commemorations}}}}}
-|-
-{{#if:{{{obituary}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Obituary
-{{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{obituary}}}}}
 |}{{reflist}}{{clear}}
 |-|
@@ Line 140: / Line 147: @@
 <div style="float:; padding-right:5px;">{{{images_tab4}}}</div>
 {|style="width:100%; margin:0; padding:5px; line-height:1.6em;"
+|-
+{{#if:{{{obituary}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Obituary
+{{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{obituary}}}}}
 |-
 {{#if:{{{newspapers}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Newspapers
@@ Line 147: / Line 157: @@
 {{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{periodicals}}}}}
 |-
-{{#if:{{{publications}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Publications
+{{#if:{{{books}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Books
-{{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{publications}}}}}
+{{!}}style="padding-left:5px; vertical-align:top;" {{!}} {{{books}}}}}
 |-
 {{#if:{{{websites}}}|{{!}}style="width:12em; padding-left:8px; vertical-align:top; font-weight:600;" {{!}} Websites
@@ Line 201: / Line 211: @@
  |age                  =
  |nationality          =
+ |education            =
  |residence            =
  |former_employment    =
@@ Line 224: / Line 235: @@
  |battles              =
  |period_of_service    =
- |service_records      =
+ |honours              =
- |campaign_medals      =
+ |decorations          =
- |awards               =
+ |medals               =
  |mention_in_dispatches=
+ |service_records      =
+ |other_records        =
  |images_tab2          =
@@ Line 237: / Line 250: @@
  |resting_place        =
  |commemorations       =
- |obituary             =
  |images_tab3          =
-<!--SCROLL SECTION-->
- |scroll_imagesize     =400
- |scroll_fontsize      =220
- |scroll_name          =
- |scroll_battalion     =
- |scroll_regiment      =The Border Regiment
 <!--MEDIA SECTION-->
+ |obituary             =
  |newspapers           =
  |periodicals          =
- |publications         =
+ |books                =
  |websites             =
  |links                =
@@ Line 259: / Line 265: @@
  |notes                =
-<!--IMAGES SECTION-->
+<!--IMAGES SECTION------------->
  |images               =   use this for gallery
 <gallery mode="packed" heights=250px>
 </gallery>
+<!--SCROLL SECTION-->
+ |scroll_imagesize     =400
+ |scroll_fontsize      =220
+ |scroll_name          =
+ |scroll_battalion     =
+ |scroll_regiment      =The Border Regiment
 }}</pre>
 [[Category:Template]]