From b522b818a5c75fc8702fce6d6b4233b9a4663e4a Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <torsten@ŧ3r.de>
Date: Wed, 25 Feb 2015 09:27:19 +0100
Subject: [PATCH] Phi: Correc vertical size of Map topic's content

---
 webgui/topics/Aircraft/Help.js     |  1 -
 webgui/topics/Aircraft/Select.html |  2 +-
 webgui/topics/Map.html             |  2 +-
 webgui/widgets/map.js              | 11 +++++++----
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/webgui/topics/Aircraft/Help.js b/webgui/topics/Aircraft/Help.js
index 55c8b00ba..30a634931 100644
--- a/webgui/topics/Aircraft/Help.js
+++ b/webgui/topics/Aircraft/Help.js
@@ -39,7 +39,6 @@ define([
                     });
                 }
             });
-            console.log(helpContent);
             self.helpContent(helpContent);
 
         });
diff --git a/webgui/topics/Aircraft/Select.html b/webgui/topics/Aircraft/Select.html
index f3bab9749..50e9e0631 100644
--- a/webgui/topics/Aircraft/Select.html
+++ b/webgui/topics/Aircraft/Select.html
@@ -1,6 +1,6 @@
 <div data-bind="if: catalogs().length == 0">
 <h3>No Catalogs found</h3>
-Sorry, but no package catalogs were found by your FlightGear instance.
+Sorry, but no package catalogs were found by your FlightGear.
 </div>
 <div data-bind="foreach: catalogs">
     <h3>Package <span data-bind="text: id"></span></h3>
diff --git a/webgui/topics/Map.html b/webgui/topics/Map.html
index aa755975a..c3da0cf57 100644
--- a/webgui/topics/Map.html
+++ b/webgui/topics/Map.html
@@ -1 +1 @@
-<div  data-bind="component: { name: 'map', params: { props: $root.props }}"></div>
\ No newline at end of file
+<div  data-bind="component: { name: 'map', params: { css: { width: '100%', height: '100%' }}}"></div>
\ No newline at end of file
diff --git a/webgui/widgets/map.js b/webgui/widgets/map.js
index fafc88224..fcb930121 100644
--- a/webgui/widgets/map.js
+++ b/webgui/widgets/map.js
@@ -22,7 +22,11 @@ define(
                     fgprop : 'heading'
                 });
 
-                $(self.element).height($(self.element).width());
+                if (params && params.css)
+                    for ( var p in params.css) {
+                        $(self.element).css(p, params.css[p]);
+
+                    }
 
                 self.map = leaflet.map(self.element).setView([
                         53.5, 10.0
@@ -86,10 +90,9 @@ define(
                                     ],
                                 }, this);
                                 this.popup
-                                        .setContent( '<div class="aircraft-marker aircraft-marker-altitude"><span data-bind="text: altitude().toFixed(0)"></span>ft</div>'
+                                        .setContent('<div class="aircraft-marker aircraft-marker-altitude"><span data-bind="text: altitude().toFixed(0)"></span>ft</div>'
                                                 + '<div class="aircraft-marker aircraft-marker-heading"><span data-bind="text: heading().toFixed(0)"></span>&deg</div>'
-                                                + '<div class="aircraft-marker aircraft-marker-tas"><span data-bind="text: tas().toFixed(0)"></span>kt</div><div style="clear: both"/>'
-                                            );
+                                                + '<div class="aircraft-marker aircraft-marker-tas"><span data-bind="text: tas().toFixed(0)"></span>kt</div><div style="clear: both"/>');
                                 this.bindPopup(this.popup);
                                 this.addTo(this._map);
                                 this.openPopup();