Start of map settings, tab control

panels/map2/editor.html

-  <div class="row-fluid" ng-controller="map">
+  <div class="row-fluid" ng-controller="map2">
     <div class="span11">
     The map panel uses 2 letter country or US state codes to plot concentrations on a map. Darker terroritories mean more records matched that area. If multiple queries are sent from a single panel the <strong>first query will be displayed</strong>
     </div>
@@ -21,15 +21,47 @@
     <div class="span1"><h6>Map</h6> 
       <select ng-change="$emit('render')" class="input-small" ng-model="panel.map" ng-options="f for f in ['world','europe','usa']"></select>
     </div>
-
-      <div class="span6">
-          <div data-fade="1" bs-tabs>
-              <div data-title="'Home'"><p>Static tab content A</p></div>
-              <div data-title="'Profile'"><p>Static tab content B</p></div>
   </div>
+
+  <div class="row-fluid">
+      <div class="span11">
+        <h4>Display Options</h4>
       </div>
 
+      <!--
+        Rolling our own tab control here because the Angular-Strap Tab directive doesn't allow
+        updates to components inside, which is quite bizarre.  Or I just can't figure it out...
+      -->
+      <div class="span11" style="margin-bottom:20px">
+          <ul class="nav nav-tabs" ng-cloak>
+              <li ng-repeat="tab in panel.displayTabs" ng-class="{active:isActive(tab)}">
+                  <a ng-click="tabClick(tab)">{{tab}}</a>
+              </li>
+          </ul>
+
+          <div ng-show="isActive('geopoints')">
+              <table ng-controller="map2">
+                  <tbody>
+                  <tr>
+                      <td style="width:100px" >
+                          <button type="button" class="btn"
+                                  bs-button
+                                  ng-class="{'btn-success': panel.display.geopoints.enabled}"
+                                  ng-model="panel.display.geopoints.enabled">{{panel.display.geopoints.enabled|enabledText}}</button>
+
+                      </td>
+                      <td>
+
+
+                      </td>
+                  </tr>
+                  </tbody>
+
+              </table>
           </div>
+      </div>
+  </div>
+
   <h5>Panel Spy</h5>
   <div class="row-fluid">
     <div class="span2">