Difference between revisions of "Template:Mars spacecraft"

From blackwiki
Jump to navigation Jump to search
imported>Naraht
m (fix redirects.)
Line 9: Line 9:
 
|group1 = Flybys
 
|group1 = Flybys
 
|list1 = <div>
 
|list1 = <div>
[[Mariner 4]]{{·}} [[Mariner 6 and 7|6]]{{·}} [[Mariner 6 and 7|7]]{{·}} [[Mars probe program|Mars 4]]{{·}} ''[[Rosetta (spacecraft)|Rosetta]]''{{·}} ''[[Dawn (spacecraft)|Dawn]]''
+
[[Mariner 4]]{{·}} [[Mariner 6 and 7|6]]{{·}} [[Mariner 6 and 7|7]]{{·}} [[Mars program|Mars 4]]{{·}} ''[[Rosetta (spacecraft)|Rosetta]]''{{·}} ''[[Dawn (spacecraft)|Dawn]]''
 
</div>
 
</div>
  
 
|group2 = Orbiters
 
|group2 = Orbiters
 
|list2 = <div>
 
|list2 = <div>
[[Mariner 9]]{{·}} [[Mars 2]]{{·}} [[Mars 3|3]]{{·}} [[Mars 5|5]]{{·}} [[Viking 1]]{{·}} [[Viking 2|2]]{{·}} [[Phobos program|Phobos 2]]{{·}} [[Mars Global Surveyor]]{{·}} '''''[[2001 Mars Odyssey]]'''''{{·}} '''''[[Mars Express]]'''''{{·}} '''''[[Fobos-Grunt]]'''''{{·}} '''''[[Yinghuo 1]]'''''{{·}} '''''[[Mars Reconnaissance Orbiter]]'''''
+
[[Mariner 9]]{{·}} [[Mars 2]]{{·}} [[Mars 3|3]]{{·}} [[Mars 5|5]]{{·}} [[Viking 1]]{{·}} [[Viking 2|2]]{{·}} [[Phobos program|Phobos 2]]{{·}} [[Mars Global Surveyor]]{{·}} '''''[[2001 Mars Odyssey]]'''''{{·}} '''''[[Mars Express]]'''''{{·}} '''''[[Fobos-Grunt]]'''''{{·}} '''''[[Yinghuo-1]]'''''{{·}} '''''[[Mars Reconnaissance Orbiter]]'''''
 
</div>
 
</div>
  
Line 31: Line 31:
 
{{nowrap|[[Mars Science Laboratory]] <small>(2011)</small>}}{{·}}
 
{{nowrap|[[Mars Science Laboratory]] <small>(2011)</small>}}{{·}}
 
{{nowrap|[[MetNet]] <small></small>}}{{·}}
 
{{nowrap|[[MetNet]] <small></small>}}{{·}}
{{nowrap|[[MAVEN (spacecraft)|MAVEN]] <small>(2013)</small>}}{{·}}
+
{{nowrap|[[MAVEN]] <small>(2013)</small>}}{{·}}
{{nowrap|[[ExoMars]] [[ExoMars#Static lander|static lander]] <small></small> and}} {{nowrap|[[ExoMars#ExoMars_rover|rover]] <small> </small>}}{{·}} {{nowrap|[[Mars Trace Gas Mission|ExoMars Trace Gas Orbiter]] <small>(2016)</small>}}{{·}}  {{nowrap|[[Northern Light (spacecraft)|Northern Light]] <small> </small>}}
+
{{nowrap|[[ExoMars]] [[ExoMars#Static lander|static lander]] <small></small> and}} {{nowrap|[[ExoMars#ExoMars_rover|rover]] <small> </small>}}{{·}} {{nowrap|[[ExoMars Trace Gas Orbiter]] <small>(2016)</small>}}{{·}}  {{nowrap|[[Northern Light (spacecraft)|Northern Light]] <small> </small>}}
  
 
|group6 = Unplanned missions
 
|group6 = Unplanned missions

Revision as of 19:33, 9 November 2011