Difference between revisions of "Template:History of Malaysia"

From blackwiki
Jump to navigation Jump to search
imported>Chipmunkdavis
(Rmv link to redirect, remove pipe)
(formatting)
Line 14: Line 14:
 
   |labelstyle=padding-right:1.0em;font-weight:normal;
 
   |labelstyle=padding-right:1.0em;font-weight:normal;
 
   |datastyle=text-align:right;white-space:nowrap;
 
   |datastyle=text-align:right;white-space:nowrap;
   |label1=[[Chi Tu]] |data1=<small>100 BC &ndash; 7th AD</small>
+
   |label1=[[Chi Tu]] |data1={{small|100 BC &ndash; 7th AD}}
 
   |label2=[[Gangga Negara]] |data2=2nd&ndash;11th
 
   |label2=[[Gangga Negara]] |data2=2nd&ndash;11th
 
   |label3=[[Langkasuka]] |data3=2nd&ndash;14th
 
   |label3=[[Langkasuka]] |data3=2nd&ndash;14th
Line 29: Line 29:
 
   |labelstyle=padding-right:1.0em;font-weight:normal;
 
   |labelstyle=padding-right:1.0em;font-weight:normal;
 
   |datastyle=text-align:right;white-space:nowrap;
 
   |datastyle=text-align:right;white-space:nowrap;
   |label1=[[History of Brunei#Conversion to Islam and "Golden Age"|Brunei Sultanate]] |data1=15th&ndash;<small>present</small>
+
   |label1=[[History of Brunei#Conversion to Islam and "Golden Age"|Brunei Sultanate]] |data1=15th&ndash;{{small|present}}
   |label2=[[Kedah Sultanate]] |data2=1136&ndash;<small>present</small>
+
   |label2=[[Kedah Sultanate]] |data2=1136&ndash;{{small|present}}
 
   |label3=[[Malacca Sultanate]] |data3=1402&ndash;1511
 
   |label3=[[Malacca Sultanate]] |data3=1402&ndash;1511
 
   |label4=[[Sultanate of Sulu|Sulu Sultanate]] |data4=1450&ndash;1899
 
   |label4=[[Sultanate of Sulu|Sulu Sultanate]] |data4=1450&ndash;1899
   |label5=[[Johor Sultanate]] |data5=1528&ndash;<small>present</small>
+
   |label5=[[Johor Sultanate]] |data5=1528&ndash;{{small|present}}
 
  }}
 
  }}
  
Line 50: Line 50:
 
   |label7=[[Kingdom of Sarawak]] |data7=1841&ndash;1946
 
   |label7=[[Kingdom of Sarawak]] |data7=1841&ndash;1946
 
   |label8=[[North Borneo]] |data8=1882&ndash;1963
 
   |label8=[[North Borneo]] |data8=1882&ndash;1963
   |label9=Japanese occupation<br>([[Japanese occupation of Malaya|Malaya]], [[Japanese occupation of British Borneo|Borneo]]) |data9=1941&ndash;1945
+
   |label9={{longitem|[[Japanese occupation of Malaya|Japanese occupation<br/>of Malaya]]{{\}}[[Japanese occupation of British Borneo|of Borneo]]}} |data9=1941&ndash;1945
 
   |label10=[[Malayan Union]] |data10=1946&ndash;1948
 
   |label10=[[Malayan Union]] |data10=1946&ndash;1948
 
   |label11=[[Federation of Malaya]] |data11=1948&ndash;1963
 
   |label11=[[Federation of Malaya]] |data11=1948&ndash;1963
Line 61: Line 61:
 
   |labelstyle=padding-right:1.0em;font-weight:normal;
 
   |labelstyle=padding-right:1.0em;font-weight:normal;
 
   |datastyle=text-align:right;white-space:nowrap;
 
   |datastyle=text-align:right;white-space:nowrap;
   |label1=[[Federation of Malaya Independence Act 1957|Independence]] (Malaya) |data1=1957
+
   |label1=[[Federation of Malaya Independence Act 1957|Independence of Malaya]] |data1=1957
 
   |label2=[[Malaysia Agreement]] |data2=1963
 
   |label2=[[Malaysia Agreement]] |data2=1963
   |label3=[[Proclamation of Malaysia|Proclamation]] |data3=1963&ndash;<small>present</small>
+
   |label3=[[Proclamation of Malaysia|Proclamation]] |data3=1963&ndash;{{small|present}}
 
  }}
 
  }}
  
Line 71: Line 71:
 
* [[Military history of Malaysia|Military]]
 
* [[Military history of Malaysia|Military]]
 
}}
 
}}
 +
 
|header7 = [[Timeline of Malaysian history|Timeline]]
 
|header7 = [[Timeline of Malaysian history|Timeline]]
  

Revision as of 22:57, 30 November 2013