Difference between revisions of "Template:History of Malaysia"

From blackwiki
Jump to navigation Jump to search
imported>Muffin Wizard
m (Cleaned up using AutoEd)
imported>Chipmunkdavis
(Splitting colonial era into colonial and war and emergency, based off main history article)
Line 41: Line 41:
 
   | [[Federated Malay States]]  | 1895–1946
 
   | [[Federated Malay States]]  | 1895–1946
 
   | [[Unfederated Malay States]] | 1909–1946
 
   | [[Unfederated Malay States]] | 1909–1946
 +
}}
 +
| header5 = War and emergency
 +
| data5 =
 +
{{Aligned table |fullwidth=yes |leftright=yes |nowrap2=yes
 
   | [[Japanese occupation]] of {{longitem|[[Japanese occupation of Malaya|Malaya]]{{\}}[[Japanese occupation of British Borneo|of Borneo]]}} | 1941–1945
 
   | [[Japanese occupation]] of {{longitem|[[Japanese occupation of Malaya|Malaya]]{{\}}[[Japanese occupation of British Borneo|of Borneo]]}} | 1941–1945
 
   | [[Crown Colony of Sarawak]]  | 1946–1963
 
   | [[Crown Colony of Sarawak]]  | 1946–1963
Line 51: Line 55:
 
   | [[13 May incident (Malaysia)|13 May Incident]]                        | 1969
 
   | [[13 May incident (Malaysia)|13 May Incident]]                        | 1969
 
}}
 
}}
| header5 = Independence
+
| header6 = Independence
| data5 =
+
| data6 =
 
  {{Aligned table |fullwidth=yes |leftright=yes |nowrap2=yes
 
  {{Aligned table |fullwidth=yes |leftright=yes |nowrap2=yes
 
   | [[Merdeka Day|Independence of Malaya]]                                | 1957
 
   | [[Merdeka Day|Independence of Malaya]]                                | 1957
Line 63: Line 67:
 
}}
 
}}
  
| header6 = By topic
+
| header7 = By topic
| data6 = {{startflatlist}}
+
| data7 = {{startflatlist}}
 
* [[History of communications in Malaysia|Communications]]  
 
* [[History of communications in Malaysia|Communications]]  
 
* [[Military history of Malaysia|Military]]
 
* [[Military history of Malaysia|Military]]
 
{{endflatlist}}
 
{{endflatlist}}
  
| header7 = [[Timeline of Malaysian history|Timeline]]
+
| header8 = [[Timeline of Malaysian history|Timeline]]
 
}}<noinclude>
 
}}<noinclude>
 
{{clear}}
 
{{clear}}

Revision as of 18:11, 3 July 2014