From 786146edd6919d69e88df858353e7376d6527a04 Mon Sep 17 00:00:00 2001 From: Richa Agarwal Date: Wed, 28 May 2014 15:06:03 -0700 Subject: [PATCH 01/81] Talk to RecordTrac API to get num results back --- postcode/helpers.py | 12 +++++++++++- postcode/jinja_filters.py | 1 + postcode/templates/recordtrac.html | 4 +++- requirements.txt | 3 ++- 4 files changed, 17 insertions(+), 3 deletions(-) diff --git a/postcode/helpers.py b/postcode/helpers.py index 1062ce5..ab833a0 100644 --- a/postcode/helpers.py +++ b/postcode/helpers.py @@ -1,5 +1,7 @@ import os, json from postcode import app +import simplejson +import urllib2 def get_product(product, attribute = None): f = open(os.path.join(app.root_path, 'static/content/products.js')) @@ -12,4 +14,12 @@ def get_product(product, attribute = None): attr = product_data['blurb'] f.close() return attr - \ No newline at end of file + +def get_api_stats(field): + opener = urllib2.build_opener() + url_request = urllib2.Request('http://records.oaklandnet.com/api/request') + json_data = simplejson.load(opener.open(url_request)) + if field in json_data: + return json_data[field] + else: + return "Field does not exist" \ No newline at end of file diff --git a/postcode/jinja_filters.py b/postcode/jinja_filters.py index 2269743..d153716 100644 --- a/postcode/jinja_filters.py +++ b/postcode/jinja_filters.py @@ -1,3 +1,4 @@ from postcode import helpers, app # Register your filter here! app.jinja_env.filters['get_product'] = helpers.get_product +app.jinja_env.filters['get_api_stats'] = helpers.get_api_stats \ No newline at end of file diff --git a/postcode/templates/recordtrac.html b/postcode/templates/recordtrac.html index 291bad4..6ac727c 100644 --- a/postcode/templates/recordtrac.html +++ b/postcode/templates/recordtrac.html @@ -19,7 +19,9 @@

RecordTrac

- + + Number of requests made via RecordTrac: {{ 'num_results' | get_api_stats }} +

RecordTrac is a new, open platform that makes it easy for agencies to communicate about public records requests in a compliant, transparent, and efficient manner.

diff --git a/requirements.txt b/requirements.txt index 482483d..2298a38 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ Flask==0.9 Jinja2==2.6 gunicorn==0.17.4 -newrelic==2.8.0.7 \ No newline at end of file +newrelic==2.8.0.7 +simplejson==3.5.2 \ No newline at end of file From 8ef2322e93b135fafca1b80dc14c4440f1d39bd9 Mon Sep 17 00:00:00 2001 From: Reed Duecy-Gibbs Date: Wed, 28 May 2014 22:05:43 -0700 Subject: [PATCH 02/81] hooking up counter to API --- postcode/static/css/custom.css | 2 +- postcode/templates/recordtrac.html | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/postcode/static/css/custom.css b/postcode/static/css/custom.css index a071b6d..b321264 100644 --- a/postcode/static/css/custom.css +++ b/postcode/static/css/custom.css @@ -338,7 +338,7 @@ a.rt_link:active {color: #E57755;} } .recordtrac .video{ - margin: 2.5em 0em 1.5em; + margin: 3.5em 0em 2.5em; } diff --git a/postcode/templates/recordtrac.html b/postcode/templates/recordtrac.html index 0f9db49..6565f21 100644 --- a/postcode/templates/recordtrac.html +++ b/postcode/templates/recordtrac.html @@ -30,11 +30,11 @@
-
-

4055

+
+

{{ 'num_results' | get_api_stats }}

-
-

Requests Processed

+
+

Records Requests Processed

@@ -48,13 +48,11 @@
-
+ -
- -
From 1fd9928457d2098c317b1a948c76729868431143 Mon Sep 17 00:00:00 2001 From: ttmp Date: Tue, 24 Jun 2014 16:25:23 -0700 Subject: [PATCH 03/81] Adding a Prop 42 redirect page --- postcode/templates/prop42.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 postcode/templates/prop42.html diff --git a/postcode/templates/prop42.html b/postcode/templates/prop42.html new file mode 100644 index 0000000..53d0330 --- /dev/null +++ b/postcode/templates/prop42.html @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file From adc887c9d0e871c52b55f9bb87b908ecd6c2db33 Mon Sep 17 00:00:00 2001 From: ttmp Date: Tue, 24 Jun 2014 16:34:01 -0700 Subject: [PATCH 04/81] Adding a Prop 42 redirect page --- postcode/templates/prop42.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 postcode/templates/prop42.html diff --git a/postcode/templates/prop42.html b/postcode/templates/prop42.html new file mode 100644 index 0000000..53d0330 --- /dev/null +++ b/postcode/templates/prop42.html @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file From 26d8f63d86ba2dcf92a6b81a4324dc4e79f6a7a6 Mon Sep 17 00:00:00 2001 From: ttmp Date: Tue, 24 Jun 2014 16:37:50 -0700 Subject: [PATCH 05/81] Adding redirect at /recordtrac42 to /recordtrac --- postcode/templates/recordtrac42.html | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 postcode/templates/recordtrac42.html diff --git a/postcode/templates/recordtrac42.html b/postcode/templates/recordtrac42.html new file mode 100644 index 0000000..53d0330 --- /dev/null +++ b/postcode/templates/recordtrac42.html @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file From 79c9577fb17bce624d820d5e32d0f8dc025464ab Mon Sep 17 00:00:00 2001 From: ttmp Date: Thu, 10 Jul 2014 12:16:06 -0700 Subject: [PATCH 06/81] updating redirect code --- postcode/templates/prop42.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/postcode/templates/prop42.html b/postcode/templates/prop42.html index 53d0330..40a7611 100644 --- a/postcode/templates/prop42.html +++ b/postcode/templates/prop42.html @@ -1,11 +1,15 @@ + + Watch Video
@@ -83,13 +83,13 @@

Open Public Records

-
+
-
+
recordtrac logo
-
+

Promptly

Easy text reminders for government services

@@ -100,13 +100,13 @@
Easy text reminders for government services
-
+
-
+
recordtrac logo
-
+

CityVoice

Community feedback for everyone

From 5c0ba258a98992e9f8aed6f9bdfe27cc6340874a Mon Sep 17 00:00:00 2001 From: Reed Duecy-Gibbs Date: Tue, 5 Aug 2014 10:59:03 -0700 Subject: [PATCH 20/81] add mailchimp sign up in footer --- postcode/static/css/custom.css | 14 ++++++++------ postcode/templates/base.html | 32 +++++++++++++++++++------------- 2 files changed, 27 insertions(+), 19 deletions(-) diff --git a/postcode/static/css/custom.css b/postcode/static/css/custom.css index fc6c863..605ec37 100644 --- a/postcode/static/css/custom.css +++ b/postcode/static/css/custom.css @@ -408,6 +408,9 @@ a.rt_link:active {color: #E57755;} margin-right: .75em; } +.btn { + margin-top: 10px; +} .btn-primary{ background: #789FD3; border: #5c7dbe; @@ -505,12 +508,11 @@ margin-bottom: .75em; padding: .25em .6em; } -/* --moz-border-radius: 3px; --webkit-border-radius: 3px; -border-radius: 3px; -*/ -} + + + + + diff --git a/postcode/templates/base.html b/postcode/templates/base.html index 5e9b95d..5bd7f50 100644 --- a/postcode/templates/base.html +++ b/postcode/templates/base.html @@ -53,31 +53,37 @@