From 34b9bae76df4b6c7969d7038ea33512b1abf8d75 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Fri, 24 Sep 2021 16:32:55 +0000
Subject: [PATCH 01/39] [home.index][l]: fix routing and update neccessary tags
 and helper functions

---
 ckanext/opendatani/templates/home/index.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ckanext/opendatani/templates/home/index.html b/ckanext/opendatani/templates/home/index.html
index 51cf6a6..c7507f4 100644
--- a/ckanext/opendatani/templates/home/index.html
+++ b/ckanext/opendatani/templates/home/index.html
@@ -14,7 +14,7 @@
 </div>
 <div role="main">
   <div class="container">
-    <h2 class="sub-heading">Latest</h2>   <a class="btn btn-primary more-btn" href="{{ h.url_for('blog_index') }}" title="{{ _('Blog') }}"><i class="icon-chevron-right"></i>{% trans %}More{% endtrans %}</a>
+    <h2 class="sub-heading">Latest</h2>   <a class="btn btn-primary more-btn" href="{{ h.url_for('pages.blog_index') }}" title="{{ _('Blog') }}"><i class="icon-chevron-right"></i>{% trans %}More{% endtrans %}</a>
 
   {% set posts = h.get_recent_blog_posts(3) %}
     <ul class="latest-posts thumbnails">
@@ -24,10 +24,10 @@ <h2 class="sub-heading">Latest</h2>   <a class="btn btn-primary more-btn" href="
           <img src="{{ post.image }}" />
         </div>
         <div class="post">
-          <h4><a href="{{ h.url_for(controller='ckanext.pages.controller:PagesController', action='blog_show', page='/' + post.name) }}">{{ post.title or post.name }}</a></h4>
+          <h4><a href="{{ h.url_for('pages.blog_show', page='/' + post.name) }}">{{ post.title or post.name }}</a></h4>
           <small class="date"> {{ h.render_datetime(post.publish_date) }} </small>
           <span class="text">{{ h.markdown_extract(post.content) }}</span>
-          <a class="btn btn-primary" href="{{ h.url_for(controller='ckanext.pages.controller:PagesController', action='blog_show', page='/' + post.name) }}"><i class="icon-chevron-right"></i>{% trans %}More{% endtrans %}</a>
+          <a class="btn btn-primary" href="{{ h.url_for('pages.blog_show', page='/' + post.name) }}"><i class="icon-chevron-right"></i>{% trans %}More{% endtrans %}</a>
         </div>
       </li>
       {% endfor %}
@@ -38,15 +38,15 @@ <h4><a href="{{ h.url_for(controller='ckanext.pages.controller:PagesController',
 
 <div role="main">
   <div class="container">
-    <h2 class="sub-heading">Showcases</h2>   <a class="btn btn-primary more-btn" href="{{ h.url_for('ckanext_showcase_index') }}" title="{{ _('Showcases') }}"><i class="icon-chevron-right"></i>{% trans %}More{% endtrans %}</a>
+    <h2 class="sub-heading">Showcases</h2>   <a class="btn btn-primary more-btn" href="{{ h.url_for('showcase_blueprint.index') }}" title="{{ _('Showcases') }}"><i class="icon-chevron-right"></i>{% trans %}More{% endtrans %}</a>
 
       {% for showcase in h.showcase_list(limit=3) %}
       <div class="showcase-item">
           <div class="col-7">
-            <h4><a href="{{ h.url_for(controller='ckanext.showcase.controller:ShowcaseController', action='read', id=showcase.name) }}">{{ _(showcase.title) }}</a></h4>
+            <h4><a href="{{ h.url_for('showcase_blueprint.read', id=showcase.name) }}">{{ _(showcase.title) }}</a></h4>
           </div>
           <div class="col-3">
-            <a href="{{ h.url_for(controller='ckanext.showcase.controller:ShowcaseController', action='read', id=showcase.name) }}" class="btn btn-primary">View</a>
+            <a href="{{ h.url_for('showcase_blueprint.read', id=showcase.name) }}" class="btn btn-primary">View</a>
           </div>
           <div class="clearfix"></div>
           <span>{{ _(showcase.package_count) }} Datasets</span>
@@ -62,5 +62,5 @@ <h4><a href="{{ h.url_for(controller='ckanext.showcase.controller:ShowcaseContro
 
 {% block scripts %}
   {{ super() }}
-  {% resource 'opendatani/main' %}
+  {% asset 'odni/main' %}
 {% endblock %}

From f4f2fcec9471ebff95f20c4719e668578c16d13d Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Fri, 24 Sep 2021 16:34:07 +0000
Subject: [PATCH 02/39] [plugin][l]: remove IRoute and replace with IBlueprint
 for ckan 2.9.4 py3. and also comment out activity stream

---
 ckanext/opendatani/plugin.py | 107 ++++++++++++++++++++---------------
 1 file changed, 61 insertions(+), 46 deletions(-)

diff --git a/ckanext/opendatani/plugin.py b/ckanext/opendatani/plugin.py
index 2a4dbe0..465c97f 100644
--- a/ckanext/opendatani/plugin.py
+++ b/ckanext/opendatani/plugin.py
@@ -1,5 +1,6 @@
 import datetime
-from pylons import config
+# from pylons import config
+from ckan.common import config
 import routes.mapper
 import logging
 
@@ -12,8 +13,8 @@
 import ckan.lib.helpers as h
 import datetime as dt
 from ckanext.opendatani.controller import CustomUserController
-from ckanext.opendatani import helpers
-from ckan.common import OrderedDict
+from ckanext.opendatani import helpers, blueprints
+from collections import OrderedDict
 
 
 log = logging.getLogger(__name__)
@@ -26,9 +27,11 @@ class OpendataniPlugin(plugins.SingletonPlugin):
     plugins.implements(plugins.ITemplateHelpers)
     plugins.implements(plugins.IValidators)
     plugins.implements(plugins.ITemplateHelpers)
-    plugins.implements(plugins.IRoutes)
+    # plugins.implements(plugins.IRoutes)
     plugins.implements(plugins.IAuthFunctions)
     plugins.implements(plugins.IActions)
+    plugins.implements(plugins.IBlueprint)
+
 
 
 
@@ -36,15 +39,16 @@ class OpendataniPlugin(plugins.SingletonPlugin):
     def update_config(self, config_):
         toolkit.add_template_directory(config_, 'templates')
         toolkit.add_public_directory(config_, 'public')
-        toolkit.add_resource('fanstatic', 'opendatani')
+        # toolkit.add_resource('fanstatic', 'opendatani')
+        toolkit.add_resource('assets', 'odni')
 
         # Set fixed config values for this extension
         config_['scheming.dataset_schemas'] = \
             'ckanext.opendatani:dataset_schema.json'
         config_['scheming.dataset_fallback'] = True
 
-        config_['licenses_group_url'] = '{0}/licenses.json'.format(
-            config_['ckan.site_url'].rstrip('/'))
+        # config_['licenses_group_url'] = '{0}/licenses.json'.format(
+        #     config_['ckan.site_url'].rstrip('/'))
 
     # IValidators
     def get_validators(self):
@@ -64,51 +68,62 @@ def get_helpers(self):
             'get_user_num_stale_datasets': get_user_num_stale_datasets,
             'group_list': group_list,
             'package_list': package_list,
-            'ni_activity_list_to_text': helpers.activity_list_to_text,
             'verify_datasets_exist': helpers.verify_datasets_exist,
             'is_admin': helpers.is_admin,
             'showcase_list': helpers.get_showcase_List
         }
 
     # IRoutes
-    def before_map(self, map):
-        controller = 'ckanext.opendatani.controller:StaticController'
-        with routes.mapper.SubMapper(map, controller=controller) as m:
-            m.connect('privacy', '/privacy', action='privacy')
-            m.connect('termsandconditions', '/terms-and-conditions',
-                      action='termsandconditions')
-            m.connect('cookies', '/cookies', action='cookies')
-            m.connect('codeofconduct', '/code-of-conduct',
-                      action='codeofconduct')
-            m.connect('privacy_notice_reg', '/privacy_notice_reg', action='privacy_notice_reg')
-
-        controller = 'ckanext.opendatani.controller:CustomUserController'
-        with routes.mapper.SubMapper(map, controller=controller) as m:
-            m.connect('/user/reset', action='request_reset')
-            m.connect('dashboard_update_notifications', '/dashboard/update_notifications',
-                      action='dashboard_update_notifications', ckan_icon='file')
-            m.connect('add_groups', '/dashboard/update_notifications',
-                      action='dashboard_update_notifications', ckan_icon='file')
-            m.connect('/user/activity/{id}/{offset}', action='activity')
-            m.connect('user_activity_stream', '/user/activity/{id}',
-                      action='activity', ckan_icon='time')
-
-        controller = 'ckanext.opendatani.controller:CustomPackageController'
-        with routes.mapper.SubMapper(map, controller=controller) as m:
-            m.connect('add_groups', '/organization/add_groups/{id}',
-                      action='add_groups', ckan_icon='file')
-            m.connect('/dataset/{id}/resource/{resource_id}',
-                      action='resource_read')
-
-        controller = 'ckanext.opendatani.controller:CustomReportController'
-        with routes.mapper.SubMapper(map, controller=controller) as m:
-            m.connect('/publisher-reports/publisher-report-{org}.csv',
-                      action='prepare_report')
-
-        return map
-
-    def after_map(self, map):
-        return map
+    # def before_map(self, map):
+    #     controller = 'ckanext.opendatani.controller:StaticController'
+    #     with routes.mapper.SubMapper(map, controller=controller) as m:
+    #         m.connect('privacy', '/privacy', action='privacy')
+    #         m.connect('termsandconditions', '/terms-and-conditions',
+    #                   action='termsandconditions')
+    #         m.connect('cookies', '/cookies', action='cookies')
+    #         m.connect('codeofconduct', '/code-of-conduct',
+    #                   action='codeofconduct')
+    #         m.connect('privacy_notice_reg', '/privacy_notice_reg', action='privacy_notice_reg')
+
+    #     controller = 'ckanext.opendatani.controller:CustomUserController'
+    #     with routes.mapper.SubMapper(map, controller=controller) as m:
+    #         m.connect('/user/reset', action='request_reset')
+    #         m.connect('dashboard_update_notifications', '/dashboard/update_notifications',
+    #                   action='dashboard_update_notifications', ckan_icon='file')
+    #         m.connect('add_groups', '/dashboard/update_notifications',
+    #                   action='dashboard_update_notifications', ckan_icon='file')
+    #         m.connect('/user/activity/{id}/{offset}', action='activity')
+    #         m.connect('user_activity_stream', '/user/activity/{id}',
+    #                   action='activity', ckan_icon='time')
+
+    #     controller = 'ckanext.opendatani.controller:CustomPackageController'
+    #     with routes.mapper.SubMapper(map, controller=controller) as m:
+    #         m.connect('add_groups', '/organization/add_groups/{id}',
+    #                   action='add_groups', ckan_icon='file')
+    #         m.connect('/dataset/{id}/resource/{resource_id}',
+    #                   action='resource_read')
+
+    #     controller = 'ckanext.opendatani.controller:CustomReportController'
+    #     with routes.mapper.SubMapper(map, controller=controller) as m:
+    #         m.connect('/publisher-reports/publisher-report-{org}.csv',
+    #                   action='prepare_report')
+
+    #     return map
+
+    # def after_map(self, map):
+    #     return map
+
+    # IBlueprints
+    def get_blueprint(self):
+        return [
+            blueprints.dashboard_blueprint,
+            blueprints.dataset_blueprint,
+            blueprints.dashboard_blueprint,
+            blueprints.organization_blueprint,
+            blueprints.publisher_blueprint,
+            blueprints.user_blueprint,
+            blueprints.static_blueprint,
+        ]
 
     # IAuthFunctions
     def get_auth_functions(self):

From 7f5d8a4734b0b7994bb08592e3c41d8c36ab6fda Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Fri, 24 Sep 2021 16:35:59 +0000
Subject: [PATCH 03/39] [assets][l]: create assets for javascript and css for
 easy access in templates

---
 ckanext/opendatani/assets/css/theme.css       | 1113 +++++++++++++++++
 ckanext/opendatani/assets/js/groups.js        |   10 +
 ckanext/opendatani/assets/js/home.js          |   41 +
 .../assets/js/jquery.adaptive-backgrounds.js  |  136 ++
 ckanext/opendatani/assets/js/privacy.js       |   10 +
 .../opendatani/assets/js/twitterFetcher.js    |  466 +++++++
 .../assets/js/twitterFetcher.min.js           |   67 +
 ckanext/opendatani/assets/webassets.yml       |   22 +
 8 files changed, 1865 insertions(+)
 create mode 100644 ckanext/opendatani/assets/css/theme.css
 create mode 100644 ckanext/opendatani/assets/js/groups.js
 create mode 100644 ckanext/opendatani/assets/js/home.js
 create mode 100644 ckanext/opendatani/assets/js/jquery.adaptive-backgrounds.js
 create mode 100644 ckanext/opendatani/assets/js/privacy.js
 create mode 100644 ckanext/opendatani/assets/js/twitterFetcher.js
 create mode 100644 ckanext/opendatani/assets/js/twitterFetcher.min.js
 create mode 100644 ckanext/opendatani/assets/webassets.yml

