- copy style changes to tracker.wsgi

git-svn-id: https://svn.spreadspace.org/mur.sat@154 7de4ea59-55d0-425e-a1af-a3118ea81d4c

4 files changed, 76 insertions, 58 deletions

diff --git a/tools/mmd/mmd.css b/tools/mmd/mmd.css
index 86461cd..61dc726 100644
--- a/tools/mmd/mmd.css
+++ b/tools/mmd/mmd.css
@@ -121,8 +121,7 @@ label.error
 
 pre.debug
 {
-    background-color: white;
-    color: black;
+    color: white;
     float: left;
     font: 10pt courier, monospace;
     padding: 1px;
@@ -190,12 +189,21 @@ div.groundstation
     color: #003366;
     z-index: 1004;
     position: absolute;
-    left: 5px;
-    top: 5px;
+    left: 35px;
+    top: 3px;
 }
 
 div.olControlAttribution
 {
-    bottom: 5px;
+    bottom: 15px;
     right: 5px;
 }
+
+.olControlAttribution a,
+.olControlAttribution a:hover,
+.olControlAttribution a:visited,
+.olControlAttribution a:active
+{
+    color: #003366;
+}
+
diff --git a/tools/mmd/orbtrak.js b/tools/mmd/orbtrak.js
index 5e9f04a..bf5cf48 100644
--- a/tools/mmd/orbtrak.js
+++ b/tools/mmd/orbtrak.js
@@ -22,31 +22,37 @@
 var Orb = 

 	{

 		satelliteMarkers: new Array(),

-        satellitePoint: new Object (),

-        satLayer: new OpenLayers.Layer.Vector ("satLayer"),

-        homeLayer: new OpenLayers.Layer.Vector ("homeLayer"),

-        trackLayer: new OpenLayers.Layer.Vector ("trackLayer"),

-        track: new Array (),

-        from: new OpenLayers.Projection ("EPSG:4326"),

-        to: new OpenLayers.Projection ("EPSG:900913"),

-

-        startOSMTracking: function (longitude, latitude, altitude, name)

-        {

-			    PLib.InitializeData();

-    			PLib.configureGroundStation(latitude, longitude, altitude, name);

-          document.getElementById ("gsName").innerHTML = name;

-          document.getElementById ("gsLongitude").innerHTML = longitude;

-          document.getElementById ("gsLatitude").innerHTML = latitude;

-          document.getElementById ("gsAltitude").innerHTML = altitude;

-          Orb.createOSMSatellite ();

-

-          var map = new OpenLayers.Map ("osm");

-          map.addLayers ([new OpenLayers.Layer.OSM (), Orb.trackLayer, Orb.satLayer, Orb.homeLayer]);

-          // map.addLayers ([new OpenLayers.Layer.WMS ("OpenLayers WMS", "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers:'basic'}), Orb.trackLayer, Orb.satLayer, Orb.homeLayer]);

-          map.zoomTo (1);

-

-          var satStyle = {fillColor: "#FFED00", pointRadius: 3, stroke: false};

-          var homeStyle = {fillColor: "#00ff00", pointRadius: 3, stroke: false};

+    satellitePoint: new Object (),

+    satLayer: new OpenLayers.Layer.Vector ("satLayer"),

+    homeLayer: new OpenLayers.Layer.Vector ("homeLayer"),

+    trackLayer: new OpenLayers.Layer.Vector ("trackLayer"),

+    track: new Array (),

+    from: new OpenLayers.Projection ("EPSG:4326"),

+    to: new OpenLayers.Projection ("EPSG:900913"),

+

+    startOSMTracking: function (longitude, latitude, altitude, name)

+    {

+      PLib.InitializeData();

+ 			PLib.configureGroundStation(latitude, longitude, altitude, name);

+      document.getElementById ("gsName").innerHTML = name;

+      document.getElementById ("gsLongitude").innerHTML = longitude;

+      document.getElementById ("gsLatitude").innerHTML = latitude;

+      document.getElementById ("gsAltitude").innerHTML = altitude;

+      Orb.createOSMSatellite ();

+

+      var map = new OpenLayers.Map ("osm");

+      var mousePosition = new OpenLayers.Control.MousePosition();

+      mousePosition.displayProjection = Orb.from;

+      map.addControl(new OpenLayers.Control.LayerSwitcher());

+      map.addControl(mousePosition);

+

+      map.addLayers ([new OpenLayers.Layer.OSM (), Orb.trackLayer, Orb.satLayer, Orb.homeLayer]);

+      // map.addLayers ([new OpenLayers.Layer.WMS ("OpenLayers WMS", "http://vmap0.tiles.osgeo.org/wms/vmap0", {layers:'basic'}), Orb.trackLayer, Orb.satLayer, Orb.homeLayer]);

+

+      map.zoomTo (1);

+

+          var satStyle = {fillColor: "#ffed00", pointRadius: 3, stroke: false};

+          var homeStyle = {fill: true, pointRadius: 5, stroke: false, fillColor: "#003366", fillOpacity: 0.6};

           var home = new OpenLayers.LonLat (longitude, latitude).transform (Orb.from, Orb.to);

 

           Orb.createSatelliteTrack ();

diff --git a/tools/mmd/tracker.html b/tools/mmd/tracker.html
index aa9b524..6a21b79 100644
--- a/tools/mmd/tracker.html
+++ b/tools/mmd/tracker.html
@@ -11,7 +11,7 @@
   <script type="text/javascript">
     function load()
     {
-      Orb.startOSMTracking(15.76, 47.01, 376, 'Graz');
+      Orb.startOSMTracking(15.4422, 47.0658, 376, 'Graz');
     }
   </script>
   <link rel="stylesheet" type="text/css" href="mmd.css" />
@@ -67,7 +67,7 @@
     preview for the next <input class="options" type="text" name="previewMinutes" id="previewMinutes" value="90" size="5" tabindex="3" />
     minutes
   </div>
-  <pre id="debug"></pre>
+  <pre class="debug" id="debug"></pre>
 </body>
 </html>
 
diff --git a/tools/mmd/tracker.wsgi b/tools/mmd/tracker.wsgi
index 8762163..df62636 100644
--- a/tools/mmd/tracker.wsgi
+++ b/tools/mmd/tracker.wsgi
@@ -11,33 +11,36 @@ def application (environ, response):
   
   body = '''
 <!doctype html>
-<html>
+<html class="tracker">
 <head>
   <meta charset="utf-8" />
-  <title>MURSAT1 tracker</title>
-  <link rel="stylesheet" type="text/css" href="http://hofos.at/mmd/static/mmd.css" />
+  <title>Tracking ARISSAT using OrbTrak</title>
+  <link rel="stylesheet" type="text/css" href="orbtrak.css" />
   <script src="http://www.openlayers.org/api/OpenLayers.js"></script>
-  <script src="static/predictlib.js" type="text/javascript"></script>
-  <script src="static/tle.js" type="text/javascript"></script>
-  <script src="static/orbtrak.js" type="text/javascript"></script>
+  <script src="predictlib.js" type="text/javascript"></script>
+  <script src="tle.js" type="text/javascript"></script>
+  <script src="orbtrak.js" type="text/javascript"></script>
   <script type="text/javascript">
     function load()
-    {{
+    {
       Orb.startOSMTracking({longitude}, {latitude}, {altitude}, '{name}');
-    }}
+    }
   </script>
+  <link rel="stylesheet" type="text/css" href="mmd.css" />
 </head>
-<body onload="load ()">
-  <div class="groundstation">
-    <span id="gsName"></span>,
-    Lon:
-    <span id="gsLongitude"></span>,
-    Lat:
-    <span id="gsLatitude"></span>,
-    Alt:
-    <span id="gsAltitude"></span>
+<body class="tracker" onload="load()">
+  <div id="osm">
+    <div class="groundstation">
+      Location
+      <span id="gsName"></span>,
+      Lon:
+      <span id="gsLongitude"></span>,
+      Lat:
+      <span id="gsLatitude"></span>,
+      Alt:
+      <span id="gsAltitude"></span>
+    </div>
   </div>
-  <div id="osm"></div>
   <table class="current">
     <tr>
       <th class="telemetry">Satellite</th>
@@ -62,8 +65,8 @@ def application (environ, response):
       </td>
     </tr>
   </table>
-  <div class="telemetry">Set refresh rate to <span>
-    <select class="telemetry" name="refresh" id="refresh">
+  <div class="options">Set refresh rate to <span>
+    <select class="options" name="refresh" id="refresh" tabindex="1">
     <option value="100">0.1</option>
     <option value="500">0.5</option>
     <option value="1000">1.0</option>
@@ -71,13 +74,14 @@ def application (environ, response):
     <option value="5000" selected="selected">5.0</option>
     </select> seconds</span>
   </div>
-  <div class="telemetry">
-    <input class="telemetry" type="submit" value="update" id="setPreviewMinutes" onClick="Orb.createSatelliteTrack ()" />
-    preview for the next <input class="telemetry" type="text" name="previewMinutes" id="previewMinutes" value="90" size="5" />
+  <div class="options">
+    <input class="options" type="submit" value="update" id="setPreviewMinutes" onClick="Orb.createSatelliteTrack ()" tabindex="2" />
+    preview for the next <input class="options" type="text" name="previewMinutes" id="previewMinutes" value="90" size="5" tabindex="3" />
     minutes
   </div>
-  <pre id="debug"></pre>
+  <pre class="debug" id="debug"></pre>
 </body>
+</html>
 '''
 
   qs = parse_qs (environ['QUERY_STRING'], True)
@@ -93,8 +97,8 @@ def application (environ, response):
       query ['name'] = 'unknown set'
   else:
     query = {
-      'longitude': 15.44226,
-      'latitude': 47.06576,
+      'longitude': 15.4422,
+      'latitude': 47.0658,
       'altitude': 376,
       'name': 'Graz'
       }