Difference between revisions of "Template:Mars spacecraft"

From blackwiki
Jump to navigation Jump to search
imported>BatteryIncluded
Line 12: Line 12:
 
   |groupstyle = text-align: center;<!---background:antiquewhite; font-weight:normal;--->
 
   |groupstyle = text-align: center;<!---background:antiquewhite; font-weight:normal;--->
  
   | group1 = [[Orbiter]]s
+
   | group1 = [[Orbiter|Orbiters]]
 
   | list1 =
 
   | list1 =
 
* [[Mars Express]]
 
* [[Mars Express]]
Line 19: Line 19:
 
* [[Mars Orbiter Mission]]
 
* [[Mars Orbiter Mission]]
 
* [[MAVEN]]
 
* [[MAVEN]]
 +
* [[ExoMars Trace Gas Orbiter]]  {{small|(en route)}}
  
   | group2 = [[Mars rover|Rover]]s
+
   | group2 = [[Mars landing|Landers]]
 
   | list2 =
 
   | list2 =
 +
* [[Schiaparelli EDM lander]]  {{small|(en route)}}
 +
 +
  | group3 = [[Mars rover|Rovers]]
 +
  | list3 =
 
* [[Opportunity (rover)|Opportunity]]
 
* [[Opportunity (rover)|Opportunity]]
 
** [[List of surface features of Mars seen by Opportunity|Observations]]
 
** [[List of surface features of Mars seen by Opportunity|Observations]]
Line 33: Line 38:
 
   |groupstyle = text-align: center;<!---background:antiquewhite; font-weight:normal;--->
 
   |groupstyle = text-align: center;<!---background:antiquewhite; font-weight:normal;--->
  
| group1 = [[Mars flyby|Flyby]]s
+
| group1 = [[Mars flyby|Flybys]]
 
| list1 =
 
| list1 =
 
* [[Mariner 4]]
 
* [[Mariner 4]]
Line 46: Line 51:
 
* [[Rosetta (spacecraft)|Rosetta]]
 
* [[Rosetta (spacecraft)|Rosetta]]
  
| group2 = Orbiters
+
| group2 = [[Orbiter|Orbiters]]
 
| list2 =
 
| list2 =
 
* [[Mariner 9]]
 
* [[Mariner 9]]
Line 62: Line 67:
 
* [[Viking 2]]
 
* [[Viking 2]]
  
| group3 = [[Mars landing|Lander]]s
+
| group3 = [[Mars landing|Landers]]
 
| list3 =
 
| list3 =
 
* [[Beagle 2]]<sup>†</sup>
 
* [[Beagle 2]]<sup>†</sup>
Line 75: Line 80:
 
* [[Viking 2]]
 
* [[Viking 2]]
  
| group4 = Rovers
+
| group4 = [[Mars rover|Rovers]]
 
| list4 =
 
| list4 =
 
* [[Prop-M]]<sup>†</sup>
 
* [[Prop-M]]<sup>†</sup>
Line 103: Line 108:
 
| group5 = Planned
 
| group5 = Planned
 
| list5 =
 
| list5 =
* [[ExoMars Trace Gas Orbiter]] / [[Schiaparelli EDM lander]]  {{small|(2016)}}
 
 
* [[ExoMars rover]] {{small|(2018)}}
 
* [[ExoMars rover]] {{small|(2018)}}
 
* [[InSight]] / [[Mars Cube One]] {{small|(2018)}}
 
* [[InSight]] / [[Mars Cube One]] {{small|(2018)}}

Revision as of 09:05, 15 March 2016