From 91245f5f983c75419dd68457a239902fb28759cf Mon Sep 17 00:00:00 2001
From: gonzalo <gonzalo@gonzalo-ID49C.(none)>
Date: Fri, 4 Apr 2014 12:54:12 -0300
Subject: [PATCH 1/3] report charts bottom margin

---
 urbansim/server/urbansimd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/urbansim/server/urbansimd.py b/urbansim/server/urbansimd.py
index 8f4aff42..836a6d68 100644
--- a/urbansim/server/urbansimd.py
+++ b/urbansim/server/urbansimd.py
@@ -271,7 +271,7 @@ def chart_type(c):
                         data="report_data['%s'].data"
                         id="%s"
                         height="300"
-                        margin="{top: 10, right: 10, bottom: 10 , left: 80}"
+                        margin="{top: 10, right: 10, bottom: 50 , left: 80}"
                         interactive="true"
                         tooltips="true"
                         showxaxis="true"

From b741de141e8ae7af3f059aba69d9b5a9b00175b2 Mon Sep 17 00:00:00 2001
From: gonzalo <gonzalo@gonzalo-ID49C.(none)>
Date: Mon, 7 Apr 2014 16:27:13 -0300
Subject: [PATCH 2/3] template for maps

---
 urbansim/server/urbansimd.py | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/urbansim/server/urbansimd.py b/urbansim/server/urbansimd.py
index 836a6d68..0882e752 100644
--- a/urbansim/server/urbansimd.py
+++ b/urbansim/server/urbansimd.py
@@ -253,8 +253,11 @@ def resp():
 
 @route('/report_data/<item>', method="GET")
 def return_data(item):
+    recs = None
+    config = None
+    template = None
     def isChart(i):
-        return True
+        return False
 
     if isChart(item):
         config = open(os.path.join(misc.charts_dir(), item)).read()
@@ -287,13 +290,23 @@ def chart_type(c):
                         """ % (config['desc'], item, item[:-5],
                                config['groupby'], config['metric'])
             # ids wouldnt work without [:-5]
-            s = simplejson.dumps(
-                {'template': template, 'data': [{'key': '', 'values': recs}]},
-                use_decimal=True
-                )
-            print "response: %s\n" % s
-            return jsonp(request, s)
-
+    else:   # map
+        config = open(os.path.join(misc.maps_dir(), item)).read()
+        config = json.loads(config)
+        recs = get_chart_data(config)
+        template = """
+            <div id="%s" mapdirective style="height: 500px; width: 100%%;"></div>
+                   """ % (item)
+
+                    
+
+    s = simplejson.dumps(
+            {'template': template, 'data': [{'key': '', 'values': recs}], 'config': config},
+        use_decimal=True
+        )
+    print "response: %s\n" % s
+    return jsonp(request, s)
+    
 
 @route('/datasets')
 def list_datasets():

From 59e12b95cbd47f030a7606e8ebca205b2df5e7ef Mon Sep 17 00:00:00 2001
From: gonzalo <gonzalo@gonzalo-ID49C.(none)>
Date: Tue, 8 Apr 2014 12:29:11 -0300
Subject: [PATCH 3/3] titles in templates

---
 urbansim/server/urbansimd.py | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/urbansim/server/urbansimd.py b/urbansim/server/urbansimd.py
index 0882e752..e80adc36 100644
--- a/urbansim/server/urbansimd.py
+++ b/urbansim/server/urbansimd.py
@@ -256,8 +256,9 @@ def return_data(item):
     recs = None
     config = None
     template = None
+
     def isChart(i):
-        return False
+        return "chart" in i
 
     if isChart(item):
         config = open(os.path.join(misc.charts_dir(), item)).read()
@@ -269,11 +270,11 @@ def chart_type(c):
         if chart_type(item) == "bar-chart":
             recs = get_chart_data(config)
             template = """
-                <h2>%s</h2>
+                <h2 style="text-align: center;">%s</h2>
                 <nvd3-multi-bar-chart
                         data="report_data['%s'].data"
                         id="%s"
-                        height="300"
+                        height="500"
                         margin="{top: 10, right: 10, bottom: 50 , left: 80}"
                         interactive="true"
                         tooltips="true"
@@ -282,31 +283,31 @@ def chart_type(c):
                         yaxislabel="%s in thousands"
                         showyaxis="true"
                         xaxisrotatelabels="0"
-                        width="600"
                         nodata="an error occurred in the chart"
                         >
                     <svg></svg>
                 </nvd3-multi-bar-chart>
                         """ % (config['desc'], item, item[:-5],
                                config['groupby'], config['metric'])
-            # ids wouldnt work without [:-5]
+            # ids wouldn't not work without the [:-5]
     else:   # map
         config = open(os.path.join(misc.maps_dir(), item)).read()
         config = json.loads(config)
         recs = get_chart_data(config)
         template = """
-            <div id="%s" mapdirective style="height: 500px; width: 100%%;"></div>
-                   """ % (item)
-
-                    
+            <h2 style="text-align: center;">%s</h2>
+            <div id="%s" mapdirective style="height: 500px; width: 100%%;">
+            </div>
+                   """ % (config['desc'], item)
 
     s = simplejson.dumps(
-            {'template': template, 'data': [{'key': '', 'values': recs}], 'config': config},
+        {'template': template, 'data': [{'key': '', 'values': recs}],
+            'config': config},
         use_decimal=True
         )
     print "response: %s\n" % s
     return jsonp(request, s)
-    
+
 
 @route('/datasets')
 def list_datasets():