diff --git a/ckanext/opendatani/assets/css/theme.css b/ckanext/opendatani/assets/css/theme.css
new file mode 100644
index 0000000..c529990
--- /dev/null
+++ b/ckanext/opendatani/assets/css/theme.css
@@ -0,0 +1,1113 @@
+.body-font {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: #4d4d4d;
+  font-size: 16px;
+  line-height: 1.5;
+}
+.full-width {
+  margin-left: -9999rem;
+  margin-right: -9999rem;
+  padding-left: 9999rem;
+  padding-right: 9999rem;
+}
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+body,
+.account-masthead,
+.masthead,
+[role="main"],
+.main,
+.site-footer {
+  background-image: none;
+  background-color: inherit;
+}
+.masthead .nav-collapse,
+.masthead .section,
+.navbar .nav {
+  float: none;
+}
+.masthead .nav-collapse {
+  padding: 0;
+}
+html,
+.site-footer {
+  background-color: #f0f1f1;
+}
+body {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: #4d4d4d;
+  font-size: 16px;
+  line-height: 1.5;
+  background-color: #fff;
+  overflow-x: hidden;
+}
+[role="main"],
+.main {
+  padding: 0;
+  min-height: 0;
+}
+input,
+button,
+select,
+textarea {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+  color: #4d4d4d;
+  font-size: 16px;
+  line-height: 1.5;
+}
+li {
+  line-height: inherit;
+}
+.btn {
+  background-image: none;
+  border-radius: 0;
+  text-decoration: none;
+  box-shadow: none;
+  text-shadow: none;
+  background-color: #25374d;
+  border-color: #25374d;
+  color: #fff;
+  transition: background-color 0.2s ease-in 0s;
+}
+.btn:hover,
+.btn:focus {
+  color: #fff;
+  background-color: #14253b;
+  border-color: #14253b;
+}
+.btn.btn-primary {
+  background-color: #0c6db7;
+  border-color: #0c6db7;
+  color: #fff;
+  transition: background-color 0.2s ease-in 0s;
+}
+.btn.btn-primary:hover,
+.btn.btn-primary:focus {
+  color: #fff;
+  background-color: #005a9f;
+  border-color: #005a9f;
+}
+.btn.btn-danger {
+  background-color: #c84398;
+  border-color: #c84398;
+  color: #fff;
+  transition: background-color 0.2s ease-in 0s;
+}
+.btn.btn-danger:hover,
+.btn.btn-danger:focus {
+  color: #fff;
+  background-color: #c4238a;
+  border-color: #c4238a;
+}
+.btn.btn-warning {
+  background-color: #9488c1;
+  border-color: #9488c1;
+  color: #fff;
+  transition: background-color 0.2s ease-in 0s;
+}
+.btn.btn-warning:hover,
+.btn.btn-warning:focus {
+  color: #fff;
+  background-color: #7560c5;
+  border-color: #7560c5;
+}
+.btn.btn-success {
+  background-color: #8dc63f;
+  border-color: #8dc63f;
+  color: #fff;
+  transition: background-color 0.2s ease-in 0s;
+}
+.btn.btn-success:hover,
+.btn.btn-success:focus {
+  color: #fff;
+  background-color: #7dbf23;
+  border-color: #7dbf23;
+}
+.btn.btn-info {
+  background-color: #4d4d4d;
+  border-color: #4d4d4d;
+  color: #fff;
+  transition: background-color 0.2s ease-in 0s;
+}
+.btn.btn-info:hover,
+.btn.btn-info:focus {
+  color: #fff;
+  background-color: #443232;
+  border-color: #443232;
+}
+.pill {
+  background-color: #25374d;
+}
+.search-form .filter-list .pill {
+  background-color: #8dc63f;
+}
+.search-form .filter-list .pill a {
+  text-decoration: none;
+}
+.search-form .filter-list .pill a:hover {
+  color: inherit;
+}
+.page-header,
+[role="main"] .wrapper.no-nav > .module > .module-content.page-header {
+  margin-left: -9999rem;
+  margin-right: -9999rem;
+  padding-left: 9999rem;
+  padding-right: 9999rem;
+}
+[role="main"] .wrapper {
+  border: none;
+  border-radius: 0;
+  box-shadow: none;
+  position: relative;
+  margin: 0;
+}
+[role="main"] .wrapper .primary .module-content {
+  padding-left: 15px;
+  padding-right: 0;
+  padding-top: 30px;
+  margin: 0;
+}
+[role="main"] .wrapper .primary.span9 .page-header {
+  margin-left: -20px;
+  padding-left: 25px;
+  margin-right: -9999rem;
+  padding-right: 9999rem;
+}
+[role="main"] .wrapper aside.secondary .nav-item.active > a,
+[role="main"] .wrapper aside.secondary .nav-aside li.active a {
+  background-color: #8dc63f;
+}
+[role="main"] .wrapper aside.secondary .nav-item.active > a:before,
+[role="main"] .wrapper aside.secondary .nav-aside li.active a:before {
+  background-image: none;
+  width: 0;
+  height: 0;
+  border-style: solid;
+  border-width: 17px 0 17px 6px;
+  border-color: transparent transparent transparent #8dc63f;
+  -webkit-transform: rotate(360deg);
+}
+[role="main"] .wrapper aside.secondary .nav-facet .nav-item > a:hover:after {
+  background-image: none;
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  content: "\F055";
+}
+[role="main"] .wrapper aside.secondary .nav-facet .nav-item.active > a:after,
+[role="main"] .wrapper aside.secondary .nav-facet .nav-aside li.active a:after {
+  background-image: none;
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  content: "\F057";
+}
+[role="main"] .wrapper aside.secondary .module .read-more {
+  color: #4d4d4d;
+  font-weight: normal;
+  font-size: 14px;
+}
+[role="main"] .wrapper .media-grid {
+  margin-left: -14px;
+  background-color: transparent;
+  background-image: none;
+  border: none;
+}
+[role="main"] .wrapper .media-grid .media-item {
+  width: 223px;
+}
+@media (min-width: 768px) {
+  [role="main"] .wrapper .media-grid .media-item {
+    width: 223px;
+  }
+}
+@media (min-width: 980px) {
+  [role="main"] .wrapper .media-grid .media-item {
+    width: 188px;
+  }
+}
+[role="main"] .wrapper.no-nav > .module > .module-content {
+  padding-left: 0;
+  padding-right: 0;
+}
+[role="main"] .wrapper.no-nav > .module > .module-content:first-child {
+  padding-top: 30px;
+}
+.stages {
+  margin-right: 0;
+}
+.media-heading {
+  word-break: normal;
+}
+a {
+  color: #0c6db7;
+  text-decoration: underline;
+}
+a:hover,
+a:focus {
+  color: #095087;
+}
+.nav-tabs a,
+a.no-text,
+.nav-item a,
+a.label,
+a.close {
+  text-decoration: none;
+}
+h1,
+h2,
+h3,
+h4,
+h5,
+h6 {
+  color: #25374d;
+  line-height: 1.3;
+}
+h1 a,
+h2 a,
+h3 a,
+h4 a,
+h5 a,
+h6 a {
+  text-decoration: none;
+}
+h1,
+h2,
+h3,
+h4 {
+  letter-spacing: -1px;
+}
+h1 {
+  font-size: 34px;
+}
+h2 {
+  font-size: 30px;
+}
+h3 {
+  font-size: 26px;
+}
+h4 {
+  font-size: 22px;
+}
+h5 {
+  font-size: 18px;
+}
+h6 {
+  font-size: 16px;
+}
+.page-header {
+  background-color: #f6f7f8;
+}
+.account-masthead {
+  background-color: #4d4d4d;
+}
+.account-masthead .account ul li {
+  border: none;
+}
+.account-masthead .account ul li a {
+  line-height: 40px;
+  color: #fff;
+  text-decoration: none;
+  font-weight: 300;
+}
+.account-masthead .account ul li a:hover {
+  background-color: rgba(247, 247, 247, 0.1);
+  color: #fff;
+}
+.masthead {
+  color: #4d4d4d;
+}
+.masthead .logo {
+  display: block;
+  width: 282px;
+  margin: 22px 0;
+}
+.masthead .nav-collapse {
+  background-color: #e8eaed;
+  clear: both;
+  position: static;
+  margin-left: -9999rem;
+  margin-right: -9999rem;
+  padding-left: 9999rem;
+  padding-right: 9999rem;
+}
+.masthead .site-search {
+  position: absolute;
+  top: 31px;
+  right: 0;
+}
+.masthead .site-search label {
+  display: block;
+  position: absolute;
+  top: 8px;
+  background-color: #fff;
+  width: 30px;
+  height: 30px;
+  border-radius: 50%;
+  text-align: center;
+  line-height: 30px;
+  color: rgba(77, 77, 77, 0.25);
+}
+.masthead .site-search label:after {
+  display: none;
+}
+.masthead .site-search label span {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+.masthead .site-search input {
+  padding: 12px 50px 12px 45px;
+  width: 210px;
+  background-color: #e8eaed;
+  border-radius: 0;
+  border-color: #e8eaed;
+  box-shadow: none;
+}
+.masthead .site-search input:focus {
+  border-color: #0c6db7;
+}
+.masthead .site-search .btn-search {
+  background-color: #0c6db7;
+  color: #fff;
+  height: 100%;
+  margin-top: 0;
+  padding: 0 12px;
+  top: 0;
+  right: -7px;
+  bottom: 0;
+  width: auto;
+}
+.masthead .site-search .btn-search:hover {
+  color: #fff;
+}
+.masthead .nav,
+.masthead .navigation .nav-pills {
+  margin-left: -16px;
+}
+.masthead .nav > li,
+.masthead .navigation .nav-pills > li {
+  font-size: 17px;
+}
+.masthead .nav > li > a,
+.masthead .navigation .nav-pills > li > a {
+  padding: 16px;
+  margin: 0;
+  color: #25374d;
+  font-weight: bold;
+  border-radius: 0;
+  position: relative;
+}
+.masthead .nav > li > a:hover,
+.masthead .navigation .nav-pills > li > a:hover {
+  background-color: #dfe2e6;
+}
+.masthead .nav > li.active > a,
+.masthead .navigation .nav-pills > li.active > a {
+  background-color: transparent;
+  box-shadow: none;
+}
+.masthead .nav > li.active > a:after,
+.masthead .navigation .nav-pills > li.active > a:after {
+  content: '';
+  width: 0;
+  height: 0;
+  border-style: solid;
+  border-width: 0 5px 6px 5px;
+  border-color: transparent transparent #dfe2e6 transparent;
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  margin-left: -5px;
+}
+.masthead .nav > li.active > a:hover,
+.masthead .navigation .nav-pills > li.active > a:hover {
+  color: #25374d;
+}
+.homepage .hero {
+  padding-bottom: 0;
+  padding-top: 20px;
+}
+@media (min-width: 768px) {
+  .homepage .hero {
+    background-color: #e8eaed;
+    border-top: solid 1px #dfe2e6;
+  }
+}
+.homepage .featured-groups li {
+  background-color: #25374d;
+}
+.homepage .featured-groups li a {
+  display: table;
+  color: #fff;
+  padding: 10px 0;
+  text-decoration: none;
+  width: 100%;
+}
+@media (min-width: 768px) {
+  .homepage .featured-groups li a {
+    height: 114px;
+    overflow: hidden;
+  }
+}
+.homepage .featured-groups li a h1,
+.homepage .featured-groups li a h2,
+.homepage .featured-groups li a h3,
+.homepage .featured-groups li a h4,
+.homepage .featured-groups li a h5,
+.homepage .featured-groups li a h6 {
+  color: inherit;
+  margin: 0;
+  display: table-cell;
+  vertical-align: middle;
+  line-height: 1.1;
+  padding: 0 15px;
+  width: 100%;
+}
+.homepage .featured-groups li a:hover {
+  background-color: rgba(255, 255, 255, 0.2);
+}
+.homepage .featured-groups li a.ab-light {
+  color: #4d4d4d;
+}
+.homepage .featured-groups li a .image {
+  display: none;
+}
+@media (min-width: 980px) {
+  .homepage .featured-groups li a .image {
+    display: block;
+    width: 75px;
+    height: 75px;
+    border-radius: 50%;
+    overflow: hidden;
+    float: left;
+    margin: 20px 6px 0 24px;
+  }
+  .homepage .featured-groups li a .image img {
+    width: 77px;
+    max-width: 77px;
+    margin: -1px 0 0 -1px;
+  }
+}
+.homepage .featured-groups li[class*="health"],
+.homepage .featured-groups li[class*="property"] {
+  background-color: #00ABC2;
+}
+.homepage .featured-groups li[class*="education"],
+.homepage .featured-groups li[class*="population"] {
+  background-color: #34455A;
+}
+.homepage .featured-groups li[class*="finance"] {
+  background-color: #247BBE;
+}
+.homepage .featured-groups li[class*="environment"] {
+  background-color: #8DC63F;
+}
+.homepage .featured-groups li[class*="tourism"],
+.homepage .featured-groups li[class*="transport"] {
+  background-color: #9488C1;
+}
+.homepage .featured-groups li[class*="economy"] {
+  background-color: #AC3192;
+}
+@media (min-width: 768px) {
+  .homepage .latest-posts .post > * {
+    margin-left: 3px;
+    margin-right: 3px;
+  }
+  .homepage .latest-posts > li:first-child .post > * {
+    margin-left: 0;
+    margin-right: 6px;
+  }
+  .homepage .latest-posts > li:last-child .post > * {
+    margin-left: 6px;
+    margin-right: 0;
+  }
+}
+.homepage .latest-posts h4 {
+  margin-bottom: 5px;
+}
+.homepage .latest-posts .date {
+  opacity: 0.6;
+  display: block;
+  margin-bottom: 6px;
+}
+.homepage .latest-posts .text {
+  display: block;
+  margin-bottom: 20px;
+}
+.twitter {
+  background-color: #0c6db7;
+  color: #fff;
+  margin: 0 -20px;
+  padding: 15px 20px;
+}
+.twitter h1,
+.twitter h2,
+.twitter h3,
+.twitter h4,
+.twitter h55,
+.twitter h6 {
+  font-size: 30px;
+  margin: 10px 0 0 0;
+  color: inherit;
+}
+.twitter a {
+  color: inherit;
+  text-decoration: none;
+  font-weight: bold;
+}
+.twitter .carousel {
+  margin-bottom: 0;
+}
+.twitter ul.carousel-inner {
+  padding: 20px 0;
+  margin: 0;
+}
+.twitter ul.carousel-inner:empty:after {
+  content: "We haven't tweeted yet. Watch this space!";
+  opacity: 0.8;
+  font-style: italic;
+}
+.twitter .item {
+  line-height: 22px;
+}
+@media (min-width: 768px) {
+  .twitter .user {
+    float: left;
+    height: 36px;
+    width: 230px;
+  }
+}
+.twitter .user span {
+  display: block;
+  line-height: 1.2;
+}
+.twitter .user span[data-scribe="element\3Ascreen_name"] {
+  font-size: 14px;
+  font-weight: normal;
+}
+.twitter .user img {
+  width: 36px;
+  height: 36px;
+  float: left;
+  margin-right: 15px;
+  border: solid 6px #fff;
+  border-radius: 50%;
+  background-color: #fff;
+  margin-top: -6px;
+}
+.twitter .tweet {
+  display: block;
+  position: relative;
+  margin: 10px 10px 0 63px;
+}
+@media (min-width: 768px) {
+  .twitter .tweet {
+    margin: 0 0 0 240px;
+  }
+}
+@media (min-width: 768px) {
+  .twitter .tweet:before,
+  .twitter .tweet:after {
+    font-size: 26px;
+    top: 4px;
+    position: relative;
+  }
+  .twitter .tweet:before {
+    content: open-quote;
+    position: absolute;
+    left: -15px;
+  }
+  .twitter .tweet:after {
+    content: close-quote;
+    margin-left: 3px;
+  }
+}
+.twitter .timePosted {
+  display: none;
+}
+.twitter .interact {
+  margin: 10px 0 0 63px;
+}
+@media (min-width: 768px) {
+  .twitter .interact {
+    margin-left: 240px;
+  }
+}
+.twitter .interact a {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  overflow: hidden;
+  font-family: FontAwesome;
+  font-style: normal;
+  font-weight: normal;
+  opacity: 0.7;
+  margin-right: 5px;
+}
+.twitter .interact a:hover {
+  opacity: 1;
+}
+.twitter .interact a:before {
+  display: block;
+  text-align: center;
+}
+.twitter .interact a.twitter_reply_icon:before {
+  content: "\F064";
+}
+.twitter .interact a.twitter_retweet_icon:before {
+  content: "\F079";
+}
+.twitter .interact a.twitter_fav_icon:before {
+  content: "\F005";
+}
+.twitter .interact-right .tweet {
+  margin-right: 30px;
+}
+.twitter .interact-right .interact {
+  position: absolute;
+  top: -8px;
+  right: 0;
+  margin: 0;
+}
+.twitter .interact-right .interact a {
+  display: block;
+  margin: 0;
+}
+.site-footer {
+  margin: 0 -20px;
+  padding: 30px 20px;
+  color: #4d4d4d;
+  font-size: 14px;
+}
+.site-footer a {
+  color: inherit;
+}
+.site-footer .logos > div {
+  margin-bottom: 20px;
+}
+@media (min-width: 768px) {
+  .site-footer .logos > div:nth-child(n+3) {
+    text-align: right;
+  }
+}
+.toolbar {
+  background-color: #e8eaed;
+  border-top: solid 1px #dfe2e6;
+  margin-left: -9999rem;
+  margin-right: -9999rem;
+  padding-left: 9999rem;
+  padding-right: 9999rem;
+  margin-bottom: 0;
+}
+.toolbar .breadcrumb {
+  font-size: 14px;
+  opacity: 0.8;
+  color: #25374d;
+}
+.toolbar .breadcrumb li {
+  text-shadow: none;
+}
+.toolbar .breadcrumb li.home .icon-home {
+  font-size: 16px;
+}
+.toolbar .breadcrumb li a {
+  text-decoration: none;
+  color: inherit;
+}
+.toolbar .breadcrumb li.active {
+  color: inherit;
+  font-weight: normal;
+}
+.toolbar .breadcrumb li.active a {
+  font-weight: inherit;
+}
+[role="main"] .wrapper {
+  background-image: none;
+}
+[role="main"] .wrapper:not(.no-nav) aside.secondary .module-heading {
+  background-color: #e8eaed;
+  border: none;
+}
+@media (min-width: 768px) {
+  [role="main"] .wrapper:not(.no-nav):before {
+    content: "";
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    width: 9600px;
+    right: 100%;
+    background-color: #f6f7f8;
+    display: block;
+    margin-right: -166px;
+  }
+  [role="main"] .wrapper:not(.no-nav) aside.secondary {
+    background-color: #f6f7f8;
+    z-index: 1;
+    position: relative;
+    padding-top: 30px;
+  }
+  [role="main"] .wrapper:not(.no-nav) aside.secondary .module-narrow .module-heading,
+  [role="main"] .wrapper:not(.no-nav) aside.secondary .module-narrow .module-content,
+  [role="main"] .wrapper:not(.no-nav) aside.secondary .module-narrow .module-footer {
+    padding-left: 0;
+  }
+  [role="main"] .wrapper:not(.no-nav) aside.secondary .module-heading {
+    position: relative;
+    border-radius: 0;
+    font-size: 15px;
+  }
+  [role="main"] .wrapper:not(.no-nav) aside.secondary .module-heading:before {
+    content: '';
+    display: block;
+    width: 15px;
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: -15px;
+    background-color: #e8eaed;
+  }
+  [role="main"] .wrapper:not(.no-nav) aside.secondary .context-info .image > a {
+    padding: 5px;
+    background-color: #e8eaed;
+  }
+  [role="main"] .wrapper:not(.no-nav) aside.secondary .context-info .image > a img {
+    background-color: #fff;
+    border-radius: 0;
+  }
+  [role="main"] .wrapper:not(.no-nav) aside.secondary .nav {
+    margin-left: -15px;
+  }
+}
+@media (min-width: 768px) and (min-width: 980px) {
+  [role="main"] .wrapper:not(.no-nav):before {
+    margin-right: -220px;
+  }
+}
+[role="main"] .wrapper .module-resource {
+  position: relative;
+}
+[role="main"] .wrapper .primary .dataset-heading {
+  font-size: 20px;
+}
+.org-list {
+  margin: 0;
+}
+.org-list li {
+  display: block;
+}
+.org-list li a {
+  display: block;
+  background-color: #f6f7f8;
+  margin-bottom: 8px;
+  border-radius: 3px;
+  padding: 5px;
+  text-decoration: none;
+  color: #4d4d4d;
+}
+.org-list li a img {
+  margin: -4px 0 0 -2px;
+  width: 24px;
+}
+.org-list li a:hover {
+  background-color: #e8eaed;
+}
+.org-list li a .count {
+  display: none;
+}
+@media (min-width: 768px) {
+  .org-list li a .count {
+    display: block;
+    float: right;
+    font-size: 13px;
+    line-height: 25px;
+    margin-right: 7px;
+  }
+}
+.org-list li a span.count {
+  opacity: 0.2;
+}
+.org-list li a strong.count {
+  opacity: 0.5;
+  font-weight: normal;
+}
+.hierarchy-tree-top li a,
+.hierarchy-tree li a {
+  position: relative;
+}
+.hierarchy-tree-top li a span,
+.hierarchy-tree li a span {
+  position: absolute;
+  right: 0;
+  top: 0;
+  background: #0c6db7;
+  padding: 4px 10px;
+  color: #f6f7f8;
+}
+.hierarchy-tree li a span {
+  background: #00ABC2;
+}
+.media-grid .media-view {
+  border: none;
+}
+.media-grid .media-item {
+  background-color: #f6f7f8;
+}
+.media-grid .media-item .media-image {
+  border-radius: 0;
+}
+.media-grid .media-item strong.count {
+  font-weight: normal;
+}
+.media-grid .media-item.ab-dark {
+  color: #fff;
+}
+.media-grid .media-item.ab-dark h1,
+.media-grid .media-item.ab-dark h2,
+.media-grid .media-item.ab-dark h3,
+.media-grid .media-item.ab-dark h4,
+.media-grid .media-item.ab-dark h5,
+.media-grid .media-item.ab-dark h6 {
+  color: inherit;
+}
+.media-grid .media-item.ab-dark span.count {
+  color: rgba(255, 255, 255, 0.6);
+}
+.media-grid .media-item.ab-dark strong.count {
+  color: rgba(255, 255, 255, 0.8);
+}
+.alert {
+  border: none;
+  background-color: #9488c1;
+  color: #fff;
+  text-shadow: none;
+}
+.alert a {
+  color: inherit;
+  text-shadow: none;
+}
+.alert .close {
+  right: 0;
+  top: auto;
+  opacity: 1;
+}
+.alert.alert-error {
+  background-color: #c84398;
+}
+.alert.alert-success {
+  background-color: #8dc63f;
+}
+.alert.alert-info {
+  background-color: #0c6db7;
+}
+.flash-messages .alert {
+  margin-left: -9999rem;
+  margin-right: -9999rem;
+  padding-left: 9999rem;
+  padding-right: 9999rem;
+  margin-bottom: 1px;
+}
+.label {
+  text-shadow: none;
+  letter-spacing: normal;
+  margin-right: 3px;
+}
+.label-open {
+  background-color: #808080 !important;
+}
+.label-in-progress {
+  background-color: #4186E0;
+}
+.label-contacted {
+  background-color: #4186E0;
+}
+.label-scheduled {
+  background-color: #FD9A00;
+}
+.label-released {
+  background-color: #2DB55D;
+}
+.label-cannot-release {
+  background-color: #E0051E;
+}
+.label-not-public {
+  background-color: #E0051E;
+}
+.expandable-menu,
+.expandable-menu ul {
+  line-height: 1.5;
+  list-style: none;
+  padding: 0;
+  margin: 0;
+}
+.expandable-menu {
+  margin-left: -1.5em;
+}
+.expandable-menu > li {
+  padding-left: 1.5em;
+  margin-bottom: 0.5em;
+}
+.expandable-menu li a {
+  display: block;
+  padding: 0.25em;
+  background: #e8eaed;
+  color: #444;
+  text-decoration: none;
+  margin-top: 5px;
+  margin-left: 10px;
+}
+.expandable-menu li a:hover {
+  background: #dfe2e6;
+}
+.expandable-menu > li > a {
+  background: #e8eaed;
+  color: #25374d;
+  font-weight: bold;
+}
+.expandable-menu > li > a:hover {
+  background: #dfe2e6;
+}
+.expandable-menu input[type="checkbox"] ~ ul li,
+.expandable-menu input[type="checkbox"].current:checked ~ ul li {
+  height: 0;
+  overflow: hidden;
+  transition: 0.2s ease-in;
+}
+.expandable-menu input[type="checkbox"]:checked ~ ul li,
+.expandable-menu input[type="checkbox"].current ~ ul li {
+  height: auto;
+}
+.expandable-menu input[type="checkbox"] {
+  display: none;
+}
+.expandable-menu label {
+  display: block;
+  float: left;
+  content: "";
+  margin-left: -2em;
+  width: 1.5em;
+  padding: 6px;
+  text-align: center;
+  background: #8cc63f;
+  color: white;
+  font-weight: bold;
+  cursor: pointer;
+}
+.expandable-menu label:hover {
+  background: #1b6a43;
+}
+.expandable-menu label:after {
+  content: "";
+}
+.expandable-menu label:before,
+.expandable-menu input[type="checkbox"]:checked.current ~ label:before {
+  font-family: FontAwesome;
+  content: "\f0fe";
+}
+.expandable-menu input[type="checkbox"]:checked ~ label:before,
+.expandable-menu input[type="checkbox"].current ~ label:before {
+  font-family: FontAwesome;
+  content: "\f146";
+}
+.paddingleft-hack > li > a {
+  padding-left: 25px;
+  color: #25374d;
+}
+#s2id_field-add_groups {
+  width: unset !important;
+}
+#s2id_field-add_groups > ul {
+  max-width: 500px;
+  min-width: 220px;
+  width: auto !important;
+  min-height: 30px !important;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+#no_content {
+  display: inline;
+}
+#no_content:after {
+  content: '';
+}
+/* Custom UI Homepage updates */
+.latest-posts.thumbnails {
+  margin-top: 30px;
+}
+.latest-posts.thumbnails li {
+  border: 1px solid #eee;
+  margin-left: 17px;
+  min-height: 501px;
+}
+.latest-posts.thumbnails li .post {
+  padding: 10px;
+}
+.sub-heading {
+  display: inline;
+  position: relative;
+  top: 6px;
+}
+.more-btn {
+  margin-left: 10px;
+  display: inline;
+}
+.col-7 {
+  width: 70%;
+  float: left;
+}
+.col-3 {
+  width: 30%;
+  float: left;
+  text-align: right;
+}
+.showcase-item {
+  padding: 30px 0;
+  border-bottom: 1px solid #e1e1e1;
+}
+.showcase-item p {
+  margin-top: 10px;
+  color: #7d7d7d;
+}
+.showcase-item .btn {
+  position: relative;
+  top: 15px;
+  padding: 5px 25px;
+}
+.showcase-item span {
+  background-color: #eee;
+  font-size: 1.1em;
+  padding: 6px 15px;
+  font-weight: 600;
+  color: #7f7f7f;
+}
+.clearfix {
+  clear: both;
+}
+.thumb {
+  width: 100%;
+  height: 160px;
+  overflow: hidden;
+}
+@media screen and (max-width: 768px) {
+  .latest-posts .span4 {
+    width: 100%;
+  }
+  .mar-l-0 {
+    margin-left: 0 !important;
+  }
+}
diff --git a/ckanext/opendatani/assets/js/groups.js b/ckanext/opendatani/assets/js/groups.js
new file mode 100644
index 0000000..16ba671
--- /dev/null
+++ b/ckanext/opendatani/assets/js/groups.js
@@ -0,0 +1,10 @@
+$(document).ready(function(){
+  var defaults  = {
+
+    exclude: [ 'rgb(0,0,0)', 'rgba(255,255,255)', 'rgb(255,255,255)' ],
+    yiqThreshold: 200,
+   
+  };
+  $.adaptiveBackground.run(defaults)
+
+});
diff --git a/ckanext/opendatani/assets/js/home.js b/ckanext/opendatani/assets/js/home.js
new file mode 100644
index 0000000..1a85857
--- /dev/null
+++ b/ckanext/opendatani/assets/js/home.js
@@ -0,0 +1,41 @@
+$(document).ready(function(){
+  var defaults  = {
+
+    exclude: [ 'rgb(0,0,0)', 'rgba(255,255,255)', 'rgb(255,255,255)' ],
+    yiqThreshold: 200,
+    parent: '.group',
+   
+  };
+  $.adaptiveBackground.run(defaults)
+
+
+  // twitter
+  twitterFetcher.fetch({
+    "profile": {"screenName": 'opendatani'},
+    "domId": 'tweets',
+    "maxTweets": 5,
+    "enableLinks": true,
+    "customCallback":handleTweets,
+  });
+  
+  
+  function handleTweets(tweets){
+    var i=0;
+    var j=tweets.length;
+    var l="<ul class='carousel-inner'>";
+    while(i<j){
+      l+="<li class='item' id='tweet"+i+"'>"+tweets[i]+"</li>";
+      i++;
+    }
+    l+="</ul>";
+    document.getElementById("tweets").innerHTML=l;
+    var n=(j-1);
+    
+    $( "#tweet0" ).addClass( "active" );
+    
+    $('.carousel').carousel({
+      interval: 10000
+    })
+  } 
+  
+});
\ No newline at end of file
diff --git a/ckanext/opendatani/assets/js/jquery.adaptive-backgrounds.js b/ckanext/opendatani/assets/js/jquery.adaptive-backgrounds.js
new file mode 100644
index 0000000..95f23cf
--- /dev/null
+++ b/ckanext/opendatani/assets/js/jquery.adaptive-backgrounds.js
@@ -0,0 +1,136 @@
+/*	
+ * Tweaked version of adaptive-backgrounds.js
+ * https://github.com/mintcanary/jquery.adaptive-backgrounds.js
+ */
+
+/* jshint debug: true, expr: true */
+
+;(function($){
+
+  /* Constants & defaults. */
+  var DATA_COLOR    = 'data-ab-color';
+  var DATA_PARENT   = 'data-ab-parent';
+  var DATA_CSS_BG   = 'data-ab-css-background';
+  var EVENT_CF      = 'ab-color-found';
+
+  var DEFAULTS      = {
+    selector:             '[data-adaptive-background]',
+    parent:               null,
+    exclude:              [ 'rgb(0,0,0)', 'rgba(255,255,255)' ],
+    normalizeTextColor:   false,
+    normalizedTextColors:  {
+      light:      "#fff",
+      dark:       "#000"
+    },
+    lumaClasses:  {
+      light:      "ab-light",
+      dark:       "ab-dark"
+    },
+    yiqThreshold: '128'
+  };
+
+  // Include RGBaster - https://github.com/briangonzalez/rgbaster.js
+  /* jshint ignore:start */
+  !function(n){"use strict";var t=function(){return document.createElement("canvas").getContext("2d")},e=function(n,e){var a=new Image,o=n.src||n;"data:"!==o.substring(0,5)&&(a.crossOrigin="Anonymous"),a.onload=function(){var n=t("2d");n.drawImage(a,0,0);var o=n.getImageData(0,0,a.width,a.height);e&&e(o.data)},a.src=o},a=function(n){return["rgb(",n,")"].join("")},o=function(n){return n.map(function(n){return a(n.name)})},r=5,i=10,c={};c.colors=function(n,t){t=t||{};var c=t.exclude||[],u=t.paletteSize||i;e(n,function(e){for(var i=n.width*n.height||e.length,m={},s="",d=[],f={dominant:{name:"",count:0},palette:Array.apply(null,new Array(u)).map(Boolean).map(function(){return{name:"0,0,0",count:0}})},l=0;i>l;){if(d[0]=e[l],d[1]=e[l+1],d[2]=e[l+2],s=d.join(","),m[s]=s in m?m[s]+1:1,-1===c.indexOf(a(s))){var g=m[s];g>f.dominant.count?(f.dominant.name=s,f.dominant.count=g):f.palette.some(function(n){return g>n.count?(n.name=s,n.count=g,!0):void 0})}l+=4*r}if(t.success){var p=o(f.palette);t.success({dominant:a(f.dominant.name),secondary:p[0],palette:p})}})},n.RGBaster=n.RGBaster||c}(window);
+  /* jshint ignore:end */
+
+
+  /*
+    Our main function declaration.
+  */
+  $.adaptiveBackground = {
+    run: function( options ){
+      var opts = $.extend({}, DEFAULTS, options);
+
+      /* Loop over each element, waiting for it to load
+         then finding its color, and triggering the
+         color found event when color has been found.
+      */
+      $( opts.selector ).each(function(index, el){
+        var $this = $(this);
+
+        /*  Small helper functions which applies
+            colors, attrs, triggers events, etc.
+        */
+        var handleColors = function () {
+          var img = useCSSBackground() ? getCSSBackground() : $this[0];
+
+          RGBaster.colors(img, {
+            paletteSize: 20,
+            exclude: opts.exclude,
+            success: function(colors) {
+              $this.attr(DATA_COLOR, colors.dominant);
+              $this.trigger(EVENT_CF, { color: colors.dominant, palette: colors.palette });
+            }
+          });
+
+        };
+
+        var useCSSBackground = function(){
+          var attr = $this.attr( DATA_CSS_BG );
+          return (typeof attr !== typeof undefined && attr !== false);
+        };
+
+        var getCSSBackground = function(){
+          var str = $this.css('background-image');
+          var regex = /\(([^)]+)\)/;
+          var match = regex.exec(str)[1].replace(/"/g, '')
+          return match;
+        };
+
+        /* Subscribe to our color-found event. */
+        $this.on( EVENT_CF, function(ev, data){
+
+          // Try to find the parent.
+          var $parent;
+          if ( opts.parent && $this.parents( opts.parent ).length ) {
+            $parent = $this.parents( opts.parent );
+          }
+          else if ( $this.attr( DATA_PARENT ) && $this.parents( $this.attr( DATA_PARENT ) ).length ){
+            $parent = $this.parents( $this.attr( DATA_PARENT ) );
+          }
+          else if ( useCSSBackground() ){
+            $parent = $this;
+          }
+          else if (opts.parent) {
+            $parent = $this.parents( opts.parent );
+          }
+          else {
+            $parent = $this.parent();
+          }
+
+          $parent.css({ backgroundColor: data.color });
+
+          // Helper function to calculate yiq - http://en.wikipedia.org/wiki/YIQ
+          var getYIQ = function(color){
+            var rgb = data.color.match(/\d+/g);
+            return ((rgb[0]*299)+(rgb[1]*587)+(rgb[2]*114))/1000;
+          };
+
+          var getNormalizedTextColor = function (color){
+            return getYIQ(color) >= opts.yiqThreshold ? opts.normalizedTextColors.dark : opts.normalizedTextColors.light;
+          };
+
+          var getLumaClass = function (color){
+            return getYIQ(color) <= opts.yiqThreshold ? opts.lumaClasses.dark : opts.lumaClasses.light;
+          };
+
+          // Normalize the text color based on luminance.
+          if ( opts.normalizeTextColor )
+            $parent.css({ color: getNormalizedTextColor(data.color) });
+
+          // Add a class based on luminance.
+          $parent.addClass( getLumaClass(data.color) )
+                 .attr('data-ab-yaq', getYIQ(data.color));
+
+          opts.success && opts.success($this, data);
+        });
+
+        /* Handle the colors. */
+        handleColors();
+
+      });
+    },
+  };
+
+})(jQuery);
diff --git a/ckanext/opendatani/assets/js/privacy.js b/ckanext/opendatani/assets/js/privacy.js
new file mode 100644
index 0000000..9f90f0b
--- /dev/null
+++ b/ckanext/opendatani/assets/js/privacy.js
@@ -0,0 +1,10 @@
+function privacyFunction(){
+    var privacy = document.getElementById("field-privacy").checked;
+    if (privacy === true) {
+      return true
+    }
+    else {
+      alert('Consent to process has not been provided, user account cannot be created');
+      return false
+    }
+}
\ No newline at end of file
diff --git a/ckanext/opendatani/assets/js/twitterFetcher.js b/ckanext/opendatani/assets/js/twitterFetcher.js
new file mode 100644
index 0000000..d42a7c0
--- /dev/null
+++ b/ckanext/opendatani/assets/js/twitterFetcher.js
@@ -0,0 +1,466 @@
+/*********************************************************************
+*  #### Twitter Post Fetcher v18.0.2 ####
+*  Coded by Jason Mayes 2015. A present to all the developers out there.
+*  www.jasonmayes.com
+*  Please keep this disclaimer with my code if you use it. Thanks. :-)
+*  Got feedback or questions, ask here:
+*  http://www.jasonmayes.com/projects/twitterApi/
+*  Github: https://github.com/jasonmayes/Twitter-Post-Fetcher
+*  Updates will be posted to this site.
+*********************************************************************/
+(function(root, factory) {
+  if (typeof define === 'function' && define.amd) {
+    // AMD. Register as an anonymous module.
+    define([], factory);
+  } else if (typeof exports === 'object') {
+    // Node. Does not work with strict CommonJS, but
+    // only CommonJS-like environments that support module.exports,
+    // like Node.
+    module.exports = factory();
+  } else {
+    // Browser globals.
+    factory();
+  }
+}(this, function() {
+  var domNode = '';
+  var maxTweets = 20;
+  var parseLinks = true;
+  var queue = [];
+  var inProgress = false;
+  var printTime = true;
+  var printUser = true;
+  var formatterFunction = null;
+  var supportsClassName = true;
+  var showRts = true;
+  var customCallbackFunction = null;
+  var showInteractionLinks = true;
+  var showImages = false;
+  var useEmoji = false;
+  var targetBlank = true;
+  var lang = 'en';
+  var permalinks = true;
+  var dataOnly = false;
+  var script = null;
+  var scriptAdded = false;
+
+  function handleTweets(tweets){
+    if (customCallbackFunction === null) {
+      var x = tweets.length;
+      var n = 0;
+      var element = document.getElementById(domNode);
+      var html = '<ul>';
+      while(n < x) {
+        html += '<li>' + tweets[n] + '</li>';
+        n++;
+      }
+      html += '</ul>';
+      element.innerHTML = html;
+    } else {
+      customCallbackFunction(tweets);
+    }
+  }
+
+  function strip(data) {
+    return data.replace(/<b[^>]*>(.*?)<\/b>/gi, function(a,s){return s;})
+        .replace(/class="(?!(tco-hidden|tco-display|tco-ellipsis))+.*?"|data-query-source=".*?"|dir=".*?"|rel=".*?"/gi,
+        '');
+  }
+
+  function targetLinksToNewWindow(el) {
+    var links = el.getElementsByTagName('a');
+    for (var i = links.length - 1; i >= 0; i--) {
+      links[i].setAttribute('target', '_blank');
+      links[i].setAttribute('rel', 'noopener');
+    }
+  }
+
+  function getElementsByClassName (node, classname) {
+    var a = [];
+    var regex = new RegExp('(^| )' + classname + '( |$)');
+    var elems = node.getElementsByTagName('*');
+    for (var i = 0, j = elems.length; i < j; i++) {
+        if(regex.test(elems[i].className)){
+          a.push(elems[i]);
+        }
+    }
+    return a;
+  }
+
+  function extractImageUrl(image_data) {
+    if (image_data !== undefined && image_data.innerHTML.indexOf('data-image') >= 0) {
+      var data_src = image_data.innerHTML.match(/data-image=\"([A-z0-9]+:\/\/[A-z0-9]+\.[A-z0-9]+\.[A-z0-9]+\/[A-z0-9]+\/[A-z0-9\-]+)/i)[1];
+      return decodeURIComponent(data_src) + '.jpg';
+    }
+  }
+ 
+
+  var twitterFetcher = {
+    fetch: function(config) {
+      if (config.maxTweets === undefined) {
+        config.maxTweets = 20;
+      }
+      if (config.enableLinks === undefined) {
+        config.enableLinks = true;
+      }
+      if (config.showUser === undefined) {
+        config.showUser = true;
+      }
+      if (config.showTime === undefined) {
+        config.showTime = true;
+      }
+      if (config.dateFunction === undefined) {
+        config.dateFunction = 'default';
+      }
+      if (config.showRetweet === undefined) {
+        config.showRetweet = true;
+      }
+      if (config.customCallback === undefined) {
+        config.customCallback = null;
+      }
+      if (config.showInteraction === undefined) {
+        config.showInteraction = true;
+      }
+      if (config.showImages === undefined) {
+        config.showImages = false;
+      }
+      if (config.useEmoji === undefined) {
+        config.useEmoji = false;
+      }
+      if (config.linksInNewWindow === undefined) {
+        config.linksInNewWindow = true;
+      }
+      if (config.showPermalinks === undefined) {
+        config.showPermalinks = true;
+      }
+      if (config.dataOnly === undefined) {
+        config.dataOnly = false;
+      }
+
+      if (inProgress) {
+        queue.push(config);
+      } else {
+        inProgress = true;
+
+        domNode = config.domId;
+        maxTweets = config.maxTweets;
+        parseLinks = config.enableLinks;
+        printUser = config.showUser;
+        printTime = config.showTime;
+        showRts = config.showRetweet;
+        formatterFunction = config.dateFunction;
+        customCallbackFunction = config.customCallback;
+        showInteractionLinks = config.showInteraction;
+        showImages = config.showImages;
+  useEmoji = config.useEmoji;
+        targetBlank = config.linksInNewWindow;
+        permalinks = config.showPermalinks;
+        dataOnly = config.dataOnly;
+
+        var head = document.getElementsByTagName('head')[0];
+        if (script !== null) {
+          head.removeChild(script);
+        }
+        script = document.createElement('script');
+        script.type = 'text/javascript';
+        if (config.list !== undefined) {
+          script.src = 'https://syndication.twitter.com/timeline/list?' +
+              'callback=__twttrf.callback&dnt=false&list_slug=' +
+              config.list.listSlug + '&screen_name=' + config.list.screenName +
+              '&suppress_response_codes=true&lang=' + (config.lang || lang) +
+              '&rnd=' + Math.random();
+        } else if (config.profile !== undefined) {
+          script.src = 'https://syndication.twitter.com/timeline/profile?' +
+              'callback=__twttrf.callback&dnt=false' +
+              '&screen_name=' + config.profile.screenName +
+              '&suppress_response_codes=true&lang=' + (config.lang || lang) +
+              '&rnd=' + Math.random();
+        } else if (config.likes !== undefined) {
+          script.src = 'https://syndication.twitter.com/timeline/likes?' +
+              'callback=__twttrf.callback&dnt=false' +
+              '&screen_name=' + config.likes.screenName +
+              '&suppress_response_codes=true&lang=' + (config.lang || lang) +
+              '&rnd=' + Math.random();
+        } else {
+          script.src = 'https://cdn.syndication.twimg.com/widgets/timelines/' +
+              config.id + '?&lang=' + (config.lang || lang) +
+              '&callback=__twttrf.callback&' +
+              'suppress_response_codes=true&rnd=' + Math.random();
+        }
+        head.appendChild(script);
+      }
+    },
+    callback: function(data) {
+      if (data === undefined || data.body === undefined) {
+        inProgress = false;
+
+        if (queue.length > 0) {
+          twitterFetcher.fetch(queue[0]);
+          queue.splice(0,1);
+        }
+        return;
+      }
+
+      // Remove emoji and summary card images.
+      if(!useEmoji){
+        data.body = data.body.replace(/(<img[^c]*class="Emoji[^>]*>)|(<img[^c]*class="u-block[^>]*>)/g, '');
+      }
+
+      // Remove display images.
+      if (!showImages) {
+        data.body = data.body.replace(/(<img[^c]*class="NaturalImage-image[^>]*>|(<img[^c]*class="CroppedImage-image[^>]*>))/g, '');
+      }
+      // Remove avatar images.
+      if (!printUser) {
+        data.body = data.body.replace(/(<img[^c]*class="Avatar"[^>]*>)/g, '');
+      }
+
+      var div = document.createElement('div');
+      div.innerHTML = data.body;
+      if (typeof(div.getElementsByClassName) === 'undefined') {
+         supportsClassName = false;
+      }
+
+      function swapDataSrc(element) {
+        var avatarImg = element.getElementsByTagName('img')[0];
+        if (avatarImg) {
+          avatarImg.src = avatarImg.getAttribute('data-src-2x');
+        } else {
+          var screenName = element.getElementsByTagName('a')[0]
+              .getAttribute('href').split('twitter.com/')[1];
+          var img = document.createElement('img');
+          img.setAttribute('src', 'https://twitter.com/' + screenName + 
+              '/profile_image?size=bigger');
+          element.prepend(img);
+        }
+        return element;
+      }
+
+      var tweets = [];
+      var authors = [];
+      var times = [];
+      var images = [];
+      var rts = [];
+      var tids = [];
+      var permalinksURL = [];
+      var x = 0;
+
+      if (supportsClassName) {
+        var tmp = div.getElementsByClassName('timeline-Tweet');
+        while (x < tmp.length) {
+          if (tmp[x].getElementsByClassName('timeline-Tweet-retweetCredit').length > 0) {
+            rts.push(true);
+          } else {
+            rts.push(false);
+          }
+          if (!rts[x] || rts[x] && showRts) {
+            tweets.push(tmp[x].getElementsByClassName('timeline-Tweet-text')[0]);
+            tids.push(tmp[x].getAttribute('data-tweet-id'));
+            if (printUser) {
+              authors.push(swapDataSrc(tmp[x].getElementsByClassName('timeline-Tweet-author')[0]));
+            }
+            times.push(tmp[x].getElementsByClassName('dt-updated')[0]);
+            permalinksURL.push(tmp[x].getElementsByClassName('timeline-Tweet-timestamp')[0]);
+            if (tmp[x].getElementsByClassName('timeline-Tweet-media')[0] !==
+                undefined) {
+              images.push(tmp[x].getElementsByClassName('timeline-Tweet-media')[0]);
+            } else {
+              images.push(undefined);
+            }
+          }
+          x++;
+        }
+      } else {
+        var tmp = getElementsByClassName(div, 'timeline-Tweet');
+        while (x < tmp.length) {
+          if (getElementsByClassName(tmp[x], 'timeline-Tweet-retweetCredit').length > 0) {
+            rts.push(true);
+          } else {
+            rts.push(false);
+          }
+          if (!rts[x] || rts[x] && showRts) {
+            tweets.push(getElementsByClassName(tmp[x], 'timeline-Tweet-text')[0]);
+            tids.push(tmp[x].getAttribute('data-tweet-id'));
+            if (printUser) {
+              authors.push(swapDataSrc(getElementsByClassName(tmp[x],'timeline-Tweet-author')[0]));
+            }
+            times.push(getElementsByClassName(tmp[x], 'dt-updated')[0]);
+            permalinksURL.push(getElementsByClassName(tmp[x], 'timeline-Tweet-timestamp')[0]);
+            if (getElementsByClassName(tmp[x], 'timeline-Tweet-media')[0] !== undefined) {
+              images.push(getElementsByClassName(tmp[x], 'timeline-Tweet-media')[0]);
+            } else {
+              images.push(undefined);
+            }
+          }
+          x++;
+        }
+      }
+
+      if (tweets.length > maxTweets) {
+        tweets.splice(maxTweets, (tweets.length - maxTweets));
+        authors.splice(maxTweets, (authors.length - maxTweets));
+        times.splice(maxTweets, (times.length - maxTweets));
+        rts.splice(maxTweets, (rts.length - maxTweets));
+        images.splice(maxTweets, (images.length - maxTweets));
+        permalinksURL.splice(maxTweets, (permalinksURL.length - maxTweets));
+      }
+
+      var arrayTweets = [];
+      var x = tweets.length;
+      var n = 0;
+      if (dataOnly) {
+        while (n < x) {
+          arrayTweets.push({
+            tweet: tweets[n].innerHTML,
+            author: authors[n] ? authors[n].innerHTML : 'Unknown Author',
+            author_data: {
+              profile_url: authors[n] ? authors[n].querySelector('[data-scribe="element:user_link"]').href : null,
+              profile_image: authors[n] ? 
+              'https://twitter.com/' + authors[n].querySelector('[data-scribe="element:screen_name"]').title.split('@')[1] + '/profile_image?size=bigger' : null,
+              profile_image_2x: authors[n] ? 'https://twitter.com/' + authors[n].querySelector('[data-scribe="element:screen_name"]').title.split('@')[1] + '/profile_image?size=original' : null,
+              screen_name: authors[n] ? authors[n].querySelector('[data-scribe="element:screen_name"]').title : null,
+              name: authors[n] ? authors[n].querySelector('[data-scribe="element:name"]').title : null
+            },
+            time: times[n].textContent,
+            timestamp: times[n].getAttribute('datetime').replace('+0000', 'Z').replace(/([\+\-])(\d\d)(\d\d)/, '$1$2:$3'),
+            image: extractImageUrl(images[n]),
+            rt: rts[n],
+            tid: tids[n],
+            permalinkURL: (permalinksURL[n] === undefined) ?
+                '' : permalinksURL[n].href
+          });
+          n++;
+        }
+      } else {
+        while (n < x) {
+          if (typeof(formatterFunction) !== 'string') {
+            var datetimeText = times[n].getAttribute('datetime');
+            var newDate = new Date(times[n].getAttribute('datetime')
+                .replace(/-/g,'/').replace('T', ' ').split('+')[0]);
+            var dateString = formatterFunction(newDate, datetimeText);
+            times[n].setAttribute('aria-label', dateString);
+
+            if (tweets[n].textContent) {
+              // IE hack.
+              if (supportsClassName) {
+                times[n].textContent = dateString;
+              } else {
+                var h = document.createElement('p');
+                var t = document.createTextNode(dateString);
+                h.appendChild(t);
+                h.setAttribute('aria-label', dateString);
+                times[n] = h;
+              }
+            } else {
+              times[n].textContent = dateString;
+            }
+          }
+          var op = '';
+          if (parseLinks) {
+            if (targetBlank) {
+              targetLinksToNewWindow(tweets[n]);
+              if (printUser) {
+                targetLinksToNewWindow(authors[n]);
+              }
+            }
+            if (printUser) {
+              op += '<div class="user">' + strip(authors[n].innerHTML) +
+                  '</div>';
+            }
+            op += '<p class="tweet">' + strip(tweets[n].innerHTML) + '</p>';
+            if (printTime) {
+              if (permalinks) {
+                op += '<p class="timePosted"><a href="' + permalinksURL[n] +
+                   '">' + times[n].getAttribute('aria-label') + '</a></p>';
+              } else {
+                op += '<p class="timePosted">' +
+                    times[n].getAttribute('aria-label') + '</p>';
+              }
+            }
+          } else {
+            if (tweets[n].textContent) {
+              if (printUser) {
+                op += '<p class="user">' + authors[n].textContent + '</p>';
+              }
+              op += '<p class="tweet">' +  tweets[n].textContent + '</p>';
+              if (printTime) {
+                op += '<p class="timePosted">' + times[n].textContent + '</p>';
+              }
+
+            } else {
+              if (printUser) {
+                op += '<p class="user">' + authors[n].textContent + '</p>';
+              }
+              op += '<p class="tweet">' +  tweets[n].textContent + '</p>';
+              if (printTime) {
+                op += '<p class="timePosted">' + times[n].textContent + '</p>';
+              }
+            }
+          }
+          if (showInteractionLinks) {
+            op += '<p class="interact"><a href="https://twitter.com/intent/' +
+                'tweet?in_reply_to=' + tids[n] +
+                '" class="twitter_reply_icon"' +
+                (targetBlank ? ' target="_blank" rel="noopener">' : '>') +
+                'Reply</a><a href="https://twitter.com/intent/retweet?' +
+                'tweet_id=' + tids[n] + '" class="twitter_retweet_icon"' +
+                (targetBlank ? ' target="_blank" rel="noopener">' : '>') + 'Retweet</a>' +
+                '<a href="https://twitter.com/intent/favorite?tweet_id=' +
+                tids[n] + '" class="twitter_fav_icon"' +
+                (targetBlank ? ' target="_blank" rel="noopener">' : '>') + 'Favorite</a></p>';
+          }
+          if (showImages && images[n] !== undefined && extractImageUrl(images[n]) !== undefined) {
+            op += '<div class="media">' +
+                '<img src="' + extractImageUrl(images[n]) +
+                '" alt="Image from tweet" />' + '</div>';
+          }
+          if (showImages) {
+            arrayTweets.push(op);
+          } else if (!showImages && tweets[n].textContent.length) {
+            arrayTweets.push(op);
+          }
+
+          n++;
+        }
+      }
+
+      handleTweets(arrayTweets);
+      inProgress = false;
+
+      if (queue.length > 0) {
+        twitterFetcher.fetch(queue[0]);
+        queue.splice(0,1);
+      }
+    }
+  };
+
+  // It must be a global variable because it will be called by JSONP.
+  window.__twttrf = twitterFetcher;
+  window.twitterFetcher = twitterFetcher;
+  return twitterFetcher;
+}));
+
+
+// Prepend polyfill for IE/Edge.
+(function (arr) {
+  arr.forEach(function (item) {
+    if (item.hasOwnProperty('prepend')) {
+      return;
+    }
+    Object.defineProperty(item, 'prepend', {
+      configurable: true,
+      enumerable: true,
+      writable: true,
+      value: function prepend() {
+        var argArr = Array.prototype.slice.call(arguments),
+          docFrag = document.createDocumentFragment();
+        
+        argArr.forEach(function (argItem) {
+          var isNode = argItem instanceof Node;
+          docFrag.appendChild(isNode ? argItem : document.createTextNode(String(argItem)));
+        });
+        
+        this.insertBefore(docFrag, this.firstChild);
+      }
+    });
+  });
+})([Element.prototype, Document.prototype, DocumentFragment.prototype]);
diff --git a/ckanext/opendatani/assets/js/twitterFetcher.min.js b/ckanext/opendatani/assets/js/twitterFetcher.min.js
new file mode 100644
index 0000000..5d4d4b2
--- /dev/null
+++ b/ckanext/opendatani/assets/js/twitterFetcher.min.js
@@ -0,0 +1,67 @@
+/*********************************************************************
+*  #### Twitter Post Fetcher v18.0.2 ####
+*  Coded by Jason Mayes 2015. A present to all the developers out there.
+*  www.jasonmayes.com
+*  Please keep this disclaimer with my code if you use it. Thanks. :-)
+*  Got feedback or questions, ask here:
+*  http://www.jasonmayes.com/projects/twitterApi/
+*  Github: https://github.com/jasonmayes/Twitter-Post-Fetcher
+*  Updates will be posted to this site.
+*********************************************************************/
+(function(root,factory){if(typeof define==='function'&&define.amd){define([],factory);}else if(typeof exports==='object'){module.exports=factory();}else{factory();}}(this,function(){var domNode='';var maxTweets=20;var parseLinks=true;var queue=[];var inProgress=false;var printTime=true;var printUser=true;var formatterFunction=null;var supportsClassName=true;var showRts=true;var customCallbackFunction=null;var showInteractionLinks=true;var showImages=false;var useEmoji=false;var targetBlank=true;var lang='en';var permalinks=true;var dataOnly=false;var script=null;var scriptAdded=false;function handleTweets(tweets){if(customCallbackFunction===null){var x=tweets.length;var n=0;var element=document.getElementById(domNode);var html='<ul>';while(n<x){html+='<li>'+tweets[n]+'</li>';n++;}
+html+='</ul>';element.innerHTML=html;}else{customCallbackFunction(tweets);}}
+function strip(data){return data.replace(/<b[^>]*>(.*?)<\/b>/gi,function(a,s){return s;}).replace(/class="(?!(tco-hidden|tco-display|tco-ellipsis))+.*?"|data-query-source=".*?"|dir=".*?"|rel=".*?"/gi,'');}
+function targetLinksToNewWindow(el){var links=el.getElementsByTagName('a');for(var i=links.length-1;i>=0;i--){links[i].setAttribute('target','_blank');links[i].setAttribute('rel','noopener');}}
+function getElementsByClassName(node,classname){var a=[];var regex=new RegExp('(^| )'+classname+'( |$)');var elems=node.getElementsByTagName('*');for(var i=0,j=elems.length;i<j;i++){if(regex.test(elems[i].className)){a.push(elems[i]);}}
+return a;}
+function extractImageUrl(image_data){if(image_data!==undefined&&image_data.innerHTML.indexOf('data-image')>=0){var data_src=image_data.innerHTML.match(/data-image=\"([A-z0-9]+:\/\/[A-z0-9]+\.[A-z0-9]+\.[A-z0-9]+\/[A-z0-9]+\/[A-z0-9\-]+)/i)[1];return decodeURIComponent(data_src)+'.jpg';}}
+var twitterFetcher={fetch:function(config){if(config.maxTweets===undefined){config.maxTweets=20;}
+if(config.enableLinks===undefined){config.enableLinks=true;}
+if(config.showUser===undefined){config.showUser=true;}
+if(config.showTime===undefined){config.showTime=true;}
+if(config.dateFunction===undefined){config.dateFunction='default';}
+if(config.showRetweet===undefined){config.showRetweet=true;}
+if(config.customCallback===undefined){config.customCallback=null;}
+if(config.showInteraction===undefined){config.showInteraction=true;}
+if(config.showImages===undefined){config.showImages=false;}
+if(config.useEmoji===undefined){config.useEmoji=false;}
+if(config.linksInNewWindow===undefined){config.linksInNewWindow=true;}
+if(config.showPermalinks===undefined){config.showPermalinks=true;}
+if(config.dataOnly===undefined){config.dataOnly=false;}
+if(inProgress){queue.push(config);}else{inProgress=true;domNode=config.domId;maxTweets=config.maxTweets;parseLinks=config.enableLinks;printUser=config.showUser;printTime=config.showTime;showRts=config.showRetweet;formatterFunction=config.dateFunction;customCallbackFunction=config.customCallback;showInteractionLinks=config.showInteraction;showImages=config.showImages;useEmoji=config.useEmoji;targetBlank=config.linksInNewWindow;permalinks=config.showPermalinks;dataOnly=config.dataOnly;var head=document.getElementsByTagName('head')[0];if(script!==null){head.removeChild(script);}
+script=document.createElement('script');script.type='text/javascript';if(config.list!==undefined){script.src='https://syndication.twitter.com/timeline/list?'+'callback=__twttrf.callback&dnt=false&list_slug='+
+config.list.listSlug+'&screen_name='+config.list.screenName+'&suppress_response_codes=true&lang='+(config.lang||lang)+'&rnd='+Math.random();}else if(config.profile!==undefined){script.src='https://syndication.twitter.com/timeline/profile?'+'callback=__twttrf.callback&dnt=false'+'&screen_name='+config.profile.screenName+'&suppress_response_codes=true&lang='+(config.lang||lang)+'&rnd='+Math.random();}else if(config.likes!==undefined){script.src='https://syndication.twitter.com/timeline/likes?'+'callback=__twttrf.callback&dnt=false'+'&screen_name='+config.likes.screenName+'&suppress_response_codes=true&lang='+(config.lang||lang)+'&rnd='+Math.random();}else{script.src='https://cdn.syndication.twimg.com/widgets/timelines/'+
+config.id+'?&lang='+(config.lang||lang)+'&callback=__twttrf.callback&'+'suppress_response_codes=true&rnd='+Math.random();}
+head.appendChild(script);}},callback:function(data){if(data===undefined||data.body===undefined){inProgress=false;if(queue.length>0){twitterFetcher.fetch(queue[0]);queue.splice(0,1);}
+return;}
+if(!useEmoji){data.body=data.body.replace(/(<img[^c]*class="Emoji[^>]*>)|(<img[^c]*class="u-block[^>]*>)/g,'');}
+if(!showImages){data.body=data.body.replace(/(<img[^c]*class="NaturalImage-image[^>]*>|(<img[^c]*class="CroppedImage-image[^>]*>))/g,'');}
+if(!printUser){data.body=data.body.replace(/(<img[^c]*class="Avatar"[^>]*>)/g,'');}
+var div=document.createElement('div');div.innerHTML=data.body;if(typeof(div.getElementsByClassName)==='undefined'){supportsClassName=false;}
+function swapDataSrc(element){var avatarImg=element.getElementsByTagName('img')[0];if(avatarImg){avatarImg.src=avatarImg.getAttribute('data-src-2x');}else{var screenName=element.getElementsByTagName('a')[0].getAttribute('href').split('twitter.com/')[1];var img=document.createElement('img');img.setAttribute('src','https://twitter.com/'+screenName+'/profile_image?size=bigger');element.prepend(img);}
+return element;}
+var tweets=[];var authors=[];var times=[];var images=[];var rts=[];var tids=[];var permalinksURL=[];var x=0;if(supportsClassName){var tmp=div.getElementsByClassName('timeline-Tweet');while(x<tmp.length){if(tmp[x].getElementsByClassName('timeline-Tweet-retweetCredit').length>0){rts.push(true);}else{rts.push(false);}
+if(!rts[x]||rts[x]&&showRts){tweets.push(tmp[x].getElementsByClassName('timeline-Tweet-text')[0]);tids.push(tmp[x].getAttribute('data-tweet-id'));if(printUser){authors.push(swapDataSrc(tmp[x].getElementsByClassName('timeline-Tweet-author')[0]));}
+times.push(tmp[x].getElementsByClassName('dt-updated')[0]);permalinksURL.push(tmp[x].getElementsByClassName('timeline-Tweet-timestamp')[0]);if(tmp[x].getElementsByClassName('timeline-Tweet-media')[0]!==undefined){images.push(tmp[x].getElementsByClassName('timeline-Tweet-media')[0]);}else{images.push(undefined);}}
+x++;}}else{var tmp=getElementsByClassName(div,'timeline-Tweet');while(x<tmp.length){if(getElementsByClassName(tmp[x],'timeline-Tweet-retweetCredit').length>0){rts.push(true);}else{rts.push(false);}
+if(!rts[x]||rts[x]&&showRts){tweets.push(getElementsByClassName(tmp[x],'timeline-Tweet-text')[0]);tids.push(tmp[x].getAttribute('data-tweet-id'));if(printUser){authors.push(swapDataSrc(getElementsByClassName(tmp[x],'timeline-Tweet-author')[0]));}
+times.push(getElementsByClassName(tmp[x],'dt-updated')[0]);permalinksURL.push(getElementsByClassName(tmp[x],'timeline-Tweet-timestamp')[0]);if(getElementsByClassName(tmp[x],'timeline-Tweet-media')[0]!==undefined){images.push(getElementsByClassName(tmp[x],'timeline-Tweet-media')[0]);}else{images.push(undefined);}}
+x++;}}
+if(tweets.length>maxTweets){tweets.splice(maxTweets,(tweets.length-maxTweets));authors.splice(maxTweets,(authors.length-maxTweets));times.splice(maxTweets,(times.length-maxTweets));rts.splice(maxTweets,(rts.length-maxTweets));images.splice(maxTweets,(images.length-maxTweets));permalinksURL.splice(maxTweets,(permalinksURL.length-maxTweets));}
+var arrayTweets=[];var x=tweets.length;var n=0;if(dataOnly){while(n<x){arrayTweets.push({tweet:tweets[n].innerHTML,author:authors[n]?authors[n].innerHTML:'Unknown Author',author_data:{profile_url:authors[n]?authors[n].querySelector('[data-scribe="element:user_link"]').href:null,profile_image:authors[n]?'https://twitter.com/'+authors[n].querySelector('[data-scribe="element:screen_name"]').title.split('@')[1]+'/profile_image?size=bigger':null,profile_image_2x:authors[n]?'https://twitter.com/'+authors[n].querySelector('[data-scribe="element:screen_name"]').title.split('@')[1]+'/profile_image?size=original':null,screen_name:authors[n]?authors[n].querySelector('[data-scribe="element:screen_name"]').title:null,name:authors[n]?authors[n].querySelector('[data-scribe="element:name"]').title:null},time:times[n].textContent,timestamp:times[n].getAttribute('datetime').replace('+0000','Z').replace(/([\+\-])(\d\d)(\d\d)/,'$1$2:$3'),image:extractImageUrl(images[n]),rt:rts[n],tid:tids[n],permalinkURL:(permalinksURL[n]===undefined)?'':permalinksURL[n].href});n++;}}else{while(n<x){if(typeof(formatterFunction)!=='string'){var datetimeText=times[n].getAttribute('datetime');var newDate=new Date(times[n].getAttribute('datetime').replace(/-/g,'/').replace('T',' ').split('+')[0]);var dateString=formatterFunction(newDate,datetimeText);times[n].setAttribute('aria-label',dateString);if(tweets[n].textContent){if(supportsClassName){times[n].textContent=dateString;}else{var h=document.createElement('p');var t=document.createTextNode(dateString);h.appendChild(t);h.setAttribute('aria-label',dateString);times[n]=h;}}else{times[n].textContent=dateString;}}
+var op='';if(parseLinks){if(targetBlank){targetLinksToNewWindow(tweets[n]);if(printUser){targetLinksToNewWindow(authors[n]);}}
+if(printUser){op+='<div class="user">'+strip(authors[n].innerHTML)+'</div>';}
+op+='<p class="tweet">'+strip(tweets[n].innerHTML)+'</p>';if(printTime){if(permalinks){op+='<p class="timePosted"><a href="'+permalinksURL[n]+'">'+times[n].getAttribute('aria-label')+'</a></p>';}else{op+='<p class="timePosted">'+
+times[n].getAttribute('aria-label')+'</p>';}}}else{if(tweets[n].textContent){if(printUser){op+='<p class="user">'+authors[n].textContent+'</p>';}
+op+='<p class="tweet">'+tweets[n].textContent+'</p>';if(printTime){op+='<p class="timePosted">'+times[n].textContent+'</p>';}}else{if(printUser){op+='<p class="user">'+authors[n].textContent+'</p>';}
+op+='<p class="tweet">'+tweets[n].textContent+'</p>';if(printTime){op+='<p class="timePosted">'+times[n].textContent+'</p>';}}}
+if(showInteractionLinks){op+='<p class="interact"><a href="https://twitter.com/intent/'+'tweet?in_reply_to='+tids[n]+'" class="twitter_reply_icon"'+
+(targetBlank?' target="_blank" rel="noopener">':'>')+'Reply</a><a href="https://twitter.com/intent/retweet?'+'tweet_id='+tids[n]+'" class="twitter_retweet_icon"'+
+(targetBlank?' target="_blank" rel="noopener">':'>')+'Retweet</a>'+'<a href="https://twitter.com/intent/favorite?tweet_id='+
+tids[n]+'" class="twitter_fav_icon"'+
+(targetBlank?' target="_blank" rel="noopener">':'>')+'Favorite</a></p>';}
+if(showImages&&images[n]!==undefined&&extractImageUrl(images[n])!==undefined){op+='<div class="media">'+'<img src="'+extractImageUrl(images[n])+'" alt="Image from tweet" />'+'</div>';}
+if(showImages){arrayTweets.push(op);}else if(!showImages&&tweets[n].textContent.length){arrayTweets.push(op);}
+n++;}}
+handleTweets(arrayTweets);inProgress=false;if(queue.length>0){twitterFetcher.fetch(queue[0]);queue.splice(0,1);}}};window.__twttrf=twitterFetcher;window.twitterFetcher=twitterFetcher;return twitterFetcher;}));(function(arr){arr.forEach(function(item){if(item.hasOwnProperty('prepend')){return;}
+Object.defineProperty(item,'prepend',{configurable:true,enumerable:true,writable:true,value:function prepend(){var argArr=Array.prototype.slice.call(arguments),docFrag=document.createDocumentFragment();argArr.forEach(function(argItem){var isNode=argItem instanceof Node;docFrag.appendChild(isNode?argItem:document.createTextNode(String(argItem)));});this.insertBefore(docFrag,this.firstChild);}});});})([Element.prototype,Document.prototype,DocumentFragment.prototype]);
\ No newline at end of file
diff --git a/ckanext/opendatani/assets/webassets.yml b/ckanext/opendatani/assets/webassets.yml
new file mode 100644
index 0000000..1b9878c
--- /dev/null
+++ b/ckanext/opendatani/assets/webassets.yml
@@ -0,0 +1,22 @@
+theme_css:
+  output: odni/%(version)s_theme_css.css
+  filters: cssrewrite
+  contents:
+    - css/theme.css
+
+main:
+  output: odni/%(version)s_main.js
+  filters: rjsmin
+  contents:
+    - js/groups.js
+    - js/home.js
+    - js/twitterFetcher.js
+    - js/jquery.adaptive-backgrounds.js
+
+adaptive_backgroudjs:
+  output: odni/%(version)s_adaptive_background.js
+  filters: rjsmin
+  contents:
+    - js/jquery.adaptive-backgrounds.js
+
+

From ac32afad66ae35aee7eba47694621bbec546aab4 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Fri, 24 Sep 2021 16:37:15 +0000
Subject: [PATCH 04/39] [blueprint][l]: create blueprint for the custom routes

---
 ckanext/opendatani/blueprints/__init__.py     |   6 +
 ckanext/opendatani/blueprints/dashboard.py    |  85 +++++++++++++
 ckanext/opendatani/blueprints/dataset.py      | 116 ++++++++++++++++++
 ckanext/opendatani/blueprints/organization.py |  70 +++++++++++
 .../blueprints/publisher_reports.py           | 101 +++++++++++++++
 .../blueprints/static_controller.py           |  76 ++++++++++++
 ckanext/opendatani/blueprints/user.py         | 114 +++++++++++++++++
 7 files changed, 568 insertions(+)
 create mode 100644 ckanext/opendatani/blueprints/__init__.py
 create mode 100644 ckanext/opendatani/blueprints/dashboard.py
 create mode 100644 ckanext/opendatani/blueprints/dataset.py
 create mode 100644 ckanext/opendatani/blueprints/organization.py
 create mode 100644 ckanext/opendatani/blueprints/publisher_reports.py
 create mode 100644 ckanext/opendatani/blueprints/static_controller.py
 create mode 100644 ckanext/opendatani/blueprints/user.py

diff --git a/ckanext/opendatani/blueprints/__init__.py b/ckanext/opendatani/blueprints/__init__.py
new file mode 100644
index 0000000..f80b759
--- /dev/null
+++ b/ckanext/opendatani/blueprints/__init__.py
@@ -0,0 +1,6 @@
+from .dashboard import dashboard_blueprint
+from .dataset import dataset_blueprint
+from .organization import organization_blueprint
+from .publisher_reports import publisher_blueprint
+from .user import user_blueprint
+from .static_controller import static_blueprint
diff --git a/ckanext/opendatani/blueprints/dashboard.py b/ckanext/opendatani/blueprints/dashboard.py
new file mode 100644
index 0000000..ac72a37
--- /dev/null
+++ b/ckanext/opendatani/blueprints/dashboard.py
@@ -0,0 +1,85 @@
+import ckan.lib.base as base
+from ckan.views.dataset import (
+    _get_pkg_template, _get_package_type, _setup_template_variables
+)
+
+import ckan.plugins.toolkit as toolkit
+import ckan.logic as logic
+from ckanext.opendatani import helpers
+import logging
+import datetime as dt
+import requests
+import os
+import csv
+from io import StringIO
+
+import ckan.lib.base as base
+from ckan import model
+import ckan.lib.helpers as h
+import ckan.lib.mailer as mailer
+   
+from flask import Blueprint
+
+
+log = logging.getLogger(__name__)
+
+render = base.render
+abort = base.abort
+
+NotFound = logic.NotFound
+NotAuthorized = logic.NotAuthorized
+get_action = logic.get_action
+ValidationError = logic.ValidationError
+
+dashboard_blueprint = Blueprint('odni_dashboard', __name__, url_prefix=u'/dashboard')
+
+def _stale_datasets_for_user(data):
+    def frequency_to_timedelta(frequency):
+        frequency_periods = {
+            "daily": dt.timedelta(days=2),
+            "weekly": dt.timedelta(days=7),
+            "fortnightly": dt.timedelta(days=14),
+            "monthly": dt.timedelta(days=30),
+            "quarterly": dt.timedelta(days=91),
+            "annually": dt.timedelta(days=365),
+        }
+        if not frequency:
+            pass
+        else:
+            return frequency_periods[frequency]
+
+    stale_datasets = []
+    if data:
+        for pkg in data:
+            if 'frequency' in pkg:
+                pkg['metadata_created'] = h.date_str_to_datetime(
+                    pkg['metadata_created'])
+                pkg['metadata_modified'] = h.date_str_to_datetime(
+                    pkg['metadata_modified'])
+                pkg['frequency'] = pkg.get('frequency', '')
+                if pkg['frequency']:
+                    if pkg['frequency'] != 'irregular' and pkg['frequency'] != 'notPlanned':
+                        if pkg['metadata_modified'].date() != pkg['metadata_created'].date():
+                            now = dt.datetime.now()
+                            diff = now - pkg['metadata_modified']
+                            if diff > frequency_to_timedelta(pkg['frequency']):
+                                stale_datasets.append(pkg)
+    return stale_datasets
+
+def dashboard_update_notifications():
+    user = toolkit.get_action('user_show')(
+        {}, {'id': toolkit.c.userobj.id, 'include_datasets': True})
+    data = user['datasets']
+    c.stale_datasets = _stale_datasets_for_user(data)
+    context = {'for_view': True, 'user': c.user,
+                'auth_user_obj': c.userobj}
+    data_dict = {'user_obj': c.userobj, 'stale_datasets': c.stale_datasets}
+    _setup_template_variables(context, data_dict)
+    return toolkit.render('user/dashboard_update.html')
+
+
+dashboard_blueprint.add_url_rule(
+    rule='/update_notifications',
+    view_func=dashboard_update_notifications,
+    methods=[u'GET', u'POST'],
+)
\ No newline at end of file
diff --git a/ckanext/opendatani/blueprints/dataset.py b/ckanext/opendatani/blueprints/dataset.py
new file mode 100644
index 0000000..a483dda
--- /dev/null
+++ b/ckanext/opendatani/blueprints/dataset.py
@@ -0,0 +1,116 @@
+import ckan.lib.base as base
+from ckan.views.dataset import (
+    _get_pkg_template, _get_package_type, _setup_template_variables
+)
+
+import ckan.plugins.toolkit as toolkit
+import ckan.logic as logic
+from ckanext.opendatani import helpers
+import logging
+import datetime as dt
+import requests
+import os
+import csv
+from io import StringIO
+
+import ckan.lib.base as base
+from ckan import model
+import ckan.lib.helpers as h
+import ckan.lib.mailer as mailer
+   
+from flask import Blueprint
+
+
+log = logging.getLogger(__name__)
+
+render = base.render
+abort = base.abort
+
+NotFound = logic.NotFound
+NotAuthorized = logic.NotAuthorized
+get_action = logic.get_action
+ValidationError = logic.ValidationError
+
+dataset_blueprint = Blueprint('odni_dataset', __name__, url_prefix=u'/dataset')
+
+
+def resource_read(id, resource_id):
+    context = {'model': model, 'session': model.Session,
+                'user': c.user,
+                'auth_user_obj': c.userobj,
+                'for_view': True}
+
+    try:
+        c.package = get_action('package_show')(context, {'id': id})
+    except (NotFound, NotAuthorized):
+        abort(404, _('Dataset not found'))
+
+    for resource in c.package.get('resources', []):
+        if resource['id'] == resource_id:
+            c.resource = resource
+            break
+    if not c.resource:
+        abort(404, _('Resource not found'))
+
+    # required for nav menu
+    c.pkg = context['package']
+    c.pkg_dict = c.package
+    dataset_type = c.pkg.type or 'dataset'
+
+    # get package license info
+    license_id = c.package.get('license_id')
+    try:
+        c.package['isopen'] = model.Package.\
+            get_license_register()[license_id].isopen()
+    except KeyError:
+        c.package['isopen'] = False
+
+    # TODO: find a nicer way of doing this
+    c.datastore_api = '%s/api/action' % \
+        config.get('ckan.site_url', '').rstrip('/')
+
+    # c.resource['can_be_previewed'] = self._resource_preview(
+    #     {'resource': c.resource, 'package': c.package})
+
+    resource_views = get_action('resource_view_list')(
+        context, {'id': resource_id})
+    c.resource['has_views'] = len(resource_views) > 0
+
+    current_resource_view = None
+    view_id = request.GET.get('view_id')
+    if c.resource['can_be_previewed'] and not view_id:
+        current_resource_view = None
+    elif c.resource['has_views']:
+        if view_id:
+            current_resource_view = [rv for rv in resource_views
+                                        if rv['id'] == view_id]
+            if len(current_resource_view) == 1:
+                current_resource_view = current_resource_view[0]
+            else:
+                abort(404, _('Resource view not found'))
+        else:
+            current_resource_view = resource_views[0]
+
+    vars = {'resource_views': resource_views,
+            'current_resource_view': current_resource_view,
+            'dataset_type': dataset_type}
+    print(MAX_FILE_SIZE)
+    if c.resource['url_type'] != 'upload':
+        try:
+            r = requests.head(c.resource['url'])
+            if r.status_code not in (400, 403, 405) and r.ok:
+                size = r.headers.get('content-length')
+                if size and int(size) > MAX_FILE_SIZE:
+                    h.flash_error('Sorry, this file is too large to be able to display in the browser, please download the data resource to examine it further.')
+        except Exception as e:
+            print(e)
+            h.flash_error('Unable to get resource')
+    template = _get_pkg_template(dataset_type)
+    return render(template, extra_vars=vars)
+
+
+dataset_blueprint.add_url_rule(
+    rule='/{id}/resource/{resource_id}',
+    view_func=resource_read,
+    methods=[u'GET', u'POST'],
+)
\ No newline at end of file
diff --git a/ckanext/opendatani/blueprints/organization.py b/ckanext/opendatani/blueprints/organization.py
new file mode 100644
index 0000000..00908cd
--- /dev/null
+++ b/ckanext/opendatani/blueprints/organization.py
@@ -0,0 +1,70 @@
+import ckan.lib.base as base
+from ckan.views.dataset import (
+    _get_pkg_template, _get_package_type, _setup_template_variables
+)
+
+import ckan.plugins.toolkit as toolkit
+import ckan.logic as logic
+from ckanext.opendatani import helpers
+import logging
+import datetime as dt
+import requests
+import os
+import csv
+from io import StringIO
+
+import ckan.lib.base as base
+from ckan import model
+import ckan.lib.helpers as h
+import ckan.lib.mailer as mailer
+   
+from flask import Blueprint
+
+
+log = logging.getLogger(__name__)
+
+render = base.render
+abort = base.abort
+
+NotFound = logic.NotFound
+NotAuthorized = logic.NotAuthorized
+get_action = logic.get_action
+ValidationError = logic.ValidationError
+
+organization_blueprint = Blueprint('odni_organization', __name__, url_prefix=u'/organization')
+
+
+def add_groups(id):
+    context = {'model': model, 'session': model.Session,
+                'user': c.user}
+    data_dict = {'id': id, 'all_fields': True}
+    c.group_dict = toolkit.get_action(
+        'organization_show')(context, data_dict)
+    c.packages = toolkit.get_action(
+        'current_package_list_with_resources')(context, data_dict)
+    c.groups = toolkit.get_action('group_list')(context, data_dict)
+
+    if request.method == 'POST':
+        selected_groups = request.POST.getall('group')
+        selected_datasets = request.POST.getall('dataset')
+        for group in selected_groups:
+            for pkg in selected_datasets:
+                data_dict = {"id": group,
+                                "object": pkg,
+                                "object_type": 'package',
+                                "capacity": 'public'}
+                try:
+                    get_action('member_create')(context, data_dict)
+                except NotFound:
+                    abort(404, _('Group not found'))
+        controller = 'ckanext.opendatani.controller:CustomPackageController'
+        url = h.url_for(controller=controller, action='add_groups', id=id)
+        h.redirect_to(url)
+    return toolkit.render('organization/add_groups.html')
+
+
+organization_blueprint.add_url_rule(
+    rule='/add_groups/{id}',
+    view_func=add_groups,
+    methods=[u'GET', u'POST'],
+)
\ No newline at end of file
diff --git a/ckanext/opendatani/blueprints/publisher_reports.py b/ckanext/opendatani/blueprints/publisher_reports.py
new file mode 100644
index 0000000..b25dee5
--- /dev/null
+++ b/ckanext/opendatani/blueprints/publisher_reports.py
@@ -0,0 +1,101 @@
+import ckan.lib.base as base
+from ckan.views.dataset import (
+    _get_pkg_template, _get_package_type, _setup_template_variables
+)
+
+import ckan.plugins.toolkit as toolkit
+import ckan.logic as logic
+from ckanext.opendatani import helpers
+import logging
+import datetime as dt
+import requests
+import os
+import csv
+from io import StringIO
+
+import ckan.lib.base as base
+from ckan import model
+import ckan.lib.helpers as h
+import ckan.lib.mailer as mailer
+   
+from flask import Blueprint
+
+
+log = logging.getLogger(__name__)
+
+render = base.render
+abort = base.abort
+
+NotFound = logic.NotFound
+NotAuthorized = logic.NotAuthorized
+get_action = logic.get_action
+ValidationError = logic.ValidationError
+
+publisher_blueprint = Blueprint('odni_publisher', __name__, url_prefix=u'/publisher-reports')
+
+
+def prepare_report(org):
+    """
+    Creates a CSV publisher report and returns it as a string
+    :param org: organization
+    :type org: string
+    :return: a CSV string
+    :rtype: string
+    """
+
+    try:
+        data_dict = {'org_name': org}
+
+        if org == '@complete':
+            data_dict = {}
+            # Use 'complete' in the file name for full reports
+            org = org[1:]
+        else:
+            # Use 'org-' in the file name for per org reports
+            org = 'org-' + org
+
+        resource = toolkit.get_action(
+            'report_resources_by_organization')({}, data_dict)
+
+        # We need this in case no datasets exist for the given organization
+        # or the organization doesn't exist
+        if not resource:
+            toolkit.abort(404, _('Either the organization does not exist, \
+                                    or it has no datasets.'))
+
+        csvout = StringIO()
+        csvwriter = csv.writer(
+            csvout,
+            dialect='excel',
+            quoting=csv.QUOTE_NONNUMERIC
+        )
+
+        fields = resource[0].keys()
+        csvwriter.writerow(fields)
+
+        for data in resource:
+            # We need to encode here due to unicode errors
+            csvwriter.writerow(
+                [unicode(d).encode('utf-8') for d in data.values()])
+
+        csvout.seek(0)
+        filename = 'publisher-report-{0}-{1}.csv'.format(org,
+                                                            dt.date.today())
+        toolkit.response.headers['Content-Type'] = 'application/csv'
+        toolkit.response.headers['Content-Disposition'] = \
+            'attachment; filename={0}'.format(filename)
+
+        return csvout.read()
+
+    except Exception as ex:
+        error = 'Preparing the CSV report failed. Error: {0}'.format(ex)
+        log.error(error)
+        h.flash_error(error)
+        raise
+
+
+publisher_blueprint.add_url_rule(
+    rule='/publisher-report-{org}.csv',
+    view_func=prepare_report,
+    methods=[u'GET', u'POST'],
+)
\ No newline at end of file
diff --git a/ckanext/opendatani/blueprints/static_controller.py b/ckanext/opendatani/blueprints/static_controller.py
new file mode 100644
index 0000000..1cc9525
--- /dev/null
+++ b/ckanext/opendatani/blueprints/static_controller.py
@@ -0,0 +1,76 @@
+import datetime as dt
+import requests
+import os
+import csv
+from io import StringIO
+import logging
+import ckan.lib.base as base
+from ckan import model
+import ckan.lib.helpers as h
+import ckan.lib.mailer as mailer
+import ckan.logic as logic
+from flask import Blueprint
+
+
+log = logging.getLogger(__name__)
+
+render = base.render
+abort = base.abort
+
+NotFound = logic.NotFound
+NotAuthorized = logic.NotAuthorized
+get_action = logic.get_action
+ValidationError = logic.ValidationError
+
+static_blueprint = Blueprint('odni_static', __name__)
+
+def cookies():
+    return base.render('static/cookies.html')
+
+def codeofconduct():
+    return base.render('static/codeofconduct.html')
+
+def termsandconditions():
+    return base.render('static/termsandconditions.html')
+
+def privacy():
+    return base.render('static/privacy.html')
+
+def privacy_notice_reg():
+    return base.render('static/privacy_notice_reg.html')
+
+
+static_blueprint.add_url_rule(
+    rule='/privacy',
+    view_func=privacy,
+    methods=[u'GET'],
+)
+
+
+static_blueprint.add_url_rule(
+    rule='/terms-and-conditions',
+    view_func=termsandconditions,
+    methods=[u'GET'],
+)
+
+
+static_blueprint.add_url_rule(
+    rule='/cookies',
+    view_func=cookies,
+    methods=[u'GET'],
+)
+
+
+static_blueprint.add_url_rule(
+    rule='/code-of-conduct',
+    view_func=codeofconduct,
+    methods=[u'GET'],
+)
+
+
+static_blueprint.add_url_rule(
+    rule='/privacy_notice_reg',
+    view_func=privacy_notice_reg,
+    methods=[u'GET'],
+)
+
diff --git a/ckanext/opendatani/blueprints/user.py b/ckanext/opendatani/blueprints/user.py
new file mode 100644
index 0000000..ee6327c
--- /dev/null
+++ b/ckanext/opendatani/blueprints/user.py
@@ -0,0 +1,114 @@
+import ckan.lib.base as base
+from ckan.views.dataset import (
+    _get_pkg_template, _get_package_type, _setup_template_variables
+)
+
+import ckan.plugins.toolkit as toolkit
+import ckan.logic as logic
+from ckanext.opendatani import helpers
+import logging
+import datetime as dt
+import requests
+import os
+import csv
+from io import StringIO
+
+import ckan.lib.base as base
+from ckan import model
+import ckan.lib.helpers as h
+import ckan.lib.mailer as mailer
+   
+from flask import Blueprint
+
+user_blueprint = Blueprint('odni_user', __name__, url_prefix=u'/user')
+
+
+log = logging.getLogger(__name__)
+
+render = base.render
+abort = base.abort
+
+NotFound = logic.NotFound
+NotAuthorized = logic.NotAuthorized
+get_action = logic.get_action
+ValidationError = logic.ValidationError
+
+
+
+def request_reset():
+    context = {'model': model, 'session': model.Session,
+                'user': toolkit.c.user,
+                'auth_user_obj': toolkit.c.userobj}
+    data_dict = {'id': toolkit.request.params.get('user')}
+    try:
+        toolkit.check_access('request_reset', context)
+    except toolkit.NotAuthorized:
+        toolkit.abort(401,
+                        toolkit._('Unauthorized to request reset password.'))
+
+    if toolkit.request.method == 'POST':
+        id = toolkit.request.params.get('user')
+
+        context = {'model': model,
+                    'user': toolkit.c.user}
+
+        data_dict = {'id': id}
+        user_obj = None
+        try:
+            toolkit.get_action('user_show')(context, data_dict)
+            user_obj = context['user_obj']
+        except toolkit.ObjectNotFound:
+            h.flash_error(toolkit._('No such user: %s') % id)
+
+        if user_obj:
+            try:
+                mailer.send_reset_link(user_obj)
+                h.flash_success(toolkit._('Please check your inbox for '
+                                            'a reset code.'))
+                h.redirect_to('/')
+            except mailer.MailerException as e:
+                h.flash_error(toolkit._('Could not send reset link: %s') %
+                                unicode(e))
+    return toolkit.render('user/request_reset.html')
+
+
+def activity(id, offset=0):
+    '''Render this user's public activity stream page.'''
+
+    context = {'model': model, 'session': model.Session,
+                'user': c.user, 'auth_user_obj': c.userobj,
+                'for_view': True}
+    data_dict = {'id': id, 'user_obj': c.userobj,
+                    'include_num_followers': True}
+    try:
+        toolkit.check_access('sysadmin', context, data_dict)
+    except NotAuthorized:
+        abort(403, _('Not authorized to see this page'))
+
+    _setup_template_variables(context, data_dict)
+
+    try:
+        c.user_activity_stream = get_action('user_activity_list_html')(
+            context, {'id': c.user_dict['id'], 'offset': offset})
+    except ValidationError:
+        base.abort(400)
+
+    return render('user/activity_stream.html')
+
+user_blueprint.add_url_rule(
+    rule='/reset',
+    view_func=request_reset,
+    methods=[u'GET', u'POST'],
+)
+
+user_blueprint.add_url_rule(
+    rule='/activity/{id}/{offset}',
+    view_func=activity,
+    methods=[u'GET', u'POST'],
+)
+
+user_blueprint.add_url_rule(
+    rule='/activity/{id}',
+    view_func=activity,
+    methods=[u'GET', u'POST'],
+)
\ No newline at end of file

From b8c62a7394e0196bbe1a61ff69e0c60e08e11b6e Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Fri, 24 Sep 2021 16:38:00 +0000
Subject: [PATCH 05/39] [base.html][m]: update base to contain js and css
 assets

---
 ckanext/opendatani/templates/base.html | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ckanext/opendatani/templates/base.html b/ckanext/opendatani/templates/base.html
index 741417e..6645d66 100644
--- a/ckanext/opendatani/templates/base.html
+++ b/ckanext/opendatani/templates/base.html
@@ -2,12 +2,13 @@
 
 {% block styles %}
   {{ super() }}
-  {% resource 'opendatani/css/theme.css' %}
+  {% asset 'odni/theme_css' %}
+
 {% endblock %}
 
 {% block scripts %}
   {{ super() }}
-  {% resource 'opendatani/js/jquery.adaptive-backgrounds.js' %}
+  {% asset 'odni/adaptive_backgroudjs' %}
 {% endblock %}
 
 {% block googleanalytics %}

From ceb97d9d1497c507857e5dcfc762a1dfc4a100d0 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 18:55:58 +0000
Subject: [PATCH 06/39] [plugin][s]: change basestring to str

---
 ckanext/opendatani/plugin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/opendatani/plugin.py b/ckanext/opendatani/plugin.py
index 465c97f..90ddd5c 100644
--- a/ckanext/opendatani/plugin.py
+++ b/ckanext/opendatani/plugin.py
@@ -324,7 +324,7 @@ def custom_user_password_validator(key, data, errors, context):
 
     if isinstance(value, Missing):
         pass
-    elif not isinstance(value, basestring):
+    elif not isinstance(value, str):
         errors[('password',)].append(_('Passwords must be strings'))
     elif value == '':
         pass
@@ -341,7 +341,7 @@ def _callable(key, data, errors, context):
         value = data.get(key)
         _number_of_tags = int(number_of_tags)
 
-        if not isinstance(value, basestring):
+        if not isinstance(value, str):
             return
 
         value = value.split(',')

From c8831bee075d24c17d62c4ab28deb291b6301cc1 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 18:56:38 +0000
Subject: [PATCH 07/39] [dashboard][s]: update template extra vars

---
 ckanext/opendatani/blueprints/dashboard.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ckanext/opendatani/blueprints/dashboard.py b/ckanext/opendatani/blueprints/dashboard.py
index ac72a37..a32e206 100644
--- a/ckanext/opendatani/blueprints/dashboard.py
+++ b/ckanext/opendatani/blueprints/dashboard.py
@@ -2,6 +2,7 @@
 from ckan.views.dataset import (
     _get_pkg_template, _get_package_type, _setup_template_variables
 )
+from ckan.views.user import _extra_template_variables
 
 import ckan.plugins.toolkit as toolkit
 import ckan.logic as logic
@@ -17,6 +18,7 @@
 from ckan import model
 import ckan.lib.helpers as h
 import ckan.lib.mailer as mailer
+from ckan.common import c
    
 from flask import Blueprint
 
@@ -74,8 +76,8 @@ def dashboard_update_notifications():
     context = {'for_view': True, 'user': c.user,
                 'auth_user_obj': c.userobj}
     data_dict = {'user_obj': c.userobj, 'stale_datasets': c.stale_datasets}
-    _setup_template_variables(context, data_dict)
-    return toolkit.render('user/dashboard_update.html')
+    extra_vars = _extra_template_variables(context, data_dict)
+    return toolkit.render('user/dashboard_update.html', extra_vars)
 
 
 dashboard_blueprint.add_url_rule(

From d6c235b27e73a4f50d9d70df0dd1d0c206695530 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:20:10 +0000
Subject: [PATCH 08/39] import c from ckan.common

---
 ckanext/opendatani/blueprints/dataset.py      | 1 +
 ckanext/opendatani/blueprints/organization.py | 1 +
 2 files changed, 2 insertions(+)

diff --git a/ckanext/opendatani/blueprints/dataset.py b/ckanext/opendatani/blueprints/dataset.py
index a483dda..eeba7bd 100644
--- a/ckanext/opendatani/blueprints/dataset.py
+++ b/ckanext/opendatani/blueprints/dataset.py
@@ -17,6 +17,7 @@
 from ckan import model
 import ckan.lib.helpers as h
 import ckan.lib.mailer as mailer
+from ckan.common import c
    
 from flask import Blueprint
 
diff --git a/ckanext/opendatani/blueprints/organization.py b/ckanext/opendatani/blueprints/organization.py
index 00908cd..19154d5 100644
--- a/ckanext/opendatani/blueprints/organization.py
+++ b/ckanext/opendatani/blueprints/organization.py
@@ -17,6 +17,7 @@
 from ckan import model
 import ckan.lib.helpers as h
 import ckan.lib.mailer as mailer
+from ckan.common import c
    
 from flask import Blueprint
 

From 319be047c05e1e7d49a912f2f9935c11621ddd90 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:20:42 +0000
Subject: [PATCH 09/39] [webassets][s]: addjs assest for group.js

---
 ckanext/opendatani/assets/webassets.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ckanext/opendatani/assets/webassets.yml b/ckanext/opendatani/assets/webassets.yml
index 1b9878c..73c97c8 100644
--- a/ckanext/opendatani/assets/webassets.yml
+++ b/ckanext/opendatani/assets/webassets.yml
@@ -19,4 +19,8 @@ adaptive_backgroudjs:
   contents:
     - js/jquery.adaptive-backgrounds.js
 
-
+group:
+  output: odni/%(version)s_group.js
+  filters: rjsmin
+  contents:
+    - js/groups.js

From 6984d8ba94a2cd042875a62a44adec50baa8a2a3 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:21:15 +0000
Subject: [PATCH 10/39] [user][s]: add extra vars to user template

---
 ckanext/opendatani/blueprints/user.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ckanext/opendatani/blueprints/user.py b/ckanext/opendatani/blueprints/user.py
index ee6327c..82177f4 100644
--- a/ckanext/opendatani/blueprints/user.py
+++ b/ckanext/opendatani/blueprints/user.py
@@ -17,6 +17,7 @@
 from ckan import model
 import ckan.lib.helpers as h
 import ckan.lib.mailer as mailer
+from ckan.common import c
    
 from flask import Blueprint
 
@@ -85,7 +86,7 @@ def activity(id, offset=0):
     except NotAuthorized:
         abort(403, _('Not authorized to see this page'))
 
-    _setup_template_variables(context, data_dict)
+    extra_vars = _setup_template_variables(context, data_dict)
 
     try:
         c.user_activity_stream = get_action('user_activity_list_html')(
@@ -93,7 +94,7 @@ def activity(id, offset=0):
     except ValidationError:
         base.abort(400)
 
-    return render('user/activity_stream.html')
+    return render('user/activity_stream.html', extra_vars)
 
 user_blueprint.add_url_rule(
     rule='/reset',

From eb58c83119cb8e6b056286ea2b5c5a678d59908b Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:21:51 +0000
Subject: [PATCH 11/39] [footer][l]: fix footer links

---
 ckanext/opendatani/templates/footer.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/opendatani/templates/footer.html b/ckanext/opendatani/templates/footer.html
index fc29f96..a10d2fc 100644
--- a/ckanext/opendatani/templates/footer.html
+++ b/ckanext/opendatani/templates/footer.html
@@ -6,7 +6,7 @@
       <a href="http://www.nidirect.gov.uk/" target="_blank"><img src="{{ h.url_for_static('/logos/nidirect.png') }}" width="121" alt="NI Direct"></a>
     </div>
     <div class="span3">
-      <a href="{{ h.url_for(controller='home', action='about') }}" target="_blank"><img src="{{ h.url_for_static('/logos/digitalni.png') }}" width="220" alt="Digital NI"></a>
+      <a href="{{ h.url_for('home.about') }}" target="_blank"><img src="{{ h.url_for_static('/logos/digitalni.png') }}" width="220" alt="Digital NI"></a>
     </div>
     <div class="span3">
       <a href="http://ckan.org/" target="_blank"><img src="{{ h.url_for_static('/logos/ckan.png') }}" width="133" alt="CKAN"></a>
@@ -16,6 +16,6 @@
     </div>
   </div>
 
-  <a href="{{ h.url_for(controller='ckanext.opendatani.controller:StaticController', action='cookies') }}">Cookies</a> | <a href="{{ h.url_for(controller='ckanext.opendatani.controller:StaticController', action='privacy') }}">Data protection</a> | <a href="{{ h.url_for(controller='ckanext.opendatani.controller:StaticController', action='codeofconduct') }}">Code of conduct</a> | <a href="{{ h.url_for(controller='ckanext.opendatani.controller:StaticController', action='termsandconditions') }}">Terms &amp; conditions</a> | <a href="http://docs.ckan.org/en/latest/api/index.html" target="_blank">CKAN API</a>
+  <a href="{{ h.url_for('odni_static.cookies') }}">Cookies</a> | <a href="{{ h.url_for('odni_static.privacy') }}">Data protection</a> | <a href="{{ h.url_for('odni_static.codeofconduct') }}">Code of conduct</a> | <a href="{{ h.url_for('odni_static.termsandconditions') }}">Terms &amp; conditions</a> | <a href="http://docs.ckan.org/en/latest/api/index.html" target="_blank">CKAN API</a>
 
 {% endblock %}

From 74e0d04322f47c9ad4ef982619ce6396f05422bc Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:22:51 +0000
Subject: [PATCH 12/39] [header.html][l]: fix header links

---
 ckanext/opendatani/templates/header.html | 26 ++++++++++++------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ckanext/opendatani/templates/header.html b/ckanext/opendatani/templates/header.html
index 36c0d3d..4d88189 100644
--- a/ckanext/opendatani/templates/header.html
+++ b/ckanext/opendatani/templates/header.html
@@ -2,25 +2,25 @@
 
 {% block header_account_logged %}
   <li>
-    <a href="{{ h.url_for('pages_index') }}" title="{{ _('Pages') }}">
+    <a href="{{ h.url_for('pages.index') }}" title="{{ _('Pages') }}">
       <i class="icon-file"></i>
     </a>
   </li>
   <li>
-    <a href="{{ h.url_for('blog_index') }}" title="{{ _('Blog') }}">
+    <a href="{{ h.url_for('pages.blog_index') }}" title="{{ _('Blog') }}">
       <i class="icon-pencil"></i>
     </a>
   </li>
 {% if c.userobj.sysadmin %}
   <li>
-    <a href="{{ h.url_for(controller='admin', action='index') }}" title="{{ _('Sysadmin settings') }}">
+    <a href="{{ h.url_for('admin.index') }}" title="{{ _('Sysadmin settings') }}">
       <i class="icon-legal" aria-hidden="true"></i>
       <span class="text">{{ _('Admin') }}</span>
     </a>
   </li>
 {% endif %}
 <li>
-  <a href="{{ h.url_for(controller='user', action='read', id=c.userobj.name) }}" class="image" title="{{ _('View profile') }}">
+  <a href="{{ h.url_for('user.read', id=c.userobj.name) }}" class="image" title="{{ _('View profile') }}">
     {{ h.gravatar((c.userobj.email_hash if c and c.userobj else ''), size=22) }}
     <span class="username">{{ c.userobj.display_name }}</span>
   </a>
@@ -29,7 +29,7 @@
 {% set stale_datasets = h.get_user_num_stale_datasets() %}
 <li class="notifications {% if new_activities > 0 or stale_datasets|int > 0 %}notifications-important{% endif %}">
   {% set notifications_tooltip = ngettext('Dashboard (%(num)d new item)', 'Dashboard (%(num)d new items)', new_activities+stale_datasets|int) %}
-  <a href="{{ h.url_for(controller='user', action='dashboard') }}" title="{{ notifications_tooltip }}">
+  <a href="{{ h.url_for('dashboard.index') }}" title="{{ notifications_tooltip }}">
     <i class="icon-dashboard" aria-hidden="true"></i>
     <span class="text">{{ _('Dashboard') }}</span>
     <span class="badge">{{ new_activities + stale_datasets|int }}</span>
@@ -37,7 +37,7 @@
 </li>
 {% block header_account_settings_link %}
   <li>
-    <a href="{{ h.url_for(controller='user', action='edit', id=c.userobj.name) }}" title="{{ _('Edit settings') }}">
+    <a href="{{ h.url_for('user.edit', id=c.userobj.name) }}" title="{{ _('Edit settings') }}">
       <i class="icon-cog" aria-hidden="true"></i>
       <span class="text">{{ _('Settings') }}</span>
     </a>
@@ -45,7 +45,7 @@
 {% endblock %}
 {% block header_account_log_out_link %}
   <li>
-    <a href="{{ h.url_for('/user/_logout') }}" title="{{ _('Log out') }}">
+    <a href="{{ h.url_for('user.logout') }}" title="{{ _('Log out') }}">
       <i class="icon-signout" aria-hidden="true"></i>
       <span class="text">{{ _('Log out') }}</span>
     </a>
@@ -54,9 +54,9 @@
 {% endblock %}
 
 {% block header_account_notlogged %}
-  <li>{% link_for _('Log in'), controller='user', action='login' %}</li>
+  <li>{% link_for _('Log in'), named_route='user.login' %}</li>
   {% if h.check_access('user_create') %}
-    <li>{% link_for _('Register'), controller='ckanext.opendatani.controller:StaticController', action='privacy_notice_reg', class_='sub' %}</li>
+    <li>{% link_for _('Register'), named_route='odni_static.privacy_notice_reg', class_='sub' %}</li>
   {% endif %}
 {% endblock %}
 
@@ -68,19 +68,19 @@
           ('home', _('Home')),
           ('search', _('Datasets')),
           ('organizations_index', _('Publisher')),
-          ('ckanext_showcase_index', _('Showcases')),
-          ('datarequests_index', _('Suggest Data') + h.get_open_datarequests_badge()),
+          ('showcase_blueprint.index', _('Showcases')),
+          ('datarequests.index', _('Suggest Data') + h.get_open_datarequests_badge()),
         ) }}
       {% endblock %}
       <li><a href="/blog">{{ _('News') }}</a></li>
-      <li><a href="{{ h.url_for(controller='home', action='about') }}">{{ _('About').format(g.site_title) }}</a></li>
+      <li><a href="{{ h.url_for('home.about') }}">{{ _('About').format(g.site_title) }}</a></li>
       <li><a href="{{ h.url_for('contact_form') }}" title="{{ _('Contact') }}">{{ _('Contact') }}</a></li>
     </ul>
   </nav>
 {% endblock %}
 
 {% block header_site_search %}
-  <form class="section site-search simple-input" action="{% url_for controller='package', action='search' %}" method="get">
+  <form class="section site-search simple-input" action="{% url_for 'dataset.search' %}" method="get">
     <div class="field">
       <label for="field-sitewide-search"><i class="icon-search"></i><span>{% block header_site_search_label %}{{ _('Search Datasets') }}{% endblock %}</span></label>
       <input id="field-sitewide-search" type="text" name="q" placeholder="{{ _('Search our data') }}" />

From 2d29f3ede00da47f319914b07d920ae58b44170a Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:23:51 +0000
Subject: [PATCH 13/39] [base_form][s]: add neccessary links from ckanest_pages

---
 .../templates/ckanext_pages/base_form.html    | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/ckanext/opendatani/templates/ckanext_pages/base_form.html b/ckanext/opendatani/templates/ckanext_pages/base_form.html
index 5644f05..67d46c0 100644
--- a/ckanext/opendatani/templates/ckanext_pages/base_form.html
+++ b/ckanext/opendatani/templates/ckanext_pages/base_form.html
@@ -5,32 +5,32 @@
 {% set errors = errors or {} %}
 
 {% if type == 'org' %}
-  {% set action_url = h.url_for('organization_pages_edit', id=id, page='/' + page) %}
-  {% set cancel_url = h.url_for('organization_pages_index', id=id) %}
+  {% set action_url = h.url_for('pages.org_edit', id=id, page=page) %}
+  {% set cancel_url = h.url_for('pages.org_show', id=id) %}
   {% set slug_prefix = cancel_url ~ '/' %}
-  {% set slug_domain = h.url_for('organization_pages_index', id=id, qualified=true) %}
+  {% set slug_domain = h.url_for('pages.org_show', id=id, qualified=true) %}
   {% set hide_field_order = true %}
 {% elif type == 'group' %}
-  {% set action_url = h.url_for('group_pages_edit', id=id, page='/' + page) %}
-  {% set cancel_url = h.url_for('group_pages_index', id=id) %}
+  {% set action_url = h.url_for('pages.group_edit', id=id, page=page) %}
+  {% set cancel_url = h.url_for('pages.group_show', id=id) %}
   {% set slug_prefix = cancel_url ~ '/' %}
-  {% set slug_domain = h.url_for('group_pages_index', id=id, qualified=true) %}
+  {% set slug_domain = h.url_for('pages.group_show', id=id, qualified=true) %}
   {% set hide_field_order = true %}
 {% elif type == 'blog' %}
-  {% set action_url = h.url_for('blog_edit', page='/' + page) %}
-  {% set cancel_url = h.url_for('blog_index') %}
+  {% set action_url = h.url_for('pages.blog_new') %}
+  {% set cancel_url = h.url_for('pages.blog_index') %}
   {% set slug_prefix = cancel_url ~ '/' %}
-  {% set slug_domain = h.url_for('blog_index', qualified=true) %}
+  {% set slug_domain = h.url_for('pages.blog_index', qualified=true) %}
   {% if page %}
-     {% set delete_url = h.url_for('blog_delete', page='/' + data.name) %}
+     {% set delete_url = h.url_for('pages.blog_delete', page=data.name) %}
   {% endif %}
 {% else %}
-  {% set action_url = h.url_for('pages_edit', page='/' + page) %}
-  {% set cancel_url = h.url_for('pages_index') %}
+  {% set action_url = h.url_for('pages.pages_edit', page=page) %}
+  {% set cancel_url = h.url_for('pages.index') %}
   {% set slug_prefix = cancel_url ~ '/' %}
-  {% set slug_domain = h.url_for('pages_index', qualified=true) %}
+  {% set slug_domain = h.url_for('pages.index', qualified=true) %}
   {% if page %}
-     {% set delete_url = h.url_for('pages_delete', page='/' + data.name) %}
+     {% set delete_url = h.url_for('pages.pages_delete', page=data.name) %}
   {% endif %}
 {% endif %}
 
@@ -95,7 +95,7 @@ <h1>{{ _('Edit page') }}</h1>
   {% if editor == 'medium' %}
     {{ wysiwyg.editor('content', id='field-content', label=_('Content'), placeholder=_('Enter content here'), value=data.content|safe, error=errors.content) }}
   {% elif editor == 'ckeditor' %}
-    {% resource 'ckanext-pages/main' %}
+    {% asset 'ckanext-pages/main-css' %}
     <div class="control-group">
         <label for="field-content-ck" class="control-label">{{ _('Content') }}</label>
     </div>

From 6e130736e1fa7b9b33726011d6de383148ae2707 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:24:51 +0000
Subject: [PATCH 14/39] [blog][m]: fix link for ckanext_pages and convert
 resource to asset

---
 ckanext/opendatani/templates/ckanext_pages/blog.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ckanext/opendatani/templates/ckanext_pages/blog.html b/ckanext/opendatani/templates/ckanext_pages/blog.html
index 176018c..fa2c072 100644
--- a/ckanext/opendatani/templates/ckanext_pages/blog.html
+++ b/ckanext/opendatani/templates/ckanext_pages/blog.html
@@ -11,7 +11,7 @@ <h2 class="module-heading">
         {% for post in posts %}
             <div class="blog-title">
                 <h3 class="dataset-heading">
-                    <a href="{{ h.url_for(controller='ckanext.pages.controller:PagesController', action='blog_show', page='/' + post.name) }}">{{ post.title or post.name }}</a>
+                    <a href="{{ h.url_for('pages.blog_show', page='/' + post.name) }}">{{ post.title or post.name }}</a>
                     <br>
                     {% if post.publish_date %}
                         <small> {{ h.render_datetime(post.publish_date) }} </small>
@@ -22,11 +22,11 @@ <h3 class="dataset-heading">
                 {{ h.markdown_extract(post.content) }}
                 {% if post.publish_date %}
                    <br>
-                   <a class="btn btn-small btn-primary more" href="{{ h.url_for(controller='ckanext.pages.controller:PagesController', action='blog_show', page='/' + post.name) }}">{{ _('More') }}</a>
+                   <a class="btn btn-small btn-primary more" href="{{ h.url_for('pages.blog_show', page='/' + post.name) }}">{{ _('More') }}</a>
                 {% endif %}
             </div>
         {% endfor %}
     </div>
   </div>
-{% resource 'ckanext-pages/blog' %}
+{% asset 'ckanext-pages/blog-css' %}
 {% endblock %}

From d6bd0c6ca08a8d26bac6f148166b6a4336f37414 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:25:32 +0000
Subject: [PATCH 15/39] [pages_list][m]: fix ckanext_page links

---
 .../templates/ckanext_pages/snippets/pages_list.html      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ckanext/opendatani/templates/ckanext_pages/snippets/pages_list.html b/ckanext/opendatani/templates/ckanext_pages/snippets/pages_list.html
index 6241132..39839f1 100644
--- a/ckanext/opendatani/templates/ckanext_pages/snippets/pages_list.html
+++ b/ckanext/opendatani/templates/ckanext_pages/snippets/pages_list.html
@@ -1,5 +1,5 @@
 {% set pages_total = pages|length %}
-{% set action = '{0}_show'.format(type) %}
+{% set action = 'pages.{0}_show'.format(type) %}
 
 {% if type == 'blog' %}
   <h2>News</h2>
@@ -12,11 +12,11 @@ <h2>Pages</h2>
 
     {% for page in pages %}
       {% if id %} {# this is for orgs and groups #}
-        {% set url = h.url_for(controller='ckanext.pages.controller:PagesController', action=action, id=id, page='/' + page.name) %}
+        {% set url = h.url_for(action, id=id, page='/' + page.name) %}
       {% elif type == 'blog' %}
-        {% set url = h.url_for(controller='ckanext.pages.controller:PagesController', action='blog_show', page='/' + page.name) %}
+        {% set url = h.url_for('pages.blog_show', page='/' + page.name) %}
       {% else %}
-        {% set url = h.url_for(controller='ckanext.pages.controller:PagesController', action='pages_show', page='/' + page.name) %}
+        {% set url = h.url_for('pages.pages_show', page='/' + page.name) %}
       {% endif %}
       <div class="row page-list-item dataset-item">
       {% if page.image %}

From 7316617a51b7cd36992c49cfc8b540c388d44ed4 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:26:17 +0000
Subject: [PATCH 16/39] [base.html][s]: fix ckanext_datarequest links

---
 ckanext/opendatani/templates/datarequests/base.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/opendatani/templates/datarequests/base.html b/ckanext/opendatani/templates/datarequests/base.html
index 2392c5f..6da8323 100644
--- a/ckanext/opendatani/templates/datarequests/base.html
+++ b/ckanext/opendatani/templates/datarequests/base.html
@@ -3,7 +3,7 @@
 {% block subtitle %}{{ _('Suggest Data') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li class="active">{% link_for _('Suggest Data'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
+  <li class="active">{% link_for _('Suggest Data'), controller='datarequests', action='index' %}</li>
 {% endblock %}
 
 {% block secondary_content %}
@@ -11,7 +11,7 @@
     <h2 class="module-heading"><i class="icon-info-sign"></i>{% trans %}Suggest Data{% endtrans %}</h2>
     <div class="module-content">
       <p>
-        This platform is for the publication of public sector datasets for all to use, manipulate and extract value from. We welcome suggestions for Northern Ireland public sector datasets which are not yet published on the platform. Let us know your ideas by using our {% link_for _('Suggest a Dataset form'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='new' %} ({% link_for _('Login'), controller='user', action='login' %}
+        This platform is for the publication of public sector datasets for all to use, manipulate and extract value from. We welcome suggestions for Northern Ireland public sector datasets which are not yet published on the platform. Let us know your ideas by using our {% link_for _('Suggest a Dataset form'), controller='datarequests', action='new' %} ({% link_for _('Login'), 'user.login' %}
         required).
 <br>    For some guidance on tailoring your data suggestion see <a href="https://www.opendatani.gov.uk/blog/data-aggregation-levels-of-geography-in-ni">this ODNI article</a> on NI geography levels.
       </p>

From e8362cb9915142dcdb04674c6510352645c6d972 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:26:42 +0000
Subject: [PATCH 17/39] [edit][s]: fix ckanext_datarequest links

---
 ckanext/opendatani/templates/datarequests/edit.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/opendatani/templates/datarequests/edit.html b/ckanext/opendatani/templates/datarequests/edit.html
index 2ab726a..d57c7d8 100644
--- a/ckanext/opendatani/templates/datarequests/edit.html
+++ b/ckanext/opendatani/templates/datarequests/edit.html
@@ -3,8 +3,8 @@
 {% block subtitle %}{{ _('Edit Data Suggestion') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li>{% link_for _('Suggest Data'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
-  <li>{% link_for c.original_title|truncate(30), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=c.datarequest.get('id') %}</li>
+  <li>{% link_for _('Suggest Data'), controller='datarequests', action='index' %}</li>
+  <li>{% link_for c.original_title|truncate(30), controller='datarequests', action='show', id=c.datarequest.get('id') %}</li>
   <li class="active"><a href="">{{ _('Edit Data Suggestion') }}</a></li>
 {% endblock %}
 

From 91c7bc6e26b668e67ef223749f4d81d85426be96 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:27:46 +0000
Subject: [PATCH 18/39] [ckanext+datarequest][m]:fix ckanext_datarequests links

---
 ckanext/opendatani/templates/datarequests/new.html            | 2 +-
 ckanext/opendatani/templates/datarequests/show.html           | 4 ++--
 .../templates/datarequests/snippets/datarequest_item.html     | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ckanext/opendatani/templates/datarequests/new.html b/ckanext/opendatani/templates/datarequests/new.html
index ac833ec..f262954 100644
--- a/ckanext/opendatani/templates/datarequests/new.html
+++ b/ckanext/opendatani/templates/datarequests/new.html
@@ -5,7 +5,7 @@
 {% block page_heading %}{{ _('Suggest a dataset') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li>{% link_for _('Suggest Data'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
+  <li>{% link_for _('Suggest Data'), controller='datarequests', action='index' %}</li>
   <li class="active"><a href="">{{ _('Suggest a Dataset') }}</a></li>
 {% endblock %}
 
diff --git a/ckanext/opendatani/templates/datarequests/show.html b/ckanext/opendatani/templates/datarequests/show.html
index d464dce..997a090 100644
--- a/ckanext/opendatani/templates/datarequests/show.html
+++ b/ckanext/opendatani/templates/datarequests/show.html
@@ -1,8 +1,8 @@
 {% ckan_extends %}
 
 {% block breadcrumb_content %}
-  <li>{% link_for _('Suggest Data'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='index' %}</li>
-  <li>{% link_for c.datarequest.get('title'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=datarequest_id %}</li>
+  <li>{% link_for _('Suggest Data'), controller='datarequests', action='index' %}</li>
+  <li>{% link_for c.datarequest.get('title'), controller='datarequests', action='show', id=datarequest_id %}</li>
 {% endblock %}
 
 {% block content_primary_nav %}
diff --git a/ckanext/opendatani/templates/datarequests/snippets/datarequest_item.html b/ckanext/opendatani/templates/datarequests/snippets/datarequest_item.html
index 411780c..ee2f961 100644
--- a/ckanext/opendatani/templates/datarequests/snippets/datarequest_item.html
+++ b/ckanext/opendatani/templates/datarequests/snippets/datarequest_item.html
@@ -42,7 +42,7 @@ <h3 class="dataset-heading">
           </span>
           {% endif %}
 
-        {{ h.link_to(h.truncate(title, truncate_title), h.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='show', id=datarequest.get('id', ''))) }}
+        {{ h.link_to(h.truncate(title, truncate_title), h.url_for(controller='datarequests', action='show', id=datarequest.get('id', ''))) }}
       </h3>
       {% if description %}
         <div>{{ description }}</div>

From de8e1a52f60eae910b8fb2cb0eaa9fac0a94c209 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:28:34 +0000
Subject: [PATCH 19/39] [assets][l]: replace resource with asset for  js

---
 ckanext/opendatani/templates/group/index.html     | 2 +-
 ckanext/opendatani/templates/group/read_base.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/opendatani/templates/group/index.html b/ckanext/opendatani/templates/group/index.html
index d44a4fc..0a8043e 100644
--- a/ckanext/opendatani/templates/group/index.html
+++ b/ckanext/opendatani/templates/group/index.html
@@ -2,5 +2,5 @@
 
 {% block scripts %}
   {{ super() }}
-  {% resource 'opendatani/js/groups.js' %}
+  {% asset 'odni/group' %}
 {% endblock %}
diff --git a/ckanext/opendatani/templates/group/read_base.html b/ckanext/opendatani/templates/group/read_base.html
index d44a4fc..0a8043e 100644
--- a/ckanext/opendatani/templates/group/read_base.html
+++ b/ckanext/opendatani/templates/group/read_base.html
@@ -2,5 +2,5 @@
 
 {% block scripts %}
   {{ super() }}
-  {% resource 'opendatani/js/groups.js' %}
+  {% asset 'odni/group' %}
 {% endblock %}

From a3503041e8467b57eed6db3e8318e76a412cc17f Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:29:00 +0000
Subject: [PATCH 20/39] [add_group][m]: convert package to dataset

---
 ckanext/opendatani/templates/organization/add_groups.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ckanext/opendatani/templates/organization/add_groups.html b/ckanext/opendatani/templates/organization/add_groups.html
index fc1066f..b407721 100644
--- a/ckanext/opendatani/templates/organization/add_groups.html
+++ b/ckanext/opendatani/templates/organization/add_groups.html
@@ -4,7 +4,7 @@
 {% block subtitle %}{{ _('Edit datasets') }} - {{ super() }}{% endblock %}
 
 {% block page_primary_action %}
-  {# {% link_for _('Add dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %} #}
+  {# {% link_for _('Add dataset'), 'dataset.new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %} #}
 {% endblock %}
 
 {% block primary_content_inner %}
@@ -38,11 +38,11 @@
                 <input type="checkbox" name="dataset" value="{{ package.id }}">
               </td>
               <td class="context">
-                <a href="{% url_for controller='package', action='edit', id=package.name %}" class="edit pull-right">
+                <a href="{% url_for 'dataset.edit', id=package.name %}" class="edit pull-right">
                   {{ _('Edit') }}
                 </a>
                 <h3 class="dataset-heading">
-                  <a href="{{ h.url_for(controller='package', action='read', id=package.name) }}"> {{ title }}</a>
+                  <a href="{{ h.url_for('dataset.read', id=package.name) }}"> {{ title }}</a>
                 </h3>
                 {% if notes %}
                   <p>{{ notes|urlize }}</p>

From edbfe7d9ec2606fd4fb0a4b13d0ffbc2df773669 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:30:03 +0000
Subject: [PATCH 21/39] [read_base][s]: add datarequest organization controller

---
 ckanext/opendatani/templates/organization/read_base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/opendatani/templates/organization/read_base.html b/ckanext/opendatani/templates/organization/read_base.html
index e3478bc..d26a918 100644
--- a/ckanext/opendatani/templates/organization/read_base.html
+++ b/ckanext/opendatani/templates/organization/read_base.html
@@ -3,6 +3,6 @@
 {% block content_primary_nav %}
   {{ h.build_nav_icon('organization_read', _('Datasets'), id=c.group_dict.name) }}
   {{ h.build_nav_icon('organization_activity', _('Activity Stream'), id=c.group_dict.name, offset=0) }}
-  {{ h.build_nav_icon('organization_datarequests', _('Suggest Data'), id=c.group_dict.name)}}
+  {{ h.build_nav_icon('datarequests.organization', _('Suggest Data'), id=c.group_dict.name)}}
   {{ h.build_nav_icon('organization_about', _('About'), id=c.group_dict.name) }}
 {% endblock %}

From 5e2e4fa33d368093699d0fe6a0bf0e1cf140a8a5 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:31:03 +0000
Subject: [PATCH 22/39] [organization_tree][s]: rewrite organization controller
 route

---
 .../templates/organization/snippets/organization_tree_menu.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/opendatani/templates/organization/snippets/organization_tree_menu.html b/ckanext/opendatani/templates/organization/snippets/organization_tree_menu.html
index 1cbbd3f..cf0f603 100644
--- a/ckanext/opendatani/templates/organization/snippets/organization_tree_menu.html
+++ b/ckanext/opendatani/templates/organization/snippets/organization_tree_menu.html
@@ -31,7 +31,7 @@
           {% endif %}
 
       {% endif %}
-      <a href="{{ h.url_for(controller='organization', action='read', id=node.name) }}">{{node.title}}<span>{{node.package_count}}</span></a>
+      <a href="{{ h.url_for('organization.read', id=node.name) }}">{{node.title}}<span>{{node.package_count}}</span></a>
       {% if node.children %}
         <ul class="hierarchy-tree paddingleft-hack"> {{ loop(node.children) }} </ul>
       {% endif %}

From 5e6ef2e6d7a481eef90d08cb230074df4dd3e777 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:31:35 +0000
Subject: [PATCH 23/39] [helper][s]: change showcase controller to showcase
 blueprint

---
 ckanext/opendatani/templates/showcase/snippets/helper.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/opendatani/templates/showcase/snippets/helper.html b/ckanext/opendatani/templates/showcase/snippets/helper.html
index 9c59181..6a1f444 100644
--- a/ckanext/opendatani/templates/showcase/snippets/helper.html
+++ b/ckanext/opendatani/templates/showcase/snippets/helper.html
@@ -12,7 +12,7 @@ <h2 class="module-heading">
     {% if h.check_access('ckanext_showcase_admin_add') %}
       <p>
         Sysadmins can manage Showcase Admins from the
-        <a href="{% url_for controller='ckanext.showcase.controller:ShowcaseController', action='manage_showcase_admins' %}">Showcase configuration page</a>.
+        <a href="{% url_for 'showcase_blueprint.admins' %}">Showcase configuration page</a>.
       </p>     
     {% endif %}
     <p>

From 1e7b0eed51c5f33383759786a728da2305c7358d Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:32:03 +0000
Subject: [PATCH 24/39] [package_item][s]: rename package to dataset

---
 ckanext/opendatani/templates/snippets/package_item.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/opendatani/templates/snippets/package_item.html b/ckanext/opendatani/templates/snippets/package_item.html
index 1a27b07..fa49f89 100644
--- a/ckanext/opendatani/templates/snippets/package_item.html
+++ b/ckanext/opendatani/templates/snippets/package_item.html
@@ -5,7 +5,7 @@
 {% block resources_inner %}
   {% for resource in h.dict_list_reduce(package.resources, 'format') %}
   <li>
-    <a href="{{ h.url_for(controller='package', action='read', id=package.name) }}" class="label" data-format="{{ resource.lower() }}">{{ h.get_resource_count(resource, package.resources )}} {{ resource }}</a>
+    <a href="{{ h.url_for('dataset.read', id=package.name) }}" class="label" data-format="{{ resource.lower() }}">{{ h.get_resource_count(resource, package.resources )}} {{ resource }}</a>
   </li>
   {% endfor %}
 {% endblock %}

From 1600e38165bc1b3ac7a02d4c76bdf4e43a719936 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:32:37 +0000
Subject: [PATCH 25/39] [codeofconduct][s]: convert static controller to static
 blueprint

---
 ckanext/opendatani/templates/static/codeofconduct.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/opendatani/templates/static/codeofconduct.html b/ckanext/opendatani/templates/static/codeofconduct.html
index c23b90e..53dfca8 100644
--- a/ckanext/opendatani/templates/static/codeofconduct.html
+++ b/ckanext/opendatani/templates/static/codeofconduct.html
@@ -3,7 +3,7 @@
 {% block subtitle %}{{ _('Code of conduct') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li class="active">{% link_for _('Code of conduct'), controller='ckanext.opendatani.controller:StaticController', action='termsandconditions' %}</li>
+  <li class="active">{% link_for _('Code of conduct'), 'odni_static.termsandconditions' %}</li>
 {% endblock %}
 
 {% block primary %}

From d9f9688ccec3a453b56b37bdb483b6c76670f8f9 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:33:34 +0000
Subject: [PATCH 26/39] [staticController][m]: convert staticcontroller to
 static bleuprint

---
 ckanext/opendatani/templates/static/cookies.html            | 2 +-
 ckanext/opendatani/templates/static/privacy.html            | 2 +-
 ckanext/opendatani/templates/static/privacy_notice_reg.html | 4 ++--
 ckanext/opendatani/templates/static/termsandconditions.html | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ckanext/opendatani/templates/static/cookies.html b/ckanext/opendatani/templates/static/cookies.html
index 8674c73..eaa0011 100644
--- a/ckanext/opendatani/templates/static/cookies.html
+++ b/ckanext/opendatani/templates/static/cookies.html
@@ -3,7 +3,7 @@
 {% block subtitle %}{{ _('Cookies') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li class="active">{% link_for _('Cookies'), controller='ckanext.opendatani.controller:StaticController', action='cookies' %}</li>
+  <li class="active">{% link_for _('Cookies'), 'odni_static.cookies' %}</li>
 {% endblock %}
 
 {% block primary %}
diff --git a/ckanext/opendatani/templates/static/privacy.html b/ckanext/opendatani/templates/static/privacy.html
index de6539c..cbf1e7a 100644
--- a/ckanext/opendatani/templates/static/privacy.html
+++ b/ckanext/opendatani/templates/static/privacy.html
@@ -3,7 +3,7 @@
 {% block subtitle %}{{ _('OpenDataNI Privacy Notice') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li class="active">{% link_for _('OpenDataNI Privacy Notice'), controller='ckanext.opendatani.controller:StaticController', action='termsandconditions' %}</li>
+  <li class="active">{% link_for _('OpenDataNI Privacy Notice'), 'odni_static.termsandconditions' %}</li>
 {% endblock %}
 
 {% block primary %}
diff --git a/ckanext/opendatani/templates/static/privacy_notice_reg.html b/ckanext/opendatani/templates/static/privacy_notice_reg.html
index 9f0c483..66105a1 100644
--- a/ckanext/opendatani/templates/static/privacy_notice_reg.html
+++ b/ckanext/opendatani/templates/static/privacy_notice_reg.html
@@ -3,7 +3,7 @@
 {% block subtitle %}{{ _('OpenDataNI Privacy Notice') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li class="active">{% link_for _('OpenDataNI Privacy Notice'), controller='ckanext.opendatani.controller:StaticController', action='termsandconditions' %}</li>
+  <li class="active">{% link_for _('OpenDataNI Privacy Notice'), 'odni_static.termsandconditions' %}</li>
 {% endblock %}
 
 {% block primary %}
@@ -108,7 +108,7 @@ <h3>Changes to this privacy policy</h3>
       <p>If this privacy policy changes in any way, we will place an updated version on this page. This page will present itself each time you successfully log in to the site. Regularly reviewing this page ensures that you are always aware of what information we collect, how we use it and under what circumstances, if any, we may share it with other parties.
 Where there are changes to what information is collected, how it is used and/or with whom it is shared, we will contact all registered site-users about whom we hold data, and whom have consented to our processing of the data for the purposes outlined above.</p>
     </div>
-    <a href="{{ h.url_for(controller='user', action='register') }}"><button type="button" class="btn btn-primary btn-lg">Continue</button></a>
+    <a href="{{ h.url_for('user.register') }}"><button type="button" class="btn btn-primary btn-lg">Continue</button></a>
   </article>
 {% endblock %}
 
diff --git a/ckanext/opendatani/templates/static/termsandconditions.html b/ckanext/opendatani/templates/static/termsandconditions.html
index 4986960..a1d7145 100644
--- a/ckanext/opendatani/templates/static/termsandconditions.html
+++ b/ckanext/opendatani/templates/static/termsandconditions.html
@@ -3,7 +3,7 @@
 {% block subtitle %}{{ _('Terms & conditions') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li class="active">{% link_for _('Terms & conditions'), controller='ckanext.opendatani.controller:StaticController', action='termsandconditions' %}</li>
+  <li class="active">{% link_for _('Terms & conditions'), 'odni_static.termsandconditions' %}</li>
 {% endblock %}
 
 {% block primary %}

From b1184626c7cf277765602739175df55247ee60d8 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:34:21 +0000
Subject: [PATCH 27/39] [dashboard_update][s]: convert package ot dataset

---
 ckanext/opendatani/templates/user/dashboard_update.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/opendatani/templates/user/dashboard_update.html b/ckanext/opendatani/templates/user/dashboard_update.html
index 0d39963..479015c 100644
--- a/ckanext/opendatani/templates/user/dashboard_update.html
+++ b/ckanext/opendatani/templates/user/dashboard_update.html
@@ -15,7 +15,7 @@
 {% if c.stale_datasets %}
 <ul>
 {% for pkg in c.stale_datasets %} <hr>
-<li><a href="{{ h.url_for(controller='package', action='read', id=pkg.id) }}"> {{ pkg.title or pkg.name }}</a></li>
+<li><a href="{{ h.url_for('dataset.read', id=pkg.id) }}"> {{ pkg.title or pkg.name }}</a></li>
 {% endfor %}
 </ul>
 {% else %}{% endif %}

From 7e89a6096375861750310f31aa0d52ee8476b42c Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:35:30 +0000
Subject: [PATCH 28/39] [dashboard][l]: update to make use of the new
 odni_dashboard blueprint

---
 ckanext/opendatani/templates/user/dashboard.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/ckanext/opendatani/templates/user/dashboard.html b/ckanext/opendatani/templates/user/dashboard.html
index edb53ec..a25e369 100644
--- a/ckanext/opendatani/templates/user/dashboard.html
+++ b/ckanext/opendatani/templates/user/dashboard.html
@@ -12,19 +12,19 @@
 {% block page_header %}
 <header class="module-content page-header hug">
   <div class="content_action">
-    {% link_for _('Edit settings'), controller='user', action='edit', id=user.name, class_='btn', icon='cog' %}
+    {% link_for _('Edit settings'), 'user.edit', id=user.name, class_='btn', icon='cog' %}
   </div>
   {% set stale_datasets = h.get_user_num_stale_datasets() %}
   <ul class="nav nav-tabs">
-    {{ h.build_nav_icon('user_dashboard', _('News feed')) }}
+    {{ h.build_nav_icon('dashboard.index', _('News feed')) }}
     {% if stale_datasets|int > 0 %}
-    {{ h.build_nav_icon('dashboard_update_notifications', _('Update datasets (' + stale_datasets + ')') )}}
+    {{ h.build_nav_icon('odni_dashboard.dashboard_update_notifications', _('Update datasets (' + stale_datasets + ')') )}}
     {% else %}
-    {{ h.build_nav_icon('dashboard_update_notifications', _('Update datasets') ) }}
+    {{ h.build_nav_icon('odni_dashboard.dashboard_update_notifications', _('Update datasets') ) }}
     {% endif %}
-    {{ h.build_nav_icon('user_dashboard_datasets', _('My Datasets')) }}
-    {{ h.build_nav_icon('user_dashboard_organizations', _('My Organizations')) }}
-    {{ h.build_nav_icon('user_dashboard_groups', _('My Groups')) }}
+    {{ h.build_nav_icon('dashboard.datasets', _('My Datasets')) }}
+    {{ h.build_nav_icon('dashboard.organizations', _('My Organizations')) }}
+    {{ h.build_nav_icon('dashboard.groups', _('My Groups')) }}
   </ul>
 </header>
 {% endblock %}

From a4c9d9ad6b49e5c1c30b097b9f4d7c517a9ae4b2 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:36:02 +0000
Subject: [PATCH 29/39] [login][s]: convert static controller to blueprint

---
 ckanext/opendatani/templates/user/login.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/opendatani/templates/user/login.html b/ckanext/opendatani/templates/user/login.html
index 859c964..adaa371 100644
--- a/ckanext/opendatani/templates/user/login.html
+++ b/ckanext/opendatani/templates/user/login.html
@@ -1,7 +1,7 @@
 {% ckan_extends %}
 
 {% block help_register_button %}
-  <a class="btn" href="{{ h.url_for(controller='ckanext.opendatani.controller:StaticController', action='privacy_notice_reg') }}">
+  <a class="btn" href="{{ h.url_for('odni_static.privacy_notice_reg') }}">
       {{ _('Create an Account') }}
   </a>
 {% endblock %}
\ No newline at end of file

From 8ee1c4e1685c520a030e67ebee043cb8a68b24ec Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 28 Sep 2021 19:37:21 +0000
Subject: [PATCH 30/39] [read_base][l]: add user activity stream and
 datarequest user blueprint

---
 ckanext/opendatani/templates/user/read_base.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ckanext/opendatani/templates/user/read_base.html b/ckanext/opendatani/templates/user/read_base.html
index afe2a5b..f1d7d8f 100644
--- a/ckanext/opendatani/templates/user/read_base.html
+++ b/ckanext/opendatani/templates/user/read_base.html
@@ -1,7 +1,7 @@
 {% ckan_extends %}
 
 {% block content_primary_nav %}
-  {{ h.build_nav_icon('user_datasets', _('Datasets'), id=user.name) }}
-  {{ h.build_nav_icon('user_activity_stream', _('Activity Stream'), id=user.name) }}
-  {{ h.build_nav_icon('user_datarequests', _('Suggest Data'), id=user.name) }}
+  {{ h.build_nav_icon('user.read', _('Datasets'), id=user.name) }}
+  {{ h.build_nav_icon('user.activity', _('Activity Stream'), id=user.name) }}
+  {{ h.build_nav_icon('datarequests.user', _('Suggest Data'), id=user.name) }}
 {% endblock %}

From fb30c06924584075097c96695b4d091eb2115c43 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Mon, 4 Oct 2021 18:52:32 +0000
Subject: [PATCH 31/39] [datarequest/index][s]: update datarequest check_access

---
 ckanext/opendatani/templates/datarequests/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/opendatani/templates/datarequests/index.html b/ckanext/opendatani/templates/datarequests/index.html
index 2c5b405..9c23e65 100644
--- a/ckanext/opendatani/templates/datarequests/index.html
+++ b/ckanext/opendatani/templates/datarequests/index.html
@@ -1,9 +1,9 @@
 {% ckan_extends %}
 
 {% block page_primary_action %}
-  {% if h.check_access('datarequest_create') %}
+  {% if h.check_access('create_datarequest') %}
     <div class="page_primary_action">
-      {% link_for _('Suggest Data'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
+      {% link_for _('Suggest Data'), controller='datarequests', action='new', class_='btn btn-primary', icon='plus-sign-alt' %}
     </div>
   {% endif %}
   {{ h.snippet('datarequests/snippets/datarequest_list.html', datarequest_count=c.datarequest_count, datarequests=c.datarequests, page=c.page)}}

From d6953782b6054388ca790139e97067a9ad2cd239 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Mon, 4 Oct 2021 18:53:18 +0000
Subject: [PATCH 32/39] [helpers.py][s]:comment out activity streams

---
 ckanext/opendatani/helpers.py | 94 +++++++++++++++++------------------
 1 file changed, 47 insertions(+), 47 deletions(-)

diff --git a/ckanext/opendatani/helpers.py b/ckanext/opendatani/helpers.py
index ec9b495..6e6472c 100644
--- a/ckanext/opendatani/helpers.py
+++ b/ckanext/opendatani/helpers.py
@@ -3,7 +3,7 @@
 import logging
 
 import ckan.model as model
-from ckan.lib import activity_streams
+# from ckan.lib import activity_streams
 import ckan.logic as logic
 import ckan.lib.helpers as h
 from ckan.plugins import toolkit
@@ -68,52 +68,52 @@ def get_dataset_url(activity):
     'resource': get_snippet_resource,
 }
 
-def activity_list_to_text(activity_stream):
-    activity_list = [] # These are the activity stream messages.
-    context = {'ignore_auth': True}
-    for activity in activity_stream:
-        detail = None
-        activity_type = activity['activity_type']
-        # Some activity types may have details.
-        if activity_type in activity_streams.activity_stream_actions_with_detail:
-            details = logic.get_action('activity_detail_list')(context=context,
-                data_dict={'id': activity['id']})
-            # If an activity has just one activity detail then render the
-            # detail instead of the activity.
-            if len(details) == 1:
-                detail = details[0]
-                object_type = detail['object_type']
-
-                if object_type == 'PackageExtra':
-                    object_type = 'package_extra'
-
-                new_activity_type = '%s %s' % (detail['activity_type'],
-                                            object_type.lower())
-                if new_activity_type in activity_streams.activity_stream_string_functions:
-                    activity_type = new_activity_type
-
-        if not activity_type in activity_streams.activity_stream_string_functions:
-            raise NotImplementedError("No activity renderer for activity "
-                "type '%s'" % activity_type)
-
-        activity_msg = activity_streams.activity_stream_string_functions[activity_type](context,
-                activity)
-        activity_msg = str(activity_msg.replace('{actor} ', ''))
-        activity_msg = activity_msg[0].upper() + activity_msg[1:]
-
-        # Get the data needed to render the message.
-        matches = re.findall('\{([^}]*)\}', activity_msg)
-        data = {}
-        for match in matches:
-            snippet = activity_snippet_functions[match](activity, detail)
-            data[str(match)] = snippet
-
-        activity_list.append({'msg': activity_msg.format(**data),
-                              'type': activity_type.replace(' ', '-').lower(),
-                              'timestamp': activity['timestamp'],
-                              'is_new': activity.get('is_new', False),
-                              'dataset_url': get_dataset_url(activity)})
-    return activity_list
+# def activity_list_to_text(activity_stream):
+#     activity_list = [] # These are the activity stream messages.
+#     context = {'ignore_auth': True}
+#     for activity in activity_stream:
+#         detail = None
+#         activity_type = activity['activity_type']
+#         # Some activity types may have details.
+#         if activity_type in activity_streams.activity_stream_actions_with_detail:
+#             details = logic.get_action('activity_detail_list')(context=context,
+#                 data_dict={'id': activity['id']})
+#             # If an activity has just one activity detail then render the
+#             # detail instead of the activity.
+#             if len(details) == 1:
+#                 detail = details[0]
+#                 object_type = detail['object_type']
+
+#                 if object_type == 'PackageExtra':
+#                     object_type = 'package_extra'
+
+#                 new_activity_type = '%s %s' % (detail['activity_type'],
+#                                             object_type.lower())
+#                 if new_activity_type in activity_streams.activity_stream_string_functions:
+#                     activity_type = new_activity_type
+
+#         if not activity_type in activity_streams.activity_stream_string_functions:
+#             raise NotImplementedError("No activity renderer for activity "
+#                 "type '%s'" % activity_type)
+
+#         activity_msg = activity_streams.activity_stream_string_functions[activity_type](context,
+#                 activity)
+#         activity_msg = str(activity_msg.replace('{actor} ', ''))
+#         activity_msg = activity_msg[0].upper() + activity_msg[1:]
+
+#         # Get the data needed to render the message.
+#         matches = re.findall('\{([^}]*)\}', activity_msg)
+#         data = {}
+#         for match in matches:
+#             snippet = activity_snippet_functions[match](activity, detail)
+#             data[str(match)] = snippet
+
+#         activity_list.append({'msg': activity_msg.format(**data),
+#                               'type': activity_type.replace(' ', '-').lower(),
+#                               'timestamp': activity['timestamp'],
+#                               'is_new': activity.get('is_new', False),
+#                               'dataset_url': get_dataset_url(activity)})
+#     return activity_list
 
 
 def _get_action(action, context_dict, data_dict):

From 08ecd523040af8cf526a7f18473670f8e0a72575 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Mon, 4 Oct 2021 18:53:57 +0000
Subject: [PATCH 33/39] [plugin][s]: change unicode to str

---
 ckanext/opendatani/plugin.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/ckanext/opendatani/plugin.py b/ckanext/opendatani/plugin.py
index 90ddd5c..d78fa2b 100644
--- a/ckanext/opendatani/plugin.py
+++ b/ckanext/opendatani/plugin.py
@@ -280,14 +280,14 @@ def custom_create_user_schema(form_schema=False):
     schema['password'] = [custom_user_password_validator,
                           toolkit.get_validator('user_password_not_empty'),
                           toolkit.get_validator('ignore_missing'),
-                          unicode]
+                          str]
 
     if form_schema:
         schema['password1'] = [toolkit.get_validator('user_both_passwords_entered'),
                                custom_user_password_validator,
                                toolkit.get_validator('user_passwords_match'),
-                               unicode]
-        schema['password2'] = [unicode]
+                               str]
+        schema['password2'] = [str]
 
     return schema
 
@@ -299,16 +299,16 @@ def custom_update_user_schema(form_schema=False):
     schema['password'] = [custom_user_password_validator,
                           toolkit.get_validator('user_password_not_empty'),
                           toolkit.get_validator('ignore_missing'),
-                          unicode]
+                          str]
 
     if form_schema:
         schema['password'] = [toolkit.get_validator('ignore_missing')]
         schema['password1'] = [toolkit.get_validator('ignore_missing'),
                                custom_user_password_validator,
                                toolkit.get_validator('user_passwords_match'),
-                               unicode]
+                               str]
         schema['password2'] = [toolkit.get_validator('ignore_missing'),
-                               unicode]
+                               str]
 
     return schema
 

From e4435b420e6ab620f96190e60eb7a065561993d0 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Mon, 4 Oct 2021 18:54:25 +0000
Subject: [PATCH 34/39] [webassets.yml][s]: add prvacy.js to webassets

---
 ckanext/opendatani/assets/webassets.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ckanext/opendatani/assets/webassets.yml b/ckanext/opendatani/assets/webassets.yml
index 73c97c8..2c61438 100644
--- a/ckanext/opendatani/assets/webassets.yml
+++ b/ckanext/opendatani/assets/webassets.yml
@@ -24,3 +24,9 @@ group:
   filters: rjsmin
   contents:
     - js/groups.js
+
+privacy:
+  output: odni/%(version)s_privacy.js
+  filters: rjsmin
+  contents:
+    - js/privacy.js

From 33e9135906a75b0cc92de821e4f50971bab929c0 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Mon, 4 Oct 2021 18:55:27 +0000
Subject: [PATCH 35/39] [base_form.html][s]: change page.pages_edit to
 page.edit

---
 ckanext/opendatani/templates/ckanext_pages/base_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/opendatani/templates/ckanext_pages/base_form.html b/ckanext/opendatani/templates/ckanext_pages/base_form.html
index 67d46c0..40e5dcc 100644
--- a/ckanext/opendatani/templates/ckanext_pages/base_form.html
+++ b/ckanext/opendatani/templates/ckanext_pages/base_form.html
@@ -25,7 +25,7 @@
      {% set delete_url = h.url_for('pages.blog_delete', page=data.name) %}
   {% endif %}
 {% else %}
-  {% set action_url = h.url_for('pages.pages_edit', page=page) %}
+  {% set action_url = h.url_for('pages.edit', page=page) %}
   {% set cancel_url = h.url_for('pages.index') %}
   {% set slug_prefix = cancel_url ~ '/' %}
   {% set slug_domain = h.url_for('pages.index', qualified=true) %}

From c6d0500c2934c978203f9024e9762de18e252944 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Mon, 4 Oct 2021 18:55:57 +0000
Subject: [PATCH 36/39] [new_user_form][s]: add privacy.js

---
 ckanext/opendatani/templates/user/new_user_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/opendatani/templates/user/new_user_form.html b/ckanext/opendatani/templates/user/new_user_form.html
index 690c2ff..da090ec 100644
--- a/ckanext/opendatani/templates/user/new_user_form.html
+++ b/ckanext/opendatani/templates/user/new_user_form.html
@@ -27,5 +27,5 @@
 </form>
 
 {% block scripts %}
-  {% resource 'opendatani/js/privacy.js' %}
+  {% asset 'odni/privacy' %}
 {% endblock %}
\ No newline at end of file

From 9b09260eee236105cfbc2d202b2d14f0703307a8 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Tue, 5 Oct 2021 11:39:19 +0000
Subject: [PATCH 37/39] [emailer.py][s]: change basestring to str

---
 ckanext/opendatani/emailer.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/opendatani/emailer.py b/ckanext/opendatani/emailer.py
index 8dc278e..3a95cd6 100644
--- a/ckanext/opendatani/emailer.py
+++ b/ckanext/opendatani/emailer.py
@@ -37,7 +37,7 @@ def send_email(content, to, subject, file=None):
 
     from_ = SMTP_FROM
     
-    if isinstance(to, basestring):
+    if isinstance(to, str):
         to = [to]
 
     msg['Subject'] = subject

From a437ad8a3285a076293b3a6c4d5b8ed4fb61e6ea Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Thu, 7 Oct 2021 07:53:46 +0000
Subject: [PATCH 38/39] [blueprints][s]: add stale_dataset to the list of
 exported package

---
 ckanext/opendatani/blueprints/__init__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/opendatani/blueprints/__init__.py b/ckanext/opendatani/blueprints/__init__.py
index f80b759..4a3da10 100644
--- a/ckanext/opendatani/blueprints/__init__.py
+++ b/ckanext/opendatani/blueprints/__init__.py
@@ -1,4 +1,4 @@
-from .dashboard import dashboard_blueprint
+from .dashboard import dashboard_blueprint, _stale_datasets_for_user
 from .dataset import dataset_blueprint
 from .organization import organization_blueprint
 from .publisher_reports import publisher_blueprint

From 4e92102399e1ebecd60b142d221163f439763707 Mon Sep 17 00:00:00 2001
From: steveoni <steohenoni2@gmail.com>
Date: Thu, 7 Oct 2021 07:54:05 +0000
Subject: [PATCH 39/39] [plugins][s]: remove controller

---
 ckanext/opendatani/plugin.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ckanext/opendatani/plugin.py b/ckanext/opendatani/plugin.py
index d78fa2b..cf971a2 100644
--- a/ckanext/opendatani/plugin.py
+++ b/ckanext/opendatani/plugin.py
@@ -12,7 +12,6 @@
 from ckan.logic.action.update import user_update as core_user_update
 import ckan.lib.helpers as h
 import datetime as dt
-from ckanext.opendatani.controller import CustomUserController
 from ckanext.opendatani import helpers, blueprints
 from collections import OrderedDict
 
@@ -422,11 +421,10 @@ def get_resource_count(resource_format, resources):
 
 def get_user_num_stale_datasets():
     """Get each user's inupdated datasets."""
-    cuc = CustomUserController()
     user = toolkit.get_action('user_show')(
         {}, {'id': toolkit.c.userobj.id, 'include_datasets': True})
     data = user['datasets']
-    stale_datasets = cuc._stale_datasets_for_user(data)
+    stale_datasets = blueprints._stale_datasets_for_user(data)
     return str(len(stale_datasets))