Difference between revisions of "Template:Mars spacecraft"

From blackwiki
Jump to navigation Jump to search
imported>Rjwilmsi
m (endash in year range)
imported>Fotaun
(update)
Line 24: Line 24:
 
|group4 = [[Rover (space exploration)|Rover]]s
 
|group4 = [[Rover (space exploration)|Rover]]s
 
|list4 = <div>
 
|list4 = <div>
[[Mars Pathfinder#Sojourner rover|Sojourner]]{{·}} '''''[[Mars Exploration Rover]]s'''''&nbsp;('''''[[Spirit rover|Spirit]]'''''{{·}}'''''[[Opportunity rover|Opportunity]]''''')
+
[[Mars Pathfinder#Sojourner rover|Sojourner]]{{·}} '''''[[Mars Exploration Rover]]s'''''&nbsp;([[Spirit rover|Spirit]]{{·}}'''''[[Opportunity rover|Opportunity]]''''')
 
</div>
 
</div>
  
|group5 = Future missions
+
|group5 = Planned missions
 
|list5 = <div>
 
|list5 = <div>
 
{{nowrap|[[Mars Science Laboratory]] <small>(2011)</small>}}{{·}}
 
{{nowrap|[[Mars Science Laboratory]] <small>(2011)</small>}}{{·}}
[[Fobos-Grunt]]{{\}}{{nowrap|[[Yinghuo 1]] <small>(2012)</small>}}{{·}}
+
[[Fobos-Grunt]]{{\}}{{nowrap|[[Yinghuo 1]] <small>(2012+)</small>}}{{·}}
 
{{nowrap|[[MetNet]] <small>(2012–2019)</small>}}{{·}}
 
{{nowrap|[[MetNet]] <small>(2012–2019)</small>}}{{·}}
{{nowrap|[[Northern Light (spacecraft)|Northern Light]] <small>(2012)</small>}}{{·}}
 
 
{{nowrap|[[MAVEN (spacecraft)|MAVEN]] <small>(2013)</small>}}{{·}}
 
{{nowrap|[[MAVEN (spacecraft)|MAVEN]] <small>(2013)</small>}}{{·}}
{{nowrap|[[Mars Trace Gas Mission]] <small>(2016)</small>}}{{·}}
+
{{nowrap|[[Mars Trace Gas Mission]] <small>(2016)</small>}}{{·}} {{nowrap|[[Northern Light (spacecraft)|Northern Light]] <small> </small>}}{{·}}
{{nowrap|[[ExoMars]] [[ExoMars#Static lander|static lander]] <small>(2016)</small> and}} {{nowrap|[[ExoMars#ExoMars_rover|rover]] <small>(2018)</small>}}{{·}}
+
{{nowrap|[[ExoMars]] [[ExoMars#Static lander|static lander]] <small>(2016+)</small> and}} {{nowrap|[[ExoMars#ExoMars_rover|rover]] <small>(2018+)</small>}}{{·}}  
{{nowrap|[[Mars Astrobiology Explorer-Cacher‎]] <small>(2018)</small>}}{{·}}
+
 
{{nowrap|[[Mars sample return mission]] <small>(2018+)</small>}}{{·}}
+
|group6 = Unplanned missions
{{nowrap|[[Manned mission to Mars|Manned mission]] <small>(2030+)</small>}}
+
|list6 = <div>
 +
{{nowrap|[[Mars sample return mission]] <small> </small>}}{{·}}
 +
{{nowrap|[[Manned mission to Mars|Manned mission]] <small> </small>}}
 
</div>
 
</div>
  
|group6 = Related topics
+
|group7 = Related topics
|list6 = <div>
+
|list7 = <div>
 
[[Exploration of Mars|Exploration]]{{·}} [[Colonization of Mars|Colonization]]{{·}} [[Template:Failed Mars missions|Failed Mars missions]]{{·}} [[Mars Scout Program]]
 
[[Exploration of Mars|Exploration]]{{·}} [[Colonization of Mars|Colonization]]{{·}} [[Template:Failed Mars missions|Failed Mars missions]]{{·}} [[Mars Scout Program]]
 
</div>
 
</div>

Revision as of 20:00, 26 April 2011