commit what I have so far

4 files changed, 17 insertions, 19 deletions

diff --git a/lib/d2/app/controllers/index.py b/lib/d2/app/controllers/index.py
index f691bfc..440bc56 100644
--- a/lib/d2/app/controllers/index.py
+++ b/lib/d2/app/controllers/index.py
@@ -32,12 +32,14 @@ class IndexController(BaseController):
 
     def get(self, id_type=None, id=None):
         if id_type and id:
-            if id_type == 'occupant_id':
+            if id_type == 'occupant':
                 forges = self._forge.get_forge_by_occupant_id(id)
                 details = self._detail.occupant_details(id)
-                plot_ids = [forge.plot_id for forge in forges]
-                plots = self._plot.get_all(plot_ids)
-            else: # plot_id
+                plots = []
+                if len(forges) > 0:
+                    plot_ids = [forge.plot_id for forge in forges]
+                    plots = self._plot.get_all(plot_ids)
+            else: # plot
                 forges = self._forge.get_forge_by_plot_id(id)
                 details = self._detail.plot_details(id)
                 plots = self._plot.get_all([id])
@@ -45,8 +47,7 @@ class IndexController(BaseController):
             self.render('index.html', 
                     mode="map", 
                     details=details,
-                    plots=plots,
-                    forges=forges)
+                    plots=plots)
         else:
             self.render('index.html', mode="get")
         
diff --git a/lib/d2/bin/d2_server.py b/lib/d2/bin/d2_server.py
index 46e465d..fbe4741 100644
--- a/lib/d2/bin/d2_server.py
+++ b/lib/d2/bin/d2_server.py
@@ -19,7 +19,7 @@ def main():
     }
     application = tornado.web.Application([
         (r"/svg_text/(.*)", SvgTextController, extras),
-        (r"/(occupant_id|plot_id)/(.*)", IndexController, extras),
+        (r"/(occupant|plot)/(.*)", IndexController, extras),
         (r"/", IndexController, extras),
     ], **settings)
     http_server = tornado.httpserver.HTTPServer(application)
diff --git a/static/html/test_label.html b/static/html/test_label.html
index 24b6fce..0c31610 100644
--- a/static/html/test_label.html
+++ b/static/html/test_label.html
@@ -14,9 +14,9 @@
    function init()

    {

      var ext = new OpenLayers.Bounds(-2671.7575, -109.76259, 4500, 4000);

-     var size = new OpenLayers.Size(4500/10, 4000/10);

+     var size = new OpenLayers.Size(4500, 4000);

 

-     options = {numZoomLevels: 20,

+     options = {numZoomLevels: 1,

                 units: 'pixels',

                 maxExtent: ext,

                 controls:[

@@ -52,7 +52,7 @@
    map.addLayers([outline, ntwk_id, label]);

    map.zoomToExtent(ext);

    //Note: origin is set at the bottom left corner for OpenLayers !!!

-   map.setCenter(new OpenLayers.LonLat(4500/5, 4000/5), 0, true, true) ;

+   map.setCenter(new OpenLayers.LonLat(0, 0), 0, true, true) ;

   }

 

     </script>

diff --git a/templates/index.html b/templates/index.html
index 23e6b76..467cd7d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -78,12 +78,6 @@
 
   function emphasize()
   {
-     var e = document.getElementById("{{forges[0].occupant_id}}");
-
-     e.setAttributeNS(null, "fill", "red");
-     e.style.fontFamily = "Arial";
-     e.style.fontSize = 20;
-     setCenter();
   }
 
   //Note: origin is set at the bottom left corner for OpenLayers !!!
@@ -120,10 +114,10 @@
     Found:
     {% for detail in details %}
         <ul id="result-list">
-            {% if detail.id_type == u'occupant_id' %}
-              <li><a href="/occupant_id/{{detail.id}}">{{detail.label}}</a></li>
+            {% if detail.id_type == u'occupant' %}
+              <li><a href="/occupant/{{detail.id}}">{{detail.label}}</a></li>
             {% else %}
-              <li><a href="/plot_id/{{detail.id}}">{{detail.label}} </a></li>
+              <li><a href="/plot/{{detail.id}}">{{detail.label}} </a></li>
             {% end %}
         </ul>
     {% end %}
@@ -143,6 +137,9 @@ Sorry, no match found. Please try to broaden your search by entering less in t h
             <h2>{{details[0]}}</h2>
             <ul id="details">
                 <li>Location: {{plots[0].map.location.name}} </li>
+                {% for i in xrange(3, len(details._fields)) %}
+                    <li>{{getattr(details, details._fields[i]).name}}: {{getattr(details, details._fields[i]).data}}</li>
+                {% end %}
             </ul>
         </div>
     </div>