From 5966f0ffd7a738817e6ff960e4a45c6586c1b851 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 26 May 2020 21:01:47 +0530
Subject: [PATCH 001/127] fix landing page ui resolution issues and fonts

- fix for a resolution of 1280x800
- update font size
- make footer small for mobile screen
---
 .../public/justicehub_theme.css               | 99 ++++++++++++++-----
 .../justicehub_theme/templates/footer.html    | 12 +--
 .../templates/home/snippets/search.html       | 10 +-
 3 files changed, 85 insertions(+), 36 deletions(-)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index b0fd091..3f4eebf 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -31,10 +31,10 @@
     padding-bottom: 0;
 }
 .masthead .navigation .nav-pills li {
-    font-size: 25px;
+    font-size: 1.5em;
     font-weight: bold;
     padding-top: 40px;
-    height: 140px;
+    height: 120px;
 }
 .masthead .navigation .nav-pills li.active {
     border-bottom: 15px solid #f65940;
@@ -49,10 +49,10 @@
     background-color: #403644;
 }
 .masthead .navigation .nav-pills li:last-child {
-    height: 140px;
+    height: 120px;
     background-color: #f65940;
     color: #ffffff;
-    font-size: 25px;
+    font-size: 1.5em;
     padding-left: 5px;
     padding-right: 10px;
 }
@@ -64,8 +64,8 @@
     margin-top: 10px;
     margin-bottom: 10px;
     margin-left: -45px;
-    width: 490px;
-    height: 120px;
+    width: 410px;
+    height: 100px;
 }
 .logo img {
     min-width: 100%;
@@ -169,15 +169,18 @@
     margin: 0;
     padding: 0;
     color: #ffffff;
-    font-size: 16px;
+    font-size: 1em;
+}
+.footer-intro {
+    font-size: 2.5em;
+    font-weight: bold;
 }
-
 .footer-disclaimer {
-    font-size: 25px;
+    font-size: 1.4em;
 }
 .footer-disclaimer div:last-child {
     color: #f65940;
-    font-size: 30px;
+    font-size: 1.3em;
     font-style: italic;
 }
 .footer-links i.fa-circle.fa-sm {
@@ -194,7 +197,7 @@
     z-index: 0;
 }
 .footer-links input {
-    font-size: 20px !important;
+    font-size: 1.5em !important;
     font-style: italic;
     color: #b9b4b4;
     padding: 23px 15px;
@@ -302,28 +305,31 @@ aside .module [class^=module] {
 
 /* ----------------------------- homepage --------------------------- */
 [role="main"] .container .row .col1 {
-    padding: 10% 4%;
+    padding: 10% 2%;
+    margin-top: -250px;
 }
 [role="main"] .container .row .col2 {
     padding: 13% 10%;
-    font-size: 25px;
+    font-size: 1.7em;
     font-style: italic;
     color: #707070;
+    margin-top: -250px;
 }
 [role="main"] .container .row .col3 {
     background-color: #403644;
     color: #ffffff;
-    padding: 40px 60px;
+    padding: 20px 60px;
+    margin-top: -310px;
 }
 [role="main"] .container .row .col3 h2{
-    font-size: 40px;
+    font-size: 2.5em;
     border-bottom: 2px solid #f65940;
     padding-bottom: 10px;
     margin-bottom: 30px;
 }
 [role="main"] .container .row .col3 p {
     padding: 10px 0;
-    font-size: 25px;
+    font-size: 1.5em;
 }
 .col-circle {
     position: relative;
@@ -336,19 +342,19 @@ aside .module [class^=module] {
     min-height: 860px;
     background: url('/uploads/admin/JH Logomark.png') no-repeat;
     background-clip: border-box;
-    background-position: -390px -320px;
+    background-position: -270px -200px;
     background-size: 75%;
     padding-top: 320px;
-    padding-left: 200px;
+    padding-left: 150px;
 }
 .search-form .search-input.search-giant .form-control {
     border-radius: 60px;
     line-height: 2;
-    font-size: 32px;
+    font-size: 1.7em;
     font-style: italic;
-    border: 5px solid #f65940;
+    border: 4px solid #f65940;
     padding-left: 30px;
-    height: 100px;
+    height: 80px;
 }
 .homepage .module-search .form-group {
     padding: 10px 0;
@@ -361,7 +367,7 @@ aside .module [class^=module] {
 }
 .search-form .search-input.search-giant .fa {
     color: #403644;
-    margin-right: 20px;
+    margin-right: 10px;
 }
 .homepage .module-search .stats-box .tag {
     background-color: #f65940;
@@ -374,26 +380,32 @@ aside .module [class^=module] {
     color: #f65940;
 }
 .search-form .search-input.search-giant {
-    width: 88%;
+    width: 80%;
 }
 .module-search .search-form {
+    margin-top: -50px;
     padding: 0;
 }
 .search-meta {
-    width: 95%;
+    width: 85%;
 }
 .search-meta .stats {
     color:#f65940;
-    font-size: 80px;
+    font-size: 5em;
     font-weight:bolder;
     display: block;
+    text-align: center;
+}
+.search-meta .stats-box {
+    margin-top: 0;
 }
 .stats-text {
     margin-top: -20px;
     color:#403644;
     font-size:20px;
-    font-weight:bold;
+    font-weight: bolder;
     display: block;
+    text-align: center;
 }
 
 /* -------------------------------------- Mobile adjustments ----------------------------- */
@@ -502,7 +514,42 @@ aside .module [class^=module] {
     [role="main"] .secondary {
         display: none;
     }
+    [role="main"] .container .row .col1,
+    [role="main"] .container .row .col2,
+    [role="main"] .container .row .col3 {
+        margin-top: 0;
+    }
     .module .module-content {
         padding: 0;
     }
+    .search-meta .stats-box {
+        margin-top: 50px;
+    }
+    .footer-disclaimer {
+        display: none;
+    }
+    .footer-intro {
+        font-size: 1.5em;
+    }
+    .social-links .fa {
+        font-size: 1.5em;
+        width: 33px;
+        height: 33px;
+    }
+    .footer-links .col {
+        padding: 0;
+    }
+    .social-links li {
+        margin-right: 0;
+    }
+    .footer-links {
+        padding: 5px 0;
+    }
+    .footer-links input {
+        padding: 18px 10px;
+        font-size: 1em !important;
+    }
+    .footer-links .input-group-btn .btn {
+        font-size: 12px;
+    }
 }
diff --git a/ckanext/justicehub_theme/templates/footer.html b/ckanext/justicehub_theme/templates/footer.html
index b112ea7..b295e4a 100644
--- a/ckanext/justicehub_theme/templates/footer.html
+++ b/ckanext/justicehub_theme/templates/footer.html
@@ -5,12 +5,12 @@
         {% block footer_content %}
         <div class="row footer-links">
             <div class="col col-md-3">
-                <div style="font-size: 30px; font-weight: bold;">{{ _('GET IN TOUCH') }}</div>
+                <div class="footer-intro">{{ _('GET IN TOUCH') }}</div>
             </div>
         </div>
 
         <div class="row footer-links">
-            <div class="col col-md-6 social-links">
+            <div class="col col-md-6 col-xs-5 social-links">
                 <ul class="list-unstyled list-inline">
                     <li>
                         <a href="mailto:info@justicehub.in" aria-hidden="true" alt="Justice Hub's Email Address" role="link" title="Email Address" aria-label="Justice Hub's Email Address" target="_blank">
@@ -35,13 +35,13 @@
                 </ul>
             </div>
 
-            <div class="col col-md-1 social-links">
+            <div class="col col-md-1 social-links hidden-xs">
             </div>
 
-            <div class="col col-md-5 social-links" data-module="justicehub_theme_subscribe">
+            <div class="col col-md-5 col-xs-7 social-links" data-module="justicehub_theme_subscribe">
                 <form id="subscribe-form" method="post" action="{{h.url_for('jhsubscribe')}}">
                 <div class="input-group">
-                    <input type="email" class="form-control input-lg" placeholder="Enter you email id" name="email">
+                    <input type="email" class="form-control" placeholder="Enter you email id" name="email">
                     <span class="input-group-btn">
                         <button class="btn btn-default btn-lg" type="submit">Subscribe</button>
                     </span>
@@ -103,4 +103,4 @@
         {% endif %}
     {% endblock %}
 
-</footer>
\ No newline at end of file
+</footer>
diff --git a/ckanext/justicehub_theme/templates/home/snippets/search.html b/ckanext/justicehub_theme/templates/home/snippets/search.html
index 29b7d83..1221831 100644
--- a/ckanext/justicehub_theme/templates/home/snippets/search.html
+++ b/ckanext/justicehub_theme/templates/home/snippets/search.html
@@ -13,19 +13,21 @@
     </div>
   </form>
   <div class="row search-meta">
-      <div class="col col-sm-5">
+      <div class="col col-sm-7 col-xs-1">
       </div>
-      <div class="col col-xs-4 col-sm-3 stats-box">
+      <div class="col col-sm-3 stats-box hidden col-xs-hidden">
           <h3>{{ _('Popular tags') }}</h3>
           {% for tag in tags %}
           <a class="tag" href="{% url_for controller='package', action='search', tags=tag.name %}">{{ h.truncate(tag.display_name, 22) }}</a>
           {% endfor %}
       </div>
-      <div class="col col-xs-4 col-sm-2 stats-box">
+      <div class="col col-xs-5 col-sm-2 stats-box">
           <span class="stats">{{ stats.organization_count }}</span>
           <span class="stats-text">{{ _('CONTRIBUTORS') }}</span>
       </div>
-      <div class="col col-xs-4 col-sm-2 stats-box">
+      <div class="col col-sm-1 col-xs-1">
+      </div>
+      <div class="col col-xs-5 col-sm-2 stats-box">
           <span class="stats">{{ stats.dataset_count }}</span>
           <span class="stats-text">{{ _('DATASETS') }}</span>
       </div>

From 6ab37ea8813f1e7ae111b0ba011ec3ddc150d2f3 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 27 May 2020 12:50:02 +0530
Subject: [PATCH 002/127] add label colors for common data formats

---
 .../public/justicehub_theme.css               | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 3f4eebf..6755db0 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -407,6 +407,34 @@ aside .module [class^=module] {
     display: block;
     text-align: center;
 }
+.label[data-format="doc"],
+.label[data-format*="doc"] {
+    background-color: #115abe;
+}
+.label[data-format="tsv"],
+.label[data-format*="tsv"] {
+    background-color: #7ca34c;
+}
+.label[data-format="zip"],
+.label[data-format*="zip"] {
+    background-color: #7ca34c;
+}
+.label[data-format="ods"],
+.label[data-format*="ods"] {
+    background-color: #2db55d;
+}
+.label[data-format="odb"],
+.label[data-format*="odb"] {
+    background-color: #85c12a;
+}
+.label[data-format="txt"],
+.label[data-format*="txt"] {
+    background-color: #55a4b5;
+}
+.label[data-format="odt"],
+.label[data-format*="odt"] {
+    background-color: #862112;
+}
 
 /* -------------------------------------- Mobile adjustments ----------------------------- */
 @media (max-device-width: 600px) and (orientation: portrait) {

From df793ae1a620390c24bd8bcbc0e7bdcbe24a01d4 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 29 May 2020 19:40:57 +0530
Subject: [PATCH 003/127] add actions for autocomplete for custom metadata

---
 .../justicehub_theme/logic/action/__init__.py |  4 +-
 .../justicehub_theme/logic/action/action.py   | 44 ++++++++++++++++---
 2 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/ckanext/justicehub_theme/logic/action/__init__.py b/ckanext/justicehub_theme/logic/action/__init__.py
index 8ad7b82..249778e 100644
--- a/ckanext/justicehub_theme/logic/action/__init__.py
+++ b/ckanext/justicehub_theme/logic/action/__init__.py
@@ -1,4 +1,6 @@
 from action import (
     partner_users_autocomplete,
-    get_package_owner_details
+    get_package_owner_details,
+    metadata_autocomplete,
+    resource_metadata_autocomplete
 )
diff --git a/ckanext/justicehub_theme/logic/action/action.py b/ckanext/justicehub_theme/logic/action/action.py
index 58d7778..93842b2 100644
--- a/ckanext/justicehub_theme/logic/action/action.py
+++ b/ckanext/justicehub_theme/logic/action/action.py
@@ -1,4 +1,5 @@
 from ckanext.issues.logic import schema
+from six import string_types
 
 import ckan.lib.dictization.model_dictize as model_dictize
 import ckan.lib.plugins as lib_plugins
@@ -48,9 +49,40 @@ def get_package_owner_details(context, data_dict):
                                                include_extras=True
                                                )
 
-    group_plugin = lib_plugins.lookup_group_plugin(partner_dict['type'])
-    schema = logic.schema.default_show_group_schema()
-    partner, errors = lib_plugins.plugin_validate(
-        group_plugin, context, partner_dict, schema, 'organization_show'
-    )
-    return partner
+
+
+@p.toolkit.side_effect_free
+def metadata_autocomplete(context, data_dict):
+    session = context['session']
+    field = data_dict['field']
+    term = data_dict['incomplete']
+    limit = data_dict.get('limit', 10)
+    matching = []
+
+    if term and isinstance(term, string_types):
+        q = model.Session.query(model.PackageExtra)
+        results = q.filter(model.PackageExtra.key == field)\
+                .filter(model.PackageExtra.value.ilike('{0}%'.format(term)))\
+                .distinct()\
+                .limit(limit)
+        matching = [result.value for result in results]
+
+    return matching
+
+@p.toolkit.side_effect_free
+def resource_metadata_autocomplete(context, data_dict):
+    session = context['session']
+    field = data_dict['field']
+    term = data_dict['incomplete']
+    limit = data_dict.get('limit', 10)
+    matching = []
+
+    if term and isinstance(term, string_types):
+        results = session.execute("""select extras::json->>'{field}'
+                                  from resource
+                                  where extras::json->>'{field}' ilike '{term}%'
+                                  limit {limit};""".format(field=field, term=term, limit=limit)
+                                  ).fetchall()
+        matching = [result[0] for result in results]
+
+    return matching

From ee587a582f1164bb8184991e9f6036c8d5208ca4 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 29 May 2020 19:43:44 +0530
Subject: [PATCH 004/127] update external_links template

- show links from composite extension
- add a helper function to parse json from string
---
 ckanext/justicehub_theme/plugin.py            |  6 ++++-
 .../templates/package/read_base.html          | 13 +++++++---
 .../scheming/form_snippets/links.html         | 26 -------------------
 3 files changed, 14 insertions(+), 31 deletions(-)
 delete mode 100644 ckanext/justicehub_theme/templates/scheming/form_snippets/links.html

diff --git a/ckanext/justicehub_theme/plugin.py b/ckanext/justicehub_theme/plugin.py
index 0173654..6029562 100644
--- a/ckanext/justicehub_theme/plugin.py
+++ b/ckanext/justicehub_theme/plugin.py
@@ -23,6 +23,9 @@
 parse_params = logic.parse_params
 tuplize_dict = logic.tuplize_dict
 
+def parse_json(string):
+    return json.loads(string)
+
 def package_activity_stream(id):
     context = {'model': model, 'session': model.Session,
                'user': c.user, 'for_view': True,
@@ -115,7 +118,8 @@ def get_helpers(self):
         # other extensions.
         return {
                 'justicehub_theme_get_package_avg_downloads': get_package_avg_downloads,
-                'justicehub_theme_package_activity_stream': package_activity_stream
+                'justicehub_theme_package_activity_stream': package_activity_stream,
+                'justicehub_theme_parse_json': parse_json
                 }
 
     #IActions
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index f5732cb..11b2df7 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -124,15 +124,20 @@ <h2>ACTIVITY</h2>
     </div>
 
     {% if pkg.links %}
+    {% set links = h.justicehub_theme_parse_json(pkg.links) %}
     <div class="col-xs-12 row page-section">
        <span>{{ _('External Links') }}</span>
-       <ul class="list-unstyled links-list">
-        {% for link in pkg.links %}
+        {% for item in links %}
+           <ul class="list-unstyled links-list list-inline">
+          {% set item = h.composite_get_as_dict(item) %}
           <li>
-              <a href="{{ link }}">{{ link }}</a>
+              <a href="{{ link }}">{{ item['title'] }}</a>
           </li>
+          <li>
+              <p>{{ item['description'] }}</p>
+          </li>
+          </ul>
         {% endfor %}
-      </ul>
     </div>
     {% endif %}
 
diff --git a/ckanext/justicehub_theme/templates/scheming/form_snippets/links.html b/ckanext/justicehub_theme/templates/scheming/form_snippets/links.html
deleted file mode 100644
index ffe630b..0000000
--- a/ckanext/justicehub_theme/templates/scheming/form_snippets/links.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{#
-Note: Taken from: https://github.com/open-data/ckanext-repeating/blob/master/ckanext/repeating/templates/scheming/form_snippets/repeating_text.html
-#}
-
-{% import 'macros/form.html' as form %}
-
-{%- set values = data.get(field.field_name, [])
-    + [''] * field.get('form_blanks', 3) -%}
-<div class="row">
-{% for element in values %}
-  <div class="col col-md-4">
-  {{ form.input(
-    field.field_name + '-' ~ loop.index,
-    id='field-' + field.field_name + '-' ~ loop.index,
-    label=h.scheming_language_text(field.label) + ' ' ~ loop.index,
-    placeholder=h.scheming_language_text(field.form_placeholder),
-    value=element,
-    type=url,
-    error=errors[field.field_name],
-    classes=['control-medium'],
-    attrs=dict({"class": "form-control"}, **(field.get('form_attrs', {}))),
-    is_required=h.scheming_field_required(field)
-    ) }}
-  </div>
-{% endfor %}
-</div>

From 05aa74bb7ce4f465079974a77c4327b567558656 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 29 May 2020 19:45:34 +0530
Subject: [PATCH 005/127] fix dataset page after update

- add partner details on after_show so the dataset gets it after update
- remove validation of partner fields in the action because it would
fail solr rebuild index
---
 ckanext/justicehub_theme/logic/action/action.py | 14 +++++++-------
 ckanext/justicehub_theme/plugin.py              |  6 +++++-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/ckanext/justicehub_theme/logic/action/action.py b/ckanext/justicehub_theme/logic/action/action.py
index 93842b2..19327d7 100644
--- a/ckanext/justicehub_theme/logic/action/action.py
+++ b/ckanext/justicehub_theme/logic/action/action.py
@@ -2,17 +2,10 @@
 from six import string_types
 
 import ckan.lib.dictization.model_dictize as model_dictize
-import ckan.lib.plugins as lib_plugins
-import ckan.logic as logic
 import ckan.model as model
 import ckan.plugins as p
 from ckan.logic import validate
 
-try:
-    import ckan.authz as authz
-except ImportError:
-    import ckan.new_authz as authz
-
 
 @p.toolkit.side_effect_free
 @validate(schema.organization_users_autocomplete_schema)
@@ -49,6 +42,13 @@ def get_package_owner_details(context, data_dict):
                                                include_extras=True
                                                )
 
+    # NOTE: commented becaues this validation causes solr to fail reindexing
+    # group_plugin = lib_plugins.lookup_group_plugin(partner_dict['type'])
+    # schema = logic.schema.default_show_group_schema()
+    # partner, errors = lib_plugins.plugin_validate(
+    #     group_plugin, context, partner_dict, schema, 'organization_show'
+    # )
+    return partner_dict
 
 
 @p.toolkit.side_effect_free
diff --git a/ckanext/justicehub_theme/plugin.py b/ckanext/justicehub_theme/plugin.py
index 6029562..85d3493 100644
--- a/ckanext/justicehub_theme/plugin.py
+++ b/ckanext/justicehub_theme/plugin.py
@@ -182,7 +182,11 @@ def after_delete(self, context, pkg_dict):
         pass
 
     def after_show(self, context, pkg_dict):
-        pass
+        partner = toolkit.get_action('get_package_owner_details')(
+                context,
+                data_dict={'org_id': pkg_dict['owner_org']}
+        )
+        pkg_dict['partner'] = partner
 
     def before_index(self, pkg_dict):
         return pkg_dict

From 1a97c291eb128d946eaa811457277528e09d856c Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 29 May 2020 19:46:36 +0530
Subject: [PATCH 006/127] add autocomplete js on package base

---
 ckanext/justicehub_theme/templates/base.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ckanext/justicehub_theme/templates/base.html b/ckanext/justicehub_theme/templates/base.html
index 8f37c05..5624c7e 100644
--- a/ckanext/justicehub_theme/templates/base.html
+++ b/ckanext/justicehub_theme/templates/base.html
@@ -14,3 +14,7 @@
   <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat" />
 {% endblock %}
 
+{%- block scripts %}
+  {{ super() }}
+  {% resource 'ckanext_issues/autocomplete-action-api.js' %}
+{% endblock -%}

From e47d29a70c0b83601797784542ca406090436e86 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 29 May 2020 19:47:30 +0530
Subject: [PATCH 007/127] add metadata fields for organisation signed pledge
 and dataset verified

- rearrange fields on dataset form
- show icons
---
 .../snippets/organization_item.html            |  9 +++++++++
 .../templates/package/read_base.html           |  3 +++
 .../package/snippets/package_form.html         | 18 +++++++++++++++++-
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html b/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html
index 29ac8a4..c9bd6fb 100644
--- a/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html
+++ b/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html
@@ -1,5 +1,14 @@
 {% ckan_extends %}
 
+{% block title %}
+    <h3 class="media-heading">
+        {{ organization.display_name }}
+    {% if organization.signed_pledge %}
+        <i class="fa fa-certificate"></i>
+    {% endif %}
+    </h3>
+{% endblock %}
+
 {% block description %}
 {% endblock %}
 
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index 11b2df7..8f231b7 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -14,6 +14,9 @@ <h1>{{h.dataset_display_name(pkg)}}
             {% if pkg.private %}
                 <i style="margin-left: 10px;" class="fa fa-lock fa-lg"></i>
             {% endif %}
+            {% if pkg.verified %}
+                <i style="margin-left: 10px;" class="fa fa-check fa-lg"></i>
+            {% endif %}
             </h1>
             <p class="package-desc"> {{h.get_translated(pkg, 'notes')}}</p>
         </div>
diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
index 00ba0ef..255af99 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
@@ -9,6 +9,7 @@
   {%- endif -%}
   {%- set schema = h.scheming_get_dataset_schema(dataset_type) -%}
 
+  {% set dataset_state = [] %}
   {% set org_fields = [] %}
   {% set geo_fields = [] %}
   {% set data_timeline_fields = [] %}
@@ -21,7 +22,10 @@
   {% set extras = [] %}
 
   {%- for field in schema.dataset_fields[4:] -%}
-      {%- if field.field_name in ['owner_org', 'license_id'] -%}
+      {%- if field.field_name in ['verified', 'state'] -%}
+          {% do dataset_state.append(field) %}
+
+      {%- elif field.field_name in ['owner_org', 'license_id'] -%}
           {% do org_fields.append(field) %}
 
       {%- elif field.field_name in ['states', 'district', 'village'] -%}
@@ -67,6 +71,18 @@
   {%- endfor -%}
   </div>
 
+  <div class="row">
+  {%- for field in dataset_state -%}
+    <div class="col col-md-6">
+    {%- if field.form_snippet is not none -%}
+      {%- snippet 'scheming/snippets/form_field.html',
+        field=field, data=data, errors=errors,
+        entity_type='dataset', object_type=dataset_type -%}
+    {%- endif -%}
+    </div>
+  {%- endfor -%}
+  </div>
+
   <div class="form-group">
       <span class="metadata-heading">{{ _('METADATA') }}</span>
   </div>

From b7b5f5c484e304d9440e1187a82bdb0f0481744a Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 29 May 2020 19:48:22 +0530
Subject: [PATCH 008/127] update form controls for package form

- change button text(NEXT: FILES UPLOAD > UPDATE DATASET) for update form
- remove delete button for package creation
---
 .../package/snippets/package_form.html        | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
index 255af99..96393e1 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
@@ -239,12 +239,26 @@
     </p>
   {% endblock %}
   {% block delete_button %}
-    {% if h.check_access('package_delete', {'id': data.id}) and not data.state == 'deleted' %}
-      <a class="btn btn-danger pull-left" href="{% url_for controller='package', action='delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this dataset?') }}">{% block delete_button_text %}{{ _('DELETE') }}{% endblock %}</a>
+    {% if form_style == 'edit'
+       and h.check_access('package_delete', {'id': c.pkg_dict.id})
+       and not data.state == 'deleted' %}
+      <a class="btn btn-danger pull-left" href="{% url_for controller='package', action='delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this dataset?') }}">
+          {% block delete_button_text %}{{ _('DELETE') }}{% endblock %}
+      </a>
     {% endif %}
   {% endblock %}
+
   {% block save_button %}
-  <button class="btn btn-primary" type="submit" name="save">{% block save_button_text %}{{ _('NEXT: FILES UPLOAD') }}{% endblock %}<i class="fa fa-chevron-right"></i><i class="fa fa-chevron-right"></i></button>
+  <button class="btn btn-primary" type="submit" name="save">
+      {% block save_button_text %}
+      {% if form_style != 'edit' %}
+          {{ _('NEXT: FILES UPLOAD') }}
+          <i class="fa fa-chevron-right"></i><i class="fa fa-chevron-right"></i>
+      {% else %}
+          {{ _('UPDATE DATASET') }}
+      {% endif %}
+      {% endblock %}
+  </button>
   {% endblock %}
   <p class="control-required-message">
     {{ _("Required field") }} <span class="control-required">*</span>

From 1887ad52dc20a8bea2b84d083eb7339f2f2f1611 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 29 May 2020 19:49:22 +0530
Subject: [PATCH 009/127] add template for autocomplete fields

---
 .../scheming/form_snippets/metadata_autocomplete.html     | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 ckanext/justicehub_theme/templates/scheming/form_snippets/metadata_autocomplete.html

diff --git a/ckanext/justicehub_theme/templates/scheming/form_snippets/metadata_autocomplete.html b/ckanext/justicehub_theme/templates/scheming/form_snippets/metadata_autocomplete.html
new file mode 100644
index 0000000..0d2dffc
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/scheming/form_snippets/metadata_autocomplete.html
@@ -0,0 +1,8 @@
+<div class="form-group control-medium">
+    <label for="field-{{ field.field_name }}" class="control-label">{{ field.label }}</label>
+    <div class="controls">
+        <input id="field-{{ field.field_name }}" name="{{ field.field_name }}" type="text" placeholder="{{ field.form_placeholder }}"
+               value="{{ data[field.field_name] }}" class="form-control" data-module="autocomplete-action-api"
+               data-module-source="{{ field.form_attrs['data-module-source'] }}">
+    </div>
+</div>

From 381a79384b24d60821fa4fd9422bf4881549e688 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sat, 30 May 2020 20:10:15 +0530
Subject: [PATCH 010/127] remove font size across all css modules

---
 .../justicehub_theme/public/dataset_info.css  | 17 ---------
 ckanext/justicehub_theme/public/issues.css    |  7 ----
 .../public/justicehub_theme.css               | 36 -------------------
 .../justicehub_theme/public/organization.css  | 14 +-------
 ckanext/justicehub_theme/public/package.css   | 11 ------
 ckanext/justicehub_theme/public/partner.css   |  8 -----
 ckanext/justicehub_theme/public/resource.css  | 11 ------
 ckanext/justicehub_theme/public/search.css    |  3 --
 8 files changed, 1 insertion(+), 106 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset_info.css b/ckanext/justicehub_theme/public/dataset_info.css
index 188ae80..4c30a2e 100644
--- a/ckanext/justicehub_theme/public/dataset_info.css
+++ b/ckanext/justicehub_theme/public/dataset_info.css
@@ -25,7 +25,6 @@
 }
 .activity .item p {
     margin-left:50px;
-    font-size: 16px;
 }
 
 .activity .item .fa{
@@ -66,16 +65,12 @@
 }
 .stats-text {
     color:#403644;
-    font-size:20px;
     font-weight:bold;
     display: block;
 }
 .pckg_rsrc_actvty {
     background:#403644;
 }
-.additional-info h3 {
-    font-size: 25px;
-}
 .pckg_rsrc_actvty,
 .page-section {
     font-weight: bolder;
@@ -87,14 +82,12 @@
     margin-left: 0;
 }
 .page-section > span:first-child {
-    font-size: 25px;
     display: inline-block;
     margin-bottom: 30px;
     padding-left: 15px;
 }
 .page-section .links-list {
     padding-left: 15px;
-    font-size: 20px;
     font-weight: normal;
     height: 150px;
 }
@@ -150,7 +143,6 @@
 }
 .pckg_rsrc_actvty h2 {
     font-weight:bolder;
-    font-size: 24px;
     line-height: 1.2;
     color:white;
     text-align:center;
@@ -163,7 +155,6 @@
     border-radius: 30px;
     padding: 5px 50px;
     color: #ffffff;
-    font-size: 24px;
     margin-top: 10px;
 }
 .content_action a:hover {
@@ -181,7 +172,6 @@
 }
 .package-tabs .nav-tabs li a {
     border-radius: 0;
-    font-size: 30px;
 }
 .pkg_tags:nth-child(even) {background-color:#00abb7;}
 .pkg_tags:nth-child(odd) {background-color:#f65940;}
@@ -189,14 +179,12 @@
 .additional-info .table {
     width: 50%;
     margin-left: 25%;
-    font-size: 16px;
 }
 .table-striped thead tr th,
 .table-striped thead tr td {
     padding-top: 10px;
     padding-bottom: 10px;
     padding-left: 10%;
-    font-size: 20px;
 }
 .table-striped tbody tr th,
 .table-striped tbody tr td {
@@ -232,7 +220,6 @@
 .nav-tabs > li >  a {
     color: #403644;
     border: None;
-    font-size: 20px;
     font-weight: bolder;
 }
 
@@ -256,9 +243,6 @@
 	.nav-tabs > li {
         margin-right:0px;
 	}
-	.nav-tabs > li >  a {
-        font-size: 15px;
-	}
 	.page_primary_action .btn-flat {
 		border-radius:0px;
         margin-right :0px;
@@ -269,6 +253,5 @@
     .additional-info .table {
         width: 100%;
         margin-left: 0;
-        font-size: 16px;
     }
 }
diff --git a/ckanext/justicehub_theme/public/issues.css b/ckanext/justicehub_theme/public/issues.css
index 1393d90..421cb37 100644
--- a/ckanext/justicehub_theme/public/issues.css
+++ b/ckanext/justicehub_theme/public/issues.css
@@ -26,7 +26,6 @@
 .issue-comment-header {
     background-color: #f65940 !important;
     color: #ffffff !important;
-    font-size: 18px;
 }
 .issue-comment-action [class^="subtle-btn"] {
     border: none;
@@ -34,7 +33,6 @@
     background: transparent;
 }
 .issue-comment-action [class^="subtle-btn"] i {
-    font-size: 24px;
     color: #ffffff;
 }
 .issues-sidebar-heading {
@@ -58,7 +56,6 @@
     font-weight: bold;
 }
 .issue-new .form-actions .btn {
-    font-size: 20px;
     color: #f65940;
 }
 .issue-new .dataset-form {
@@ -67,10 +64,6 @@
 .issue-list-group .list-group-item {
     box-shadow: 0 0 10px 1px #bcb4bf;
 }
-.issue-list-group .list-group-item-name,
-.issue-list-group .list-group-item-number {
-    font-size: 18px;
-}
 .open.icon {
     padding-top: 5px;
 }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 6755db0..eb0da71 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -31,8 +31,6 @@
     padding-bottom: 0;
 }
 .masthead .navigation .nav-pills li {
-    font-size: 1.5em;
-    font-weight: bold;
     padding-top: 40px;
     height: 120px;
 }
@@ -52,7 +50,6 @@
     height: 120px;
     background-color: #f65940;
     color: #ffffff;
-    font-size: 1.5em;
     padding-left: 5px;
     padding-right: 10px;
 }
@@ -169,19 +166,9 @@
     margin: 0;
     padding: 0;
     color: #ffffff;
-    font-size: 1em;
-}
-.footer-intro {
-    font-size: 2.5em;
-    font-weight: bold;
-}
-.footer-disclaimer {
-    font-size: 1.4em;
 }
 .footer-disclaimer div:last-child {
     color: #f65940;
-    font-size: 1.3em;
-    font-style: italic;
 }
 .footer-links i.fa-circle.fa-sm {
     font-size: 9px;
@@ -197,7 +184,6 @@
     z-index: 0;
 }
 .footer-links input {
-    font-size: 1.5em !important;
     font-style: italic;
     color: #b9b4b4;
     padding: 23px 15px;
@@ -216,7 +202,6 @@
 }
 .module-narrow h1.heading,
 .module-narrow h2.module-heading {
-    font-size: 22px;
     background-color: #f65940;
     height: 100px;
     padding-left: 25px;
@@ -234,7 +219,6 @@
 .module-heading {
     color: #ffffff;
     font-weight: bold;
-    font-size: 1.5em;
     background-color: #403644;
     border-color: #f87c69;
     margin-bottom: 0 !important;
@@ -245,9 +229,6 @@
     padding-left: 0;
 }
 
-h1 {
-    font-size: 30px;
-}
 hr {
     margin-top: 20px;
     border-top: 1.5px solid #403644;
@@ -262,7 +243,6 @@ hr {
     color: #ffffff;
     border-radius: 30px;
     padding: 5px 25px;
-    font-size: 20px;
 }
 [role="main"] .secondary {
     padding-right: 0;
@@ -286,13 +266,11 @@ aside .module [class^=module] {
 }
 .login-sidebar-heading {
     color: #ffffff;
-    font-size: 28px;
     padding: 50px 60px;
     padding-bottom: 10px;
 }
 .login-sidebar p {
     padding: 15px 5px;
-    font-size: 16px;
 }
 .login-sidebar p.action {
     background-color: #f65940;
@@ -310,7 +288,6 @@ aside .module [class^=module] {
 }
 [role="main"] .container .row .col2 {
     padding: 13% 10%;
-    font-size: 1.7em;
     font-style: italic;
     color: #707070;
     margin-top: -250px;
@@ -322,14 +299,12 @@ aside .module [class^=module] {
     margin-top: -310px;
 }
 [role="main"] .container .row .col3 h2{
-    font-size: 2.5em;
     border-bottom: 2px solid #f65940;
     padding-bottom: 10px;
     margin-bottom: 30px;
 }
 [role="main"] .container .row .col3 p {
     padding: 10px 0;
-    font-size: 1.5em;
 }
 .col-circle {
     position: relative;
@@ -350,7 +325,6 @@ aside .module [class^=module] {
 .search-form .search-input.search-giant .form-control {
     border-radius: 60px;
     line-height: 2;
-    font-size: 1.7em;
     font-style: italic;
     border: 4px solid #f65940;
     padding-left: 30px;
@@ -464,8 +438,6 @@ aside .module [class^=module] {
     }
     .masthead .navigation .nav-pills li {
         height: auto;
-        font-size: 18px;
-        font-weight: bold;
         padding-top: 5px;
         padding-bottom: 5px;
     }
@@ -480,7 +452,6 @@ aside .module [class^=module] {
         background-color: #f65940;
         color: #ffffff;
         padding-top: 5px;
-        font-size: 18px;
         border-bottom: none;
     }
     .masthead .navigation .nav-pills li:last-child a:hover {
@@ -523,12 +494,8 @@ aside .module [class^=module] {
         width: 120%;
         margin-left: -80px;
     }
-    .search-meta .stats {
-        font-size:50px;
-    }
     .search-meta .stats-text {
         margin-top: 0;
-        font-size: 16px;
     }
     .col-circle i.fa {
         font-size: 100px;
@@ -556,9 +523,6 @@ aside .module [class^=module] {
     .footer-disclaimer {
         display: none;
     }
-    .footer-intro {
-        font-size: 1.5em;
-    }
     .social-links .fa {
         font-size: 1.5em;
         width: 33px;
diff --git a/ckanext/justicehub_theme/public/organization.css b/ckanext/justicehub_theme/public/organization.css
index 6c2937e..0708945 100644
--- a/ckanext/justicehub_theme/public/organization.css
+++ b/ckanext/justicehub_theme/public/organization.css
@@ -12,7 +12,6 @@
     border-bottom: none;
 }
 .dataset-org, .downloads, .dataset-heading, .dataset-meta {
-    font-size: 18px;
     font-weight: bold;
 }
 .dataset-org > a{
@@ -43,7 +42,6 @@
     border-radius: 30px;
     padding: 5px 50px;
     color: #ffffff;
-    font-size: 24px;
     margin-top: 10px;
     border: 0;
 }
@@ -63,7 +61,6 @@
 }
 .header-tabs .nav-tabs li a {
     border-radius: 0;
-    font-size: 30px;
 }
 
 /* ----------- stages ----------- */
@@ -99,10 +96,6 @@ aside .module-content {
 .stages li .highlight {
     font-weight: bold;
 }
-.metadata-heading,
-.stages li .highlight {
-    font-size: 19px;
-}
 .page-header .nav,
 .page-header .nav li a:hover,
 .stages {
@@ -167,13 +160,11 @@ aside .module-content {
     border: 0;
     border-bottom: 2px solid #f65940;
     padding: 25px;
-    font-size: 25px;
     font-weight: bold;
 }
 
 .members-table > tbody > tr > td{
     padding: 35px;
-    font-size: 20px;
     color: black;
     font-weight: bold;
 }
@@ -194,7 +185,6 @@ aside .module-content {
     color: #ffffff;
     border-radius: 30px;
     padding: 5px 25px;
-    font-size: 20px;
 }
 
 .member_action .delete {
@@ -202,7 +192,6 @@ aside .module-content {
     color: #ffffff;
     border-radius: 25px;
     padding: 5px 10px;
-    font-size: 20px;
     margin-left: 5px;
 }
 
@@ -211,5 +200,4 @@ aside .module-content {
     color: #ffffff;
     border-radius: 30px;
     padding: 5px 25px;
-    font-size: 20px;
-}
\ No newline at end of file
+}
diff --git a/ckanext/justicehub_theme/public/package.css b/ckanext/justicehub_theme/public/package.css
index 5ff1241..2f16b01 100644
--- a/ckanext/justicehub_theme/public/package.css
+++ b/ckanext/justicehub_theme/public/package.css
@@ -7,7 +7,6 @@
     padding: 5px 20px;
     border-radius: 25px;
     font-weight: bold;
-    font-size: 18px;
 }
 .dataset-heading {
     margin-bottom: 0;
@@ -16,15 +15,9 @@
 .dataset-item {
     border-bottom: none;
 }
-.dataset-desc {
-    font-size: 20px;
-}
 .downloads, .dataset-meta {
     font-style: italic;
 }
-.dataset-org, .downloads, .dataset-heading, .dataset-meta {
-    font-size: 25px;
-}
 .dataset-org > a{
     color: #f65940;
 }
@@ -78,10 +71,6 @@
 .stages li .highlight {
     font-weight: bold;
 }
-.metadata-heading,
-.stages li .highlight {
-    font-size: 19px;
-}
 .page-header .nav,
 .page-header .nav li a:hover,
 .stages {
diff --git a/ckanext/justicehub_theme/public/partner.css b/ckanext/justicehub_theme/public/partner.css
index a7e9adf..0d42c95 100644
--- a/ckanext/justicehub_theme/public/partner.css
+++ b/ckanext/justicehub_theme/public/partner.css
@@ -25,20 +25,12 @@
     height:150px;
 }
 
-.partner-dataset-table > tbody > tr > td  a{
-    font-size:25px;
-}
-
 .partner-dataset-table > thead > tr > th{
     border-bottom:None;
     height:150px;
     vertical-align:middle;
 }
 
-.dataset-notes{
-    font-size:18px;
-}
-
 .context .content_action a {
     padding-right:25px;
     padding-left:25px;
diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index c2ccc7c..971a701 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -3,7 +3,6 @@
     border-radius: 30px;
     padding: 5px 30px;
     color: #ffffff;
-    font-size: 15px;
     margin-top: 10px;
     border: none;
 }
@@ -14,22 +13,16 @@
   color: #f65940;
 }
 
-.resource-desc{
-   font-size:20px;
-}
-
 .res-line-margin-bottom{
    margin-bottom:20px;
 }
 
 .res-title{
-   font-size:20px;
    color:#f65940;
    font-weight:bolder;
 }
 
 .res-url-src{
-   font-size:17px;
    color : #403644;
 }
 
@@ -93,7 +86,6 @@
 .module .rsrc-list-side .rsrc-item-side a{
    margin-top:5px;
    margin-left:0px;
-   font-size:18px;
    font-weight:bolder;
    padding-left:0px;
 }
@@ -101,7 +93,6 @@
 
 .rsrc-item-desc-side{
    color: #f65940;
-   font-size:15px;
    border-bottom: 1px dotted #dddddd;
    padding-left:15px;
 }
@@ -121,13 +112,11 @@
 
 
 .content_action .rsrc-edit-actn-btn{
-   font-size:15px;
    padding: 5px 20px;
 }
 
 
 .module-narrow h2.social-heading {
-    font-size: 20px;
     background-color: #ffffff;
     color: #f65940;
     height: 70px;
diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index 8d953cc..f4c41f8 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -6,7 +6,6 @@
     text-align: center;
 }
 .dataset-count-box span {
-    font-size: 25px;
     font-weight: bold;
 }
 .dataset-count {
@@ -15,7 +14,6 @@
 .filters .module-heading {
     color: #ffffff;
     font-weight: bold;
-    font-size: 30px;
     background-color: #403644;
     border-color: #f65940;
     margin-bottom: 0 !important;
@@ -33,7 +31,6 @@
 }
 .nav-facet .nav-item > a {
     color: #ffffff;
-    font-size: 20px;
 }
 .nav-facet .nav-item > a:hover {
     color: #403644;

From 5818dee2b49c795d66877ec0acd0d8f06ea0bfb9 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sat, 30 May 2020 20:11:22 +0530
Subject: [PATCH 011/127] create standard font blocks

- include font's multiple weights from google fonts
---
 .../justicehub_theme/public/dataset_info.css  |  6 --
 .../public/justicehub_theme.css               | 56 +++++++++++++++++--
 ckanext/justicehub_theme/templates/base.html  |  2 +-
 3 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset_info.css b/ckanext/justicehub_theme/public/dataset_info.css
index 4c30a2e..9320980 100644
--- a/ckanext/justicehub_theme/public/dataset_info.css
+++ b/ckanext/justicehub_theme/public/dataset_info.css
@@ -57,12 +57,6 @@
     margin-top: 50px;
     margin-bottom: 20px;
 }
-.stats {
-    color:#f65940;
-    font-size:50px;
-    font-weight:bolder;
-    display: block;
-}
 .stats-text {
     color:#403644;
     font-weight:bold;
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index eb0da71..2f2eb5a 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -1,3 +1,49 @@
+.footer-links .nav-item a {
+    font-size: 14px;
+}
+.footer-links .input-group-btn .btn {
+    font-size: 16px;
+}
+.nav-pills li {
+    font-size: 18px;
+}
+body,
+.stats-box,
+.search-form .search-input.search-giant input,
+.nav-pills li:last-child {
+    font-size: 20px;
+}
+.col2 p,
+.footer-intro {
+    font-size: 25px;
+}
+.col3 h2 {
+    font-size: 30px;
+}
+.footer-links .nav-item a {
+    font-weight: 400;
+}
+.nav-pills li,
+.footer-disclaimer div:last-child {
+    font-weight: 600;
+}
+.footer-links .input-group-btn .btn {
+    font-weight: 700;
+}
+.stats-box,
+.col3 h2,
+.footer-intro,
+.nav-pills li:last-child {
+    font-weight: 800;
+}
+.search-form .search-input.search-giant input {
+    font-weight: 300;
+}
+.col2 p,
+.footer-disclaimer div:last-child,
+.search-form .search-input.search-giant input {
+    font-style: italic;
+}
 .account-masthead {
     background-color: rgb(40, 40, 40);
     display: none;
@@ -101,7 +147,8 @@
 }
 
 [role="main"], body {
-  font-family: 'Montserrat';
+  font-family: 'Montserrat', sans-serif;
+  font-weight: 500;
   background: none;
   background-color: #ffffff;
 }
@@ -363,10 +410,9 @@ aside .module [class^=module] {
 .search-meta {
     width: 85%;
 }
-.search-meta .stats {
-    color:#f65940;
-    font-size: 5em;
-    font-weight:bolder;
+.stats {
+    color: #f65940;
+    font-size: 60px;
     display: block;
     text-align: center;
 }
diff --git a/ckanext/justicehub_theme/templates/base.html b/ckanext/justicehub_theme/templates/base.html
index 5624c7e..5e5d4dc 100644
--- a/ckanext/justicehub_theme/templates/base.html
+++ b/ckanext/justicehub_theme/templates/base.html
@@ -11,7 +11,7 @@
   <link rel="stylesheet" href="/partner.css"/>
   <link rel="stylesheet" href="/issues.css"/>
   <link rel="stylesheet" href="/resource.css"/>
-  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat" />
+  <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Montserrat:100,200,300,400,500,600,700,800,900&display=swap" />
 {% endblock %}
 
 {%- block scripts %}

From 1418f1c98794dc23ba514612b30b4d83b1e950ad Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sat, 30 May 2020 20:12:34 +0530
Subject: [PATCH 012/127] update footer for new fonts and layout of subscribe
 button

---
 .../public/justicehub_theme.css               |  50 ++++---
 .../justicehub_theme/templates/footer.html    | 125 +++++++++---------
 2 files changed, 100 insertions(+), 75 deletions(-)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 2f2eb5a..df483b3 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -155,6 +155,7 @@ body,
 .site-footer {
   background: none;
   background-color: #403644;
+  padding: 0;
 }
 /* The text in the footer. */
 .site-footer,
@@ -174,8 +175,8 @@ body,
 .footer-links {
     padding: 20px 10px;
 }
-.footer-links .col-md-1 {
-    padding: 20px 0;
+.footer-links [class*="col-md"] {
+    margin-top: 20px;
 }
 
 
@@ -185,9 +186,9 @@ body,
 }
 .social-links .fa {
   padding: 12px 5px;
-  font-size: 45px;
-  width: 75px;
-  height: 75px;
+  font-size: 35px;
+  width: 50px;
+  height: 50px;
   text-decoration: none;
   border-radius: 50%;
   background-color: #f65940;
@@ -196,6 +197,9 @@ body,
   justify-content: center;
   align-items: center;
 }
+.fa.fa-envelope {
+  font-size: 30px;
+}
 
 .social-links li {
     margin-right: 18px;
@@ -233,13 +237,13 @@ body,
 .footer-links input {
     font-style: italic;
     color: #b9b4b4;
-    padding: 23px 15px;
+    padding: 22px 15px;
 }
 .footer-links .input-group-btn .btn {
     margin-left: -20px;
-    background-color: #f65940;
-    font-size: 20px;
-    border-color: #f65940;
+    background-color: #403644;
+    color: #ffffff;
+    border-color: #403644;
     text-align: center;
 }
 
@@ -380,6 +384,7 @@ aside .module [class^=module] {
 .homepage .module-search .form-group {
     padding: 10px 0;
 }
+.footer-intro-invert,
 .homepage .module-search .module-content,
 .homepage .search-form .search-giant,
 .homepage .module-search .stats-box {
@@ -422,11 +427,16 @@ aside .module [class^=module] {
 .stats-text {
     margin-top: -20px;
     color:#403644;
-    font-size:20px;
-    font-weight: bolder;
+    font-weight: 700;
     display: block;
     text-align: center;
 }
+.subscribe-box {
+    background-color: #f65940;
+    min-height: 300px;
+    padding-right: 60px;
+    padding-left: 30px;
+}
 .label[data-format="doc"],
 .label[data-format*="doc"] {
     background-color: #115abe;
@@ -566,13 +576,14 @@ aside .module [class^=module] {
     .search-meta .stats-box {
         margin-top: 50px;
     }
+    .footer-intro-invert,
     .footer-disclaimer {
         display: none;
     }
     .social-links .fa {
-        font-size: 1.5em;
-        width: 33px;
-        height: 33px;
+        width: 37px;
+        height: 37px;
+        font-size: 22px;
     }
     .footer-links .col {
         padding: 0;
@@ -585,9 +596,16 @@ aside .module [class^=module] {
     }
     .footer-links input {
         padding: 18px 10px;
-        font-size: 1em !important;
     }
     .footer-links .input-group-btn .btn {
-        font-size: 12px;
+        font-size: 14px;
+        padding: 9px 10px;
+        width: 100px;
+        background-color: #f65940;
+        border-color: #f65940;
+    }
+    .subscribe-box {
+        background: transparent;
+        min-height: 100%;
     }
 }
diff --git a/ckanext/justicehub_theme/templates/footer.html b/ckanext/justicehub_theme/templates/footer.html
index b295e4a..140817e 100644
--- a/ckanext/justicehub_theme/templates/footer.html
+++ b/ckanext/justicehub_theme/templates/footer.html
@@ -1,33 +1,32 @@
 <footer class="site-footer">
     {% resource "justicehub_theme/subscribe.js"%}
     <div class="container">
-        
-        {% block footer_content %}
-        <div class="row footer-links">
-            <div class="col col-md-3">
+    {% block footer_content %}
+    <div class="row">
+
+        <div class="col col-md-6 footer-links">
+            <div class="col col-md-12 col-xs-12">
                 <div class="footer-intro">{{ _('GET IN TOUCH') }}</div>
             </div>
-        </div>
 
-        <div class="row footer-links">
-            <div class="col col-md-6 col-xs-5 social-links">
+            <div class="col col-md-12 col-xs-5 social-links">
                 <ul class="list-unstyled list-inline">
                     <li>
                         <a href="mailto:info@justicehub.in" aria-hidden="true" alt="Justice Hub's Email Address" role="link" title="Email Address" aria-label="Justice Hub's Email Address" target="_blank">
-                        <i class="fa fa-envelope fa-lg"></i>
+                        <i class="fa fa-envelope"></i>
                         </a>
-                    </li>
-                    <li>
+                    </li><!--
+                    --><li>
                         <a href="https://twitter.com/JusticeHubIndia" aria-hidden="true" alt="Justice Hub India's Official Twitter Handle" role="link" title="Official Twitter Handle" aria-label="Justice Hub India's Official Twitter Handle" target="_blank">
                             <i class="fa fa-twitter fa-lg"></i>
                         </a>
-                    </li>
-                    <li>
+                    </li><!--
+                    --><li>
                         <a href="https://www.facebook.com/JusticeHubIndia" aria-hidden="true" role="link" alt="Justice Hub India's Official Facebook Page" title="Official Facebook Page" aria-label="Justice Hub India's Official Facebook Page" target="_blank">
                             <i class="fa fa-facebook fa-lg"></i>
                         </a>
-                    </li>
-                    <li>
+                    </li><!--
+                    --><li>
                         <a href="https://github.com/justicehub-in" alt="Justice Hub India's Official Github handle" aria-label="Justice Hub India's Official Github handle" title="Official Github Handle" aria-hidden="true" role="link" target="_blank">
                             <i class="fa fa-github fa-lg"></i>
                         </a>
@@ -35,66 +34,74 @@
                 </ul>
             </div>
 
-            <div class="col col-md-1 social-links hidden-xs">
+            <div class="col col-md-10 footer-disclaimer">
+                <div>
+                    This is an Alpha release, we will be working to add more datasets in the coming days to the Justice Hub.
+                </div>
+                <div>
+                    So please stay tuned.
+                </div>
+            </div>
+        </div>
+
+        <div class="col col-md-6 subscribe-box footer-links">
+
+            <div class="col col-md-12">
+                <div class="footer-intro footer-intro-invert">{{ _('SUBSCRIBE') }}</div>
             </div>
 
-            <div class="col col-md-5 col-xs-7 social-links" data-module="justicehub_theme_subscribe">
+            <div class="col col-md-12 col-xs-7" data-module="justicehub_theme_subscribe">
                 <form id="subscribe-form" method="post" action="{{h.url_for('jhsubscribe')}}">
                 <div class="input-group">
                     <input type="email" class="form-control" placeholder="Enter you email id" name="email">
                     <span class="input-group-btn">
-                        <button class="btn btn-default btn-lg" type="submit">Subscribe</button>
+                        <button class="btn btn-default btn-lg" type="submit">{{ _('Subscribe') }}</button>
                     </span>
                 </div>
                 </form>
             </div>
-        </div>
 
-        <div class="row footer-links">
-            <div class="col col-md-4 footer-disclaimer">
-                <div>
-                    This is an Alpha release, we will be working to add more datasets in the coming days to the Justice Hub.
-                </div>
-                <div>
-                    So please stay tuned.
-                </div>
+            <div class="col col-md-12">
+                <p class="footer-intro-invert">Be part of our mailing list, to keep up with the latest happenings and events of the Hub.</p>
             </div>
-        </div>
 
-        <div class="row footer-links">
-            <div class="col col-md-8 pull-left">
-                <ul class="list-unstyled list-inline">
-                    {% block footer_links %}
-                    <li class="nav-item">
-                        <a href="{{ h.url_for(controller='home', action='about') }}">{{ _('About {0}').format(g.site_title) }}</a></li>
-                    </li>
-                    {% endblock %}
-                    <i class="fa fa-circle fa-sm"></i>
-                    {% block footer_links_legal %}
-                    <li class="nav-item">
-                        <a href="https://justicehub.in/terms">{{ _('Terms & Conditions') }}</a>
-                    </li>
-                    <i class="fa fa-circle fa-sm"></i>
-                    <li class="nav-item">
-                        <a href="https://github.com/justicehub-in/Justice-Hub/blob/master/CODE_OF_CONDUCT.md">{{ _('Code of Conduct') }}</a>
-                    </li>
-                    {% endblock %}
-                    <i class="fa fa-circle fa-sm"></i>
-                    {% block footer_links_ckan %}
-                    {% set api_url = 'http://docs.ckan.org/en/{0}/api/'.format(g.ckan_doc_version) %}
-                    <li class="nav-item">
-                        <a href="{{ api_url }}">{{ _('CKAN API') }}</a>
-                    </li>
-                    <i class="fa fa-circle fa-sm"></i>
-                    <li class="nav-item">
-                        <a href="http://www.opendefinition.org/okd/"><img src="{{ h.url_for_static('/base/images/od_80x15_blue.png') }}" alt="Open Data"></a>
-                    </li>
-                    {% endblock %}
-                </ul>
-            </div>
         </div>
-        {% endblock %}
+    </div>
 
+
+    <div class="row footer-links">
+        <div class="col col-md-12 col-xs-12 pull-left">
+            <ul class="list-unstyled list-inline">
+                {% block footer_links %}
+                <li class="nav-item">
+                    <a href="{{ h.url_for(controller='home', action='about') }}">{{ _('About {0}').format(g.site_title) }}</a></li>
+                </li>
+                {% endblock %}
+                <i class="fa fa-circle fa-sm"></i>
+                {% block footer_links_legal %}
+                <li class="nav-item">
+                    <a href="https://justicehub.in/terms">{{ _('Terms & Conditions') }}</a>
+                </li>
+                <i class="fa fa-circle fa-sm"></i>
+                <li class="nav-item">
+                    <a href="https://github.com/justicehub-in/Justice-Hub/blob/master/CODE_OF_CONDUCT.md">{{ _('Code of Conduct') }}</a>
+                </li>
+                {% endblock %}
+                <i class="fa fa-circle fa-sm"></i>
+                {% block footer_links_ckan %}
+                {% set api_url = 'http://docs.ckan.org/en/{0}/api/'.format(g.ckan_doc_version) %}
+                <li class="nav-item">
+                    <a href="{{ api_url }}">{{ _('CKAN API') }}</a>
+                </li>
+                <i class="fa fa-circle fa-sm"></i>
+                <li class="nav-item">
+                    <a href="http://www.opendefinition.org/okd/"><img src="{{ h.url_for_static('/base/images/od_80x15_blue.png') }}" alt="Open Data"></a>
+                </li>
+                {% endblock %}
+            </ul>
+        </div>
+    </div>
+    {% endblock %}
     </div>
 
     {% block footer_debug %}

From 782359cb4f056ba62d81cbb182e4c433c3be3244 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sun, 31 May 2020 18:17:26 +0530
Subject: [PATCH 013/127] update sitewide fonts

---
 .../justicehub_theme/public/dataset_info.css  |  1 -
 .../public/justicehub_theme.css               | 45 ++++++++++++++-----
 ckanext/justicehub_theme/public/package.css   |  5 ---
 ckanext/justicehub_theme/public/search.css    |  1 -
 .../templates/package/read_base.html          |  4 +-
 .../templates/snippets/facet_list.html        |  2 +-
 6 files changed, 37 insertions(+), 21 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset_info.css b/ckanext/justicehub_theme/public/dataset_info.css
index 9320980..390e90e 100644
--- a/ckanext/justicehub_theme/public/dataset_info.css
+++ b/ckanext/justicehub_theme/public/dataset_info.css
@@ -98,7 +98,6 @@
 .package-desc {
     width:75%;
     margin-bottom:50px;
-    font-weight:bold;
 }
 /* Ref: https://stackoverflow.com/a/36311846/3860168 */
 .image-box {
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index df483b3..9d8ede5 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -1,46 +1,70 @@
+/* ---------------------- Site Fonts ------------------- */
+.count,
 .footer-links .nav-item a {
     font-size: 14px;
 }
+.package-item-row,
 .footer-links .input-group-btn .btn {
     font-size: 16px;
 }
+.resource-item .heading,
+.resource-item .description,
+.nav-facet .nav-item a,
+.filters .module-content.empty,
+.dataset-desc,
+.downloads, .dataset-meta,
 .nav-pills li {
     font-size: 18px;
 }
 body,
 .stats-box,
+.dataset-heading,
+.dataset-org,
 .search-form .search-input.search-giant input,
 .nav-pills li:last-child {
     font-size: 20px;
 }
+h1,
 .col2 p,
+.nav-tabs > li >  a,
+.module-heading,
 .footer-intro {
     font-size: 25px;
 }
 .col3 h2 {
     font-size: 30px;
 }
-.footer-links .nav-item a {
-    font-weight: 400;
+.footer-links .nav-item a,
+.search-form .search-input.search-giant input {
+    font-weight: 300; /* Light */
 }
+.count,
+.resource-item .description,
+.dataset-org,
+.dataset-meta,
 .nav-pills li,
 .footer-disclaimer div:last-child {
-    font-weight: 600;
+    font-weight: 500; /* Medium */
 }
+.media-item .media-heading {
+    font-weight: 600; /* Semi Bold */
+}
+.col3 h2,
+.nav-tabs > li >  a,
+.dataset-heading,
+.module-heading,
 .footer-links .input-group-btn .btn {
-    font-weight: 700;
+    font-weight: 700; /* Bold */
 }
 .stats-box,
-.col3 h2,
 .footer-intro,
 .nav-pills li:last-child {
-    font-weight: 800;
-}
-.search-form .search-input.search-giant input {
-    font-weight: 300;
+    font-weight: 800; /* Extra Bold */
 }
 .col2 p,
+.downloads,
 .footer-disclaimer div:last-child,
+.filters .module-content.empty,
 .search-form .search-input.search-giant input {
     font-style: italic;
 }
@@ -148,7 +172,7 @@ body,
 
 [role="main"], body {
   font-family: 'Montserrat', sans-serif;
-  font-weight: 500;
+  font-weight: 400; /* Regular */
   background: none;
   background-color: #ffffff;
 }
@@ -269,7 +293,6 @@ body,
 }
 .module-heading {
     color: #ffffff;
-    font-weight: bold;
     background-color: #403644;
     border-color: #f87c69;
     margin-bottom: 0 !important;
diff --git a/ckanext/justicehub_theme/public/package.css b/ckanext/justicehub_theme/public/package.css
index 2f16b01..40d6bec 100644
--- a/ckanext/justicehub_theme/public/package.css
+++ b/ckanext/justicehub_theme/public/package.css
@@ -6,7 +6,6 @@
 .label {
     padding: 5px 20px;
     border-radius: 25px;
-    font-weight: bold;
 }
 .dataset-heading {
     margin-bottom: 0;
@@ -15,9 +14,6 @@
 .dataset-item {
     border-bottom: none;
 }
-.downloads, .dataset-meta {
-    font-style: italic;
-}
 .dataset-org > a{
     color: #f65940;
 }
@@ -66,7 +62,6 @@
     color: #ffffff;
 }
 
-.module-heading,
 .metadata-heading,
 .stages li .highlight {
     font-weight: bold;
diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index f4c41f8..ad3caf1 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -13,7 +13,6 @@
 }
 .filters .module-heading {
     color: #ffffff;
-    font-weight: bold;
     background-color: #403644;
     border-color: #f65940;
     margin-bottom: 0 !important;
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index 8f231b7..c632cdc 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -158,9 +158,9 @@ <h2>ACTIVITY</h2>
 <div class="row package-tabs">
     <ul class="nav nav-tabs">
         {% block content_primary_nav %}
-        {{ h.build_nav_icon('dataset_read', _('Files'), id=pkg.name) }}
+        {{ h.build_nav_icon('dataset_read', _('FILES'), id=pkg.name) }}
         {% if h.issues_enabled(pkg) %}
-        {{ h.build_nav_icon('issues_dataset', _('Issues'), dataset_id=pkg.name) }}
+        {{ h.build_nav_icon('issues_dataset', _('ISSUES'), dataset_id=pkg.name) }}
         {% endif %}
         {% endblock %}
     </ul>
diff --git a/ckanext/justicehub_theme/templates/snippets/facet_list.html b/ckanext/justicehub_theme/templates/snippets/facet_list.html
index b499494..9712e85 100644
--- a/ckanext/justicehub_theme/templates/snippets/facet_list.html
+++ b/ckanext/justicehub_theme/templates/snippets/facet_list.html
@@ -3,6 +3,6 @@
 {% block facet_list_heading %}
 <h1 class="module-heading">
   {% set title = title or h.get_facet_title(name) %}
-  {{ title }}
+  {{ title | upper }}
 </h1>
 {% endblock %}

From 83477b0a26e29ede0fd68a715d9002e7ee2db801 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sun, 31 May 2020 18:19:26 +0530
Subject: [PATCH 014/127] fix partner logo positioning and size on various
 places

---
 .../justicehub_theme/public/dataset_info.css    | 10 ----------
 .../public/justicehub_theme.css                 | 13 +++++++++++++
 .../justicehub_theme/public/organization.css    |  2 +-
 ckanext/justicehub_theme/public/partner.css     | 17 ++++++++---------
 .../templates/organization/read_base.html       |  4 ++--
 .../snippets/organization_item.html             |  6 ++++++
 6 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset_info.css b/ckanext/justicehub_theme/public/dataset_info.css
index 390e90e..7a6c4a1 100644
--- a/ckanext/justicehub_theme/public/dataset_info.css
+++ b/ckanext/justicehub_theme/public/dataset_info.css
@@ -100,21 +100,11 @@
     margin-bottom:50px;
 }
 /* Ref: https://stackoverflow.com/a/36311846/3860168 */
-.image-box {
-    display:flex;
-    justify-content:center;
-    align-items: center;
-}
 .org-box {
     width: 350px;
     height: 350px;
     margin-top: -30px;
 }
-.image-box img.media-image {
-    margin:auto;
-    width: 100%;
-    height: 100%;
-}
 .pkg_tags {
     border-radius:30px;
     padding: 5px 20px;
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 9d8ede5..967bf90 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -68,6 +68,19 @@ h1,
 .search-form .search-input.search-giant input {
     font-style: italic;
 }
+
+/* ----------------------- images --------------------------- */
+/* Ref: https://stackoverflow.com/a/36311846/3860168 */
+.image-box {
+    display:flex;
+    justify-content:center;
+    align-items: center;
+}
+.image-box img.media-image {
+    margin:auto;
+}
+
+
 .account-masthead {
     background-color: rgb(40, 40, 40);
     display: none;
diff --git a/ckanext/justicehub_theme/public/organization.css b/ckanext/justicehub_theme/public/organization.css
index 0708945..0e65966 100644
--- a/ckanext/justicehub_theme/public/organization.css
+++ b/ckanext/justicehub_theme/public/organization.css
@@ -34,7 +34,7 @@
 .org-row .private-icon i {
     color: #403644;
 }
-.partner-logo a {
+.partner-logo {
     height: 200px;
 }
 .follow_button a {
diff --git a/ckanext/justicehub_theme/public/partner.css b/ckanext/justicehub_theme/public/partner.css
index 0d42c95..6370f1a 100644
--- a/ckanext/justicehub_theme/public/partner.css
+++ b/ckanext/justicehub_theme/public/partner.css
@@ -1,20 +1,19 @@
 .media-item {
     color:#f65940;
-    margin:20px;
-    height:200px;
+    width:200px;
+}
+.count,
+.media-item .media-heading {
+    line-height: 1;
+    margin-bottom: 0;
 }
 .count {
     color:#f65940;
 }
-.media-item .media-image {
-    height: 130px;
-    width: 150px;
-}
-.media-item {
-    height: 210px;
+.media-logo {
+    height: 150px;
 }
 
-
 /*----------------- partner editing data set page css ----------------------*/
 .partner-datset-content{
     margin-left:15px;
diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index 25b94a5..365c23e 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -11,8 +11,8 @@
 <div class="row top-section">
     
     {% block image %}
-        <div class="image dataset-org col-sm-3 col-md-3 col-xs-12 image-box partner-logo">
-        <a href="{{ url }}">
+        <div class="image dataset-org col-sm-3 col-md-3 col-xs-12">
+        <a href="{{ url }}" class="image-box partner-logo">
             <img src="{{ c.group_dict.image_display_url or h.url_for_static('/base/images/placeholder-organization.png') }}" class="media-image" alt="{{ c.group_dict.name }}" />
         </a>
         </div>
diff --git a/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html b/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html
index c9bd6fb..c52f2b3 100644
--- a/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html
+++ b/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html
@@ -1,5 +1,11 @@
 {% ckan_extends %}
 
+{% block image %}
+<div class="image-box media-logo">
+    <img src="{{ organization.image_display_url or h.url_for_static('/base/images/placeholder-organization.png') }}" alt="{{ organization.name }}" class="img-responsive media-image">
+</div>
+{% endblock %}
+
 {% block title %}
     <h3 class="media-heading">
         {{ organization.display_name }}

From c406bfba26539f061bc3033c731e3bbdb3250129 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sun, 31 May 2020 18:21:18 +0530
Subject: [PATCH 015/127] fix naviagtion tab hover

---
 ckanext/justicehub_theme/public/dataset_info.css | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset_info.css b/ckanext/justicehub_theme/public/dataset_info.css
index 7a6c4a1..fd48d84 100644
--- a/ckanext/justicehub_theme/public/dataset_info.css
+++ b/ckanext/justicehub_theme/public/dataset_info.css
@@ -1,8 +1,6 @@
 .activity .item::after{
   margin-bottom:40px;
 }
-
-
 .activity .item {
     font-weight: normal;
     font-style: italic;
@@ -148,6 +146,11 @@
 .package-tabs {
     margin-left: 0;
 }
+.package-tabs .nav-tabs::before,
+.package-tabs .nav-tabs::after {
+    margin-bottom: 2px;
+    border: none;
+}
 .package-tabs .nav-tabs {
     width: 100%;
     margin-top: -60px;
@@ -200,22 +203,20 @@
 	border-bottom:1px solid #403644;
 }
 
+.nav-tabs > li {
+    margin-bottom: -2px;
+}
 .nav-tabs > li >  a {
     color: #403644;
     border: None;
-    font-weight: bolder;
 }
-
 .nav-tabs > li >  a > i {
     display:None;
 }
-
 .nav-tabs > li.active >  a {
 	background: #403644;
     color:#ffffff;
-    border: None;
 }
-
 .page_primary_action .btn-flat {
 	border-radius:0px;
     margin-right :40px;

From b7c58cd73dc86c26dd062a22ce1dbe1cbcd37c59 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sun, 31 May 2020 18:22:00 +0530
Subject: [PATCH 016/127] remove repetitive css blocks

---
 .../justicehub_theme/public/organization.css  | 104 ------------------
 1 file changed, 104 deletions(-)

diff --git a/ckanext/justicehub_theme/public/organization.css b/ckanext/justicehub_theme/public/organization.css
index 0e65966..61df7f9 100644
--- a/ckanext/justicehub_theme/public/organization.css
+++ b/ckanext/justicehub_theme/public/organization.css
@@ -1,28 +1,5 @@
 /* ---------- package-item ------- */
 
-.label {
-    padding: 6px 21px;
-    border-radius: 15px;
-    font-weight: bold;
-}
-.dataset-heading {
-    margin-bottom: 0;
-}
-.dataset-item {
-    border-bottom: none;
-}
-.dataset-org, .downloads, .dataset-heading, .dataset-meta {
-    font-weight: bold;
-}
-.dataset-org > a{
-    color: #f65940;
-}
-.downloads, .dataset-meta {
-    color: #bcb4bf;
-}
-.heading {
-    padding-bottom: 20px;
-}
 .org-row {
     padding-left:50px;
 }
@@ -63,91 +40,10 @@
     border-radius: 0;
 }
 
-/* ----------- stages ----------- */
-
-/* ------------ background borders fonts ------ */
-.page-header .content_action {
-    color: #403644;
-}
-.page-header,
-.page-header .nav {
-    background: transparent;
-    border: none;
-}
-.page-header .nav-tabs li.active a,
-.page-header .nav-tabs li.active a:hover,
-.stages li,
-.stages li.active .highlight,
-.metadata-heading,
-aside .module-content {
-    background-color: #403644;
-}
-.page-header .nav-tabs li.active a:hover,
-.stages,
-.stages li.active .highlight,
-.module-heading,
-.metadata-heading,
-aside .module-content {
-    color: #ffffff;
-}
-
-.module-heading,
-.metadata-heading,
-.stages li .highlight {
-    font-weight: bold;
-}
-.page-header .nav,
-.page-header .nav li a:hover,
-.stages {
-    border: none;
-    border-bottom: 1px solid #403644;
-}
-.nav-tabs,
-.stages {
-    margin: 50px -65px 0 0;
-}
-.stages li {
-    padding: 0;
-}
-.page-header .nav-tabs li a,
-.stages li .highlight {
-    position: static;
-    text-align: center;
-}
-.stages li.complete .highlight,
-.stages li.uncomplete .highlight {
-    background-color: #ffffff;
-    color: #403644;
-}
-.stages li:before {
-    content: none;
-}
-.stages li:after {
-    top: 0;
-    border:none;
-    margin: 0;
-}
-
-/* --------------- layout sizing ------------- */
-.metadata-heading {
-    padding: 10px 0;
-    margin-left: -30px;
-    width: 55%;
-    display: inline-block;
-    text-align: center;
-}
-
-@media (max-device-width: 600px) and (orientation: portrait) {
-    .metadata-heading {
-        margin-left: 0;
-    }
-}
-
 .wrapper::before {
     top: auto;
 }
 
-
 /* members table */
 
 .members-table {

From fffed9ecd389e0e6cc880addbfe75c5449517c5b Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sun, 31 May 2020 18:23:14 +0530
Subject: [PATCH 017/127] update package item snippet on search pages

- add icon for verified dataset
- remove udpate frequency
- make file format labels clickable
---
 ckanext/justicehub_theme/public/package.css     |  3 ++-
 .../templates/snippets/package_item.html        | 17 +++++++++--------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ckanext/justicehub_theme/public/package.css b/ckanext/justicehub_theme/public/package.css
index 40d6bec..6dc43af 100644
--- a/ckanext/justicehub_theme/public/package.css
+++ b/ckanext/justicehub_theme/public/package.css
@@ -4,7 +4,8 @@
     padding-top: 20px;
 }
 .label {
-    padding: 5px 20px;
+    display: inline-block;
+    padding: 5px 15px;
     border-radius: 25px;
 }
 .dataset-heading {
diff --git a/ckanext/justicehub_theme/templates/snippets/package_item.html b/ckanext/justicehub_theme/templates/snippets/package_item.html
index c2d94c4..9797890 100644
--- a/ckanext/justicehub_theme/templates/snippets/package_item.html
+++ b/ckanext/justicehub_theme/templates/snippets/package_item.html
@@ -11,12 +11,12 @@ <h3 class="dataset-heading">
               {{ h.link_to(h.truncate(title, truncate_title), h.url_for(package.type + '_read', controller='package', action='read', id=package.name)) }}
           {% endblock %}
 
-
           {% block heading_private %}
             {% if package.private %}
-            <span class="dataset-private label label-inverse private-icon">
-                <i class="fa fa-lock fa-lg" data-toggle="tooltip"></i>
-            </span>
+                <i class="fa fa-lock" data-toggle="tooltip"></i>
+            {% endif %}
+            {% if package.verified %}
+                <i class="fa fa-check" data-toggle="tooltip"></i>
             {% endif %}
           {% endblock %}
 
@@ -67,8 +67,8 @@ <h3 class="dataset-heading">
         <div class="col col-md-5">
             {% block package_meta %}
             <div class="dataset-meta">
-                <span>{{ package.update_frequency or _('Not updated') }}</span>
-                <span>{{ _('|') }}</span>
+                <!--span>{#{ package.update_frequency or _('Not updated') #}}</span>
+                <span>{#{ _('|') }#}</span-->
                 <span>{{ _('Data Timeline:') }} {% if package.start_year %}{{ package.start_year }}-{{ package.end_year }} {% else %}{{ _('Not Available')}} {% endif %}</span>
             </div>
             {% endblock %}
@@ -85,8 +85,9 @@ <h3 class="dataset-heading">
                     {% block resources_inner %}
                     {% for resource in h.dict_list_reduce(package.resources, 'format') %}
                         <li>
-                        <span class="label label-default" data-format="{{ resource.lower() }}">{{ resource }}</span>
-                        <!-- a href="{{ h.url_for(controller='package', action='read', id=package.name) }}" class="label label-default" data-format="{{ resource.lower() }}">{{ resource }}</a-->
+                        <a href="{{ h.url_for(controller='package', action='read', id=package.name) }}"
+                           class="label label-default"
+                           data-format="{{ resource.lower() }}">{{ resource | upper }}</a>
                         </li>
                     {% endfor %}
                     {% endblock %}

From 0d77a25f5b5a4aabc0a13b6687f2957b7743035f Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sun, 31 May 2020 18:24:23 +0530
Subject: [PATCH 018/127] fix resource page css

---
 ckanext/justicehub_theme/public/resource.css  | 14 +++++++++++
 .../package/snippets/resource_item.html       | 23 ++++---------------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index 971a701..d83b66d 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -1,3 +1,17 @@
+.resource-item .heading {
+    color:#403644;
+}
+.format-label {
+    margin-top:10px;
+}
+.description {
+    color:#f65940;
+    font-size:16px;
+    font-weight:bold;
+}
+.dropdown-toggle {
+    background:#403644;
+}
 .btn-action{
     background-color: #f65940;
     border-radius: 30px;
diff --git a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
index 3b918f4..7f851bb 100644
--- a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
+++ b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
@@ -1,24 +1,9 @@
-{% set url_action = 'resource_edit' if url_is_edit and can_edit else 'resource_read' %}
-{% set url = h.url_for(controller='package', action=url_action, id=pkg.name, resource_id=res.id) %}
+{% ckan_extends %}
 
-<li class="resource-item" data-id="{{ res.id }}">
-  {% block resource_item_title %}
-  <a class="heading" href="{{ url }}" title="{{ res.name or res.description }}" style ="font-size:20px; color:#403644;">
-    {{ h.resource_display_name(res) | truncate(50) }}<span class="format-label" property="dc:format" data-format="{{ res.format.lower() or 'data' }}" style="margin-top:10px;">{{ h.get_translated(res, 'format') }}</span>
-    {{ h.popular('views', res.tracking_summary.total, min=10) }}
-  </a>
-  {% endblock %}
-  {% block resource_item_description %}
-    <p class="description" style="color:#f65940; font-size:16px; font-weight:bold;">
-      {% if res.description %}
-        {{ h.markdown_extract(h.get_translated(res, 'description'), extract_length=80) }}
-      {% endif %}
-    </p>
-  {% endblock %}
-  {% block resource_item_explore %}
-  {% if not url_is_edit %}
+{% block resource_item_explore %}
+{% if not url_is_edit %}
   <div class="dropdown btn-group">
-    <a href="#" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" style="background:#403644;">
+    <a href="#" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
       {{ _('Explore') }}
       <span class="caret"></span>
     </a>

From ca3b2fae6dd188c2e7d48a64419b705ccb84ca4d Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sun, 31 May 2020 18:25:02 +0530
Subject: [PATCH 019/127] fix edit page tabs

- eariler they were all shifted on left and mixed up with sidebar
---
 ckanext/justicehub_theme/public/resource.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index d83b66d..c7a502f 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -45,7 +45,6 @@
     margin-top: 50px;
     border-top: 2px solid #f65940;
     border-bottom: 2px solid #f65940;
-    margin-left:-35px;
 }
 
 .res-top-content{

From ad85513554d0f43a8f9292ed6aada606c7dc07b7 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sun, 31 May 2020 18:26:17 +0530
Subject: [PATCH 020/127] fix minor issues in search page

- center align count of searched entities
- fix padding and hover issues on search facets
- make search icon prominent
---
 ckanext/justicehub_theme/public/search.css    | 18 ++++++++++------
 .../templates/snippets/search_form.html       | 21 ++++++++++---------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index ad3caf1..0975497 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -1,12 +1,12 @@
 .field-giant-search {
 }
 .dataset-count-box {
-    color: #202020;
-    padding: 20px 0 !important;
-    text-align: center;
+    display: flex !important;
+    justify-content: center;
+    align-items: center;
 }
 .dataset-count-box span {
-    font-weight: bold;
+    margin: auto;
 }
 .dataset-count {
     color: #f65940;
@@ -21,7 +21,8 @@
 .filters .module-content {
     height: 100%;
 }
-.nav-facet .nav-item.active > a{
+.nav-facet .nav-item.active,
+.nav-facet .nav-item.active a {
     background-color: #f65940;
     color: #ffffff;
 }
@@ -31,13 +32,18 @@
 .nav-facet .nav-item > a {
     color: #ffffff;
 }
+.nav-facet .nav-item:hover,
 .nav-facet .nav-item > a:hover {
     color: #403644;
     background-color: #ffffff;
 }
-.nav-facet .nav-item > a:hover::after {
+.nav-facet .nav-item.active > a::before {
+    border-left: none;
+}
+.nav-facet .nav-item:not(.active) > a:hover::after {
     background: none;
 }
+.filters .module-content.empty,
 .filters .nav-facet .nav-item {
     padding-left: 40px;
     border-bottom: none;
diff --git a/ckanext/justicehub_theme/templates/snippets/search_form.html b/ckanext/justicehub_theme/templates/snippets/search_form.html
index f220b10..5790f0c 100644
--- a/ckanext/justicehub_theme/templates/snippets/search_form.html
+++ b/ckanext/justicehub_theme/templates/snippets/search_form.html
@@ -3,15 +3,16 @@
 {% block search_input %}
 <div class="col col-md-3 pull-left input-group">
     <div class="form-control input-lg square-border dataset-count-box">
-        {% if count_box_title %}
-          <span>{{ count_box_title }}</span>
-        {% elif type %}
-            <span>{{ type | capitalize }}{{_('s')}}</span>
-        {% else %}
-          <span>{{_('DATA')}}</span>
-        {% endif %}
-
-        <span class="dataset-count">{{ _('[') }}{{ c.page.items | length }}{{ _(']') }}</span>
+        <span>
+            {% if count_box_title %}
+                {{ count_box_title }}
+            {% elif type %}
+                {{ type | upper }}{{_('S')}}
+            {% else %}
+              {{_('DATA')}}
+            {% endif %}
+            <span class="dataset-count">{{ _('[') }}{{ c.page.items | length }}{{ _(']') }}</span>
+        </span>
     </div>
 </div>
 
@@ -20,7 +21,7 @@
   {% block search_input_button %}
   <span class="input-group-btn">
     <button class="btn btn-default btn-lg square-border" type="submit" value="search">
-      <i class="fa fa-search fa-flip-horizontal"></i>
+      <i class="fa fa-search fa-flip-horizontal fa-lg"></i>
     </button>
   </span>
   {% endblock %}

From 34b5d55d896160fa7f26fd09d3326090b1b17d27 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sun, 31 May 2020 18:27:34 +0530
Subject: [PATCH 021/127] add partner name below partner logo on dataset detail
 page

---
 ckanext/justicehub_theme/templates/package/read_base.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index c632cdc..a769921 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -63,6 +63,13 @@ <h1>{{h.dataset_display_name(pkg)}}
         {{ c.group_dict.display_name }}
         </a>
         </div>
+        <div class="row">
+            <div class="col col-md-3">
+            </div>
+            <div class="col col-md-4 dataset-org">
+            <a href="{{ h.url_for(controller='organization', action='read', id=pkg.organization.id) }}">{{ pkg.organization.title}}</a>
+            </div>
+        </div>
         <div class="row partner-links">
             <div class="col col-md-12 social-links">
             <ul class="list-unstyled list-inline">

From 32c55e66696bd7e17c6b61f55c1054810d6a41b9 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sun, 31 May 2020 18:28:35 +0530
Subject: [PATCH 022/127] update resource base page

- fix html error
---
 .../templates/package/snippets/resource_item.html            | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
index 7f851bb..ab693da 100644
--- a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
+++ b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
@@ -45,6 +45,5 @@
       {% endblock %}
     </ul>
   </div>
-  {% endif %}
-  {% endblock %}
-</li>
+{% endif %}
+{% endblock %}

From e12ffae16a98685d7da941647af96926f5279cbc Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Sun, 31 May 2020 18:29:21 +0530
Subject: [PATCH 023/127] add tooltip for metadata items in additional info
 snippet

---
 .../templates/scheming/package/snippets/additional_info.html    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
index a530d3b..9ed7c7f 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
@@ -17,7 +17,7 @@
         and field.display_snippet is not none
         and pkg_dict[field.field_name] -%}
       <tr>
-        <th scope="row" class="dataset-label">{{
+        <th scope="row" class="dataset-label" title="{{ field.description }}">{{
           h.scheming_language_text(field.label) }}</th>
         <td class="dataset-details"{%
           if field.display_property %} property="{{ field.display_property

From 44cd982ac15f1cc10b7ad5ffdeda3fa6d1be4ee9 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 12:35:37 +0530
Subject: [PATCH 024/127] update search form error placement

---
 .../templates/snippets/search_form.html       | 21 ++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/snippets/search_form.html b/ckanext/justicehub_theme/templates/snippets/search_form.html
index 5790f0c..1b3c5a6 100644
--- a/ckanext/justicehub_theme/templates/snippets/search_form.html
+++ b/ckanext/justicehub_theme/templates/snippets/search_form.html
@@ -1,5 +1,12 @@
-{% ckan_extends %}
+{% import 'macros/form.html' as form %}
 
+{% set placeholder = placeholder if placeholder else _('Search datasets...') %}
+{% set sorting = sorting if sorting else [(_('Name Ascending'), 'name asc'), (_('Name Descending'), 'name desc')] %}
+{% set search_class = search_class if search_class else 'search-giant' %}
+{% set no_bottom_border = no_bottom_border if no_bottom_border else false %}
+{% set form_id = form_id if form_id else false %}
+
+<form {% if form_id %}id="{{ form_id }}" {% endif %}class="search-form{% if no_bottom_border %} no-bottom-border{% endif %}" method="get" data-module="select-switch">
 {% block search_input %}
 <div class="col col-md-3 pull-left input-group">
     <div class="form-control input-lg square-border dataset-count-box">
@@ -48,19 +55,19 @@
 
 
 {% block search_title %}
+    {% if not error and count == 0 %}
+      <h2>{% snippet 'snippets/search_result_text.html', query=query, count=count, type=type %}</h2>
+      <p class="extra">Please try another search.</p>
+    {% endif %}
 {% endblock %}
 
+
 {% block search_facets %}
 {% endblock %}
 
-{% if show_empty and count == 0 and not error %}
-  {% trans %}
-    <p class="extra">Please try another search.</p>
-  {% endtrans %}
-{% endif %}
-
 {% if error %}
   {% trans %}
     <p id="search-error"><strong>There was an error while searching.</strong> Please try again.</p>
   {% endtrans %}
 {% endif %}
+</form>

From fb1ec49ffa02033e767b07383dfac84a9d2ce889 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 12:48:12 +0530
Subject: [PATCH 025/127] remove resource views from resource edit page

---
 .../justicehub_theme/templates/package/resource_edit_base.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/templates/package/resource_edit_base.html b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
index ac793ce..965b8d2 100644
--- a/ckanext/justicehub_theme/templates/package/resource_edit_base.html
+++ b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
@@ -23,7 +23,8 @@
 {% block content_primary_nav %}
   {{ h.build_nav_icon('resource_edit', _('Edit resource'), id=pkg.name, resource_id=res.id) }}
   {% block inner_primary_nav %}{% endblock %}
-  {{ h.build_nav_icon('views', _('Views'), id=pkg.name, resource_id=res.id) }}
+  <!--NOTE: Removing for Alpha -->
+  {#{ h.build_nav_icon('views', _('Views'), id=pkg.name, resource_id=res.id) }#}
 {% endblock %}
 
 {% block primary_content_inner %}

From 07f5fa17ac9490cb68f5539153d56ed819e1d5d5 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 12:48:34 +0530
Subject: [PATCH 026/127] remove extra download button from data explorer error
 block

---
 .../package/snippets/resource_view.html       | 86 +++++++++++++++++++
 1 file changed, 86 insertions(+)
 create mode 100644 ckanext/justicehub_theme/templates/package/snippets/resource_view.html

diff --git a/ckanext/justicehub_theme/templates/package/snippets/resource_view.html b/ckanext/justicehub_theme/templates/package/snippets/resource_view.html
new file mode 100644
index 0000000..a440cbe
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/package/snippets/resource_view.html
@@ -0,0 +1,86 @@
+{% ckan_extends %}
+
+{% block resource_view %}
+  <div id="view-{{ resource_view['id'] }}" class="resource-view" data-id="{{ resource_view['id'] }}" data-title="{{ resource_view['title'] }}" data-description="{{ resource_view['descripion'] }}">
+  <div class="actions">
+    <a class="btn btn-default"
+       target="_blank"
+       href="{{ h.url_for('resource_view', id=package['name'], resource_id=resource['id'], view_id=resource_view['id'], qualified=True) }}">
+      <i class="fa fa-arrows-alt"></i>
+      {{ _("Fullscreen") }}
+    </a>
+    <a class="btn btn-default"
+       href="#embed-{{ resource_view['id'] }}"
+       data-module="resource-view-embed"
+       data-module-id="{{ resource_view['id'] }}"
+       data-module-url="{{ h.url_for('resource_view', id=package['name'], resource_id=resource['id'], view_id=resource_view['id'], qualified=True) }}">
+      <i class="fa fa-code"></i>
+      {{ _("Embed") }}
+    </a>
+  </div>
+  <p class="desc">{{ h.render_markdown(resource_view['description']) }}</p>
+    <div class="m-top ckanext-datapreview">
+      {% if not to_preview and h.resource_view_is_filterable(resource_view) %}
+        {% snippet 'package/snippets/resource_view_filters.html', resource=resource %}
+      {% endif %}
+      {% if not h.resource_view_is_iframed(resource_view) %}
+        {{ h.rendered_resource_view(resource_view, resource, package) }}
+      {% else %}
+        <div class="data-viewer-error js-hide">
+          <p class="text-danger">
+            <i class="fa fa-info-circle"></i>
+            {{ _('This resource view is not available at the moment.') }}
+            <a href="#" data-toggle="collapse" data-target="#data-view-error">
+              {{ _('Click here for more information.') }}
+            </a>
+          </p>
+          <p id="data-view-error" class="collapse"></p>
+        </div>
+        {% if not to_preview %}
+          {% set current_filters = request.str_GET.get('filters') %}
+          {% if current_filters %}
+            {% set src = h.url_for(qualified=true, controller='package',
+                               action='resource_view', id=package['name'],
+                               resource_id=resource['id'],
+                               view_id=resource_view['id'],
+                               filters=current_filters)  %}
+          {% else %}
+            {% set src = h.url_for(qualified=true, controller='package',
+                               action='resource_view', id=package['name'],
+                               resource_id=resource['id'],
+                               view_id=resource_view['id'])  %}
+          {% endif %}
+        {% else %}
+          {# When previewing we need to stick the whole resource_view as a param as there is no other way to pass to information on to the iframe #}
+          {% set src = h.url_for(qualified=true, controller='package', action='resource_view', id=package['name'], resource_id=resource['id']) + '?' + h.urlencode({'resource_view': h.dump_json(resource_view)}) %}
+        {% endif %}
+        <iframe src="{{ src }}" frameborder="0" width="100%" data-module="data-viewer">
+          <p>{{ _('Your browser does not support iframes.') }}</p>
+        </iframe>
+      {% endif %}
+    </div>
+    <div id="embed-{{ resource_view['id'] }}" class="modal fade resource-view-embed">
+      <div class="modal-dialog">
+    <div class="modal-content">
+
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal">&times;</button>
+        <h3>{{ _("Embed resource view") }}</h3>
+      </div>
+      <div class="modal-body">
+        <p class="embed-content">{{ _("You can copy and paste the embed code into a CMS or blog software that supports raw HTML") }}</p>
+        <div class="row">
+          <div class="col-md-6">
+            {{ form.input("width", label=_("Width"), value=700, classes=["control-full"]) }}
+          </div>
+          <div class="col-md-6">
+            {{ form.input("height", label=_("Height"), value=400, classes=["control-full"]) }}
+          </div>
+        </div>
+        {{ form.textarea("code", label=_("Code"), value="", classes=["pre"], rows=3) }}
+      </div>
+      </div>
+      </div>
+    </div>
+  </div>
+{% endblock %}

From a07c72c126d0fe0e6e29cf5e317cfc74cc9635bd Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 13:27:03 +0530
Subject: [PATCH 027/127] show icon for organisation who signed pledge on org
 details page

---
 ckanext/justicehub_theme/public/justicehub_theme.css         | 5 +++++
 .../justicehub_theme/templates/organization/read_base.html   | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 967bf90..b8450c6 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -80,6 +80,11 @@ h1,
     margin:auto;
 }
 
+/* ----------------------- colors ------------------------- */
+.fa-certificate {
+    color: #f65940;
+}
+
 
 .account-masthead {
     background-color: rgb(40, 40, 40);
diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index 365c23e..a5c7e20 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -22,6 +22,9 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
             {% if c.group_dict.state == 'deleted' %}
             [{{ _('Deleted') }}]
             {% endif %}
+            {% if c.group_dict.signed_pledge %}
+                <i class="fa fa-certificate"></i>
+            {% endif %}
         </h1>
         {% block description %}
         {% if c.group_dict.description %}

From 9e9ca8f18c6b82a003a2f9873d41fe9010cd9c7c Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 13:29:59 +0530
Subject: [PATCH 028/127] change color for dataset verified icon

---
 ckanext/justicehub_theme/public/justicehub_theme.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index b8450c6..f4f97f7 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -81,7 +81,8 @@ h1,
 }
 
 /* ----------------------- colors ------------------------- */
-.fa-certificate {
+.fa-certificate,
+.fa-check {
     color: #f65940;
 }
 

From 230b460ca91a22caaae335be209dbd6a2a78d440 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 13:31:52 +0530
Subject: [PATCH 029/127] move all search related css to search css module

---
 .../public/justicehub_theme.css               | 28 ----------
 ckanext/justicehub_theme/public/search.css    | 53 ++++++++++++++++++-
 2 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index f4f97f7..00667b9 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -415,28 +415,12 @@ aside .module [class^=module] {
     padding-top: 320px;
     padding-left: 150px;
 }
-.search-form .search-input.search-giant .form-control {
-    border-radius: 60px;
-    line-height: 2;
-    font-style: italic;
-    border: 4px solid #f65940;
-    padding-left: 30px;
-    height: 80px;
-}
-.homepage .module-search .form-group {
-    padding: 10px 0;
-}
 .footer-intro-invert,
 .homepage .module-search .module-content,
-.homepage .search-form .search-giant,
 .homepage .module-search .stats-box {
     background: transparent;
     color: #403644;
 }
-.search-form .search-input.search-giant .fa {
-    color: #403644;
-    margin-right: 10px;
-}
 .homepage .module-search .stats-box .tag {
     background-color: #f65940;
     color: #ffffff;
@@ -447,9 +431,6 @@ aside .module [class^=module] {
     background-color: inherit;
     color: #f65940;
 }
-.search-form .search-input.search-giant {
-    width: 80%;
-}
 .module-search .search-form {
     margin-top: -50px;
     padding: 0;
@@ -569,11 +550,6 @@ aside .module [class^=module] {
     .login-sidebar {
         height: 100%;
     }
-    .search-form .search-input.search-giant .form-control {
-        line-height: 1;
-        height: 65px;
-        border: 3px solid #f65940;
-    }
     .homepage .module-search {
         background-clip: border-box;
         background-position: -155px -95px;
@@ -584,10 +560,6 @@ aside .module [class^=module] {
         border-bottom: 2px solid #f65940;
         margin-bottom: 50px;
     }
-    .search-form .search-input.search-giant {
-        width: 100%;
-        margin-bottom: 80px;
-    }
     .search-meta {
         width: 120%;
         margin-left: -80px;
diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index 0975497..29c076e 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -1,4 +1,36 @@
-.field-giant-search {
+#field-giant-search+.input-group-btn .fa {
+    padding: 0 5px;
+}
+#field-giant-search+.input-group-btn .btn {
+    background-color: #f65940;
+    color: #ffffff;
+}
+.search-form .search-input.search-giant .form-control {
+    border-radius: 60px;
+    line-height: 2;
+    border: 4px solid #f65940;
+    padding-left: 30px;
+    height: 80px;
+}
+.search-form .search-input.search-giant .fa {
+    color: #ffffff;
+    margin: auto;
+}
+.search-form .search-input.search-giant button {
+    background-color: #f65940;
+    border-radius: 50px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: 60px;
+    height: 60px;
+    margin-top: -30px;
+}
+.homepage .module-search .form-group {
+    padding: 0 0;
+}
+.search-form .search-input.search-giant {
+    width: 80%;
 }
 .dataset-count-box {
     display: flex !important;
@@ -52,3 +84,22 @@
     background-color: #403644;
     color: #ffffff;
 }
+
+/* -------------------------------------- Mobile adjustments ----------------------------- */
+@media (max-device-width: 600px) and (orientation: portrait) {
+    .search-form .search-input.search-giant .form-control {
+        line-height: 1;
+        height: 65px;
+        border: 3px solid #f65940;
+    }
+    .search-form .search-input.search-giant {
+        width: 100%;
+        margin-bottom: 80px;
+    }
+    .search-form .search-input.search-giant .fa {
+        color: #403644;
+    }
+    .search-form .search-input.search-giant button {
+        background: transparent;
+    }
+}

From 8d2fd8bbb9ea30435733380d0ac84a00e04a3211 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 13:40:53 +0530
Subject: [PATCH 030/127] style page primary action buttons

- move buttons to right
- remove icons
- capitalize the text
---
 ckanext/justicehub_theme/public/partner.css         |  4 ----
 ckanext/justicehub_theme/templates/group/index.html | 13 +++++++++++++
 .../templates/organization/index.html               |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
 create mode 100644 ckanext/justicehub_theme/templates/group/index.html

diff --git a/ckanext/justicehub_theme/public/partner.css b/ckanext/justicehub_theme/public/partner.css
index 6370f1a..4120d72 100644
--- a/ckanext/justicehub_theme/public/partner.css
+++ b/ckanext/justicehub_theme/public/partner.css
@@ -52,10 +52,6 @@
     border:None;
 }
 
-.page_primary_action {
-   padding-right:0px;
-   margin-bottom: 0;
-}
 .page_primary_action .search-form {
     margin-bottom: 10px;
 }
diff --git a/ckanext/justicehub_theme/templates/group/index.html b/ckanext/justicehub_theme/templates/group/index.html
new file mode 100644
index 0000000..1834624
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/group/index.html
@@ -0,0 +1,13 @@
+{% ckan_extends %}
+
+{% block subtitle %}{{ _('Sectors') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{% link_for _('Sectors'), controller='group', action='index', named_route=group_type + '_index' %}</li>
+{% endblock %}
+
+{% block page_primary_action %}
+  {% if h.check_access('group_create') %}
+    {% link_for _('ADD SECTOR'), controller='group', action='new', class_='btn btn-primary pull-right', named_route=group_type + '_new' %}
+  {% endif %}
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/organization/index.html b/ckanext/justicehub_theme/templates/organization/index.html
index 1d7b6ff..66d6a42 100644
--- a/ckanext/justicehub_theme/templates/organization/index.html
+++ b/ckanext/justicehub_theme/templates/organization/index.html
@@ -14,7 +14,7 @@
 
 {% block page_primary_action %}
   {% if h.check_access('organization_create') %}
-    {% link_for _('Add Partner'), controller='organization', action='new', class_='btn btn-primary', named_route=group_type + '_new' %}
+    {% link_for _('ADD PARTNER'), controller='organization', action='new', class_='btn btn-primary pull-right', named_route=group_type + '_new' %}
   {% endif %}
 {% endblock %}
 

From 7f590c628e0bac9db4ec7f6b9f79b1c5cfbe0e30 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 14:56:55 +0530
Subject: [PATCH 031/127] fix resource read html and remove preview for formats
 other than csv

---
 .../templates/package/resource_read.html      | 195 +++---------------
 1 file changed, 33 insertions(+), 162 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/package/resource_read.html b/ckanext/justicehub_theme/templates/package/resource_read.html
index 6e11bc5..3218c47 100644
--- a/ckanext/justicehub_theme/templates/package/resource_read.html
+++ b/ckanext/justicehub_theme/templates/package/resource_read.html
@@ -1,32 +1,15 @@
 {% ckan_extends %}
 
-{% set res = c.resource %}
+{% block resource_inner %}
+    <div class="module-content res-top-content">
 
-{% block head_extras -%}
-  {{ super() }}
-  {% set description = h.markdown_extract(h.get_translated(res, 'description'), extract_length=200) if res.description else h.markdown_extract(h.get_translated(c.package, 'notes'), extract_length=200) %}
-  <meta property="og:title" content="{{ h.dataset_display_name(c.package) }} - {{ h.resource_display_name(res) }} - {{ g.site_title }}">
-  <meta property="og:description" content="{{ description|forceescape }}">
-{% endblock -%}
+    {% block resource_content %}
 
-{% block subtitle %}{{ h.dataset_display_name(c.package) }} - {{ h.resource_display_name(res) }}{% endblock %}
-
-{% block breadcrumb_content_selected %}{% endblock %}
-
-{% block breadcrumb_content %}
-  {{ super() }}
-  <li class="active"><a href="">{{ h.resource_display_name(res)|truncate(30) }}</a></li>
-{% endblock %}
-
-{% block pre_primary %}
-  {% block resource %}
-    <section class="module module-resource">
-      {% block resource_inner %}
-      <div class="module-content res-top-content">
+        {% block resource_read_title %}
+            {{ super() }}
+        {% endblock %}
 
-        {% block resource_content %}
-          {% block resource_read_title %}<h1 class="page-heading">{{ h.resource_display_name(res) | truncate(50) }}</h1>{% endblock %}
-          <div class="prose notes resource-desc" property="rdfs:label">
+        <div class="prose notes resource-desc" property="rdfs:label">
             {% if res.description %}
               {{ h.render_markdown(res.description) }}
             {% endif %}
@@ -35,182 +18,70 @@ <h3>{{ _('From the dataset abstract') }}</h3>
               <blockquote>{{ h.markdown_extract(h.get_translated(c.package, 'notes')) }}</blockquote>
               <p class="res-title">{% trans dataset=c.package.title, url=h.url_for(controller='package', action='read', id=c.package['name']) %}Source: <a class="res-url-src" href="{{ url }}">{{ dataset }}</a>{% endtrans %}
             {% endif %}
-          </div>
-          <div class="res-line-margin-bottom">
+        </div>
+
+        <div class="res-line-margin-bottom">
             <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
             <a href="http://www.opendefinition.org/okd/"><img src="{{ h.url_for_static('/base/images/od_80x15_blue.png') }}" alt="Open Data"></a>
-          </div>
-          {% block resource_read_url %}
+        </div>
+
+        {% block resource_read_url %}
             {% if res.url and h.is_url(res.url) %}
               <p class="text-muted ellipsis res-title">{{ _('URL:') }} <a class="resource-url-analytics res-url-src" href="{{ res.url }}" title="{{ res.url }}">{{ res.url }}</a></p>
             {% elif res.url %}
               <p class="text-muted break-word res-title">{{ _('URL:') }} {{ res.url }}</p>
             {% endif %}
-          {% endblock %}
+        {% endblock %}
 
 		<div class="actions res-actions">
 		  {% block resource_actions %}
-		  <ul style="padding-left:0px;">
-		    {% block resource_actions_inner %}
+		  <ul>
+		  {% block resource_actions_inner %}
 		    {% if h.check_access('package_update', {'id':pkg.id }) %}
 		        {% link_for _('EDIT'), controller='package', action='resource_edit', id=pkg.name, resource_id=res.id, class_='btn btn-default btn-action' %}
 		    {% endif %}
+
 		    {% if res.url and h.is_url(res.url) %}
 		      <li>
 		        <div class="btn-group">
 		        <a class="btn btn-primary btn-action resource-url-analytics resource-type-{{ res.resource_type }}" href="{{ res.url }}">
 		          {% if res.resource_type in ('listing', 'service') %}
-		            <i class="fa fa-eye"></i> {{ _('View') }}
+                      {{ _('View') }}
 		          {% elif  res.resource_type == 'api' %}
-		            <i class="fa fa-key"></i> {{ _('API Endpoint') }}
+                      {{ _('API Endpoint') }}
 		          {% elif (not res.has_views or not res.can_be_previewed) and not res.url_type == 'upload' %}
-		            <i class="fa"></i> {{ _('Go to resource') }}
+                      {{ _('Go to resource') }}
 		          {% else %}
-		            <i class="fa"></i> {{ _('Download') }}
+                      {{ _('Download') }}
 		          {% endif %}
 		        </a>
-		         {% block download_resource_button %}
-		          {%if res.datastore_active %}
-		        <button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-		            <span class="caret"></span>
-		          </button>
-		        <ul class="dropdown-menu">
-		          <li>
-		            <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, bom=True) }}"
-		              target="_blank"><span>CSV</span></a>
-		            <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='tsv', bom=True) }}"
-		              target="_blank"><span>TSV</span></a>
-		            <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='json') }}"
-		              target="_blank"><span>JSON</span></a>
-		            <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='xml') }}"
-		              target="_blank"><span>XML</span></a>
-		          </li>
-		        </ul>
-		        {%endif%} {% endblock %}
+
+		        {% block download_resource_button %}
+                    {{ super() }}
+                {% endblock %}
 		        </div>
 		      </li>
 		    {% endif %}
-		    {% endblock %}
+		  {% endblock %}
 		  </ul>
 		  {% endblock %}
 		</div>
+    {% endblock %}
 
-
-
-
-
-        {% endblock %}
-      {% block data_preview %}
-      {% block resource_view %}
-        {% block resource_view_nav %}
-          {% set resource_preview = h.resource_preview(c.resource, c.package) %}
-          {% snippet "package/snippets/resource_views_list.html",
-             views=resource_views,
-             pkg=pkg,
-             is_edit=false,
-             view_id=current_resource_view['id'],
-             resource_preview=resource_preview,
-             resource=c.resource,
-             extra_class="nav-tabs nav-tabs-plain"
-           %}
+    {% if res.format == 'CSV' %}
+        {% block data_preview %}
+        {{ super() }}
         {% endblock %}
-          {% block resource_view_content %}
-            <div class="resource-view">
-              {% set resource_preview = h.resource_preview(c.resource, c.package) %}
-              {% set views_created = res.has_views or resource_preview %}
-              {% if views_created %}
-                {% if resource_preview and not current_resource_view %}
-                  {{ h.resource_preview(c.resource, c.package) }}
-                {% else %}
-                  {% for resource_view in resource_views %}
-                    {% if resource_view == current_resource_view %}
-                      {% snippet 'package/snippets/resource_view.html',
-                         resource_view=resource_view,
-                         resource=c.resource,
-                         package=c.package
-                       %}
-                    {% endif %}
-                  {% endfor %}
-                {% endif %}
-              {% else %}
-                {# Views not created #}
-                <div class="data-viewer-info">
-                  <p>{{ _("There are no views created for this resource yet.") }}</p>
-                  {% if h.check_access('resource_view_create', {'resource_id': c.resource.id}) %}
-                    <p class="text-muted">
-                      <i class="fa fa-info-circle"></i>
-                      {{ _("Not seeing the views you were expecting?")}}
-                      <a href="javascript:void(0);" data-toggle="collapse" data-target="#data-view-info">
-                        {{ _('Click here for more information.') }}</a>
-                    </p>
-                    <div id="data-view-info" class="collapse">
-                      <p>{{ _('Here are some reasons you may not be seeing expected views:') }}</p>
-                      <ul>
-                        <li>{{ _("No view has been created that is suitable for this resource")}}</li>
-                        <li>{{ _("The site administrators may not have enabled the relevant view plugins")}}</li>
-                        <li>{{ _("If a view requires the DataStore, the DataStore plugin may not be enabled, or the data may not have been pushed to the DataStore, or the DataStore hasn't finished processing the data yet")}}</li>
-                      </ul>
-                    </div>
-                  {% endif %}
-                </div>
-              {% endif %}
-            </div>
-          {% endblock %}
-        </div>
-      {% endblock %}
-      {% endblock %}
-      {% endblock %}
-    </section>
-  {% endblock %}
+    {% endif %}
 {% endblock %}
 
 {% block primary_content %}
   <div class="col-sm-10 col-xs-12">
   {% block resource_additional_information %}
-    {% if res %}
-      <section class="module">
-        {% block resource_additional_information_inner %}
-        <div class="module-content">
-          <h2>{{ _('Additional Information') }}</h2>
-          <table class="table table-striped table-bordered table-condensed" data-module="table-toggle-more">
-            <thead>
-              <tr>
-                <th scope="col">{{ _('Field') }}</th>
-                <th scope="col">{{ _('Value') }}</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <th scope="row">{{ _('Data last updated') }}</th>
-                <td>{{ h.render_datetime(res.last_modified) or h.render_datetime(res.created) or _('unknown') }}</td>
-              </tr>
-              <tr>
-                <th scope="row">{{ _('Metadata last updated') }}</th>
-                <td>{{ h.render_datetime(res.revision_timestamp) or h.render_datetime(res.created) or _('unknown') }}</td>
-              </tr>
-              <tr>
-                <th scope="row">{{ _('Created') }}</th>
-                <td>{{ h.render_datetime(res.created) or _('unknown') }}</td>
-              </tr>
-              <tr>
-                <th scope="row">{{ _('Format') }}</th>
-                <td>{{ res.mimetype_inner or res.mimetype or res.format or _('unknown') }}</td>
-              </tr>
-              <tr>
-                <th scope="row">{{ _('License') }}</th>
-                <td>{% snippet "snippets/license.html", pkg_dict=pkg, text_only=True %}</td>
-              </tr>
-              {% for key, value in h.format_resource_items(res.items()) %}
-                <tr class="toggle-more"><th scope="row">{{ key }}</th><td>{{ value }}</td></tr>
-              {% endfor %}
-            </tbody>
-          </table>
-        </div>
-        {% endblock %}
-      </section>
-    {% endif %}
+    {{ super() }}
   {% endblock %}
   </div>
+
   <div class="col-sm-2  col-xs-12 res-social">
     {% snippet "snippets/social.html" %}
   </div>

From 1986e07ace038cc4094bfe9e1d88cd644d2f8943 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 15:13:51 +0530
Subject: [PATCH 032/127] fix add group and organization button position

---
 .../templates/group/index.html                | 32 +++++++++++++--
 .../templates/organization/index.html         | 39 +++++++------------
 2 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/group/index.html b/ckanext/justicehub_theme/templates/group/index.html
index 1834624..a54d9db 100644
--- a/ckanext/justicehub_theme/templates/group/index.html
+++ b/ckanext/justicehub_theme/templates/group/index.html
@@ -6,8 +6,32 @@
   <li class="active">{% link_for _('Sectors'), controller='group', action='index', named_route=group_type + '_index' %}</li>
 {% endblock %}
 
-{% block page_primary_action %}
-  {% if h.check_access('group_create') %}
-    {% link_for _('ADD SECTOR'), controller='group', action='new', class_='btn btn-primary pull-right', named_route=group_type + '_new' %}
-  {% endif %}
+{% block pre_primary %}
+    {% block page_primary_action %}
+      <div class="page_primary_action row">
+      {% if h.check_access('group_create') %}
+        {% link_for _('ADD SECTOR'), controller='group', action='new', class_='btn btn-primary pull-right', named_route=group_type + '_new' %}
+      {% endif %}
+      </div>
+    {% endblock %}
+
+    {% block groups_search_form %}
+        {% snippet 'snippets/search_form.html', form_id='group-search-form', type='group', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search groups...'), show_empty=request.params, no_bottom_border=true if c.page.items, sorting = [(_('Name Ascending'), 'title asc'), (_('Name Descending'), 'title desc')] %}
+    {% endblock %}
+{% endblock %}
+
+{% block primary_content %}
+    {% block primary_content_inner %}
+
+    <h1 class="hide-heading">{{ _('Groups') }}</h1>
+
+    {% block groups_list %}
+        {{ super() }}
+    {% endblock %}
+
+    {% block page_pagination %}
+        {{ c.page.pager(q=c.q or '', sort=c.sort_by_selected or '') }}
+    {% endblock %}
+
+    {% endblock %}
 {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/organization/index.html b/ckanext/justicehub_theme/templates/organization/index.html
index 66d6a42..2b6a8d9 100644
--- a/ckanext/justicehub_theme/templates/organization/index.html
+++ b/ckanext/justicehub_theme/templates/organization/index.html
@@ -7,40 +7,29 @@
 {% endblock %}
 
 {% block pre_primary %}
+
+  {% block page_primary_action %}
+    {% if h.check_access('organization_create') %}
+      <div class="page_primary_action row">
+      {% link_for _('ADD PARTNER'), controller='organization', action='new', class_='btn btn-primary pull-right', named_route=group_type + '_new' %}
+      </div>
+    {% endif %}
+  {% endblock %}
+
   {% block organizations_search_form %}
     {% snippet 'snippets/search_form.html', form_id='organization-search-form', type='organization', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search Partners...'), show_empty=request.params if c.page.items, sorting = [(_('Name (A-Z)'), 'title asc'), (_('Name (Z-A)'), 'title desc')] %}
   {% endblock %}
 {% endblock %}
 
-{% block page_primary_action %}
-  {% if h.check_access('organization_create') %}
-    {% link_for _('ADD PARTNER'), controller='organization', action='new', class_='btn btn-primary pull-right', named_route=group_type + '_new' %}
-  {% endif %}
-{% endblock %}
-
+{% block primary_content %}
 {% block primary_content_inner %}
-  {% block page_heading %}{% endblock %}
   {% block organizations_list %}
-    {% if h.check_access('organization_create') %}
-    {% endif %}
-    {% if c.page.items or request.params %}
-      {% if c.page.items %}
-        {% snippet "organization/snippets/organization_list.html", organizations=c.page.items %}
-      {% endif %}
-    {% else %}
-      <p class="empty">
-        {{ _('There are currently no organizations for this site') }}.
-        {% if h.check_access('organization_create') %}
-          {% link_for _('How about creating one?'), controller='organization', action='new' %}</a>.
-        {% endif %}
-      </p>
-    {% endif %}
+  {{ super() }}
   {% endblock %}
+
   {% block page_pagination %}
-    {{ c.page.pager(q=c.q or '', sort=c.sort_by_selected or '') }}
+      {{ super() }}
   {% endblock %}
-{% endblock %}
 
-{% block secondary_content %}
-  {% snippet "organization/snippets/helper.html" %}
+{% endblock %}
 {% endblock %}

From 9557ede0b2e5c60e243d77c1e1067dd6897263d1 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 15:30:10 +0530
Subject: [PATCH 033/127] fix spacing for search error and search form
 positioning for mobile

---
 ckanext/justicehub_theme/public/search.css    |  3 ++
 .../templates/snippets/search_form.html       | 35 ++++++++++---------
 2 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index 29c076e..99fc2f4 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -43,6 +43,9 @@
 .dataset-count {
     color: #f65940;
 }
+.empty, .extra {
+    padding-left: 20px;
+}
 .filters .module-heading {
     color: #ffffff;
     background-color: #403644;
diff --git a/ckanext/justicehub_theme/templates/snippets/search_form.html b/ckanext/justicehub_theme/templates/snippets/search_form.html
index 1b3c5a6..015f751 100644
--- a/ckanext/justicehub_theme/templates/snippets/search_form.html
+++ b/ckanext/justicehub_theme/templates/snippets/search_form.html
@@ -7,8 +7,7 @@
 {% set form_id = form_id if form_id else false %}
 
 <form {% if form_id %}id="{{ form_id }}" {% endif %}class="search-form{% if no_bottom_border %} no-bottom-border{% endif %}" method="get" data-module="select-switch">
-{% block search_input %}
-<div class="col col-md-3 pull-left input-group">
+<div class="col col-md-3 col-xs-4 input-group pull-left">
     <div class="form-control input-lg square-border dataset-count-box">
         <span>
             {% if count_box_title %}
@@ -23,21 +22,9 @@
     </div>
 </div>
 
-<div class="col col-md-6 input-group pull-left">
-  <input aria-label="{% block header_site_search_label %}{{ placeholder }}{% endblock %}" id="field-giant-search" type="text" class="form-control input-lg square-border" name="q" value="{{ query }}" autocomplete="off" placeholder="{{ placeholder }}">
-  {% block search_input_button %}
-  <span class="input-group-btn">
-    <button class="btn btn-default btn-lg square-border" type="submit" value="search">
-      <i class="fa fa-search fa-flip-horizontal fa-lg"></i>
-    </button>
-  </span>
-  {% endblock %}
-</div>
-{% endblock %}
-
 {% block search_sortby %}
 {% if sorting %}
-  <div class="col col-md-3 input-group">
+  <div class="col col-md-3 col-xs-8 input-group pull-right">
     <span class="input-group-addon square-border bg-clear">{{ _('SORT BY') }}</span>
     <select id="field-order-by" name="sort" class="form-control input-lg square-border sort-box">
       {% for label, value in sorting %}
@@ -53,11 +40,25 @@
 {% endif %}
 {% endblock %}
 
+{% block search_input %}
+<div class="col col-md-6 col-xs-12 input-group">
+  <input aria-label="{% block header_site_search_label %}{{ placeholder }}{% endblock %}" id="field-giant-search" type="text" class="form-control input-lg square-border" name="q" value="{{ query }}" autocomplete="off" placeholder="{{ placeholder }}">
+  {% block search_input_button %}
+  <span class="input-group-btn">
+    <button class="btn btn-default btn-lg square-border" type="submit" value="search">
+      <i class="fa fa-search fa-flip-horizontal fa-lg"></i>
+    </button>
+  </span>
+  {% endblock %}
+</div>
+{% endblock %}
 
 {% block search_title %}
     {% if not error and count == 0 %}
-      <h2>{% snippet 'snippets/search_result_text.html', query=query, count=count, type=type %}</h2>
-      <p class="extra">Please try another search.</p>
+      <div class="extra">
+          <h2>{% snippet 'snippets/search_result_text.html', query=query, count=count, type=type %}</h2>
+          <p>Please try another search.</p>
+      </div>
     {% endif %}
 {% endblock %}
 

From c302655a4ce643897080f664285ff7dd7a55bcee Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 15:41:28 +0530
Subject: [PATCH 034/127] fix partner social links hover

---
 ckanext/justicehub_theme/public/dataset_info.css            | 6 ------
 ckanext/justicehub_theme/public/partner.css                 | 6 ++++++
 .../justicehub_theme/templates/organization/read_base.html  | 2 +-
 ckanext/justicehub_theme/templates/package/read_base.html   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset_info.css b/ckanext/justicehub_theme/public/dataset_info.css
index fd48d84..2c927d9 100644
--- a/ckanext/justicehub_theme/public/dataset_info.css
+++ b/ckanext/justicehub_theme/public/dataset_info.css
@@ -191,12 +191,6 @@
 .dropdown-toggle {
     border-radius: 30px;
 }
-.partner-links .social-links .fa:hover {
-    background-color: #ffffff;
-    color: #f65940;
-    border: 1px solid #f65940;
-}
-
 
 /*----------------- data set editing page css ----------------------*/
 .edit-pkg-header{
diff --git a/ckanext/justicehub_theme/public/partner.css b/ckanext/justicehub_theme/public/partner.css
index 4120d72..7ebf15e 100644
--- a/ckanext/justicehub_theme/public/partner.css
+++ b/ckanext/justicehub_theme/public/partner.css
@@ -13,6 +13,12 @@
 .media-logo {
     height: 150px;
 }
+.partner-links.social-links .fa:hover {
+    background-color: #ffffff;
+    color: #f65940;
+    border: 1px solid #f65940;
+}
+
 
 /*----------------- partner editing data set page css ----------------------*/
 .partner-datset-content{
diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index a5c7e20..03c3c42 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -52,7 +52,7 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
             {% endblock %}
         </div>
     </div>
-    <div class="social-links col-md-4 col-sm-4 col-xs-12">
+    <div class="partner-links social-links col-md-4 col-sm-4 col-xs-12">
         <ul class="list-unstyled list-inline">
             <li>
                 <a href="{{ c.group_dict.website }}"
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index a769921..b2c4c28 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -70,8 +70,8 @@ <h1>{{h.dataset_display_name(pkg)}}
             <a href="{{ h.url_for(controller='organization', action='read', id=pkg.organization.id) }}">{{ pkg.organization.title}}</a>
             </div>
         </div>
-        <div class="row partner-links">
-            <div class="col col-md-12 social-links">
+        <div class="row">
+            <div class="col col-md-12 partner-links social-links">
             <ul class="list-unstyled list-inline">
                 <li>
                     <a href="{{ pkg.partner.website }}"

From 4174aff71d748f3ebbe83c72c0acb1b50a435e88 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 16:05:51 +0530
Subject: [PATCH 035/127] fix reorder button

---
 ckanext/justicehub_theme/public/dataset_info.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ckanext/justicehub_theme/public/dataset_info.css b/ckanext/justicehub_theme/public/dataset_info.css
index 2c927d9..cec3c98 100644
--- a/ckanext/justicehub_theme/public/dataset_info.css
+++ b/ckanext/justicehub_theme/public/dataset_info.css
@@ -191,6 +191,18 @@
 .dropdown-toggle {
     border-radius: 30px;
 }
+.fa-bars+span {
+    display: none;
+}
+.fa-bars::before {
+    display: none;
+}
+.fa-bars:after {
+    content: ' REORDER';
+    font-family: 'Montserrat', sans-serif;
+    font-weight: 700;
+    font-size: 14px;
+}
 
 /*----------------- data set editing page css ----------------------*/
 .edit-pkg-header{

From 588f9c7fbf5bf894f7f020148c32a07873050c15 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 16:19:05 +0530
Subject: [PATCH 036/127] capitalize all action buttons

---
 ckanext/justicehub_theme/public/dataset_info.css       |  3 ++-
 ckanext/justicehub_theme/public/justicehub_theme.css   |  6 +++++-
 ckanext/justicehub_theme/public/organization.css       |  7 -------
 .../templates/organization/jh_members.html             |  6 ++++--
 .../templates/organization/read_base.html              | 10 +++++-----
 .../justicehub_theme/templates/package/edit_base.html  |  2 +-
 .../templates/package/resource_edit_base.html          |  6 +++---
 .../templates/package/resource_read.html               |  6 +++---
 .../templates/package/snippets/resource_item.html      |  2 +-
 .../templates/snippets/follow_button.html              |  4 ++--
 10 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset_info.css b/ckanext/justicehub_theme/public/dataset_info.css
index cec3c98..1d05e4c 100644
--- a/ckanext/justicehub_theme/public/dataset_info.css
+++ b/ckanext/justicehub_theme/public/dataset_info.css
@@ -134,7 +134,7 @@
 .content_action a {
     background-color: #f65940;
     border-radius: 30px;
-    padding: 5px 50px;
+    padding: 5px 25px;
     color: #ffffff;
     margin-top: 10px;
 }
@@ -202,6 +202,7 @@
     font-family: 'Montserrat', sans-serif;
     font-weight: 700;
     font-size: 14px;
+    padding: 8px 15px;
 }
 
 /*----------------- data set editing page css ----------------------*/
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 00667b9..4d7f260 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -20,6 +20,9 @@ body,
 .stats-box,
 .dataset-heading,
 .dataset-org,
+.res-actions a,
+.content_action a,
+.btn-primary,
 .search-form .search-input.search-giant input,
 .nav-pills li:last-child {
     font-size: 20px;
@@ -51,6 +54,7 @@ h1,
 }
 .col3 h2,
 .nav-tabs > li >  a,
+.content_action a,
 .dataset-heading,
 .module-heading,
 .footer-links .input-group-btn .btn {
@@ -335,7 +339,7 @@ hr {
     background-color: #403644;
     color: #ffffff;
     border-radius: 30px;
-    padding: 5px 25px;
+    padding: 8px 25px;
 }
 [role="main"] .secondary {
     padding-right: 0;
diff --git a/ckanext/justicehub_theme/public/organization.css b/ckanext/justicehub_theme/public/organization.css
index 61df7f9..aca0c3f 100644
--- a/ckanext/justicehub_theme/public/organization.css
+++ b/ckanext/justicehub_theme/public/organization.css
@@ -90,10 +90,3 @@
     padding: 5px 10px;
     margin-left: 5px;
 }
-
-.add_member {
-    background-color: #403644;
-    color: #ffffff;
-    border-radius: 30px;
-    padding: 5px 25px;
-}
diff --git a/ckanext/justicehub_theme/templates/organization/jh_members.html b/ckanext/justicehub_theme/templates/organization/jh_members.html
index 5cd07b8..757b709 100644
--- a/ckanext/justicehub_theme/templates/organization/jh_members.html
+++ b/ckanext/justicehub_theme/templates/organization/jh_members.html
@@ -11,9 +11,11 @@
 {% endblock %}
 
 {% block primary_content_inner %}
+    <div class="row page_primary_action">
     {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
-        {% link_for _('Add Member'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn btn-primary add_member', named_route=group_type + '_member_new' %}
+        {% link_for _('ADD MEMBER'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn btn-primary pull-right', named_route=group_type + '_member_new' %}
     {% endif %}
+    </div>
 
 
 	{% block packages_list %}
@@ -42,7 +44,7 @@
                     <td>
                         <div class="btn-group member_action pull-right">
                                 <a class="btn-primary" href="{{ h.url_for(group_type + '_member_new', id=c.group_dict.id, user=user_id) }}" title="{{ _('Edit') }}">
-                            {{ _('Edit') }}
+                            {{ _('EDIT') }}
                             </a>
                         <a class="delete" href="{{ h.url_for(group_type + '_member_delete', id=c.group_dict.id, user=user_id) }}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}" title="{{ _('Delete') }}">{% block delete_button_text %}<i class="fa fa-times"></i>{% endblock %}</a>
                         </div>
diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index 03c3c42..b347074 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -40,7 +40,7 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
             {% block content_action %}
             <div class="col col-md-4 col-xs-6 content_action">
                 {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
-                    {% link_for _('Edit'), controller='organization', action='edit', id=c.group_dict.name, class_='btn btn-default', named_route=group_type + '_edit'  %}
+                    {% link_for _('EDIT'), controller='organization', action='edit', id=c.group_dict.name, class_='btn btn-default', named_route=group_type + '_edit'  %}
                 {% endif %}
             </div>
             {% endblock %}
@@ -103,10 +103,10 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
 <div class="row header-tabs">
     <ul class="nav nav-tabs">
         {% block content_primary_nav %}
-        {{ h.build_nav_icon(group_type + '_read', _('Datasets'), id=c.group_dict.name) }}
-        {{ h.build_nav_icon(group_type + '_activity', _('Activity'), id=c.group_dict.name, offset=0) }}
-        {{ h.build_nav_icon('jhorg' + '_stats', _('Stats'), id=c.group_dict.name) }}
-        {{ h.build_nav_icon('jhorg' + '_members', _('Members'), id=c.group_dict.name) }}
+        {{ h.build_nav_icon(group_type + '_read', _('DATASETS'), id=c.group_dict.name) }}
+        {{ h.build_nav_icon(group_type + '_activity', _('ACTIVITY'), id=c.group_dict.name, offset=0) }}
+        {{ h.build_nav_icon('jhorg' + '_stats', _('STATS'), id=c.group_dict.name) }}
+        {{ h.build_nav_icon('jhorg' + '_members', _('MEMBERS'), id=c.group_dict.name) }}
         {% endblock %}
     </ul>
 </div>
diff --git a/ckanext/justicehub_theme/templates/package/edit_base.html b/ckanext/justicehub_theme/templates/package/edit_base.html
index 232144b..d7420bc 100644
--- a/ckanext/justicehub_theme/templates/package/edit_base.html
+++ b/ckanext/justicehub_theme/templates/package/edit_base.html
@@ -6,5 +6,5 @@
 {% endblock %}
 
 {% block content_action %}
-  {% link_for _('View dataset'), controller='package', action='read', id=pkg.name, class_='btn btn-default' %}
+  {% link_for _('VIEW'), controller='package', action='read', id=pkg.name, class_='btn btn-default' %}
 {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/package/resource_edit_base.html b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
index 965b8d2..9d28cf7 100644
--- a/ckanext/justicehub_theme/templates/package/resource_edit_base.html
+++ b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
@@ -14,14 +14,14 @@
 {% endblock %} 
 
 {% block content_action %}
-  {% link_for _('All resources'), controller='package', action='resources', id=pkg.name, class_='btn btn-default rsrc-edit-actn-btn', icon='arrow-left' %}
+  {% link_for _('ALL RESOURCES'), controller='package', action='resources', id=pkg.name, class_='btn btn-default rsrc-edit-actn-btn', icon='arrow-left' %}
   {% if res %}
-    {% link_for _('View resource'), controller='package', action='resource_read', id=pkg.name, resource_id=res.id, class_='btn btn-default rsrc-edit-actn-btn' %}
+    {% link_for _('VIEW'), controller='package', action='resource_read', id=pkg.name, resource_id=res.id, class_='btn btn-default rsrc-edit-actn-btn' %}
   {% endif %}
 {% endblock %}
 
 {% block content_primary_nav %}
-  {{ h.build_nav_icon('resource_edit', _('Edit resource'), id=pkg.name, resource_id=res.id) }}
+  {{ h.build_nav_icon('resource_edit', _('EDIT RESOURCE'), id=pkg.name, resource_id=res.id) }}
   {% block inner_primary_nav %}{% endblock %}
   <!--NOTE: Removing for Alpha -->
   {#{ h.build_nav_icon('views', _('Views'), id=pkg.name, resource_id=res.id) }#}
diff --git a/ckanext/justicehub_theme/templates/package/resource_read.html b/ckanext/justicehub_theme/templates/package/resource_read.html
index 3218c47..827f01f 100644
--- a/ckanext/justicehub_theme/templates/package/resource_read.html
+++ b/ckanext/justicehub_theme/templates/package/resource_read.html
@@ -46,13 +46,13 @@ <h3>{{ _('From the dataset abstract') }}</h3>
 		        <div class="btn-group">
 		        <a class="btn btn-primary btn-action resource-url-analytics resource-type-{{ res.resource_type }}" href="{{ res.url }}">
 		          {% if res.resource_type in ('listing', 'service') %}
-                      {{ _('View') }}
+                      {{ _('VIEW') }}
 		          {% elif  res.resource_type == 'api' %}
-                      {{ _('API Endpoint') }}
+                      {{ _('API ENDPOINT') }}
 		          {% elif (not res.has_views or not res.can_be_previewed) and not res.url_type == 'upload' %}
                       {{ _('Go to resource') }}
 		          {% else %}
-                      {{ _('Download') }}
+                      {{ _('DOWNLOAD') }}
 		          {% endif %}
 		        </a>
 
diff --git a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
index ab693da..7784c34 100644
--- a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
+++ b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
@@ -4,7 +4,7 @@
 {% if not url_is_edit %}
   <div class="dropdown btn-group">
     <a href="#" class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
-      {{ _('Explore') }}
+      {{ _('EXPLORE') }}
       <span class="caret"></span>
     </a>
     <ul class="dropdown-menu">
diff --git a/ckanext/justicehub_theme/templates/snippets/follow_button.html b/ckanext/justicehub_theme/templates/snippets/follow_button.html
index 2b1d89d..457c0d3 100644
--- a/ckanext/justicehub_theme/templates/snippets/follow_button.html
+++ b/ckanext/justicehub_theme/templates/snippets/follow_button.html
@@ -5,10 +5,10 @@
 
 {% if following %}
   <a href="{{ h.url_for(controller=controller, action='unfollow', id=obj_id) }}" class="{% block following_class %}btn btn-danger{% endblock %}" data-module="follow" data-module-type="{{ obj_type }}" data-module-id="{{ obj_id }}" data-module-action="unfollow">
-    {{ _('Unfollow') }}
+    {{ _('UNFOLLOW') }}
   </a>
 {% else %}
   <a href="{{ h.url_for(controller=controller, action='follow', id=obj_id) }}" class="{% block unfollowing_class %}btn btn-success{% endblock %}" data-module="follow" data-module-type="{{ obj_type }}" data-module-id="{{ obj_id }}" data-module-action="follow">
-    {{ _('Follow') }}
+    {{ _('FOLLOW') }}
   </a>
 {% endif %}

From b8a0dc8c35b96010b22d717b800a4946ebe5be5a Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 16:44:10 +0530
Subject: [PATCH 037/127] fix button paddings

---
 ckanext/justicehub_theme/public/dataset_info.css     | 9 ++++-----
 ckanext/justicehub_theme/public/justicehub_theme.css | 6 ++++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset_info.css b/ckanext/justicehub_theme/public/dataset_info.css
index 1d05e4c..bc6c540 100644
--- a/ckanext/justicehub_theme/public/dataset_info.css
+++ b/ckanext/justicehub_theme/public/dataset_info.css
@@ -191,18 +191,17 @@
 .dropdown-toggle {
     border-radius: 30px;
 }
-.fa-bars+span {
+.btn-default .fa-bars+span {
     display: none;
 }
-.fa-bars::before {
+.btn-default .fa-bars::before {
     display: none;
 }
-.fa-bars:after {
+.btn-default .fa-bars:after {
     content: ' REORDER';
     font-family: 'Montserrat', sans-serif;
     font-weight: 700;
-    font-size: 14px;
-    padding: 8px 15px;
+    font-size: 20px;
 }
 
 /*----------------- data set editing page css ----------------------*/
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 4d7f260..e70a690 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -90,7 +90,9 @@ h1,
     color: #f65940;
 }
 
-
+.btn {
+    padding: 8px 25px;
+}
 .account-masthead {
     background-color: rgb(40, 40, 40);
     display: none;
@@ -339,7 +341,7 @@ hr {
     background-color: #403644;
     color: #ffffff;
     border-radius: 30px;
-    padding: 8px 25px;
+    padding: 5px 25px;
 }
 [role="main"] .secondary {
     padding-right: 0;

From c5125bb5cc9e232594d72d2298e6cebdb9827c08 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 17:17:15 +0530
Subject: [PATCH 038/127] fix search box and remove form control fonts

---
 ckanext/justicehub_theme/public/form.css      | 37 -------------------
 .../public/justicehub_theme.css               | 12 +++++-
 ckanext/justicehub_theme/public/search.css    |  1 +
 .../templates/snippets/search_form.html       |  6 +--
 4 files changed, 14 insertions(+), 42 deletions(-)

diff --git a/ckanext/justicehub_theme/public/form.css b/ckanext/justicehub_theme/public/form.css
index 7fb0122..d1b6786 100644
--- a/ckanext/justicehub_theme/public/form.css
+++ b/ckanext/justicehub_theme/public/form.css
@@ -34,14 +34,6 @@
 .control-label {
     color: #403644;
 }
-.select2-results .select2-highlighted,
-.control-label,
-.dataset-form .form-actions .btn-primary,
-.dataset-form .form-actions .btn-primary:focus,
-.select2-container-multi .select2-choices > li.select2-search-choice:nth-child(2n),
-.select2-container-multi .select2-choices > li.select2-search-choice:nth-child(2n+1) {
-    font-weight: bold;
-}
 .page_primary_action .btn.btn-default,
 .controls > input:first-child,
 .input-group > *:first-child,
@@ -83,34 +75,12 @@ fieldset.checkboxes > label > input,
     box-shadow: none;
 }
 .page_primary_action .btn.btn-default,
-.controls > *:first-child,
-.controls > a.btn,
-.dataset-form .form-actions .btn-danger,
-.dataset-form .form-actions .btn-finish,
-.dataset-form .form-actions .btn-primary,
-.input-group > *:first-child,
-.editor .editor-info-block,
-fieldset.radios label,
-fieldset.checkboxes label,
-fieldset.checkboxes + label,
-.select2-container-multi .select2-choices > li.select2-search-choice {
-    font-size: 18px;
-}
-fieldset.radios label,
-fieldset.checkboxes label,
-fieldset.checkboxes + label {
-    font-weight: normal;
-}
-.page_primary_action .btn.btn-default,
 .controls > a.btn,
 .controls .btn,
 .dataset-form .form-actions .btn-finish,
 .select2-container-multi .select2-choices > li.select2-search-choice {
     background-color: #403644;
 }
-.sort-box {
-    font-size: 25px;
-}
 .sort-box,
 .sort-box:focus,
 .search-form .btn,
@@ -138,9 +108,6 @@ fieldset.checkboxes + label {
     background: none;
     background-color: #403644 !important;
 }
-.control-label {
-    font-size: 21px;
-}
 #field-giant-search:focus,
 .input-group .input-group-addon {
     border-right: none;
@@ -253,8 +220,6 @@ input[type="month"].form-control {
 .btn-register:active,
 .btn-register:hover,
 .btn-register {
-    font-size: 30px;
-    font-weight: bold;
     color: white !important;
     border: none;
     background-color: #f65940 !important;
@@ -272,14 +237,12 @@ input[type="month"].form-control {
     background-color: #ffffff;
     border: none;
     color: #f65940;
-    font-size: 18px;
     padding-right: 0;
 }
 .login-form .form-actions .btn-primary {
     background-color: #403644;
     border-radius: 30px;
     color: #ffffff;
-    font-size: 23px;
     padding: 6px 40px;
     float: right;
 }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index e70a690..b86a8a7 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -1,8 +1,15 @@
 /* ---------------------- Site Fonts ------------------- */
+body {
+  font-family: 'Montserrat', sans-serif;
+  font-weight: 400; /* Regular */
+}
 .count,
 .footer-links .nav-item a {
     font-size: 14px;
 }
+.sort-box,
+.form-control,
+.input-group-addon,
 .package-item-row,
 .footer-links .input-group-btn .btn {
     font-size: 16px;
@@ -52,6 +59,9 @@ h1,
 .media-item .media-heading {
     font-weight: 600; /* Semi Bold */
 }
+.sort-box,
+.form-control,
+.input-group-addon,
 .col3 h2,
 .nav-tabs > li >  a,
 .content_action a,
@@ -196,8 +206,6 @@ h1,
 }
 
 [role="main"], body {
-  font-family: 'Montserrat', sans-serif;
-  font-weight: 400; /* Regular */
   background: none;
   background-color: #ffffff;
 }
diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index 99fc2f4..73dc596 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -36,6 +36,7 @@
     display: flex !important;
     justify-content: center;
     align-items: center;
+    padding: 10px;
 }
 .dataset-count-box span {
     margin: auto;
diff --git a/ckanext/justicehub_theme/templates/snippets/search_form.html b/ckanext/justicehub_theme/templates/snippets/search_form.html
index 015f751..5d77cba 100644
--- a/ckanext/justicehub_theme/templates/snippets/search_form.html
+++ b/ckanext/justicehub_theme/templates/snippets/search_form.html
@@ -7,7 +7,7 @@
 {% set form_id = form_id if form_id else false %}
 
 <form {% if form_id %}id="{{ form_id }}" {% endif %}class="search-form{% if no_bottom_border %} no-bottom-border{% endif %}" method="get" data-module="select-switch">
-<div class="col col-md-3 col-xs-4 input-group pull-left">
+<div class="col col-md-3 col-xs-5 input-group pull-left">
     <div class="form-control input-lg square-border dataset-count-box">
         <span>
             {% if count_box_title %}
@@ -24,12 +24,12 @@
 
 {% block search_sortby %}
 {% if sorting %}
-  <div class="col col-md-3 col-xs-8 input-group pull-right">
+  <div class="col col-md-3 col-xs-7 input-group pull-right">
     <span class="input-group-addon square-border bg-clear">{{ _('SORT BY') }}</span>
     <select id="field-order-by" name="sort" class="form-control input-lg square-border sort-box">
       {% for label, value in sorting %}
         {% if label and value %}
-          <option value="{{ value }}"{% if sorting_selected == value %} selected="selected"{% endif %}>{{ label }}</option>
+          <option value="{{ value }}"{% if sorting_selected == value %} selected="selected"{% endif %}>{{ label | upper }}</option>
         {% endif %}
       {% endfor %}
     </select>

From c7a900641fb4b2d3d7a9389f4ac239814086b17c Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 17:23:59 +0530
Subject: [PATCH 039/127] fix issues action button and external links css

---
 ckanext/justicehub_theme/public/dataset_info.css       | 2 +-
 ckanext/justicehub_theme/public/justicehub_theme.css   | 4 ++++
 ckanext/justicehub_theme/templates/issues/dataset.html | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset_info.css b/ckanext/justicehub_theme/public/dataset_info.css
index bc6c540..636c896 100644
--- a/ckanext/justicehub_theme/public/dataset_info.css
+++ b/ckanext/justicehub_theme/public/dataset_info.css
@@ -84,7 +84,7 @@
     height: 150px;
 }
 .page-section .links-list a {
-    color: #403644;
+    color: #f65940;
 }
 .resources {
     padding: 10px 35px;
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index b86a8a7..877cb8d 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -28,8 +28,10 @@ body,
 .dataset-heading,
 .dataset-org,
 .res-actions a,
+.issues-actions a,
 .content_action a,
 .btn-primary,
+#field-giant-search,
 .search-form .search-input.search-giant input,
 .nav-pills li:last-child {
     font-size: 20px;
@@ -45,6 +47,7 @@ h1,
     font-size: 30px;
 }
 .footer-links .nav-item a,
+#field-giant-search,
 .search-form .search-input.search-giant input {
     font-weight: 300; /* Light */
 }
@@ -79,6 +82,7 @@ h1,
 .downloads,
 .footer-disclaimer div:last-child,
 .filters .module-content.empty,
+#field-giant-search,
 .search-form .search-input.search-giant input {
     font-style: italic;
 }
diff --git a/ckanext/justicehub_theme/templates/issues/dataset.html b/ckanext/justicehub_theme/templates/issues/dataset.html
index 3589593..195d94c 100644
--- a/ckanext/justicehub_theme/templates/issues/dataset.html
+++ b/ckanext/justicehub_theme/templates/issues/dataset.html
@@ -11,7 +11,7 @@
 
     <div class="header row">
         <h1 class="page-heading">
-            <div class="issues-actions">
+            <div class="issues-actions page_primary_action row">
                 {{ h.nav_link(_('New Issue'), named_route='issues_new', dataset_id=pkg.name, class_='btn btn-success') }}
             </div>
         </h1>

From 7c3852d46400711c93a16e9e02041a16fac73d2f Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 17:55:17 +0530
Subject: [PATCH 040/127] add padding the module-content

---
 ckanext/justicehub_theme/public/dataset_info.css      |  2 +-
 ckanext/justicehub_theme/public/issues.css            |  3 ---
 ckanext/justicehub_theme/public/justicehub_theme.css  |  4 ++--
 ckanext/justicehub_theme/public/package.css           |  6 ------
 ckanext/justicehub_theme/public/search.css            |  5 +++++
 .../justicehub_theme/templates/issues/dataset.html    | 11 +++++------
 6 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset_info.css b/ckanext/justicehub_theme/public/dataset_info.css
index 636c896..c634d3c 100644
--- a/ckanext/justicehub_theme/public/dataset_info.css
+++ b/ckanext/justicehub_theme/public/dataset_info.css
@@ -87,7 +87,7 @@
     color: #f65940;
 }
 .resources {
-    padding: 10px 35px;
+    padding: 10px 0;
 }
 .top-section {
     margin: 0 20px;
diff --git a/ckanext/justicehub_theme/public/issues.css b/ckanext/justicehub_theme/public/issues.css
index 421cb37..1430111 100644
--- a/ckanext/justicehub_theme/public/issues.css
+++ b/ckanext/justicehub_theme/public/issues.css
@@ -1,6 +1,3 @@
-.issues-home .search-form {
-    margin-right: -15px;
-}
 #issues-found,
 .issue-list-group {
     padding-left: 30px;
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 877cb8d..d0c9583 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -187,9 +187,8 @@ h1,
   box-shadow: none;
   border: none;
 }
-.module > .module-content:nth-child(2),
 .module-content {
-    padding: 0;
+    padding-right: 5px;
 }
 .module-content:last-child {
   padding-bottom: 0px;
@@ -338,6 +337,7 @@ h1,
 
 .primary {
     padding-left: 0;
+    padding-right: 0;
 }
 
 hr {
diff --git a/ckanext/justicehub_theme/public/package.css b/ckanext/justicehub_theme/public/package.css
index 6dc43af..2a09866 100644
--- a/ckanext/justicehub_theme/public/package.css
+++ b/ckanext/justicehub_theme/public/package.css
@@ -1,8 +1,5 @@
 /* ---------- package-item ------- */
 
-.dataset-list {
-    padding-top: 20px;
-}
 .label {
     display: inline-block;
     padding: 5px 15px;
@@ -24,9 +21,6 @@
 .heading {
     padding-bottom: 20px;
 }
-.package-item-row {
-    padding-left:50px;
-}
 .package-item-row .private-icon
 {
     padding-left: 5px;
diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index 73dc596..b5322d7 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -1,3 +1,8 @@
+.module-content .search-form {
+    margin-left: -30px;
+    margin-top: -15px;
+    margin-right: -5px;
+}
 #field-giant-search+.input-group-btn .fa {
     padding: 0 5px;
 }
diff --git a/ckanext/justicehub_theme/templates/issues/dataset.html b/ckanext/justicehub_theme/templates/issues/dataset.html
index 195d94c..c4a12e2 100644
--- a/ckanext/justicehub_theme/templates/issues/dataset.html
+++ b/ckanext/justicehub_theme/templates/issues/dataset.html
@@ -7,15 +7,14 @@
 
 {% block primary_content_inner %}
 <section class="module issues-home">
-    {% snippet 'snippets/search_form.html', type='issue', query=q, fields=(('page', pagination.page), ('per_page', pagination.per_page), ('status', status), ('visibility', visibility)), sorting=filters, sorting_selected=sort, placeholder=_('Search issues...'), no_bottom_border=true, no_title=true %}
 
-    <div class="header row">
-        <h1 class="page-heading">
-            <div class="issues-actions page_primary_action row">
-                {{ h.nav_link(_('New Issue'), named_route='issues_new', dataset_id=pkg.name, class_='btn btn-success') }}
+        <h1 class="page-heading row">
+            <div class="issues-actions page_primary_action">
+                {{ h.nav_link(_('New Issue'), named_route='issues_new', dataset_id=pkg.name, class_='btn btn-success pull-right') }}
             </div>
         </h1>
-    </div>
+
+    {% snippet 'snippets/search_form.html', type='issue', query=q, fields=(('page', pagination.page), ('per_page', pagination.per_page), ('status', status), ('visibility', visibility)), sorting=filters, sorting_selected=sort, placeholder=_('Search issues...'), no_bottom_border=true, no_title=true %}
 
    <h2 id="issues-found">
        {{ ungettext('{number} issue found', '{number} issues found', pagination.total_count) .format(number=pagination.total_count) }}

From 927dac57163ffce87f2808440bef2860c14dc164 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 1 Jun 2020 18:03:57 +0530
Subject: [PATCH 041/127] fix resource read page

---
 .../justicehub_theme/public/justicehub_theme.css   |  4 +---
 ckanext/justicehub_theme/public/resource.css       | 14 +++-----------
 .../templates/package/read_base.html               |  2 +-
 .../templates/package/resource_read.html           | 10 +++++-----
 4 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index d0c9583..7fbdc01 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -4,6 +4,7 @@ body {
   font-weight: 400; /* Regular */
 }
 .count,
+.meta-desc,
 .footer-links .nav-item a {
     font-size: 14px;
 }
@@ -602,9 +603,6 @@ aside .module [class^=module] {
     [role="main"] .container .row .col3 {
         margin-top: 0;
     }
-    .module .module-content {
-        padding: 0;
-    }
     .search-meta .stats-box {
         margin-top: 50px;
     }
diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index c7a502f..3aefce7 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -7,7 +7,6 @@
 .description {
     color:#f65940;
     font-size:16px;
-    font-weight:bold;
 }
 .dropdown-toggle {
     background:#403644;
@@ -33,7 +32,6 @@
 
 .res-title{
    color:#f65940;
-   font-weight:bolder;
 }
 
 .res-url-src{
@@ -99,7 +97,6 @@
 .module .rsrc-list-side .rsrc-item-side a{
    margin-top:5px;
    margin-left:0px;
-   font-weight:bolder;
    padding-left:0px;
 }
 
@@ -167,11 +164,6 @@
   margin-top:30px;
   margin-bottom:30px;
 }
-
-
-
-
-
-
-
-
+.module-content .res-actions ul{
+    padding-left: 0;
+}
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index b2c4c28..9e3ce57 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -21,7 +21,7 @@ <h1>{{h.dataset_display_name(pkg)}}
             <p class="package-desc"> {{h.get_translated(pkg, 'notes')}}</p>
         </div>
 
-        <div class="row">
+        <div class="row meta-desc">
             <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
             <a href="http://www.opendefinition.org/okd/"><img src="{{ h.url_for_static('/base/images/od_80x15_blue.png') }}" alt="Open Data"></a>
         </div>
diff --git a/ckanext/justicehub_theme/templates/package/resource_read.html b/ckanext/justicehub_theme/templates/package/resource_read.html
index 827f01f..12d437d 100644
--- a/ckanext/justicehub_theme/templates/package/resource_read.html
+++ b/ckanext/justicehub_theme/templates/package/resource_read.html
@@ -20,16 +20,16 @@ <h3>{{ _('From the dataset abstract') }}</h3>
             {% endif %}
         </div>
 
-        <div class="res-line-margin-bottom">
+        <div class="res-line-margin-bottom meta-desc">
             <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
             <a href="http://www.opendefinition.org/okd/"><img src="{{ h.url_for_static('/base/images/od_80x15_blue.png') }}" alt="Open Data"></a>
         </div>
 
         {% block resource_read_url %}
             {% if res.url and h.is_url(res.url) %}
-              <p class="text-muted ellipsis res-title">{{ _('URL:') }} <a class="resource-url-analytics res-url-src" href="{{ res.url }}" title="{{ res.url }}">{{ res.url }}</a></p>
+              <p class="text-muted ellipsis res-title meta-desc">{{ _('URL:') }} <a class="resource-url-analytics res-url-src" href="{{ res.url }}" title="{{ res.url }}">{{ res.url }}</a></p>
             {% elif res.url %}
-              <p class="text-muted break-word res-title">{{ _('URL:') }} {{ res.url }}</p>
+              <p class="text-muted break-word res-title meta-desc">{{ _('URL:') }} {{ res.url }}</p>
             {% endif %}
         {% endblock %}
 
@@ -76,13 +76,13 @@ <h3>{{ _('From the dataset abstract') }}</h3>
 {% endblock %}
 
 {% block primary_content %}
-  <div class="col-sm-10 col-xs-12">
+  <div class="col-sm-9 col-xs-12">
   {% block resource_additional_information %}
     {{ super() }}
   {% endblock %}
   </div>
 
-  <div class="col-sm-2  col-xs-12 res-social">
+  <div class="col-sm-3  col-xs-12 res-social">
     {% snippet "snippets/social.html" %}
   </div>
 {% endblock %}

From e0a74e5d8c62f39fff149f7bbc85abcebb99f03b Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 2 Jun 2020 00:49:56 +0530
Subject: [PATCH 042/127] minor updates

---
 .../justicehub_theme/public/dataset_info.css  | 36 ++++----
 ckanext/justicehub_theme/public/form.css      |  8 +-
 .../public/justicehub_theme.css               | 87 ++++++++-----------
 .../justicehub_theme/public/organization.css  |  4 +-
 ckanext/justicehub_theme/public/package.css   |  3 +
 ckanext/justicehub_theme/public/partner.css   |  7 +-
 ckanext/justicehub_theme/public/resource.css  | 15 ++--
 ckanext/justicehub_theme/public/search.css    | 36 +++++++-
 .../templates/home/snippets/search.html       |  8 +-
 .../templates/issues/dataset.html             | 11 ++-
 .../templates/organization/read.html          | 10 +++
 .../templates/package/edit_base.html          |  9 ++
 .../templates/package/read.html               |  3 +
 .../templates/package/read_base.html          | 22 ++---
 .../templates/package/resource_read.html      | 46 +++++++++-
 .../package/snippets/resource_item.html       |  3 +
 .../templates/package/snippets/resources.html |  4 +-
 .../package/snippets/additional_info.html     | 56 +++++++-----
 .../package/snippets/package_form.html        |  2 +-
 .../templates/snippets/package_item.html      |  2 +-
 .../templates/snippets/social.html            |  2 +-
 21 files changed, 234 insertions(+), 140 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset_info.css b/ckanext/justicehub_theme/public/dataset_info.css
index c634d3c..42905a4 100644
--- a/ckanext/justicehub_theme/public/dataset_info.css
+++ b/ckanext/justicehub_theme/public/dataset_info.css
@@ -22,7 +22,7 @@
     font-size: 25px;
 }
 .activity .item p {
-    margin-left:50px;
+    margin-left:60px;
 }
 
 .activity .item .fa{
@@ -34,7 +34,7 @@
 }
 
 .activity .item a{
-  color:white;
+  color: #bcb4bf;
 }
 
 .activity {
@@ -65,7 +65,6 @@
 }
 .pckg_rsrc_actvty,
 .page-section {
-    font-weight: bolder;
     border-top: 2px solid #f65940;
     padding-top: 20px;
 }
@@ -79,23 +78,23 @@
     padding-left: 15px;
 }
 .page-section .links-list {
-    padding-left: 15px;
+    padding-left: 0;
     font-weight: normal;
     height: 150px;
 }
 .page-section .links-list a {
     color: #f65940;
 }
-.resources {
-    padding: 10px 0;
-}
 .top-section {
     margin: 0 20px;
-    margin-bottom: 100px;
+    margin-bottom: 250px;
 }
 .package-desc {
     width:75%;
-    margin-bottom:50px;
+    margin-bottom:20px;
+}
+.meta-desc {
+    padding: 10px 0;
 }
 /* Ref: https://stackoverflow.com/a/36311846/3860168 */
 .org-box {
@@ -107,6 +106,7 @@
     border-radius:30px;
     padding: 5px 20px;
     display:inline-flex;
+    background-color: #bcb4bf;
 }
 .pkg_tags a {
     color:white;
@@ -131,6 +131,13 @@
     padding-top:5px;
     padding-bottom:21px;
 }
+.page-heading {
+    border-bottom: 2px solid #f65940;
+    margin-left: -30px;
+    padding-left: 15px;
+    padding-bottom: 20px;
+    margin-bottom: 10px !important;
+}
 .content_action a {
     background-color: #f65940;
     border-radius: 30px;
@@ -154,28 +161,25 @@
 .package-tabs .nav-tabs {
     width: 100%;
     margin-top: -60px;
-    border-bottom: 2px solid #f65940;
+    border-bottom: 1px solid #f65940;
 }
 .package-tabs .nav-tabs li a {
     border-radius: 0;
 }
-.pkg_tags:nth-child(even) {background-color:#00abb7;}
-.pkg_tags:nth-child(odd) {background-color:#f65940;}
-
 .additional-info .table {
-    width: 50%;
-    margin-left: 25%;
+    width: 65%;
 }
 .table-striped thead tr th,
 .table-striped thead tr td {
     padding-top: 10px;
     padding-bottom: 10px;
-    padding-left: 10%;
+    padding-left: 5%;
 }
 .table-striped tbody tr th,
 .table-striped tbody tr td {
     padding-top: 12px;
     padding-bottom: 12px;
+    padding-left: 5%;
 }
 .table-striped tbody tr:nth-child(2n) td,
 .table-striped tbody tr:nth-child(2n) th {
diff --git a/ckanext/justicehub_theme/public/form.css b/ckanext/justicehub_theme/public/form.css
index d1b6786..7f122b5 100644
--- a/ckanext/justicehub_theme/public/form.css
+++ b/ckanext/justicehub_theme/public/form.css
@@ -1,7 +1,7 @@
 /*----------------- form style ----------------------*/
 .search-form, .dataset-form {
     border-bottom: none;
-    margin-bottom: 50px;
+    margin-bottom: 20px;
 }
 .dataset-form {
     padding-right: 50px;
@@ -108,6 +108,7 @@ fieldset.checkboxes > label > input,
     background: none;
     background-color: #403644 !important;
 }
+.sort-box,
 #field-giant-search:focus,
 .input-group .input-group-addon {
     border-right: none;
@@ -183,7 +184,7 @@ fieldset.checkboxes label {
 .search-form .input-group .btn,
 .dataset-form .input-group .btn {
     padding-top: 26px;
-    padding-bottom: 23px;
+    padding-bottom: 21px;
 }
 .select2-container {
     padding: 0;
@@ -224,7 +225,8 @@ input[type="month"].form-control {
     border: none;
     background-color: #f65940 !important;
     box-shadow: none;
-    width: 100%;
+    border-radius: 30px;
+    margin: auto;
 }
 #user-register-form,
 .login-form {
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 7fbdc01..5ce15ab 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -1,9 +1,11 @@
 /* ---------------------- Site Fonts ------------------- */
+.footer-links .input-group input,
 body {
   font-family: 'Montserrat', sans-serif;
   font-weight: 400; /* Regular */
 }
 .count,
+.pkg_tags,
 .meta-desc,
 .footer-links .nav-item a {
     font-size: 14px;
@@ -12,6 +14,7 @@ body {
 .form-control,
 .input-group-addon,
 .package-item-row,
+.rsrc-list-side > li a,
 .footer-links .input-group-btn .btn {
     font-size: 16px;
 }
@@ -21,6 +24,7 @@ body {
 .filters .module-content.empty,
 .dataset-desc,
 .downloads, .dataset-meta,
+.edit-module-heading,
 .nav-pills li {
     font-size: 18px;
 }
@@ -31,7 +35,7 @@ body,
 .res-actions a,
 .issues-actions a,
 .content_action a,
-.btn-primary,
+.btn,
 #field-giant-search,
 .search-form .search-input.search-giant input,
 .nav-pills li:last-child {
@@ -41,6 +45,7 @@ h1,
 .col2 p,
 .nav-tabs > li >  a,
 .module-heading,
+.login-sidebar-heading,
 .footer-intro {
     font-size: 25px;
 }
@@ -49,6 +54,7 @@ h1,
 }
 .footer-links .nav-item a,
 #field-giant-search,
+.footer-links .input-group input::placeholder,
 .search-form .search-input.search-giant input {
     font-weight: 300; /* Light */
 }
@@ -60,6 +66,7 @@ h1,
 .footer-disclaimer div:last-child {
     font-weight: 500; /* Medium */
 }
+.rsrc-list-side > li a,
 .media-item .media-heading {
     font-weight: 600; /* Semi Bold */
 }
@@ -84,6 +91,7 @@ h1,
 .footer-disclaimer div:last-child,
 .filters .module-content.empty,
 #field-giant-search,
+.footer-links .input-group input,
 .search-form .search-input.search-giant input {
     font-style: italic;
 }
@@ -104,6 +112,15 @@ h1,
 .fa-check {
     color: #f65940;
 }
+h1 {
+    color: #403644;
+}
+.edit-module-heading {
+    color: #ffffff;
+    text-align: center;
+    border: 1px solid #f65940;
+    margin: 0;
+}
 
 .btn {
     padding: 8px 25px;
@@ -124,10 +141,8 @@ h1,
 }
 
 
-.container {
-    width: 92%;
-}
-[role="main"] .container {
+[role="main"] .container,
+.site-footer .container {
     width: 100%;
 }
 .masthead {
@@ -188,11 +203,16 @@ h1,
   box-shadow: none;
   border: none;
 }
+.module-content.page-header {
+    padding: 0;
+}
 .module-content {
     padding-right: 5px;
 }
+.module-shallow .module-content:last-child,
 .module-content:last-child {
   padding-bottom: 0px;
+  padding-top: 0px;
 }
 .homepage [role="main"] {
   background: none;
@@ -234,7 +254,7 @@ h1,
 }
 
 .footer-links {
-    padding: 20px 10px;
+    padding: 20px 30px;
 }
 .footer-links [class*="col-md"] {
     margin-top: 20px;
@@ -261,7 +281,6 @@ h1,
 .fa.fa-envelope {
   font-size: 30px;
 }
-
 .social-links li {
     margin-right: 18px;
 }
@@ -287,26 +306,6 @@ h1,
     color: #f65940;
     padding: 10px;
 }
-.footer-links .input-group-btn .btn,
-.footer-links .input-group input {
-    border-radius: 30px;
-}
-.footer-links .input-group .form-control:focus {
-    border-color: #f65940;
-    z-index: 0;
-}
-.footer-links input {
-    font-style: italic;
-    color: #b9b4b4;
-    padding: 22px 15px;
-}
-.footer-links .input-group-btn .btn {
-    margin-left: -20px;
-    background-color: #403644;
-    color: #ffffff;
-    border-color: #403644;
-    text-align: center;
-}
 
 /* ------------- sidebar --------- */
 .context-info .module-content {
@@ -314,11 +313,9 @@ h1,
 }
 .module-narrow h1.heading,
 .module-narrow h2.module-heading {
-    background-color: #f65940;
-    height: 100px;
     padding-left: 25px;
-    padding-top: 30px;
-    border-bottom: none;
+    padding-top: 20px;
+    padding-bottom: 20px !important;
 }
 .context-info .nums {
     border: none;
@@ -348,6 +345,7 @@ hr {
 
 .page_primary_action {
     padding-right: 40px;
+    margin-bottom: 40px;
     height: 40px;
 }
 .page_primary_action .btn-primary {
@@ -364,9 +362,11 @@ hr {
 aside .module-content {
     color: #ffffff;
     background-color: #403644;
+    padding-left: 0;
 }
 aside .module [class^=module] {
-    padding: 30px;
+    padding-left: 40px;
+    padding-top: 30px;
     padding-bottom: 10px;
 }
 
@@ -378,14 +378,13 @@ aside .module [class^=module] {
 }
 .login-sidebar-heading {
     color: #ffffff;
-    padding: 50px 60px;
+    padding: 50px 70px;
     padding-bottom: 10px;
 }
 .login-sidebar p {
-    padding: 15px 5px;
-}
-.login-sidebar p.action {
-    background-color: #f65940;
+    display: flex;
+    justify-content: center;
+    align-items: center;
 }
 .login-heading {
     border-bottom: 1px solid #f65940;
@@ -455,13 +454,12 @@ aside .module [class^=module] {
     padding: 0;
 }
 .search-meta {
-    width: 85%;
+    width: 95%;
 }
 .stats {
     color: #f65940;
     font-size: 60px;
     display: block;
-    text-align: center;
 }
 .search-meta .stats-box {
     margin-top: 0;
@@ -471,7 +469,6 @@ aside .module [class^=module] {
     color:#403644;
     font-weight: 700;
     display: block;
-    text-align: center;
 }
 .subscribe-box {
     background-color: #f65940;
@@ -624,16 +621,6 @@ aside .module [class^=module] {
     .footer-links {
         padding: 5px 0;
     }
-    .footer-links input {
-        padding: 18px 10px;
-    }
-    .footer-links .input-group-btn .btn {
-        font-size: 14px;
-        padding: 9px 10px;
-        width: 100px;
-        background-color: #f65940;
-        border-color: #f65940;
-    }
     .subscribe-box {
         background: transparent;
         min-height: 100%;
diff --git a/ckanext/justicehub_theme/public/organization.css b/ckanext/justicehub_theme/public/organization.css
index aca0c3f..254383c 100644
--- a/ckanext/justicehub_theme/public/organization.css
+++ b/ckanext/justicehub_theme/public/organization.css
@@ -33,8 +33,8 @@
 }
 .header-tabs .nav-tabs {
     width: 100%;
-    margin-top: -60px;
-    border-bottom: 2px solid #f65940;
+    margin-top: -56px;
+    border-bottom: 1px solid #f65940;
 }
 .header-tabs .nav-tabs li a {
     border-radius: 0;
diff --git a/ckanext/justicehub_theme/public/package.css b/ckanext/justicehub_theme/public/package.css
index 2a09866..9e574d0 100644
--- a/ckanext/justicehub_theme/public/package.css
+++ b/ckanext/justicehub_theme/public/package.css
@@ -1,5 +1,8 @@
 /* ---------- package-item ------- */
 
+.dataset-resources {
+    margin-top: 0;
+}
 .label {
     display: inline-block;
     padding: 5px 15px;
diff --git a/ckanext/justicehub_theme/public/partner.css b/ckanext/justicehub_theme/public/partner.css
index 7ebf15e..caa4ea2 100644
--- a/ckanext/justicehub_theme/public/partner.css
+++ b/ckanext/justicehub_theme/public/partner.css
@@ -13,10 +13,13 @@
 .media-logo {
     height: 150px;
 }
+.partner-links.social-links .fa {
+    background-color: #403644;
+}
 .partner-links.social-links .fa:hover {
     background-color: #ffffff;
-    color: #f65940;
-    border: 1px solid #f65940;
+    color: #403644;
+    border: 1px solid #403644;
 }
 
 
diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index 3aefce7..cafb674 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -1,6 +1,9 @@
 .resource-item .heading {
     color:#403644;
 }
+.resource-item {
+    margin-bottom: 20px;
+}
 .format-label {
     margin-top:10px;
 }
@@ -39,8 +42,6 @@
 }
 
 .module-content .nav-tabs {
-    margin: 0px;
-    margin-top: 50px;
     border-top: 2px solid #f65940;
     border-bottom: 2px solid #f65940;
 }
@@ -65,18 +66,18 @@
 }
 
 .rsrc-list-side > li {
-    padding-left:15px;
+    padding-left: 40px;
     border: none;
 }
 
-
 .rsrc-list-side .rsrc-item-side a{
     color:#ffffff;
 }
 
+.rsrc-list-side .rsrc-item-side a:hover,
 .rsrc-list-side .rsrc-item-side:hover {
-    background:#eeeeee;
-    color:#403644;
+    background: #ffffff;
+    color: #403644;
 }
 
 .rsrc-list-side .rsrc-item-side a:hover{
@@ -91,7 +92,6 @@
    background:#f65940;
    padding-top:40px;
    padding-bottom:40px;
-   padding-left:15px;
 }
 
 .module .rsrc-list-side .rsrc-item-side a{
@@ -100,7 +100,6 @@
    padding-left:0px;
 }
 
-
 .rsrc-item-desc-side{
    color: #f65940;
    border-bottom: 1px dotted #dddddd;
diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index b5322d7..d7c1bd5 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -35,13 +35,32 @@
     padding: 0 0;
 }
 .search-form .search-input.search-giant {
-    width: 80%;
+    width: 94%;
+}
+.footer-links .input-group-btn .btn,
+.footer-links .input-group input {
+    border-radius: 30px;
+}
+.footer-links .input-group .form-control:focus {
+    border-color: #f65940;
+    z-index: 0;
+}
+.footer-links input {
+    padding: 20px 15px;
+}
+.footer-links .input-group-btn .btn {
+    margin-left: -20px;
+    background-color: #403644;
+    color: #ffffff;
+    border-color: #403644;
+    text-align: center;
 }
 .dataset-count-box {
     display: flex !important;
     justify-content: center;
     align-items: center;
     padding: 10px;
+    border-left: none !important;
 }
 .dataset-count-box span {
     margin: auto;
@@ -86,9 +105,12 @@
 }
 .filters .module-content.empty,
 .filters .nav-facet .nav-item {
-    padding-left: 40px;
+    padding-left: 50px;
     border-bottom: none;
 }
+.filters .module-footer {
+    display: none;
+}
 .nav-facet, .filters .module-content.empty {
     background-color: #403644;
     color: #ffffff;
@@ -111,4 +133,14 @@
     .search-form .search-input.search-giant button {
         background: transparent;
     }
+    .footer-links input {
+        padding: 18px 10px;
+    }
+    .footer-links .input-group-btn .btn {
+        font-size: 14px;
+        padding: 9px 10px;
+        width: 100px;
+        background-color: #f65940;
+        border-color: #f65940;
+    }
 }
diff --git a/ckanext/justicehub_theme/templates/home/snippets/search.html b/ckanext/justicehub_theme/templates/home/snippets/search.html
index 1221831..69914ad 100644
--- a/ckanext/justicehub_theme/templates/home/snippets/search.html
+++ b/ckanext/justicehub_theme/templates/home/snippets/search.html
@@ -13,21 +13,17 @@
     </div>
   </form>
   <div class="row search-meta">
-      <div class="col col-sm-7 col-xs-1">
-      </div>
       <div class="col col-sm-3 stats-box hidden col-xs-hidden">
           <h3>{{ _('Popular tags') }}</h3>
           {% for tag in tags %}
           <a class="tag" href="{% url_for controller='package', action='search', tags=tag.name %}">{{ h.truncate(tag.display_name, 22) }}</a>
           {% endfor %}
       </div>
-      <div class="col col-xs-5 col-sm-2 stats-box">
+      <div class="col col-xs-5 col-sm-2 stats-box pull-right">
           <span class="stats">{{ stats.organization_count }}</span>
           <span class="stats-text">{{ _('CONTRIBUTORS') }}</span>
       </div>
-      <div class="col col-sm-1 col-xs-1">
-      </div>
-      <div class="col col-xs-5 col-sm-2 stats-box">
+      <div class="col col-xs-5 col-sm-2 stats-box pull-right">
           <span class="stats">{{ stats.dataset_count }}</span>
           <span class="stats-text">{{ _('DATASETS') }}</span>
       </div>
diff --git a/ckanext/justicehub_theme/templates/issues/dataset.html b/ckanext/justicehub_theme/templates/issues/dataset.html
index c4a12e2..9268bdd 100644
--- a/ckanext/justicehub_theme/templates/issues/dataset.html
+++ b/ckanext/justicehub_theme/templates/issues/dataset.html
@@ -8,13 +8,12 @@
 {% block primary_content_inner %}
 <section class="module issues-home">
 
-        <h1 class="page-heading row">
-            <div class="issues-actions page_primary_action">
-                {{ h.nav_link(_('New Issue'), named_route='issues_new', dataset_id=pkg.name, class_='btn btn-success pull-right') }}
-            </div>
-        </h1>
-
     {% snippet 'snippets/search_form.html', type='issue', query=q, fields=(('page', pagination.page), ('per_page', pagination.per_page), ('status', status), ('visibility', visibility)), sorting=filters, sorting_selected=sort, placeholder=_('Search issues...'), no_bottom_border=true, no_title=true %}
+    <h1 class="row">
+        <div class="issues-actions page_primary_action">
+            {{ h.nav_link(_('New Issue'), named_route='issues_new', dataset_id=pkg.name, class_='btn btn-success pull-right') }}
+        </div>
+    </h1>
 
    <h2 id="issues-found">
        {{ ungettext('{number} issue found', '{number} issues found', pagination.total_count) .format(number=pagination.total_count) }}
diff --git a/ckanext/justicehub_theme/templates/organization/read.html b/ckanext/justicehub_theme/templates/organization/read.html
index 9147eb1..73709be 100644
--- a/ckanext/justicehub_theme/templates/organization/read.html
+++ b/ckanext/justicehub_theme/templates/organization/read.html
@@ -1,5 +1,8 @@
 {% ckan_extends %}
 
+{% block page_primary_action %}
+{% endblock %}
+
 {% block primary_content_inner %}
     {% block groups_search_form %}
       {% set facets = {
@@ -18,6 +21,13 @@
       %}
       {% snippet 'snippets/search_form.html', form_id='organization-datasets-search-form', type='dataset', query=c.q, sorting=sorting, sorting_selected=c.sort_by_selected, count=c.page.item_count, facets=facets, placeholder=_('Search datasets...'), show_empty=request.params, fields=c.fields %}
     {% endblock %}
+
+    {% if h.check_access('package_create', {'owner_org': c.group_dict.id}) %}
+      <div class="page_primary_action row">
+      {% snippet 'snippets/add_dataset.html', group=c.group_dict.id %}
+      </div>
+    {% endif %}
+
   {% block packages_list %}
     {% if c.page.items %}
       {{ h.snippet('snippets/package_list.html', packages=c.page.items) }}
diff --git a/ckanext/justicehub_theme/templates/package/edit_base.html b/ckanext/justicehub_theme/templates/package/edit_base.html
index d7420bc..e9cd6b9 100644
--- a/ckanext/justicehub_theme/templates/package/edit_base.html
+++ b/ckanext/justicehub_theme/templates/package/edit_base.html
@@ -1,5 +1,10 @@
 {% ckan_extends %}
 
+{% block pre_primary %}
+<div class="col-xs-12 row top-section">
+</div>
+{% endblock %}
+
 {% block content_primary_nav %}
   {{ h.build_nav_icon('dataset_edit', _('ABOUT DATASET'), id=pkg.name) }}
   {{ h.build_nav_icon('dataset_resources', _('DATA & RESOURCES'), id=pkg.name) }}
@@ -8,3 +13,7 @@
 {% block content_action %}
   {% link_for _('VIEW'), controller='package', action='read', id=pkg.name, class_='btn btn-default' %}
 {% endblock %}
+
+{% block secondary_content %}
+    <h2 class="edit-module-heading">{{ pkg.title }}</h2>
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/package/read.html b/ckanext/justicehub_theme/templates/package/read.html
index a27288e..e63008a 100644
--- a/ckanext/justicehub_theme/templates/package/read.html
+++ b/ckanext/justicehub_theme/templates/package/read.html
@@ -5,6 +5,9 @@
 {% block primary_content_inner %}
   {{ super() }}
   {% block package_description %}
+    <h1 class="page-heading">
+        {{ _('FILES') }}
+    </h1>
   {% endblock %}
 
   {% block package_resources %}
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index 9e3ce57..4fb2003 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -21,10 +21,6 @@ <h1>{{h.dataset_display_name(pkg)}}
             <p class="package-desc"> {{h.get_translated(pkg, 'notes')}}</p>
         </div>
 
-        <div class="row meta-desc">
-            <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
-            <a href="http://www.opendefinition.org/okd/"><img src="{{ h.url_for_static('/base/images/od_80x15_blue.png') }}" alt="Open Data"></a>
-        </div>
         <div class="row">
             {% for tag in pkg.tags %}
             <div class="pkg_tags">
@@ -32,6 +28,9 @@ <h1>{{h.dataset_display_name(pkg)}}
             </div>
             {% endfor %}
         </div>
+        <div class="row meta-desc">
+            <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
+        </div>
         <div class="row stats-box">
             <div class="col-xs-6 col-sm-4">
                 <span class="stats">{{ h.justicehub_theme_get_package_avg_downloads(pkg) }}{{ _('+') }}</span>
@@ -63,13 +62,6 @@ <h1>{{h.dataset_display_name(pkg)}}
         {{ c.group_dict.display_name }}
         </a>
         </div>
-        <div class="row">
-            <div class="col col-md-3">
-            </div>
-            <div class="col col-md-4 dataset-org">
-            <a href="{{ h.url_for(controller='organization', action='read', id=pkg.organization.id) }}">{{ pkg.organization.title}}</a>
-            </div>
-        </div>
         <div class="row">
             <div class="col col-md-12 partner-links social-links">
             <ul class="list-unstyled list-inline">
@@ -136,23 +128,25 @@ <h2>ACTIVITY</h2>
     {% if pkg.links %}
     {% set links = h.justicehub_theme_parse_json(pkg.links) %}
     <div class="col-xs-12 row page-section">
-       <span>{{ _('External Links') }}</span>
+        <div class="col col-sm-9 col-xs-12 pull-right">
+        <h1 class="heading">{{ _('EXTERNAL LINKS') }}</h1>
         {% for item in links %}
            <ul class="list-unstyled links-list list-inline">
           {% set item = h.composite_get_as_dict(item) %}
           <li>
               <a href="{{ link }}">{{ item['title'] }}</a>
           </li>
-          <li>
+          <li class="pull-right">
               <p>{{ item['description'] }}</p>
           </li>
           </ul>
         {% endfor %}
+        </div>
     </div>
     {% endif %}
 
     <div class= "col-xs-12 row page-section">
-        <div class="col-xs-12">
+        <div class="col col-sm-9 col-xs-12 pull-right">
             {% block package_additional_info %}
             {% snippet "package/snippets/additional_info.html", pkg_dict=pkg %}
             {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/package/resource_read.html b/ckanext/justicehub_theme/templates/package/resource_read.html
index 12d437d..b130643 100644
--- a/ckanext/justicehub_theme/templates/package/resource_read.html
+++ b/ckanext/justicehub_theme/templates/package/resource_read.html
@@ -6,7 +6,7 @@
     {% block resource_content %}
 
         {% block resource_read_title %}
-            {{ super() }}
+            <h1>{{ h.resource_display_name(res) | truncate(50) }}</h1>
         {% endblock %}
 
         <div class="prose notes resource-desc" property="rdfs:label">
@@ -22,7 +22,6 @@ <h3>{{ _('From the dataset abstract') }}</h3>
 
         <div class="res-line-margin-bottom meta-desc">
             <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
-            <a href="http://www.opendefinition.org/okd/"><img src="{{ h.url_for_static('/base/images/od_80x15_blue.png') }}" alt="Open Data"></a>
         </div>
 
         {% block resource_read_url %}
@@ -78,7 +77,48 @@ <h3>{{ _('From the dataset abstract') }}</h3>
 {% block primary_content %}
   <div class="col-sm-9 col-xs-12">
   {% block resource_additional_information %}
-    {{ super() }}
+  {% if res %}
+      <section class="module">
+          <h1 class="page-heading">{{ _('ADDITIONAL INFORMATION') }}</h2>
+          {% block resource_additional_information_inner %}
+          <div class="module-content">
+          <table class="table table-striped table-bordered table-condensed" data-module="table-toggle-more">
+            <thead>
+              <tr>
+                <th scope="col">{{ _('Field') }}</th>
+                <th scope="col">{{ _('Value') }}</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td scope="row">{{ _('Data last updated') }}</th>
+                <td>{{ h.render_datetime(res.last_modified) or h.render_datetime(res.created) or _('unknown') }}</td>
+              </tr>
+              <tr>
+                <td scope="row">{{ _('Metadata last updated') }}</th>
+                <td>{{ h.render_datetime(res.revision_timestamp) or h.render_datetime(res.created) or _('unknown') }}</td>
+              </tr>
+              <tr>
+                <td scope="row">{{ _('Created') }}</th>
+                <td>{{ h.render_datetime(res.created) or _('unknown') }}</td>
+              </tr>
+              <tr>
+                <td scope="row">{{ _('Format') }}</th>
+                <td>{{ res.mimetype_inner or res.mimetype or res.format or _('unknown') }}</td>
+              </tr>
+              <tr>
+                <td scope="row">{{ _('License') }}</th>
+                <td>{% snippet "snippets/license.html", pkg_dict=pkg, text_only=True %}</td>
+              </tr>
+              {% for key, value in h.format_resource_items(res.items()) %}
+                <tr class="toggle-more"><td scope="row">{{ key }}</th><td>{{ value }}</td></tr>
+              {% endfor %}
+            </tbody>
+          </table>
+          </div>
+          {% endblock %}
+      </section>
+  {% endif %}
   {% endblock %}
   </div>
 
diff --git a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
index 7784c34..d1f4036 100644
--- a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
+++ b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
@@ -1,5 +1,8 @@
 {% ckan_extends %}
 
+{% block resource_item_description %}
+{% endblock %}
+
 {% block resource_item_explore %}
 {% if not url_is_edit %}
   <div class="dropdown btn-group">
diff --git a/ckanext/justicehub_theme/templates/package/snippets/resources.html b/ckanext/justicehub_theme/templates/package/snippets/resources.html
index 9153dbd..5449169 100644
--- a/ckanext/justicehub_theme/templates/package/snippets/resources.html
+++ b/ckanext/justicehub_theme/templates/package/snippets/resources.html
@@ -17,16 +17,14 @@
     <section class="module module-narrow">
       {% block resources_inner %}
         {% block resources_title %}
-          <h2 class="module-heading"><i class="fa fa-files-o"></i> {{ _("Resources") }}</h2>
+          <h2 class="module-heading">{{ _("LIST OF ALL FILES") }}</h2>
         {% endblock %}
         {% block resources_list %}
           <ul class="list-unstyled nav nav-simple rsrc-list-side">
             {% for resource in resources %}
               <li class="nav-item rsrc-item-side">
                 {% link_for h.resource_display_name(resource)|truncate(25), controller='package', action=action or 'resource_read', id=pkg.name, resource_id=resource.id, inner_span=true %}
-                
               </li>
-              <p class="rsrc-item-desc-side">{{ h.markdown_extract(h.get_translated(resource, 'description'), extract_length=25) }}</p>
               
             {% endfor %}
           </ul>
diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
index 9ed7c7f..f37e81c 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
@@ -1,5 +1,3 @@
-{% extends "package/snippets/additional_info.html" %}
-
 {%- set exclude_fields = [
     'id',
     'title',
@@ -11,25 +9,39 @@
     'links'
     ] -%}
 
-{% block package_additional_info %}
-  {%- for field in schema.dataset_fields -%}
-    {%- if field.field_name not in exclude_fields
-        and field.display_snippet is not none
-        and pkg_dict[field.field_name] -%}
+<section class="additional-info">
+  <h1>{{ _('ADDITIONAL INFO') }}</h1>
+  <table class="table table-striped table-bordered table-condensed">
+    <thead>
       <tr>
-        <th scope="row" class="dataset-label" title="{{ field.description }}">{{
-          h.scheming_language_text(field.label) }}</th>
-        <td class="dataset-details"{%
-          if field.display_property %} property="{{ field.display_property
-          }}"{% endif %}>{%- snippet 'scheming/snippets/display_field.html',
-          field=field, data=pkg_dict, schema=schema -%}</td>
+        <th scope="col">{{ _('Field') }}</th>
+        <th scope="col">{{ _('Value') }}</th>
       </tr>
-    {%- endif -%}
-  {%- endfor -%}
-  {% if h.check_access('package_update',{'id':pkg_dict.id}) %}
-    <tr>
-      <th scope="row" class="dataset-label">{{ _("State") }}</th>
-      <td class="dataset-details">{{ _(pkg_dict.state) }}</td>
-    </tr>
-  {% endif %}
-{% endblock %}
+    </thead>
+
+    <tbody>
+    {% block package_additional_info %}
+      {%- for field in schema.dataset_fields -%}
+        {%- if field.field_name not in exclude_fields
+            and field.display_snippet is not none
+            and pkg_dict[field.field_name] -%}
+          <tr>
+            <td scope="row" class="dataset-label" title="{{ field.description }}">{{
+              h.scheming_language_text(field.label) }}</th>
+            <td class="dataset-details"{%
+              if field.display_property %} property="{{ field.display_property
+              }}"{% endif %}>{%- snippet 'scheming/snippets/display_field.html',
+              field=field, data=pkg_dict, schema=schema -%}</td>
+          </tr>
+        {%- endif -%}
+      {%- endfor -%}
+      {% if h.check_access('package_update',{'id':pkg_dict.id}) %}
+        <tr>
+          <td scope="row" class="dataset-label">{{ _("State") }}</th>
+          <td class="dataset-details">{{ _(pkg_dict.state) }}</td>
+        </tr>
+      {% endif %}
+    {% endblock %}
+    </tbody>
+  </table>
+</section>
diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
index 96393e1..5a46afe 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
@@ -83,7 +83,7 @@
   {%- endfor -%}
   </div>
 
-  <div class="form-group">
+  <div style="margin-top: 25px;">
       <span class="metadata-heading">{{ _('METADATA') }}</span>
   </div>
 
diff --git a/ckanext/justicehub_theme/templates/snippets/package_item.html b/ckanext/justicehub_theme/templates/snippets/package_item.html
index 9797890..94c8919 100644
--- a/ckanext/justicehub_theme/templates/snippets/package_item.html
+++ b/ckanext/justicehub_theme/templates/snippets/package_item.html
@@ -16,7 +16,7 @@ <h3 class="dataset-heading">
                 <i class="fa fa-lock" data-toggle="tooltip"></i>
             {% endif %}
             {% if package.verified %}
-                <i class="fa fa-check" data-toggle="tooltip"></i>
+                <i class="fa fa-check" title="verified"></i>
             {% endif %}
           {% endblock %}
 
diff --git a/ckanext/justicehub_theme/templates/snippets/social.html b/ckanext/justicehub_theme/templates/snippets/social.html
index 520e537..00163d5 100644
--- a/ckanext/justicehub_theme/templates/snippets/social.html
+++ b/ckanext/justicehub_theme/templates/snippets/social.html
@@ -2,7 +2,7 @@
 {% block social %}
   <section class="module module-narrow social">
     {% block social_title %}
-      <h2 class="module-heading social-heading"><i class="fa fa-share-square-o"></i> {{ _('Share on') }}</h2>
+      <h2 class="module-heading social-heading"> {{ _('Share on') }}</h2>
     {% endblock %}
     {% block social_nav %}
     <div class="social-links">

From 2048074bc3a24bf01fe6db07d4d44b69c1c1a038 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 3 Jun 2020 23:27:36 +0530
Subject: [PATCH 043/127] clean and rearrange css modules

---
 .../justicehub_theme/public/dataset_info.css  | 251 ----------
 ckanext/justicehub_theme/public/form.css      | 214 +++-----
 .../public/justicehub_theme.css               | 466 ++++++------------
 .../justicehub_theme/public/organization.css  |  92 ----
 ckanext/justicehub_theme/public/package.css   | 114 -----
 ckanext/justicehub_theme/public/partner.css   |  84 ++--
 ckanext/justicehub_theme/public/resource.css  | 169 +------
 ckanext/justicehub_theme/public/search.css    |  43 +-
 ckanext/justicehub_theme/templates/base.html  |   5 +-
 .../templates/package/snippets/resources.html |   4 +-
 10 files changed, 290 insertions(+), 1152 deletions(-)
 delete mode 100644 ckanext/justicehub_theme/public/dataset_info.css
 delete mode 100644 ckanext/justicehub_theme/public/organization.css
 delete mode 100644 ckanext/justicehub_theme/public/package.css

diff --git a/ckanext/justicehub_theme/public/dataset_info.css b/ckanext/justicehub_theme/public/dataset_info.css
deleted file mode 100644
index 42905a4..0000000
--- a/ckanext/justicehub_theme/public/dataset_info.css
+++ /dev/null
@@ -1,251 +0,0 @@
-.activity .item::after{
-  margin-bottom:40px;
-}
-.activity .item {
-    font-weight: normal;
-    font-style: italic;
-}
-.activity .item .actor a {
-    color: #f65940;
-}
-.activity .item a {
-    font-weight: bold;
-    font-style: normal;
-}
-.activity .item .icon {
-    background-color: #00abb7 !important;
-    height: 45px;
-    width: 45px;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    font-size: 25px;
-}
-.activity .item p {
-    margin-left:60px;
-}
-
-.activity .item .fa{
-  margin-top:10px;
-}
-
-.activity .item {
-  margin-left:15px;
-}
-
-.activity .item a{
-  color: #bcb4bf;
-}
-
-.activity {
-  background:none
-}
-
-
-.activity .item .date{
-  color:#f65940;
-  display:block
-}
-
-.actor .gravatar {
-  display:none
-}
-
-.stats-box {
-    margin-top: 50px;
-    margin-bottom: 20px;
-}
-.stats-text {
-    color:#403644;
-    font-weight:bold;
-    display: block;
-}
-.pckg_rsrc_actvty {
-    background:#403644;
-}
-.pckg_rsrc_actvty,
-.page-section {
-    border-top: 2px solid #f65940;
-    padding-top: 20px;
-}
-.page-section {
-    padding-bottom: 20px;
-    margin-left: 0;
-}
-.page-section > span:first-child {
-    display: inline-block;
-    margin-bottom: 30px;
-    padding-left: 15px;
-}
-.page-section .links-list {
-    padding-left: 0;
-    font-weight: normal;
-    height: 150px;
-}
-.page-section .links-list a {
-    color: #f65940;
-}
-.top-section {
-    margin: 0 20px;
-    margin-bottom: 250px;
-}
-.package-desc {
-    width:75%;
-    margin-bottom:20px;
-}
-.meta-desc {
-    padding: 10px 0;
-}
-/* Ref: https://stackoverflow.com/a/36311846/3860168 */
-.org-box {
-    width: 350px;
-    height: 350px;
-    margin-top: -30px;
-}
-.pkg_tags {
-    border-radius:30px;
-    padding: 5px 20px;
-    display:inline-flex;
-    background-color: #bcb4bf;
-}
-.pkg_tags a {
-    color:white;
-    font-weight:bold;
-}
-
-.pckg_rsrc_actvty {
-    border-top: 2px solid #f65940;
-    margin-left: 0;
-}
-.pckg_rsrc_actvty > .activity-item {
-    color: #ffffff;
-    margin-left: 10px;
-    margin-right: 20px;
-}
-.pckg_rsrc_actvty h2 {
-    font-weight:bolder;
-    line-height: 1.2;
-    color:white;
-    text-align:center;
-    border-bottom: 2px solid #f65940;
-    padding-top:5px;
-    padding-bottom:21px;
-}
-.page-heading {
-    border-bottom: 2px solid #f65940;
-    margin-left: -30px;
-    padding-left: 15px;
-    padding-bottom: 20px;
-    margin-bottom: 10px !important;
-}
-.content_action a {
-    background-color: #f65940;
-    border-radius: 30px;
-    padding: 5px 25px;
-    color: #ffffff;
-    margin-top: 10px;
-}
-.content_action a:hover {
-    color: #f65940;
-    background-color: inherit;
-    border: 1px solid #f65940;
-}
-.package-tabs {
-    margin-left: 0;
-}
-.package-tabs .nav-tabs::before,
-.package-tabs .nav-tabs::after {
-    margin-bottom: 2px;
-    border: none;
-}
-.package-tabs .nav-tabs {
-    width: 100%;
-    margin-top: -60px;
-    border-bottom: 1px solid #f65940;
-}
-.package-tabs .nav-tabs li a {
-    border-radius: 0;
-}
-.additional-info .table {
-    width: 65%;
-}
-.table-striped thead tr th,
-.table-striped thead tr td {
-    padding-top: 10px;
-    padding-bottom: 10px;
-    padding-left: 5%;
-}
-.table-striped tbody tr th,
-.table-striped tbody tr td {
-    padding-top: 12px;
-    padding-bottom: 12px;
-    padding-left: 5%;
-}
-.table-striped tbody tr:nth-child(2n) td,
-.table-striped tbody tr:nth-child(2n) th {
-    background-color: #ffffff;
-}
-.table-striped tbody tr:nth-child(2n+1) td,
-.table-striped tbody tr:nth-child(2n+1) th {
-    background-color: #c1bbc3;
-}
-.resource-item {
-    margin-right: 20px;
-}
-.dropdown-toggle {
-    border-radius: 30px;
-}
-.btn-default .fa-bars+span {
-    display: none;
-}
-.btn-default .fa-bars::before {
-    display: none;
-}
-.btn-default .fa-bars:after {
-    content: ' REORDER';
-    font-family: 'Montserrat', sans-serif;
-    font-weight: 700;
-    font-size: 20px;
-}
-
-/*----------------- data set editing page css ----------------------*/
-.edit-pkg-header{
-	border-bottom:1px solid #403644;
-}
-
-.nav-tabs > li {
-    margin-bottom: -2px;
-}
-.nav-tabs > li >  a {
-    color: #403644;
-    border: None;
-}
-.nav-tabs > li >  a > i {
-    display:None;
-}
-.nav-tabs > li.active >  a {
-	background: #403644;
-    color:#ffffff;
-}
-.page_primary_action .btn-flat {
-	border-radius:0px;
-    margin-right :40px;
-}
-
-/* --------------------- responsive ------------------------- */
-@media only screen and (max-width: 768px){
-	.nav-tabs > li {
-        margin-right:0px;
-	}
-	.page_primary_action .btn-flat {
-		border-radius:0px;
-        margin-right :0px;
-	}
-    .pckg_rsrc_actvty{
-        display:block;
-    }
-    .additional-info .table {
-        width: 100%;
-        margin-left: 0;
-    }
-}
diff --git a/ckanext/justicehub_theme/public/form.css b/ckanext/justicehub_theme/public/form.css
index 7f122b5..577a86d 100644
--- a/ckanext/justicehub_theme/public/form.css
+++ b/ckanext/justicehub_theme/public/form.css
@@ -3,128 +3,81 @@
     border-bottom: none;
     margin-bottom: 20px;
 }
-.dataset-form {
-    padding-right: 50px;
-}
+/* --------------- tag remove icon ----------------- */
 .select2-container-multi .select2-search-choice-close {
     left: auto;
     margin: 5px 10px 5px 5px;
-    /* background: url('https://image.flaticon.com/icons/svg/2919/2919559.svg') right top no-repeat;*/
     background: url('https://image.flaticon.com/icons/svg/458/458595.svg');
 }
-
-/*------------------ form control borders, backgrounds fonts colors ----------------*/
-.dataset-form .form-actions .btn-primary,
-.dataset-form .form-actions .btn-primary:active,
-.dataset-form .form-actions .btn-primary:hover,
-.dataset-form .form-actions .btn-primary:focus {
-    color: #f65940;
-}
-.page_primary_action .btn.btn-default,
-.controls > a.btn,
-.js  .image-upload .btn.hover,
-.controls .btn,
-.dataset-form .form-actions .btn-finish,
-.select2-container-multi .select2-choices > li.select2-search-choice {
-    color: #ffffff;
+/* --------------- arrow icon in select dropdown --- */
+.select2-container .select2-choice .select2-arrow {
+    margin-top: 7px;
+    margin-right: 10px;
+    background: transparent;
+    box-shadow: none;
+    border-left: none;
 }
-.dataset-form .form-actions .btn-finish:active,
-.dataset-form .form-actions .btn-finish:hover,
-.dataset-form .form-actions .btn-finish:focus,
-.control-label {
-    color: #403644;
+.select2-container .select2-choice .select2-arrow b {
+    background-size: cover;
 }
-.page_primary_action .btn.btn-default,
-.controls > input:first-child,
-.input-group > *:first-child,
+
+/*------------------ form control borders, backgrounds ----------------*/
+.square-border,
+.form-control,
+.form-control:focus,
+.controls input,
+.controls .form-control,
+.input-group-addon,
+.editor textarea,
 .editor .editor-info-block,
-[class^="input-group"] > *:first-child,
-[class^="form-control"],
-[class^="form-control"]:focus,
-fieldset.checkboxes > label > input,
 .select2-drop,
 .select2-container .select2-choice,
-.select2-container-multi .select2-choices {
+.select2-container .select2-choices {
     border-radius: 0px;
-}
-.input-group > *:first-child,
-.editor .editor-info-block,
-[class^="input-group"] > *:first-child,
-[class^="form-control"],
-[class^="form-control"]:focus,
-.dataset-form .form-actions .btn-finish:hover,
-.dataset-form .form-actions .btn-finish:focus,
-.dataset-form .form-actions .btn-finish:active,
-.select2-drop,
-.select2-container .select2-choice,
-.select2-container-multi.form-control,
-.select2-container-multi .select2-choices {
     border: 1px solid #f65940;
 }
+.btn-xs,
+.btn-xs:hover,
+.bg-clear.btn,
+.controls .select2-container,
+.checkbox-other.select2-container {
+    border: none;
+}
+.btn-xs,
+.btn-xs:active:hover,
+.btn-xs:focus,
+.btn-xs:focus,
 .bg-clear,
-.dataset-form .form-actions .btn-primary,
-.dataset-form .form-actions .btn-primary:focus,
-.dataset-form .form-actions .btn-finish:hover,
-.dataset-form .form-actions .btn-finish:active,
-.checkbox-other > *:first-child,
-fieldset.checkboxes > label > input,
-.controls .select2-container .select2-choice .select2-arrow,
-.select2-dropdown-open.select2-container > .select2-choices,
-.controls .select2-container > a.select2-choice {
+.bg-clear:active,
+.bg-clear:focus,
+.bg-clear:hover,
+.bg-clear:active:hover,
+.bg-clear[disabled]:hover,
+.controls .select2-container > a.select2-choice,
+.checkbox-other.select2-container > .select2-choices {
     background: transparent;
     box-shadow: none;
 }
-.page_primary_action .btn.btn-default,
-.controls > a.btn,
-.controls .btn,
-.dataset-form .form-actions .btn-finish,
-.select2-container-multi .select2-choices > li.select2-search-choice {
-    background-color: #403644;
-}
-.sort-box,
-.sort-box:focus,
-.search-form .btn,
-.controls .select2-container .select2-choice .select2-arrow {
-    border-left: none;
-}
 .select2-container-active .select2-choices {
     border-color: #f65940 !important; /* important because it gets overridden by dynamic class change */
 }
-.controls > a.btn,
-.controls .btn,
-.dataset-form .form-actions .btn-primary,
-.dataset-form .form-actions .btn-danger,
-.dataset-form .form-actions .btn-finish,
+.checkbox-other.select2-container .select2-choices {
+    border: none;
+    border-bottom: 1px solid #f65940;
+}
+
+/* -------------------- tags ------------------- */
 .select2-container-multi .select2-choices > li.select2-search-choice {
     padding: 7px 25px;
     border-radius: 30px;
 }
-.select2-results .select2-highlighted,
 .select2-container-multi .select2-choices > li.select2-search-choice:nth-child(2n) {
     background-color: #f65940 !important;
     background: none;
 }
 .select2-container-multi .select2-choices > li.select2-search-choice:nth-child(2n+1) {
     background: none;
-    background-color: #403644 !important;
-}
-.sort-box,
-#field-giant-search:focus,
-.input-group .input-group-addon {
-    border-right: none;
-}
-.select2-dropdown-open.select2-container > .select2-choices,
-.checkbox-other > *:first-child {
-    border-top: none;
-    border-left: none;
-    border-right: none;
-}
-.select2-container .select2-choice .select2-arrow {
-    margin-top: 7px;
-    margin-right: 10px;
-}
-.select2-container .select2-choice .select2-arrow b {
-    background-size: cover;
+    background-color: #403644;
 }
 
 /*------------------ form control layout ----------------*/
@@ -138,20 +91,32 @@ fieldset.checkboxes > label > input,
 .controls .select2-container {
     height: 50px;
 }
-.search-form .input-group > *,
-.search-form .input-group > select {
-    height: 75px;
-}
 fieldset.checkboxes label {
     display: inline-block !important;
 }
+.select2-container {
+    padding: 0;
+}
 .checkbox-other {
-    width: 200px !important;
+    width: 250px !important;
+}
+/* HACK: the logo remove button was floating right */
+.js .image-upload .btn-remove-url {
+    right: 35px;
+}
+/* HACK: since we're not updating the composite template */
+.composite-header {
+    padding-top: 15px;
+    padding-left: 15px;
 }
 
 /* ----------------- form control spacing ------------- */
-.dataset-form .form-actions {
-    margin-top: 50px;
+.form-actions {
+    margin-top: 20px;
+}
+.controls,
+.form-actions {
+    padding-right: 30px;
 }
 .controls .select2-container.select2-container-multi .select2-choices {
     padding-top: 10px;
@@ -167,10 +132,6 @@ fieldset.checkboxes label {
     padding-top: 3px;
     padding-bottom: 3px;
 }
-.dataset-form .form-actions .btn-primary,
-.controls > .select2-container .select2-choices {
-    border: none;
-}
 .controls .select2-container .select2-choices {
     padding-left: 0;
 }
@@ -181,35 +142,19 @@ fieldset.checkboxes label {
     padding-left: 30px;
     margin-bottom: 0;
 }
-.search-form .input-group .btn,
-.dataset-form .input-group .btn {
-    padding-top: 26px;
-    padding-bottom: 21px;
-}
-.select2-container {
-    padding: 0;
-}
 .select2-container .select2-choice,
 .select2-container-multi .select2-choices {
-    padding: 0 0 0 10px;
+    padding: 0 0 0 12px;
 }
 fieldset.radios label > input {
     margin-right: 5px;
-    background: white;
 }
 fieldset.radios label,
 fieldset.checkboxes label {
     padding-right: 40px;
 }
-.checkbox-other > *:first-child {
-    margin-left: 10px;
-}
 .select2-search-choice > div {
     margin-right: 15px;
-    padding-left: 5px;
-}
-.controls .checkbox-other .select2-choices {
-    padding-top :0;
 }
 input[type="date"].form-control,
 input[type="month"].form-control {
@@ -217,41 +162,14 @@ input[type="month"].form-control {
 }
 
 /* ----------------------------- login form ------------------------------ */
-.btn-register:focus,
-.btn-register:active,
-.btn-register:hover,
-.btn-register {
-    color: white !important;
-    border: none;
-    background-color: #f65940 !important;
-    box-shadow: none;
-    border-radius: 30px;
-    margin: auto;
-}
 #user-register-form,
 .login-form {
     padding-left: 20px;
     padding-right: 50px;
     padding-bottom: 20px;
 }
-.btn-forgot,
-.btn-forgot:hover {
-    background-color: #ffffff;
-    border: none;
-    color: #f65940;
-    padding-right: 0;
-}
-.login-form .form-actions .btn-primary {
-    background-color: #403644;
-    border-radius: 30px;
-    color: #ffffff;
-    padding: 6px 40px;
-    float: right;
-}
-.checkbox-inline {
-    padding: 10px 30px;
-}
 
+/* ----------------------------- responsive ---------------------------- */
 @media (max-device-width: 600px) and (orientation: portrait) {
     .form-group {
         padding-left: 10px;
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 5ce15ab..dcdb6d9 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -1,101 +1,3 @@
-/* ---------------------- Site Fonts ------------------- */
-.footer-links .input-group input,
-body {
-  font-family: 'Montserrat', sans-serif;
-  font-weight: 400; /* Regular */
-}
-.count,
-.pkg_tags,
-.meta-desc,
-.footer-links .nav-item a {
-    font-size: 14px;
-}
-.sort-box,
-.form-control,
-.input-group-addon,
-.package-item-row,
-.rsrc-list-side > li a,
-.footer-links .input-group-btn .btn {
-    font-size: 16px;
-}
-.resource-item .heading,
-.resource-item .description,
-.nav-facet .nav-item a,
-.filters .module-content.empty,
-.dataset-desc,
-.downloads, .dataset-meta,
-.edit-module-heading,
-.nav-pills li {
-    font-size: 18px;
-}
-body,
-.stats-box,
-.dataset-heading,
-.dataset-org,
-.res-actions a,
-.issues-actions a,
-.content_action a,
-.btn,
-#field-giant-search,
-.search-form .search-input.search-giant input,
-.nav-pills li:last-child {
-    font-size: 20px;
-}
-h1,
-.col2 p,
-.nav-tabs > li >  a,
-.module-heading,
-.login-sidebar-heading,
-.footer-intro {
-    font-size: 25px;
-}
-.col3 h2 {
-    font-size: 30px;
-}
-.footer-links .nav-item a,
-#field-giant-search,
-.footer-links .input-group input::placeholder,
-.search-form .search-input.search-giant input {
-    font-weight: 300; /* Light */
-}
-.count,
-.resource-item .description,
-.dataset-org,
-.dataset-meta,
-.nav-pills li,
-.footer-disclaimer div:last-child {
-    font-weight: 500; /* Medium */
-}
-.rsrc-list-side > li a,
-.media-item .media-heading {
-    font-weight: 600; /* Semi Bold */
-}
-.sort-box,
-.form-control,
-.input-group-addon,
-.col3 h2,
-.nav-tabs > li >  a,
-.content_action a,
-.dataset-heading,
-.module-heading,
-.footer-links .input-group-btn .btn {
-    font-weight: 700; /* Bold */
-}
-.stats-box,
-.footer-intro,
-.nav-pills li:last-child {
-    font-weight: 800; /* Extra Bold */
-}
-.col2 p,
-.downloads,
-.footer-disclaimer div:last-child,
-.filters .module-content.empty,
-#field-giant-search,
-.footer-links .input-group input,
-.search-form .search-input.search-giant input {
-    font-style: italic;
-}
-
 /* ----------------------- images --------------------------- */
 /* Ref: https://stackoverflow.com/a/36311846/3860168 */
 .image-box {
@@ -107,47 +9,12 @@ h1,
     margin:auto;
 }
 
-/* ----------------------- colors ------------------------- */
-.fa-certificate,
-.fa-check {
-    color: #f65940;
-}
-h1 {
-    color: #403644;
-}
-.edit-module-heading {
-    color: #ffffff;
-    text-align: center;
-    border: 1px solid #f65940;
-    margin: 0;
-}
-
-.btn {
-    padding: 8px 25px;
-}
+/* ------------------------ header ------------------------ */
+/* Hide top account bar */
 .account-masthead {
-    background-color: rgb(40, 40, 40);
     display: none;
 }
-.account-masthead .account .notifications a span {
-  background-color: black;
-}
-.account-masthead .account ul li a {
-  color: rgba(255, 255, 255, 0.6);
-}
-.account-masthead .account ul li a:hover {
-  color: rgba(255, 255, 255, 0.7);
-  background-color: black;
-}
-
-
-[role="main"] .container,
-.site-footer .container {
-    width: 100%;
-}
 .masthead {
-    background: none;
-    background-color: #403644;
     padding-top: 0;
     padding-bottom: 0;
 }
@@ -165,23 +32,11 @@ h1 {
 .masthead .navigation .nav-pills li:hover {
     border-bottom: 15px solid #f65940;
 }
-.masthead .navigation .nav-pills li a:hover {
-    background-color: #403644;
-}
-.masthead .navigation .nav-pills li.active a {
-    background-color: #403644;
-}
 .masthead .navigation .nav-pills li:last-child {
     height: 120px;
-    background-color: #f65940;
-    color: #ffffff;
     padding-left: 5px;
     padding-right: 10px;
 }
-.masthead .navigation .nav-pills li:last-child a:hover {
-  color: #ffffff;
-}
-
 .masthead .logo {
     margin-top: 10px;
     margin-bottom: 10px;
@@ -196,8 +51,11 @@ h1 {
     object-fit: cover;
 }
 
-.toolbar {
-    padding: 20px 20px;
+/* -------------------- body layout ----------------------- */
+
+[role="main"] .container,
+.site-footer .container {
+    width: 100%;
 }
 .box {
   box-shadow: none;
@@ -209,16 +67,6 @@ h1 {
 .module-content {
     padding-right: 5px;
 }
-.module-shallow .module-content:last-child,
-.module-content:last-child {
-  padding-bottom: 0px;
-  padding-top: 0px;
-}
-.homepage [role="main"] {
-  background: none;
-  background-color: #ffffff;
-}
-
 .wrapper {
     box-shadow: none;
     min-height: 600px;
@@ -229,108 +77,115 @@ h1 {
     border-right: none;
 }
 
-[role="main"], body {
-  background: none;
-  background-color: #ffffff;
+.toolbar {
+    padding: 20px 20px;
 }
-.site-footer {
-  background: none;
-  background-color: #403644;
-  padding: 0;
+
+/* ----------------------- pre-primary-blocks ----------------- */
+.top-section {
+    margin: 0 20px;
+    margin-bottom: 250px;
 }
-/* The text in the footer. */
-.site-footer,
-.site-footer label,
-.site-footer small {
-  color: rgba(255, 255, 255, 0.6);
+.content_action {
+    margin-right: 30px;
 }
-/* The link texts in the footer. */
-.site-footer a {
-  color: rgba(255, 255, 255, 0.6);
+[class^="btn btn-"],
+.nav-tabs .content_action a {
+    border-color: #403644;
 }
-
-.site-footer {
+.res-actions a,
+.content_action a {
+    border-color: #f65940;
+}
+[class^="btn btn-"],
+.res-actions a,
+.content_action a {
+    border-radius: 30px;
+    padding: 5px 25px;
     color: #ffffff;
 }
-
-.footer-links {
-    padding: 20px 30px;
+.res-actions a,
+.content_action a {
+    margin-top: 10px;
 }
-.footer-links [class*="col-md"] {
-    margin-top: 20px;
+.js .image-upload .btn.hover,
+[class^="btn btn-"]:hover,
+[class^="btn btn-"]:active,
+[class^="btn btn-"]:focus,
+.bg-clear:active:hover,
+.res-actions a:hover,
+.content_action a:hover {
+    color: #f65940;
+    border: 1px solid #f65940;
+    background-color: #ffffff;
+    text-decoration:none;
 }
 
-
-/* https://www.w3schools.com/howto/howto_css_social_media_buttons.asp */
-.social-links a {
-  text-decoration: none;
-}
-.social-links .fa {
-  padding: 12px 5px;
-  font-size: 35px;
-  width: 50px;
-  height: 50px;
-  text-decoration: none;
-  border-radius: 50%;
-  background-color: #f65940;
-  color: #ffffff;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-}
-.fa.fa-envelope {
-  font-size: 30px;
-}
-.social-links li {
-    margin-right: 18px;
-}
-.social-links li:first-of-type {
-    padding-left: 0;
-}
-.social-links .fa:hover {
-  background-color: #403644;
-  border: 1px solid #ffffff;
-  color: #ffffff;
+/* ---------------------- primary blocks ---------------------- */
+.page-heading {
+    border-bottom: 2px solid #f65940;
+    padding-top: 6px;
+    padding-left: 15px;
+    padding-bottom: 20px;
+    margin-bottom: 10px !important;
+    margin-left: -30px;
 }
-.footer-links .nav-item > a:hover, 
-.footer-links .nav-item > a {
+.module .page-header {
     margin: 0;
-    padding: 0;
-    color: #ffffff;
+    padding-bottom: 0;
+    background: transparent;
+    border: none;
 }
-.footer-disclaimer div:last-child {
-    color: #f65940;
+.page-header .nav-tabs {
+    width: 100%;
+    border-bottom: 2px solid #f65940;
+    margin-top: -55px;
 }
-.footer-links i.fa-circle.fa-sm {
-    font-size: 9px;
-    color: #f65940;
-    padding: 10px;
+.page-header .nav-tabs li a {
+    border-radius: 0;
+}
+.page-header .nav-tabs li a:hover {
+    border-bottom: 1.5px solid #f65940;
+}
+.page-header .nav-tabs::before,
+.page-header .nav-tabs::after {
+    border: none;
+}
+.page-header .nav-tabs > li {
+    margin-bottom: -2px;
+}
+.nav-tabs > li >  a > i {
+    display: None;
 }
 
 /* ------------- sidebar --------- */
 .context-info .module-content {
     padding: 0;
 }
-.module-narrow h1.heading,
-.module-narrow h2.module-heading {
-    padding-left: 25px;
-    padding-top: 20px;
-    padding-bottom: 20px !important;
-}
 .context-info .nums {
     border: none;
 }
 .module-footer {
     border: none;
-    background-color: #403644;
-    color: #ffffff;
 }
-.module-heading {
-    color: #ffffff;
-    background-color: #403644;
-    border-color: #f87c69;
-    margin-bottom: 0 !important;
-    border-top: none;
+.sidebar {
+    border-top: 2px solid #f65940;
+}
+.module-shallow .module-content p {
+    padding: 20px 10px;
+}
+.module-shallow .module-content:first-child,
+.module-shallow .module-content:last-child {
+    padding-top: 0;
+    padding-bottom: 0;
+}
+.sidebar h2 {
+    line-height: 1.2;
+    text-align:center;
+    border-bottom: 2px solid #f65940;
+    padding-top:5px;
+    padding-bottom:21px;
+    margin-bottom: 0;
 }
 
 .primary {
@@ -338,46 +193,72 @@ h1 {
     padding-right: 0;
 }
 
-hr {
-    margin-top: 20px;
-    border-top: 1.5px solid #403644;
-}
-
 .page_primary_action {
     padding-right: 40px;
-    margin-bottom: 40px;
+    margin-bottom: 10px;
     height: 40px;
+    margin-top: 10px;
 }
 .page_primary_action .btn-primary {
-    background-color: #403644;
-    color: #ffffff;
     border-radius: 30px;
     padding: 5px 25px;
 }
 [role="main"] .secondary {
     padding-right: 0;
-    /* min-height: 700px; */
-    background-color: #403644;
 }
 aside .module-content {
-    color: #ffffff;
-    background-color: #403644;
     padding-left: 0;
 }
 aside .module [class^=module] {
     padding-left: 40px;
-    padding-top: 30px;
-    padding-bottom: 10px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+
+
+/* ------------------------ footer ------------------------ */
+.site-footer {
+    padding: 0;
+}
+.footer-links {
+    padding: 20px 30px;
+}
+.footer-links [class*="col-md"] {
+    margin-top: 20px;
+}
+.footer-links .nav-item > a:hover, 
+.footer-links .nav-item > a {
+    margin: 0;
+    padding: 0;
+}
+.footer-links i.fa-circle.fa-sm {
+    font-size: 9px;
+    color: #f65940;
+    padding: 10px;
+}
+.footer-links .social-links .fa {
+    background-color: #f65940;
+    color: #ffffff;
+}
+.footer-links .social-links .fa:hover {
+    border-color: #ffffff;
+    color: #ffffff;
+}
+.subscribe-box {
+    min-height: 300px;
+    padding-right: 60px;
+    padding-left: 30px;
+}
+.subscribe-box .btn.btn-default {
+    padding: 10px 25px;
 }
 
 /* ------------------------------- Login ------------------------- */
 .login-sidebar {
-    background-color: #403644;
     margin-top: -20px;
     height: 700px;
 }
 .login-sidebar-heading {
-    color: #ffffff;
     padding: 50px 70px;
     padding-bottom: 10px;
 }
@@ -394,22 +275,19 @@ aside .module [class^=module] {
 
 /* ----------------------------- homepage --------------------------- */
 [role="main"] .container .row .col1 {
-    padding: 10% 2%;
+    padding: 10% 5%;
     margin-top: -250px;
 }
 [role="main"] .container .row .col2 {
     padding: 13% 10%;
     font-style: italic;
-    color: #707070;
     margin-top: -250px;
 }
 [role="main"] .container .row .col3 {
-    background-color: #403644;
-    color: #ffffff;
     padding: 20px 60px;
     margin-top: -310px;
 }
-[role="main"] .container .row .col3 h2{
+[role="main"] .container .row .col3 h2 {
     border-bottom: 2px solid #f65940;
     padding-bottom: 10px;
     margin-bottom: 30px;
@@ -417,12 +295,9 @@ aside .module [class^=module] {
 [role="main"] .container .row .col3 p {
     padding: 10px 0;
 }
-.col-circle {
-    position: relative;
-}
-.col-circle i.fa {
-    font-size: 350px;
-    color: #f65940;
+.col-circle img {
+    width: 250px;
+    height: 250px;
 }
 .homepage .module-search {
     min-height: 860px;
@@ -433,21 +308,8 @@ aside .module [class^=module] {
     padding-top: 320px;
     padding-left: 150px;
 }
-.footer-intro-invert,
-.homepage .module-search .module-content,
-.homepage .module-search .stats-box {
+.homepage .module-search .module-content {
     background: transparent;
-    color: #403644;
-}
-.homepage .module-search .stats-box .tag {
-    background-color: #f65940;
-    color: #ffffff;
-    border: 1px solid #f65940;
-    box-shadow: none;
-}
-.homepage .module-search .stats-box .tag:hover {
-    background-color: inherit;
-    color: #f65940;
 }
 .module-search .search-form {
     margin-top: -50px;
@@ -456,54 +318,9 @@ aside .module [class^=module] {
 .search-meta {
     width: 95%;
 }
-.stats {
-    color: #f65940;
-    font-size: 60px;
-    display: block;
-}
 .search-meta .stats-box {
     margin-top: 0;
 }
-.stats-text {
-    margin-top: -20px;
-    color:#403644;
-    font-weight: 700;
-    display: block;
-}
-.subscribe-box {
-    background-color: #f65940;
-    min-height: 300px;
-    padding-right: 60px;
-    padding-left: 30px;
-}
-.label[data-format="doc"],
-.label[data-format*="doc"] {
-    background-color: #115abe;
-}
-.label[data-format="tsv"],
-.label[data-format*="tsv"] {
-    background-color: #7ca34c;
-}
-.label[data-format="zip"],
-.label[data-format*="zip"] {
-    background-color: #7ca34c;
-}
-.label[data-format="ods"],
-.label[data-format*="ods"] {
-    background-color: #2db55d;
-}
-.label[data-format="odb"],
-.label[data-format*="odb"] {
-    background-color: #85c12a;
-}
-.label[data-format="txt"],
-.label[data-format*="txt"] {
-    background-color: #55a4b5;
-}
-.label[data-format="odt"],
-.label[data-format*="odt"] {
-    background-color: #862112;
-}
 
 /* -------------------------------------- Mobile adjustments ----------------------------- */
 @media (max-device-width: 600px) and (orientation: portrait) {
@@ -544,14 +361,9 @@ aside .module [class^=module] {
     }
     .masthead .navigation .nav-pills li:last-child {
         height: auto;
-        background-color: #f65940;
-        color: #ffffff;
         padding-top: 5px;
         border-bottom: none;
     }
-    .masthead .navigation .nav-pills li:last-child a:hover {
-      color: #ffffff;
-    }
     .footer-links {
         padding: 5px 10px;
     }
diff --git a/ckanext/justicehub_theme/public/organization.css b/ckanext/justicehub_theme/public/organization.css
deleted file mode 100644
index 254383c..0000000
--- a/ckanext/justicehub_theme/public/organization.css
+++ /dev/null
@@ -1,92 +0,0 @@
-/* ---------- package-item ------- */
-
-.org-row {
-    padding-left:50px;
-}
-.org-row .private-icon
-{
-    padding: 0;
-    background: none;
-}
-.org-row .private-icon i {
-    color: #403644;
-}
-.partner-logo {
-    height: 200px;
-}
-.follow_button a {
-    background-color: #f65940;
-    border-radius: 30px;
-    padding: 5px 50px;
-    color: #ffffff;
-    margin-top: 10px;
-    border: 0;
-}
-.follow_button a:hover {
-    color: #f65940;
-    background-color: inherit;
-    border: 1px solid #f65940;
-}
-
-.header-tabs {
-    margin-left: 0;
-}
-.header-tabs .nav-tabs {
-    width: 100%;
-    margin-top: -56px;
-    border-bottom: 1px solid #f65940;
-}
-.header-tabs .nav-tabs li a {
-    border-radius: 0;
-}
-
-.wrapper::before {
-    top: auto;
-}
-
-/* members table */
-
-.members-table {
-    margin-top: 30px;
-}
-
-.members-table > thead > tr > th{
-    text-align: left;
-    background-color: white;
-    border: 0;
-    border-bottom: 2px solid #f65940;
-    padding: 25px;
-    font-weight: bold;
-}
-
-.members-table > tbody > tr > td{
-    padding: 35px;
-    color: black;
-    font-weight: bold;
-}
-
-.member_media > img {
-    width: 50px;
-    height: 50px;
-}
-
-.member_media > a {
-    color: black;
-    padding-left: 10px;
-    
-}
-
-.member_action .btn-primary {
-    background-color: #403644;
-    color: #ffffff;
-    border-radius: 30px;
-    padding: 5px 25px;
-}
-
-.member_action .delete {
-    background-color: red;
-    color: #ffffff;
-    border-radius: 25px;
-    padding: 5px 10px;
-    margin-left: 5px;
-}
diff --git a/ckanext/justicehub_theme/public/package.css b/ckanext/justicehub_theme/public/package.css
deleted file mode 100644
index 9e574d0..0000000
--- a/ckanext/justicehub_theme/public/package.css
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ---------- package-item ------- */
-
-.dataset-resources {
-    margin-top: 0;
-}
-.label {
-    display: inline-block;
-    padding: 5px 15px;
-    border-radius: 25px;
-}
-.dataset-heading {
-    margin-bottom: 0;
-    font-weight: bold;
-}
-.dataset-item {
-    border-bottom: none;
-}
-.dataset-org > a{
-    color: #f65940;
-}
-.downloads, .dataset-meta {
-    color: #bcb4bf;
-}
-.heading {
-    padding-bottom: 20px;
-}
-.package-item-row .private-icon
-{
-    padding-left: 5px;
-    background: none;
-    font-size: 15px;
-}
-.package-item-row .private-icon i {
-    color: #403644;
-}
-
-/* ----------- stages ----------- */
-
-/* ------------ background borders fonts ------ */
-.page-header .content_action {
-    color: #403644;
-}
-.page-header,
-.page-header .nav {
-    background: transparent;
-    border: none;
-}
-.page-header .nav-tabs li.active a,
-.page-header .nav-tabs li.active a:hover,
-.stages li,
-.stages li.active .highlight,
-.metadata-heading {
-    background-color: #403644;
-}
-.page-header .nav-tabs li.active a:hover,
-.stages,
-.stages li.active .highlight,
-.module-heading,
-.metadata-heading {
-    color: #ffffff;
-}
-
-.metadata-heading,
-.stages li .highlight {
-    font-weight: bold;
-}
-.page-header .nav,
-.page-header .nav li a:hover,
-.stages {
-    border: none;
-    border-bottom: 1px solid #403644;
-}
-.page-header .nav-tabs,
-.stages {
-    margin: 50px -65px 0 0;
-}
-.stages li {
-    padding: 0;
-}
-.page-header .nav-tabs li a,
-.stages li .highlight {
-    position: static;
-    text-align: center;
-    text-indent: 0;
-    padding: 10px 10px;
-}
-.stages li.complete .highlight,
-.stages li.uncomplete .highlight {
-    background-color: #ffffff;
-    color: #403644;
-}
-.stages li:before {
-    content: none;
-}
-.stages li:after {
-    top: 0;
-    border:none;
-    margin: 0;
-}
-
-/* --------------- layout sizing ------------- */
-.metadata-heading {
-    padding: 10px 0;
-    margin-left: -30px;
-    width: 55%;
-    display: inline-block;
-    text-align: center;
-}
-
-@media (max-device-width: 600px) and (orientation: portrait) {
-    .metadata-heading {
-        margin-left: 0;
-    }
-}
diff --git a/ckanext/justicehub_theme/public/partner.css b/ckanext/justicehub_theme/public/partner.css
index caa4ea2..b5a1ad1 100644
--- a/ckanext/justicehub_theme/public/partner.css
+++ b/ckanext/justicehub_theme/public/partner.css
@@ -1,5 +1,9 @@
+/* -------------------------- org-item ----------------------- */
+.media-grid {
+    margin-top: 10px;
+    border: none;
+}
 .media-item {
-    color:#f65940;
     width:200px;
 }
 .count,
@@ -7,66 +11,58 @@
     line-height: 1;
     margin-bottom: 0;
 }
-.count {
-    color:#f65940;
-}
 .media-logo {
     height: 150px;
 }
-.partner-links.social-links .fa {
-    background-color: #403644;
+
+/* ------------------------- org-detail ---------------------- */
+.partner-logo {
+    height: 200px;
 }
-.partner-links.social-links .fa:hover {
-    background-color: #ffffff;
-    color: #403644;
-    border: 1px solid #403644;
+.follow_button a {
+    margin-top: 10px;
 }
 
-
-/*----------------- partner editing data set page css ----------------------*/
-.partner-datset-content{
-    margin-left:15px;
+/* ----------------------- members --------------------------- */
+.members-table > thead > tr > th {
+    border-bottom: 2px solid #f65940;
+    padding: 25px;
+}
+.members-table > tbody > tr > td {
+    padding: 35px;
+}
+.member_media > img {
+    width: 60px;
+    height: 60px;
+    border-radius: 50%;
+}
+.member_media > a {
+    padding-left: 10px;
+    
+}
+.member_action .delete {
+    border-radius: 25px;
+    padding: 3px 6px;
+    margin-left: 5px;
+    font-size: 16px;
 }
 
-.partner-dataset-table > tbody > tr > td{
+/*----------------- org-edit dataset ----------------------*/
+.partner-dataset-table > tbody > tr > td {
     border-top:None;
     height:150px;
 }
-
-.partner-dataset-table > thead > tr > th{
+.partner-dataset-table > thead > tr > th {
     border-bottom:None;
     height:150px;
     vertical-align:middle;
 }
-
-.context .content_action a {
-    padding-right:25px;
-    padding-left:25px;
-    font-size:16px;
-    font-weight:bolder;
-}
-
-.btn-icon{
-    background: white;
+.btn-icon {
     border:None;
-    font-size:15px;
 }
-
-.action-fa{
-   font-size:40px;
-}
-
 .btn-icon:hover{
-    background: white;
-    border:None;
+    background: #ffffff;
 }
-
-.page_primary_action .search-form {
-    margin-bottom: 10px;
+.partner-dataset-table td.context {
+    padding-left: 20px;
 }
-
-.private-icon{
-   font-size:25px; 
-   margin-left:10px; 
-}
-
diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index cafb674..2311848 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -1,131 +1,24 @@
-.resource-item .heading {
-    color:#403644;
-}
 .resource-item {
     margin-bottom: 20px;
 }
-.format-label {
-    margin-top:10px;
-}
-.description {
-    color:#f65940;
-    font-size:16px;
-}
-.dropdown-toggle {
-    background:#403644;
-}
-.btn-action{
-    background-color: #f65940;
-    border-radius: 30px;
-    padding: 5px 30px;
-    color: #ffffff;
-    margin-top: 10px;
-    border: none;
-}
-
-.btn-action:hover {
-  background-color: #ffffff;
-  border: 1px solid #f65940;
-  color: #f65940;
-}
-
-.res-line-margin-bottom{
-   margin-bottom:20px;
-}
-
-.res-title{
-   color:#f65940;
-}
-
-.res-url-src{
-   color : #403644;
-}
-
-.module-content .nav-tabs {
-    border-top: 2px solid #f65940;
-    border-bottom: 2px solid #f65940;
-}
-
-.res-top-content{
-    padding-left:35px;
-}
-
-.module-content .nav-tabs-plain {
-    padding: 0px;
-}
-
-.module-content .nav {
-    background-color: #ffffff;
-    color: #403644;
-}
-
-.module-content .nav-tabs > li.active > a {
-    background: white;
-    color: #403644;
-    border-bottom:0.1px solid #f65940;
-}
-
-.rsrc-list-side > li {
-    padding-left: 40px;
-    border: none;
+.nav-simple li {
+    border-bottom: none;
 }
-
-.rsrc-list-side .rsrc-item-side a{
-    color:#ffffff;
+.nav-simple > .nav-item {
+    padding-left: 50px;
+    padding-top: 30px;
 }
-
-.rsrc-list-side .rsrc-item-side a:hover,
-.rsrc-list-side .rsrc-item-side:hover {
+.nav-simple .nav-item a:hover,
+.nav-simple .nav-item:hover {
     background: #ffffff;
     color: #403644;
 }
-
-.rsrc-list-side .rsrc-item-side a:hover{
-    color:#403644;
-}
-
-.rsrc-list-side{
-   height:100vh;
-}
-
-.context-info h1.rsrc-info-heading{
-   background:#f65940;
-   padding-top:40px;
-   padding-bottom:40px;
-}
-
-.module .rsrc-list-side .rsrc-item-side a{
-   margin-top:5px;
-   margin-left:0px;
-   padding-left:0px;
-}
-
-.rsrc-item-desc-side{
-   color: #f65940;
-   border-bottom: 1px dotted #dddddd;
-   padding-left:15px;
-}
-
-.res-social{
-    position:absolute; 
-    bottom:17px; 
-    right:0;
-}
-
-@media only screen and (max-width: 768px){
-    .res-social{
-       position:unset; 
-    }
-
+.res-social {
+    position: absolute; 
+    bottom: 17px; 
+    right: 0;
 }
-
-
-.content_action .rsrc-edit-actn-btn{
-   padding: 5px 20px;
-}
-
-
-.module-narrow h2.social-heading {
+.social-heading {
     background-color: #ffffff;
     color: #f65940;
     height: 70px;
@@ -133,36 +26,18 @@
     padding-left:0px;
     border-bottom: none;
 }
-
-
-.social .social-links .fa:hover {
-  background-color: #ffffff;
-  border: 1px solid #403644;
-  color: #403644;
+.res-actions {
+    margin-top: 20px;
+    margin-bottom: 50px;
 }
-
-
-.social .social-links .fa {
-  padding: 12px 5px;
-  font-size: 30px;
-  width: 50px;
-  height: 50px;
-  text-align: center;
-  text-decoration: none;
-  border-radius: 50%;
-  background-color: #403644;
-  color: #ffffff;
+.module-content .res-actions ul {
+    padding-left: 0;
 }
 
+/* ------------------------------- responsive ---------------------- */
+@media only screen and (max-width: 768px){
+    .res-social{
+       position:unset; 
+    }
 
-.module-content .res-actions{
-  position: None;
-  float: None;
-  top: None;
-  right: 0px;
-  margin-top:30px;
-  margin-bottom:30px;
-}
-.module-content .res-actions ul{
-    padding-left: 0;
 }
diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index d7c1bd5..51815e6 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -1,3 +1,17 @@
+.sort-box,
+.sort-box:focus,
+.search-form .btn {
+    border-left: none;
+}
+#field-giant-search:focus {
+    border-right: none;
+}
+
+.search-form .input-group-btn .btn,
+.search-form .input-group >:first-child,
+.search-form .input-group > select {
+    height: 75px;
+}
 .module-content .search-form {
     margin-left: -30px;
     margin-top: -15px;
@@ -50,30 +64,21 @@
 }
 .footer-links .input-group-btn .btn {
     margin-left: -20px;
-    background-color: #403644;
-    color: #ffffff;
     border-color: #403644;
     text-align: center;
 }
 .dataset-count-box {
-    display: flex !important;
-    justify-content: center;
-    align-items: center;
-    padding: 10px;
     border-left: none !important;
-}
-.dataset-count-box span {
-    margin: auto;
-}
-.dataset-count {
-    color: #f65940;
+    padding: 0;
+    justify-content: center !important;
+    align-items: center !important;
+    display: flex !important;
+    flex-direction: column;
 }
 .empty, .extra {
     padding-left: 20px;
 }
 .filters .module-heading {
-    color: #ffffff;
-    background-color: #403644;
     border-color: #f65940;
     margin-bottom: 0 !important;
     border-top: none;
@@ -86,12 +91,6 @@
     background-color: #f65940;
     color: #ffffff;
 }
-.nav-item.active > a:hover {
-    color: #403644;
-}
-.nav-facet .nav-item > a {
-    color: #ffffff;
-}
 .nav-facet .nav-item:hover,
 .nav-facet .nav-item > a:hover {
     color: #403644;
@@ -111,10 +110,6 @@
 .filters .module-footer {
     display: none;
 }
-.nav-facet, .filters .module-content.empty {
-    background-color: #403644;
-    color: #ffffff;
-}
 
 /* -------------------------------------- Mobile adjustments ----------------------------- */
 @media (max-device-width: 600px) and (orientation: portrait) {
diff --git a/ckanext/justicehub_theme/templates/base.html b/ckanext/justicehub_theme/templates/base.html
index 5e5d4dc..92c66f5 100644
--- a/ckanext/justicehub_theme/templates/base.html
+++ b/ckanext/justicehub_theme/templates/base.html
@@ -3,11 +3,10 @@
 {% block styles %}
   {{ super() }}
   <link rel="stylesheet" href="/justicehub_theme.css" />
+  <link rel="stylesheet" href="/common.css" />
   <link rel="stylesheet" href="/form.css" />
   <link rel="stylesheet" href="/search.css" />
-  <link rel="stylesheet" href="/package.css" />
-  <link rel="stylesheet" href="/organization.css" />
-  <link rel="stylesheet" href="/dataset_info.css"/>
+  <link rel="stylesheet" href="/dataset.css" />
   <link rel="stylesheet" href="/partner.css"/>
   <link rel="stylesheet" href="/issues.css"/>
   <link rel="stylesheet" href="/resource.css"/>
diff --git a/ckanext/justicehub_theme/templates/package/snippets/resources.html b/ckanext/justicehub_theme/templates/package/snippets/resources.html
index 5449169..067ba31 100644
--- a/ckanext/justicehub_theme/templates/package/snippets/resources.html
+++ b/ckanext/justicehub_theme/templates/package/snippets/resources.html
@@ -20,9 +20,9 @@
           <h2 class="module-heading">{{ _("LIST OF ALL FILES") }}</h2>
         {% endblock %}
         {% block resources_list %}
-          <ul class="list-unstyled nav nav-simple rsrc-list-side">
+          <ul class="list-unstyled nav nav-simple">
             {% for resource in resources %}
-              <li class="nav-item rsrc-item-side">
+              <li class="nav-item">
                 {% link_for h.resource_display_name(resource)|truncate(25), controller='package', action=action or 'resource_read', id=pkg.name, resource_id=resource.id, inner_span=true %}
               </li>
               

From eca655f3b6abb93ae1d53fb08c7d6e09aaa756a8 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 3 Jun 2020 23:31:19 +0530
Subject: [PATCH 044/127] minor layout and styling updates

---
 .../templates/organization/bulk_process.html  | 41 ++++++++++---------
 .../templates/organization/edit_base.html     | 34 +++++++++++++--
 .../templates/organization/jh_members.html    | 13 +++++-
 .../templates/organization/read_base.html     |  2 +-
 .../organization/snippets/helper.html         |  6 +--
 .../snippets/organization_list.html           |  2 +-
 .../templates/organization/stats.html         | 22 +++++++---
 .../templates/package/edit_base.html          | 19 +++++++--
 .../templates/package/read_base.html          | 14 ++++---
 .../templates/package/resource_read.html      | 12 +++---
 .../templates/package/resources.html          |  2 +-
 .../package/snippets/resource_info.html       |  2 +-
 .../package/snippets/package_form.html        |  9 +---
 .../package/snippets/resource_form.html       |  4 +-
 .../templates/snippets/package_item.html      |  4 +-
 .../templates/snippets/search_form.html       |  2 +-
 .../templates/user/snippets/login_form.html   |  2 +-
 17 files changed, 124 insertions(+), 66 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/organization/bulk_process.html b/ckanext/justicehub_theme/templates/organization/bulk_process.html
index 7ebcaa4..7715b2e 100644
--- a/ckanext/justicehub_theme/templates/organization/bulk_process.html
+++ b/ckanext/justicehub_theme/templates/organization/bulk_process.html
@@ -3,18 +3,6 @@
 {% block subtitle %}{{ _('Edit datasets') }} - {{ super() }}{% endblock %}
 
 {% block page_primary_action %}
-    {% block search_form %}
-        {% set sorting = [
-        (_('Name (A-Z)'), 'title_string asc'),
-        (_('Name (Z-A)'), 'title_string desc'),
-        (_('Last Modified'), 'data_modified desc'),
-        (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ]
-        %}
-        {% snippet 'snippets/search_form.html', form_id='organization-datasets-search-form', type='dataset', query=c.q, count=c.page.item_count, sorting=sorting, sorting_selected=c.sort_by_selected,    no_title=true, search_class=' ', count_box_title='EDIT DATASETS' %}
-    {% endblock %}
-    <div class="row">
-    {% snippet 'snippets/add_dataset.html', group=c.group_dict.id %}
-    </div>
 {% endblock %}
 
 {% block secondary_content %}
@@ -29,7 +17,22 @@
 {% endblock %}
 
 {% block primary_content_inner %}
-  <div class="row partner-datset-content">
+    {% block search_form %}
+        {% set sorting = [
+        (_('Name (A-Z)'), 'title_string asc'),
+        (_('Name (Z-A)'), 'title_string desc'),
+        (_('Last Modified'), 'data_modified desc'),
+        (_('Popular'), 'views_recent desc') if g.tracking_enabled else (false, false) ]
+        %}
+        {% snippet 'snippets/search_form.html', form_id='organization-datasets-search-form', type='dataset', query=c.q, count=c.page.item_count, sorting=sorting, sorting_selected=c.sort_by_selected,    no_title=true, search_class=' ', count_box_title='EDIT DATASETS' %}
+    {% endblock %}
+    <div class="row">
+        <div class="page_primary_action">
+        {% snippet 'snippets/add_dataset.html', group=c.group_dict.id %}
+        </div>
+    </div>
+
+  <div class="row partner-dataset-content">
     <h1 class="hide-heading">{{ _('Edit datasets') }}</h1>
     <div class="primary col-xs-12">
       {#<h3 class="page-heading">
@@ -54,19 +57,19 @@ <h1 class="hide-heading">{{ _('Edit datasets') }}</h1>
                   <th></th>
                   <th class="table-actions">
                     <div class="btn-group">
-                      <button name="bulk_action.public" value="public" class="btn btn-default btn-icon" type="submit">
+                      <button name="bulk_action.public" value="public" class="btn btn-default btn-icon bg-clear" type="submit">
                         <i class="fa fa-unlock-alt action-fa"></i>
                         {{ _('Make public') }}
                       </button>
                     </div>
                     <div class="btn-group">
-                      <button name="bulk_action.private" value="private" class="btn btn-default btn-icon" type="submit">
+                      <button name="bulk_action.private" value="private" class="btn btn-default btn-icon bg-clear" type="submit">
                         <i class="fa fa-lock action-fa"></i>
                         {{ _('Make private') }}
                       </button>
                     </div>
                     <div class="btn-group">
-                      <button name="bulk_action.delete" value="delete" class="btn btn-default btn-icon" type="submit">
+                      <button name="bulk_action.delete" value="delete" class="btn btn-default btn-icon bg-clear" type="submit">
                         <i class="fa fa-trash action-fa"></i>
                         {{ _('Delete') }}
                       </button>
@@ -86,7 +89,7 @@ <h1 class="hide-heading">{{ _('Edit datasets') }}</h1>
                     </td>
                     <td class="context" >
                       <div class="content_action pull-right"><a href="{% url_for controller='package', action='edit', id=package.name %}">
-                        {{ _('Edit') }}
+                        {{ _('EDIT') }}
                       </a></div>
                       <h3 class="dataset-heading">
                         {{ h.link_to(h.truncate(title, truncate_title), h.url_for(controller='package', action='read', id=package.name)) }}
@@ -96,11 +99,11 @@ <h3 class="dataset-heading">
                           <span class="label label-danger">{{ _('Deleted') }}</span>
                         {% endif %}
                         {% if package.private %}
-                          <i class="fa fa-lock private-icon"></i>
+                          <i class="fa fa-lock"></i>
                         {% endif %}
                       </h3>
                       {% if notes %}
-                        <p class="dataset-notes">{{ notes|urlize }}</p>
+                        <p class="dataset-desc">{{ notes|urlize }}</p>
                       {% endif %}
                     </td>
                   </tr>
diff --git a/ckanext/justicehub_theme/templates/organization/edit_base.html b/ckanext/justicehub_theme/templates/organization/edit_base.html
index 15e6f88..83ce726 100644
--- a/ckanext/justicehub_theme/templates/organization/edit_base.html
+++ b/ckanext/justicehub_theme/templates/organization/edit_base.html
@@ -11,17 +11,45 @@
 {% endblock %}
 
 {% block content_action %}
-  {% if organization and h.check_access('organization_update', {'id': organization.id}) %}
-    {% link_for _('View'), controller='organization', action='read', id=organization.name, class_='btn btn-default', named_route=group_type + '_read' %}
-  {% endif %}
+{% endblock %}
+
+{% block pre_primary %}
+<div class="col-xs-12 row top-section">
+    {% block image %}
+        <div class="image dataset-org col-sm-3 col-md-3 col-xs-12">
+        <a href="{{ url }}" class="image-box partner-logo">
+            <img src="{{ c.group_dict.image_display_url or h.url_for_static('/base/images/placeholder-organization.png') }}" class="media-image" alt="{{ c.group_dict.name }}" />
+        </a>
+        </div>
+    {% endblock %}
+</div>
 {% endblock %}
 
 {% block content_primary_nav %}
   {{ h.build_nav_icon(group_type + '_edit', _('INFO'), id=c.group_dict.name) }}
   {{ h.build_nav_icon(group_type + '_bulk_process', _('DATASETS'), id=c.group_dict.name) }}
+
+  {% if organization and h.check_access('organization_update', {'id': organization.id}) %}
+
+    <div class="content_action">
+    {% link_for _('VIEW'), controller='organization', action='read', id=organization.name, class_='btn btn-default', named_route=group_type + '_read' %}
+
+    {% if h.check_access('organization_delete', {'id': organization.id})  %}
+        <a class="btn btn-danger" href="{% url_for controller='organization', action='delete', id=organization.id %}"
+           data-module="confirm-action"
+           data-module-content="{{ _('Are you sure you want to delete this Organization? Note*: Deleting cannot be performed while public or private datasets belong to this organization.') }}">
+            {% block delete_button_text %}{{ _('DELETE') }}{% endblock %}
+        </a>
+    {% endif %}
+    </div>
+
+  {% endif %}
 {% endblock %}
 
 {% block secondary_content %}
+  <div class="sidebar">
+      <h2>{{ c.group_dict.title }}</h2>
+  </div>
   {% if organization %}
     {% snippet 'snippets/organization.html', organization=organization, show_nums=true %}
   {% else %}
diff --git a/ckanext/justicehub_theme/templates/organization/jh_members.html b/ckanext/justicehub_theme/templates/organization/jh_members.html
index 757b709..05f7f66 100644
--- a/ckanext/justicehub_theme/templates/organization/jh_members.html
+++ b/ckanext/justicehub_theme/templates/organization/jh_members.html
@@ -11,13 +11,17 @@
 {% endblock %}
 
 {% block primary_content_inner %}
+    {% block package_description %}
+      <h1 class="page-heading">
+          {{ _('MEMBERS') }}
+      </h1>
+    {% endblock %}
     <div class="row page_primary_action">
     {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
         {% link_for _('ADD MEMBER'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn btn-primary pull-right', named_route=group_type + '_member_new' %}
     {% endif %}
     </div>
 
-
 	{% block packages_list %}
         {% block member_list %}
         {% set count = c.members|length %}
@@ -59,4 +63,9 @@
     {% endblock %}
     {% block page_pagination %}
     {% endblock %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+{% block secondary_content %}
+  <div class="sidebar">
+      <h2>{{ c.group_dict.title }}</h2>
+  </div>
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index b347074..657234a 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -100,7 +100,7 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
 
 
 {% block page_header %}
-<div class="row header-tabs">
+<div class="row page-header">
     <ul class="nav nav-tabs">
         {% block content_primary_nav %}
         {{ h.build_nav_icon(group_type + '_read', _('DATASETS'), id=c.group_dict.name) }}
diff --git a/ckanext/justicehub_theme/templates/organization/snippets/helper.html b/ckanext/justicehub_theme/templates/organization/snippets/helper.html
index f2bc1f4..33514b3 100644
--- a/ckanext/justicehub_theme/templates/organization/snippets/helper.html
+++ b/ckanext/justicehub_theme/templates/organization/snippets/helper.html
@@ -1,9 +1,9 @@
 <div class="module module-narrow module-shallow">
-  <h2 class="module-heading" style="background:#f65940; color:white; text-align:center; font-size:20px;">
+  <h2 class="module-heading">
     {#<i class="fa fa-info-circle"></i>#}
-    {{ _('Partners') }}
+    {{ _('PARTNERS') }}
   </h2>
-  <div class="module-content" style="background:#403644; color:white; height:65vh;">
+  <div class="module-content">
     <p>
       {% trans %}
         CKAN Organizations are used to create, manage and publish collections
diff --git a/ckanext/justicehub_theme/templates/organization/snippets/organization_list.html b/ckanext/justicehub_theme/templates/organization/snippets/organization_list.html
index d401f4e..e47e32c 100644
--- a/ckanext/justicehub_theme/templates/organization/snippets/organization_list.html
+++ b/ckanext/justicehub_theme/templates/organization/snippets/organization_list.html
@@ -9,7 +9,7 @@
 
 #}
 {% block organization_list %}
-<ul class="media-grid" data-module="media-grid" style="margin-top:10px; background:white; border:none;">
+<ul class="media-grid" data-module="media-grid">
   {% block organization_list_inner %}
   {% for organization in organizations %}
     {% snippet "organization/snippets/organization_item.html", organization=organization, position=loop.index, show_capacity=show_capacity %}
diff --git a/ckanext/justicehub_theme/templates/organization/stats.html b/ckanext/justicehub_theme/templates/organization/stats.html
index 5de4dc9..22d10a4 100644
--- a/ckanext/justicehub_theme/templates/organization/stats.html
+++ b/ckanext/justicehub_theme/templates/organization/stats.html
@@ -10,20 +10,30 @@
 {% endblock %}
 
 {% block primary_content_inner %}
+  {% block package_description %}
+    <h1 class="page-heading">
+        {{ _('STATS') }}
+    </h1>
+  {% endblock %}
 	<div class="row stats-box">
         <div class="col-xs-6 col-sm-4">
-            <span class="stats">{{ c.group_dict.downloads }}{{ _('+') }}</span>
+            <span class="stats">{{ c.group_dict.downloads }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
             <span class="stats-text">{{ _('DOWNLOADS') }}</span>
         </div>
         <div class="col-xs-6 col-sm-4">
-            <span class="stats">{{ c.group_dict.visits }}{{ _('+') }}</span>
-            <span class="stats-text">{{ _('Visits') }}</span>
+            <span class="stats">{{ c.group_dict.visits }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
+            <span class="stats-text">{{ _('VISITS') }}</span>
         </div>
         <div class="col-xs-6 col-sm-4">
-            <span class="stats">{{ c.group_dict.num_followers }}{{ _('+') }}</span>
-            <span class="stats-text">{{ _('Followers') }}</span>
+            <span class="stats">{{ c.group_dict.num_followers }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
+            <span class="stats-text">{{ _('FOLLOWERS') }}</span>
         </div>
     </div>
     {% block page_pagination %}
     {% endblock %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
+{% block secondary_content %}
+  <div class="sidebar">
+      <h2>{{ c.group_dict.title }}</h2>
+  </div>
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/package/edit_base.html b/ckanext/justicehub_theme/templates/package/edit_base.html
index e9cd6b9..1af72bb 100644
--- a/ckanext/justicehub_theme/templates/package/edit_base.html
+++ b/ckanext/justicehub_theme/templates/package/edit_base.html
@@ -6,14 +6,25 @@
 {% endblock %}
 
 {% block content_primary_nav %}
-  {{ h.build_nav_icon('dataset_edit', _('ABOUT DATASET'), id=pkg.name) }}
-  {{ h.build_nav_icon('dataset_resources', _('DATA & RESOURCES'), id=pkg.name) }}
+    {{ h.build_nav_icon('dataset_edit', _('ABOUT DATASET'), id=pkg.name) }}
+    {{ h.build_nav_icon('dataset_resources', _('DATA & RESOURCES'), id=pkg.name) }}
+
+    <div class="content_action">
+    {% link_for _('VIEW'), controller='package', action='read', id=pkg.name, class_='btn btn-default' %}
+    {% if h.check_access('package_delete', {'id': c.pkg_dict.id})
+       and not c.pkg_dict.state == 'deleted' %}
+      <a class="btn btn-danger" href="{% url_for controller='package', action='delete', id=c.pkg_dict.id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this dataset?') }}">
+          {% block delete_button_text %}{{ _('DELETE') }}{% endblock %}
+      </a>
+    {% endif %}
+    </div>
 {% endblock %}
 
 {% block content_action %}
-  {% link_for _('VIEW'), controller='package', action='read', id=pkg.name, class_='btn btn-default' %}
 {% endblock %}
 
 {% block secondary_content %}
-    <h2 class="edit-module-heading">{{ pkg.title }}</h2>
+<div class="sidebar">
+    <h2>{{ pkg.title }}</h2>
+</div>
 {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index 4fb2003..4349223 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -18,7 +18,7 @@ <h1>{{h.dataset_display_name(pkg)}}
                 <i style="margin-left: 10px;" class="fa fa-check fa-lg"></i>
             {% endif %}
             </h1>
-            <p class="package-desc"> {{h.get_translated(pkg, 'notes')}}</p>
+            <p class="dataset-desc"> {{h.get_translated(pkg, 'notes')}}</p>
         </div>
 
         <div class="row">
@@ -28,16 +28,18 @@ <h1>{{h.dataset_display_name(pkg)}}
             </div>
             {% endfor %}
         </div>
-        <div class="row meta-desc">
+        <div class="row dataset-meta">
             <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
         </div>
         <div class="row stats-box">
             <div class="col-xs-6 col-sm-4">
-                <span class="stats">{{ h.justicehub_theme_get_package_avg_downloads(pkg) }}{{ _('+') }}</span>
+                {% set downloads = h.justicehub_theme_get_package_avg_downloads(pkg) %}
+                <span class="stats">{{ downloads }}{% if downloads %}{{ _('+') }}{% endif %}</span>
                 <span class="stats-text">{{ _('DOWNLOADS') }}</span>
             </div>
             <div class="col-xs-6 col-sm-4">
-                <span class="stats">{{ pkg.tracking_summary.total }}{{ _('+') }}</span>
+                {% set views = pkg.tracking_summary.total %}
+                <span class="stats">{{ views }}{% if views %}{{ _('+') }}{% endif %}</span>
                 <span class="stats-text">{{ _('VIEWS') }}</span>
             </div>
         </div>
@@ -110,7 +112,7 @@ <h1>{{h.dataset_display_name(pkg)}}
 
 <div class="col-xs-12 row">
     {% block secondary %}
-    <aside class="secondary col-sm-3 col-xs-12 pckg_rsrc_actvty">
+    <aside class="secondary col-sm-3 col-xs-12 sidebar">
         <h2>ACTIVITY</h2>
         {% block activity_stream %}
         <div class="activity-item">{{ h.justicehub_theme_package_activity_stream(pkg.id) }}</div>
@@ -156,7 +158,7 @@ <h1 class="heading">{{ _('EXTERNAL LINKS') }}</h1>
 </div>
 
 {% block page_header %}
-<div class="row package-tabs">
+<div class="row page-header">
     <ul class="nav nav-tabs">
         {% block content_primary_nav %}
         {{ h.build_nav_icon('dataset_read', _('FILES'), id=pkg.name) }}
diff --git a/ckanext/justicehub_theme/templates/package/resource_read.html b/ckanext/justicehub_theme/templates/package/resource_read.html
index b130643..06d18ec 100644
--- a/ckanext/justicehub_theme/templates/package/resource_read.html
+++ b/ckanext/justicehub_theme/templates/package/resource_read.html
@@ -1,7 +1,7 @@
 {% ckan_extends %}
 
 {% block resource_inner %}
-    <div class="module-content res-top-content">
+    <div class="module-content top-section">
 
     {% block resource_content %}
 
@@ -16,23 +16,24 @@ <h1>{{ h.resource_display_name(res) | truncate(50) }}</h1>
             {% if not res.description and c.package.notes %}
               <h3>{{ _('From the dataset abstract') }}</h3>
               <blockquote>{{ h.markdown_extract(h.get_translated(c.package, 'notes')) }}</blockquote>
-              <p class="res-title">{% trans dataset=c.package.title, url=h.url_for(controller='package', action='read', id=c.package['name']) %}Source: <a class="res-url-src" href="{{ url }}">{{ dataset }}</a>{% endtrans %}
+              <p class="res-title">{% trans dataset=c.package.title, url=h.url_for(controller='package', action='read', id=c.package['name']) %}Source: <a href="{{ url }}">{{ dataset }}</a>{% endtrans %}
             {% endif %}
         </div>
 
-        <div class="res-line-margin-bottom meta-desc">
+        <div class="meta-desc">
             <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
         </div>
 
         {% block resource_read_url %}
             {% if res.url and h.is_url(res.url) %}
-              <p class="text-muted ellipsis res-title meta-desc">{{ _('URL:') }} <a class="resource-url-analytics res-url-src" href="{{ res.url }}" title="{{ res.url }}">{{ res.url }}</a></p>
+              <p class="text-muted ellipsis res-title meta-desc">{{ _('URL:') }} <a class="resource-url-analytics" href="{{ res.url }}" title="{{ res.url }}">{{ res.url }}</a></p>
             {% elif res.url %}
               <p class="text-muted break-word res-title meta-desc">{{ _('URL:') }} {{ res.url }}</p>
             {% endif %}
         {% endblock %}
 
-		<div class="actions res-actions">
+		<div class="row">
+		<div class="actions res-actions pull-left">
 		  {% block resource_actions %}
 		  <ul>
 		  {% block resource_actions_inner %}
@@ -65,6 +66,7 @@ <h3>{{ _('From the dataset abstract') }}</h3>
 		  </ul>
 		  {% endblock %}
 		</div>
+		</div>
     {% endblock %}
 
     {% if res.format == 'CSV' %}
diff --git a/ckanext/justicehub_theme/templates/package/resources.html b/ckanext/justicehub_theme/templates/package/resources.html
index 8b74f87..2ec0318 100644
--- a/ckanext/justicehub_theme/templates/package/resources.html
+++ b/ckanext/justicehub_theme/templates/package/resources.html
@@ -5,7 +5,7 @@
 {% block subtitle %}{{ _('Resources') }} - {{ h.dataset_display_name(pkg) }}{% endblock %}
 
 {% block page_primary_action %}
-  {% link_for _('UPLOAD'), controller='package', action='new_resource', id=c.pkg_dict.name, class_='btn btn-primary btn-flat' %}
+  {% link_for _('UPLOAD'), controller='package', action='new_resource', id=c.pkg_dict.name, class_='btn btn-primary' %}
 {% endblock %}
 
 {% block primary_content_inner %}
diff --git a/ckanext/justicehub_theme/templates/package/snippets/resource_info.html b/ckanext/justicehub_theme/templates/package/snippets/resource_info.html
index 01a8fd4..5a86806 100644
--- a/ckanext/justicehub_theme/templates/package/snippets/resource_info.html
+++ b/ckanext/justicehub_theme/templates/package/snippets/resource_info.html
@@ -10,7 +10,7 @@
 #}
 <div class="module context-info">
   <div class="module-content">
-    <h1 class="heading rsrc-info-heading">{{ h.resource_display_name(res) or res.id }}</h1>
+    <h1 class="heading">{{ h.resource_display_name(res) or res.id }}</h1>
     <div class="nums">
       <dl>
         <dt>{{ _('Format') }}</dt>
diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
index 5a46afe..5baeccc 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
@@ -239,17 +239,10 @@
     </p>
   {% endblock %}
   {% block delete_button %}
-    {% if form_style == 'edit'
-       and h.check_access('package_delete', {'id': c.pkg_dict.id})
-       and not data.state == 'deleted' %}
-      <a class="btn btn-danger pull-left" href="{% url_for controller='package', action='delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this dataset?') }}">
-          {% block delete_button_text %}{{ _('DELETE') }}{% endblock %}
-      </a>
-    {% endif %}
   {% endblock %}
 
   {% block save_button %}
-  <button class="btn btn-primary" type="submit" name="save">
+  <button class="btn btn-primary bg-clear" type="submit" name="save">
       {% block save_button_text %}
       {% if form_style != 'edit' %}
           {{ _('NEXT: FILES UPLOAD') }}
diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/resource_form.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/resource_form.html
index e5c488c..f8fe91c 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/resource_form.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/resource_form.html
@@ -1,7 +1,7 @@
 {% ckan_extends %}
 
 {% block previous_button %}
-    <button class="btn btn-primary btn-default" name="save" value="go-dataset" type="submit"><i class="fa fa-chevron-left"></i><i class="fa fa-chevron-left"></i>{{ _('Previous') }}</button>
+    <button class="btn btn-primary btn-default bg-clear" name="save" value="go-dataset" type="submit"><i class="fa fa-chevron-left"></i><i class="fa fa-chevron-left"></i>{{ _('Previous') }}</button>
 {% endblock %}
 
 {% block again_button %}
@@ -13,5 +13,5 @@
 {% endblock %}
 
 {% block add_button %}
-    <button class="btn btn-primary" name="save" value="go-dataset-complete" type="submit">{{ _('SAVE') }}</button>
+    <button class="btn btn-primary bg-clear" name="save" value="go-dataset-complete" type="submit">{{ _('SAVE') }}</button>
 {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/snippets/package_item.html b/ckanext/justicehub_theme/templates/snippets/package_item.html
index 94c8919..3f56473 100644
--- a/ckanext/justicehub_theme/templates/snippets/package_item.html
+++ b/ckanext/justicehub_theme/templates/snippets/package_item.html
@@ -3,10 +3,10 @@
 {% block content %}
 <div class="dataset-content">
 
-    <div class="row package-item-row heading">
+    <div class="row package-item-row">
         <div class="col col-md-5">
           {% block heading %}
-          <h3 class="dataset-heading">
+          <h3 class="dataset-title">
           {% block heading_title %}
               {{ h.link_to(h.truncate(title, truncate_title), h.url_for(package.type + '_read', controller='package', action='read', id=package.name)) }}
           {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/snippets/search_form.html b/ckanext/justicehub_theme/templates/snippets/search_form.html
index 5d77cba..0044ba4 100644
--- a/ckanext/justicehub_theme/templates/snippets/search_form.html
+++ b/ckanext/justicehub_theme/templates/snippets/search_form.html
@@ -17,7 +17,7 @@
             {% else %}
               {{_('DATA')}}
             {% endif %}
-            <span class="dataset-count">{{ _('[') }}{{ c.page.items | length }}{{ _(']') }}</span>
+            <span class="count">{{ _('[') }}{{ c.page.items | length }}{{ _(']') }}</span>
         </span>
     </div>
 </div>
diff --git a/ckanext/justicehub_theme/templates/user/snippets/login_form.html b/ckanext/justicehub_theme/templates/user/snippets/login_form.html
index af88e0e..81a34d3 100644
--- a/ckanext/justicehub_theme/templates/user/snippets/login_form.html
+++ b/ckanext/justicehub_theme/templates/user/snippets/login_form.html
@@ -20,7 +20,7 @@
   {{ form.input('login', label=_("Username"), id='field-login', value="", error=username_error, classes=["control-medium"]) }}
 
   {{ form.input('password', label=_("Password"), id='field-password', type="password", value="", error=password_error, classes=["control-medium"]) }}
-  <a class="btn btn-default btn-forgot pull-right" href="{{ h.url_for('user.request_reset') }}">{{ _('Forgot password') }}</a>
+  <a class="btn btn-default btn-forgot bg-clear pull-right" href="{{ h.url_for('user.request_reset') }}">{{ _('Forgot password') }}</a>
 
   {{ form.checkbox('remember', label=_("Remember me"), id='field-remember', checked=true, value="63072000") }}
 

From 03b88dd9e7a51725c55a025bcd217e2bb01b8d91 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 3 Jun 2020 23:32:32 +0530
Subject: [PATCH 045/127] update icons for verified dataset and organization
 signed pledge

---
 .../justicehub_theme/templates/home/layout4.html    |  2 +-
 .../templates/organization/read_base.html           |  2 +-
 .../organization/snippets/organization_item.html    |  2 +-
 .../templates/package/read_base.html                |  2 +-
 .../templates/snippets/package_item.html            | 13 ++++++++++++-
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/home/layout4.html b/ckanext/justicehub_theme/templates/home/layout4.html
index 8229d60..2b96307 100644
--- a/ckanext/justicehub_theme/templates/home/layout4.html
+++ b/ckanext/justicehub_theme/templates/home/layout4.html
@@ -7,7 +7,7 @@
         </div>
         <div class="row">
             <div class="col col-xs-4 col-sm-2 col1 col-circle">
-                <i class="fa fa-circle fa-lg"></i>
+                <img src="{{ h.url_for_static('uploads/admin/landing-carousel-1.png') }}"/>
             </div>
             <div class="col col-xs-8 col-sm-5 col2">
                 <p>
diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index 657234a..cb60395 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -23,7 +23,7 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
             [{{ _('Deleted') }}]
             {% endif %}
             {% if c.group_dict.signed_pledge %}
-                <i class="fa fa-certificate"></i>
+                <img class="fa fa-lg fa-certificate" src="{{ h.url_for_static('uploads/admin/signed_pledge_icon.png') }}" alt="signed_pledge" title="signed_pledge"></img>
             {% endif %}
         </h1>
         {% block description %}
diff --git a/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html b/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html
index c52f2b3..cbba134 100644
--- a/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html
+++ b/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html
@@ -10,7 +10,7 @@
     <h3 class="media-heading">
         {{ organization.display_name }}
     {% if organization.signed_pledge %}
-        <i class="fa fa-certificate"></i>
+        <img class="fa fa-certificate" src="{{ h.url_for_static('uploads/admin/signed_pledge_icon.png') }}" alt="signed_pledge" title="signed_pledge"></img>
     {% endif %}
     </h3>
 {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index 4349223..dbd0ca6 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -15,7 +15,7 @@ <h1>{{h.dataset_display_name(pkg)}}
                 <i style="margin-left: 10px;" class="fa fa-lock fa-lg"></i>
             {% endif %}
             {% if pkg.verified %}
-                <i style="margin-left: 10px;" class="fa fa-check fa-lg"></i>
+                <img class="fa fa-check fa-lg" src="{{ h.url_for_static('uploads/admin/verified_icon.png') }}" alt="verified" title="verified"></img>
             {% endif %}
             </h1>
             <p class="dataset-desc"> {{h.get_translated(pkg, 'notes')}}</p>
diff --git a/ckanext/justicehub_theme/templates/snippets/package_item.html b/ckanext/justicehub_theme/templates/snippets/package_item.html
index 3f56473..613d0c0 100644
--- a/ckanext/justicehub_theme/templates/snippets/package_item.html
+++ b/ckanext/justicehub_theme/templates/snippets/package_item.html
@@ -16,7 +16,7 @@ <h3 class="dataset-title">
                 <i class="fa fa-lock" data-toggle="tooltip"></i>
             {% endif %}
             {% if package.verified %}
-                <i class="fa fa-check" title="verified"></i>
+                <img class="fa fa-check" src="{{ h.url_for_static('uploads/admin/verified_icon.png') }}" alt="verified" title="verified"></img>
             {% endif %}
           {% endblock %}
 
@@ -34,6 +34,17 @@ <h3 class="dataset-title">
           {% block organization %}
           <div class="dataset-org">
               {{ h.link_to(h.truncate(package.organization.title, truncate_title), h.url_for(controller='organization', action='read', id=package.organization.name)) }}
+
+              {# HACK: need to fix #}
+              {% set org_extras = package.partner['extras'] %}
+              {% for item in org_extras %}
+              {% if item['key'] == 'signed_pledge' %}
+                  {% set signed_pledge = item['value'] %}
+                  {% if signed_pledge == 'true' %}
+                    <img class="fa fa-certificate" src="{{ h.url_for_static('uploads/admin/signed_pledge_icon.png') }}" alt="verified" title="verified"></img>
+                  {% endif %}
+              {% endif %}
+              {% endfor %}
           </div>
           {% endblock %}
         </div>

From 18743004dda3afcfdc186f1d2be1f0159ee1c67c Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 3 Jun 2020 23:32:53 +0530
Subject: [PATCH 046/127] remove sectors from navbar

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

diff --git a/ckanext/justicehub_theme/templates/header.html b/ckanext/justicehub_theme/templates/header.html
index 1137a5e..e4e7bad 100644
--- a/ckanext/justicehub_theme/templates/header.html
+++ b/ckanext/justicehub_theme/templates/header.html
@@ -3,8 +3,9 @@
 {% block header_site_navigation %}
     <nav class="section navigation">
     <ul class="nav nav-pills">
-        {% block header_site_navigation_tabs %} {{ h.build_nav_main( ('home.about', _('About Us')), ('search', _('Datasets')), ('organizations_index', _('Partners')),
-        ('group_index', _('Sectors')) ) }} {% endblock %}
+        {% block header_site_navigation_tabs %}
+            {{ h.build_nav_main( ('home.about', _('About Us')), ('search', _('Datasets')), ('organizations_index', _('Partners'))) }}
+        {% endblock %}
 
         {% if not c.userobj %}
           {% block header_account_notlogged %}

From a49b90af8874111b35cf8c47a4ac7ae70c45b6bd Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 3 Jun 2020 23:34:05 +0530
Subject: [PATCH 047/127] update org add form

---
 .../organization/.group_form.html.swp         | Bin 0 -> 12288 bytes
 .../scheming/organization/group_form.html     |  30 ++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 ckanext/justicehub_theme/templates/scheming/organization/.group_form.html.swp
 create mode 100644 ckanext/justicehub_theme/templates/scheming/organization/group_form.html

diff --git a/ckanext/justicehub_theme/templates/scheming/organization/.group_form.html.swp b/ckanext/justicehub_theme/templates/scheming/organization/.group_form.html.swp
new file mode 100644
index 0000000000000000000000000000000000000000..2d8d78f29905c97601eb8f71fc87543942d65381
GIT binary patch
literal 12288
zcmeI2L5mzk6vr!GH7XI}NqM#mvw`X9jmeUL(+lE3MAU;QNJyIM?wXlOy1Uw{>NT5X
zUHt&!_t2Aw7eT**@uVQ+6v!o?z?1J)ckfIRh-bqq_*ZvTy{dZeS2Y8}ynOew_dkTI
z^Id`EWg$NQ_0Jot_s)yI&k13T@zniaW%uHhy(?GuE|r(_y{FlJMGGcHStZ3S*(8<D
z!%M81gT&b)G}LV$-|U>%g<5xc=GUrL<3RGnfLC=}Nv~Yu3bfSCDlv8?8+}K5ZJK0d
zP1j~iW9#|a*VWUU<1r@i%o8{(F1>XzeAM5J-hfxmefrEt%mFe1Ccp%k025#WOn?b6
z0Vc2^;M+6e1e?zdU9S(%GmkxoCO?<}6JP>NfC(@GCcp%k025#WOn?b6f&U=^Sqky$
z^FsW9qW}NL-~WHTB*f3CZ&BZ%zDAv(6zV$aHPnL_g}8^hi~1dP19cwt@T?HOpiWS4
zqyBk8i2JBNP<K&3qP|1jM%~AKe?$E=`0zdX!G#Gh0Vco%m;e)C0!)AjFo8uviLCnq
zuq={NAM~%(JUW7q<Z9IyowlmXYUP|<shtaOd@RU<$|CQ)Hw_e(bS{l@-vBCZt*)g#
zgnShjm6A4sM%F5goIFqw_`{aoyS&yu+CQ2=UYX(+&|u~<TNftBxO=uU{RDg9<E`x5
zDQ%7uR8#hICdZ4UcVWx(N5)0)6RXpGN>wSZvcdC7AIt)SAEThSV_8tTuZ#9YSm9_A
z)2=uK@i2uJ9=i4NkzPPkul->bBAssM4^L-c@|&vg{aBw(OlFTQu+*w5(@@W#lwPJ(
z%|KaetV{dH3@S`&Zk%%I_%aLLl54$luF-9)JWNlsnTH-1jy?-JgiPk?W-3L6A@yTK
zBO8~|4jSW8&BkG}CN9AobOT{4d2Jdx-1PcsXk_Wonce_WSkFhdvX%1LHmIyO+Sw4g
z5Y}0cKjTRe6I?J3eN@G3WAz==cv(eIE59~n8nwpxC_s#BQ+5?zzFaz8glQ3;Rngzb
zx~sfyrS$<#OpDX;KY7NBq}^P%TCdhb#6zy2Fm;Q0;(4XuOYPS{S?QF2K87j6!C<us
zD@<+i<D*LO2FCpJIUJhK!hy05?;)5ay!*jBABFh~+<iDA+IDLxx|-xLT~$25;i6)j
wsBhV&P|UZQXoog9VXJRA=~69qgPsj0b!#kMrdk%(^f#!#J0M;7x*)rM0R{!UdjJ3c

literal 0
HcmV?d00001

diff --git a/ckanext/justicehub_theme/templates/scheming/organization/group_form.html b/ckanext/justicehub_theme/templates/scheming/organization/group_form.html
new file mode 100644
index 0000000..4f172ce
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/scheming/organization/group_form.html
@@ -0,0 +1,30 @@
+{% import 'macros/form.html' as form %}
+{% if group_type is not defined %}
+    {% set group_type = c.group_type %}
+{% endif %}
+
+
+{%- if not group_type -%}
+    <p>
+        group_type not passed to template. your version of CKAN
+        might not be compatible with ckanext-scheming
+    </p>
+{%- endif -%}
+
+<form class="dataset-form form-horizontal" method="post" data-module="basic-form" enctype="multipart/form-data">
+    {%- set schema = h.scheming_get_organization_schema(group_type) -%}
+    {%- for field in schema['fields'] -%}
+        {%- if field.form_snippet is not none -%}
+          {%- snippet 'scheming/snippets/form_field.html',
+          field=field, data=data, errors=errors, licenses=licenses,
+          entity_type='organization', object_type=group_type -%}
+        {%- endif -%}
+    {%- endfor -%}
+
+    <div class="form-actions">
+        {% block delete_button %}
+        {% endblock %}
+        <button class="btn btn-primary bg-clear" name="save" type="submit">{% block save_text %}{{ _('Save Organization') }}{% endblock %}</button>
+        {{ form.required_message() }}
+    </div>
+</form>

From 7c349847376ff3d65a939528a99e72a8f84b8d85 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 3 Jun 2020 23:34:55 +0530
Subject: [PATCH 048/127] update user dashboard

---
 .../templates/user/dashboard.html             | 25 ++++++++++
 .../templates/user/dashboard_groups.html      |  7 +++
 .../user/dashboard_organizations.html         |  7 +++
 .../user/snippets/followee_dropdown.html      | 47 +++++++++++++++++++
 4 files changed, 86 insertions(+)
 create mode 100644 ckanext/justicehub_theme/templates/user/dashboard.html
 create mode 100644 ckanext/justicehub_theme/templates/user/dashboard_groups.html
 create mode 100644 ckanext/justicehub_theme/templates/user/dashboard_organizations.html
 create mode 100644 ckanext/justicehub_theme/templates/user/snippets/followee_dropdown.html

diff --git a/ckanext/justicehub_theme/templates/user/dashboard.html b/ckanext/justicehub_theme/templates/user/dashboard.html
new file mode 100644
index 0000000..21ed0bf
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/user/dashboard.html
@@ -0,0 +1,25 @@
+{% ckan_extends %}
+
+{% block pre_primary %}
+<div class="col-xs-12 row" style="margin-top: 100px;">
+</div>
+{% endblock %}
+
+{% block page_header %}
+  <header class="module-content page-header hug">
+    <ul class="nav nav-tabs">
+      {{ h.build_nav_icon('dashboard.index', _('MY FEED')) }}
+      {{ h.build_nav_icon('dashboard.datasets', _('DATASETS')) }}
+      {{ h.build_nav_icon('dashboard.organizations', _('PARTNERS')) }}
+      {{ h.build_nav_icon('dashboard.groups', _('SECTORS')) }}
+
+      <div class="content_action">
+          {% link_for _('Edit settings'), named_route='user.edit', id=user.name, class_='btn btn-default' %}
+      </div>
+    </ul>
+  </header>
+{% endblock %}
+
+{% block page_heading %}
+  {{ _('MY FEED') }}
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/user/dashboard_groups.html b/ckanext/justicehub_theme/templates/user/dashboard_groups.html
new file mode 100644
index 0000000..b59f308
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/user/dashboard_groups.html
@@ -0,0 +1,7 @@
+{% ckan_extends %}
+
+{% block page_primary_action %}
+  {% if h.check_access('group_create') %}
+    {% link_for _('ADD SECTOR'), controller='group', action='new', class_="btn btn-primary" %}
+  {% endif %}
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/user/dashboard_organizations.html b/ckanext/justicehub_theme/templates/user/dashboard_organizations.html
new file mode 100644
index 0000000..b96e790
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/user/dashboard_organizations.html
@@ -0,0 +1,7 @@
+{% ckan_extends %}
+
+{% block page_primary_action %}
+  {% if h.check_access('organization_create') %}
+    {% link_for _('ADD PARTNER'), controller='organization', action='new', class_="btn btn-primary" %}
+  {% endif %}
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/user/snippets/followee_dropdown.html b/ckanext/justicehub_theme/templates/user/snippets/followee_dropdown.html
new file mode 100644
index 0000000..6d59df3
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/user/snippets/followee_dropdown.html
@@ -0,0 +1,47 @@
+{% macro followee_icon(type) -%}
+  {% if type == 'dataset' %}
+    <i class="fa fa-sitemap"></i>
+  {% elif type == 'user' %}
+    <i class="fa fa-user"></i>
+  {% elif type == 'group' %}
+    <i class="fa fa-users"></i>
+  {% elif type == 'organization' %}
+    <i class="fa fa-building-o"></i>
+  {% endif %}
+{%- endmacro %}
+
+<div id="followee-filter" class="pull-right">
+  <div class="btn-group">
+    <a href="#followee-popover" class="btn btn-default dropdown-toggle bg-clear" title="{{ _('Activity from:') }} {{ context.context }}">
+    <span>{{ _('Activity from:') }}</span> <strong>{{ context.context }}</strong> <span class="caret"></span>
+    </a>
+  </div>
+  <form id="followee-popover" action="/dashboard" class="dropdown js-hide">
+    <div class="popover-header">
+      <div class="input-group">
+        <span class="input-group-addon"><i class="fa fa-search"></i></span>
+        <input type="text" class="form-control" name="q" placeholder="{{ _('Search list...') }}" value="{{context.q}}" autocomplete="off">
+      </div>
+    </div>
+    {% if followees %}
+      <ul class="nav nav-pills nav-stacked">
+        <li class="everything {% if context.selected_id == False %} active{% endif %}">
+          <a href="{{ h.url_for('dashboard.index') }}">
+            <i class="fa fa-star"></i>
+            <span>Everything</span>
+          </a>
+        </li>
+        {% for followee in followees %}
+          <li{% if context.selected_id == followee.dict.id %} class="active"{% endif %} data-search="{{followee.display_name|lower}}">
+            <a href="{{ h.url_for('dashboard.index', type=followee.type, name=followee.dict.name) }}" title="{{followee.display_name}}">
+              {{followee_icon(followee.type)}}
+              <span>{{followee.display_name}}</span>
+            </a>
+          </li>
+        {% endfor %}
+      </ul>
+    {% else %}
+      <p class="empty">{{ _('You are not following anything') }}</p>
+    {% endif %}
+  </form>
+</div>

From 9da387355ee3709dd65b2a37df7405b6e1b2a7de Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 3 Jun 2020 23:35:18 +0530
Subject: [PATCH 049/127] update user profile, password reset and user edit
 pages

---
 .../templates/user/edit_user_form.html        | 56 +++++++++++++++++++
 .../templates/user/read_base.html             | 19 +++++++
 .../templates/user/request_reset.html         | 46 +++++++++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 ckanext/justicehub_theme/templates/user/edit_user_form.html
 create mode 100644 ckanext/justicehub_theme/templates/user/read_base.html
 create mode 100644 ckanext/justicehub_theme/templates/user/request_reset.html

diff --git a/ckanext/justicehub_theme/templates/user/edit_user_form.html b/ckanext/justicehub_theme/templates/user/edit_user_form.html
new file mode 100644
index 0000000..2a04e14
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/user/edit_user_form.html
@@ -0,0 +1,56 @@
+{% import 'macros/form.html' as form %}
+
+<form id="user-edit-form" class="dataset-form" method="post" action="{{ action }}">
+  {{ form.errors(error_summary) }}
+
+  <fieldset>
+    <legend>{{ _('Change details') }}</legend>
+    {{ form.input('name', label=_('Username'), id='field-username', value=data.name, error=errors.name, classes=['control-medium'], attrs={'readonly': '', 'class': 'form-control'}) }}
+
+    {{ form.input('fullname', label=_('Full name'), id='field-fullname', value=data.fullname, error=errors.fullname, placeholder=_('eg. Joe Bloggs'), classes=['control-medium']) }}
+
+    {{ form.input('email', label=_('Email'), id='field-email', type='email', value=data.email, error=errors.email, placeholder=_('eg. joe@example.com'), classes=['control-medium'], is_required=true) }}
+
+    {{ form.markdown('about', label=_('About'), id='field-about', value=data.about, error=errors.about, placeholder=_('A little information about yourself')) }}
+
+    {% if show_email_notifications %}
+      {% call form.checkbox('activity_streams_email_notifications', label=_('Subscribe to notification emails'), id='field-activity-streams-email-notifications', value=True, checked=g.userobj.activity_streams_email_notifications) %}
+      {% set helper_text = _("You will receive notification emails from {site_title}, e.g. when you have new activities on your dashboard."|string) %}
+      {{ form.info(helper_text.format(site_title=g.site_title), classes=['info-help-tight']) }}
+      {% endcall %}
+    {% endif %}
+
+  </fieldset>
+
+  <fieldset>
+    <legend>{{ _('Change password') }}</legend>
+    {{ form.input('old_password',
+                  type='password',
+                  label=_('Sysadmin Password') if is_sysadmin else _('Old Password'),
+                  id='field-password',
+                  value=data.oldpassword,
+                  error=errors.oldpassword,
+                  classes=['control-medium'],
+                  attrs={'autocomplete': 'off', 'class': 'form-control'}
+                  ) }}
+
+    {{ form.input('password1', type='password', label=_('Password'), id='field-password', value=data.password1, error=errors.password1, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'} ) }}
+
+    {{ form.input('password2', type='password', label=_('Confirm Password'), id='field-password-confirm', value=data.password2, error=errors.password2, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'}) }}
+  </fieldset>
+
+  <div class="form-actions">
+    {% block delete_button %}
+      {% if h.check_access('user_delete', {'id': data.id})  %}
+        <a class="btn btn-danger pull-left" href="{% url_for 'user_delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this User?') }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
+      {% endif %}
+    {% endblock %}
+    {% block generate_button %}
+      {% if h.check_access('user_generate_apikey', {'id': data.id})  %}
+        <a class="btn btn-warning bg-clear" href="{% url_for 'user.generate_apikey', id=data.id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to regenerate the API key?') }}">{% block generate_button_text %}{{ _('Regenerate API Key') }}{% endblock %}</a>
+      {% endif %}
+    {% endblock %}
+    {{ form.required_message() }}
+    <button class="btn btn-primary bg-clear" type="submit" name="save">{{ _('Update Profile') }}</button>
+  </div>
+</form>
diff --git a/ckanext/justicehub_theme/templates/user/read_base.html b/ckanext/justicehub_theme/templates/user/read_base.html
new file mode 100644
index 0000000..b9569a0
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/user/read_base.html
@@ -0,0 +1,19 @@
+{% ckan_extends %}
+
+{% block pre_primary %}
+<div class="col-xs-12 row" style="margin-top: 100px;">
+</div>
+{% endblock %}
+
+{% block content_action %}
+{% endblock %}
+
+{% block content_primary_nav %}
+  {{ h.build_nav_icon('user.read', _('DATASETS'), id=user.name) }}
+  {{ h.build_nav_icon('user.activity', _('ACTIVITY'), id=user.name) }}
+  {% if h.check_access('user_update', user) %}
+      <div class="content_action">
+        {% link_for _('EDIT'), named_route='user.edit', id=user.name, class_='btn btn-default' %}
+      </div>
+  {% endif %}
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/user/request_reset.html b/ckanext/justicehub_theme/templates/user/request_reset.html
new file mode 100644
index 0000000..dd25b78
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/user/request_reset.html
@@ -0,0 +1,46 @@
+{% extends "page.html" %}
+
+{% block subtitle %}{{ _('Reset your password') }}{% endblock %}
+
+{% block breadcrumb_content %}
+  <li class="active">{% link_for _('Password Reset'), named_route='user.request_reset' %}</li>
+{% endblock %}
+
+{% block primary_content %}
+  <article class="module">
+    <div class="module-content">
+      {% block primary_content_inner %}
+      <h1 class="page-heading">{{ _('Reset your password') }}</h1>
+      {% block form %}
+        <form action="" method="post">
+            <div class="controls">
+                <div class="form-group">
+                    <label for="field-username">{{ _('Username') }}</label>
+                    <input id="field-username" class="control-medium form-control" name="user" value="" type="text" />
+                </div>
+            </div>
+          <div class="form-actions">
+            {% block form_button %}
+            <button class="btn btn-primary" type="submit" name="reset">{{ _("Request Reset") }}</button>
+            {% endblock %}
+          </div>
+        </form>
+      {% endblock %}
+      {% endblock %}
+    </div>
+  </article>
+{% endblock %}
+
+{% block secondary_content %}
+  {% block help %}
+  <section class="module module-narrow module-shallow">
+    {% block help_inner %}
+    <h2 class="module-heading">{{ _('How does this work?') }}</h2>
+    <div class="module-content">
+      <p>{% trans %}Enter your username into the box and we will send you
+      an email with a link to enter a new password.{% endtrans %}</p>
+    </div>
+    {% endblock %}
+  </section>
+  {% endblock %}
+{% endblock %}

From ab5d7755969e7ea0cda7e14081fad4f794d25c16 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 3 Jun 2020 23:35:57 +0530
Subject: [PATCH 050/127] add new css module for common fonts, colors, icons
 etc

---
 ckanext/justicehub_theme/public/common.css    | 344 ++++++++++++++++++
 ckanext/justicehub_theme/public/dataset.css   | 130 +++++++
 .../organization/.group_form.html.swp         | Bin 12288 -> 0 bytes
 3 files changed, 474 insertions(+)
 create mode 100644 ckanext/justicehub_theme/public/common.css
 create mode 100644 ckanext/justicehub_theme/public/dataset.css
 delete mode 100644 ckanext/justicehub_theme/templates/scheming/organization/.group_form.html.swp

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
new file mode 100644
index 0000000..47368ec
--- /dev/null
+++ b/ckanext/justicehub_theme/public/common.css
@@ -0,0 +1,344 @@
+/* ---------------------- Site Fonts ------------------- */
+.radios label,
+.footer-links .input-group input,
+body {
+    font-family: 'Montserrat', sans-serif;
+    font-weight: 400; /* Regular */
+}
+.pkg_tags,
+.meta-desc,
+.footer-links .nav-item a {
+    font-size: 14px;
+}
+.count,
+.sort-box,
+.control-label,
+.input-group-addon,
+.package-item-row,
+.rsrc-list-side > li a,
+.footer-links .input-group-btn .btn {
+    font-size: 16px;
+}
+.resource-item .heading,
+.resource-item .description,
+.nav-simple .nav-item a,
+.nav-facet .nav-item a,
+.filters .module-content.empty,
+.dataset-desc,
+.downloads, .dataset-meta,
+.nav-pills li {
+   font-size: 18px;
+}
+body,
+.page-heading,
+.stats-box,
+.dataset-title,
+.dataset-org,
+.action a,
+.res-actions a,
+.issues-actions a,
+.res-actions a,
+.content_action a,
+.btn,
+#field-giant-search,
+.search-form .search-input.search-giant input,
+.nav-pills li:last-child {
+    font-size: 20px;
+}
+h1,
+.col2 p,
+.stages li,
+.nav-tabs > li >  a,
+.module-heading,
+.login-sidebar-heading,
+.footer-intro {
+    font-size: 25px;
+}
+.col3 h2 {
+    font-size: 30px;
+}
+.footer-links .nav-item a,
+#field-giant-search,
+.footer-links .input-group input::placeholder,
+.search-form .search-input.search-giant input {
+    font-weight: 300; /* Light */
+}
+.resource-item .description,
+.dataset-org,
+.dataset-meta,
+.nav-pills li,
+.footer-disclaimer div:last-child {
+    font-weight: 500; /* Medium */
+}
+.count,
+.activity .item a,
+.rsrc-list-side > li a,
+.media-item .media-heading {
+    font-weight: 600; /* Semi Bold */
+}
+.pkg_tags a,
+.sort-box,
+.input-group-addon,
+.col3 h2,
+.stages li,
+.nav-tabs > li >  a,
+[class^="btn btn-"],
+.action a,
+.res-actions a,
+.content_action a,
+.dataset-title,
+.module-heading,
+.footer-links .input-group-btn .btn {
+    font-weight: 700; /* Bold */
+}
+.stats-box,
+.footer-intro,
+.nav-pills li:last-child {
+    font-weight: 800; /* Extra Bold */
+}
+.col2 p,
+.downloads,
+.activity .item,
+.footer-disclaimer div:last-child,
+.filters .module-content.empty,
+#field-giant-search,
+.footer-links .input-group input,
+.search-form .search-input.search-giant input {
+    font-style: italic;
+}
+
+/* ----------------------- colors ------------------------- */
+.stats,
+.count,
+.media-item,
+.res-title,
+.fa-check,
+.btn-xs,
+.btn-xs:active:hover,
+.bg-clear.btn,
+.bg-clear.btn:hover,
+.fa-certificate,
+.dataset-org > a,
+.activity .item .date,
+.activity .item .actor a,
+.page-section .links-list a,
+.footer-disclaimer div:last-child {
+    color: #f65940;
+}
+.homepage .col2,
+.activity .item a,
+.downloads, .dataset-meta {
+    color: #bcb4bf;
+}
+body,
+.stats-text,
+.res-title a,
+.fa.fa-lock,
+.fa.fa-trash,
+.fa.fa-unlock-alt,
+.dataset-title a,
+.resource-item .heading,
+.page-header .nav-tabs li a,
+.footer-intro-invert,
+.stages li .highlight,
+.stages li.complete .highlight {
+    color: #403644;
+}
+.context-info .nums dl,
+.homepage .col3,
+.secondary,
+.site-footer,
+.pkg_tags a,
+.nav-facet,
+.nav-simple .nav-item a,
+.module-heading,
+.metadata-heading,
+.activity-item .activity .item,
+.filters .module-heading,
+.filters .module-content.empty,
+.nav-facet .nav-item > a,
+.member_action .delete,
+.footer-links .nav-item > a,
+.footer-links .nav-item > a:hover,
+.btn-register:hover,
+.context-info .follow_button .btn:hover,
+.page-header .nav-tabs li.active a,
+.select2-container-multi .select2-choices > li.select2-search-choice {
+    color: #ffffff;
+}
+.media-grid,
+.members-table thead th,
+.stages li .highlight,
+.stages li.complete .highlight,
+.subscribe-box .btn.btn-default:hover,
+[role="main"], body {
+  background: none;
+  background-color: #ffffff;
+}
+.secondary,
+.masthead,
+.site-footer,
+.account-masthead,
+.nav-facet,
+.sidebar,
+[class^="btn btn-"],
+.nav-tabs .content_action a,
+.res-actions a,
+.stages li.active .highlight,
+.metadata-heading,
+.page-header .nav-tabs li.active a,
+.filters .module-heading,
+.filters .module-content.empty,
+.footer-links .input-group-btn .btn,
+.btn-register:hover,
+.context-info .follow_button .btn:hover,
+.masthead .navigation .nav-pills li a:hover,
+.masthead .navigation .nav-pills li.active a,
+.footer-links .social-links .fa:hover,
+[role="main"] .container .row .col3 {
+    background: none;
+    background-color: #403644;
+}
+.context-info .follow_button .btn,
+.subscribe-box,
+.action a,
+.content_action a,
+.content_action .btn.btn-danger,
+.res-actions a,
+h2.module-heading,
+.member_action .delete,
+.nav-facet .nav-item.active,
+.nav-facet .nav-item.active a,
+.select2-results .select2-highlighted,
+.masthead .navigation .nav-pills li:last-child {
+    background: none;
+    background-color: #f65940;
+    border-color: #f65940;
+}
+.activity .item .fa[class*="fa"] {
+    background-color: #00abb7;
+}
+.pkg_tags {
+    background-color: #bcb4bf;
+}
+.table-striped tbody tr:nth-child(2n+1) td,
+.table-striped tbody tr:nth-child(2n+1) th {
+    background-color: #c1bbc3;
+}
+.label[data-format="doc"],
+.label[data-format*="doc"] {
+    background-color: #115abe;
+}
+.label[data-format="tsv"],
+.label[data-format*="tsv"] {
+    background-color: #7ca34c;
+}
+.label[data-format="zip"],
+.label[data-format*="zip"] {
+    background-color: #7ca34c;
+}
+.label[data-format="ods"],
+.label[data-format*="ods"] {
+    background-color: #2db55d;
+}
+.label[data-format="odb"],
+.label[data-format*="odb"] {
+    background-color: #85c12a;
+}
+.label[data-format="txt"],
+.label[data-format*="txt"] {
+    background-color: #55a4b5;
+}
+.label[data-format="odt"],
+.label[data-format*="odt"] {
+    background-color: #862112;
+}
+.module-heading {
+    border-bottom-color: #f65940;
+}
+.btn-register:hover,
+.context-info .follow_button .btn:hover {
+    border-color: #ffffff;
+}
+.subscribe-box .btn.btn-default:hover {
+    border-color: #f65940;
+}
+
+/* ---------------------- social links ------------------ */
+/* https://www.w3schools.com/howto/howto_css_social_media_buttons.asp */
+.social-links a {
+    text-decoration: none;
+}
+.social-links .fa {
+    padding: 12px 5px;
+    font-size: 35px;
+    width: 50px;
+    height: 50px;
+    text-decoration: none;
+    border-radius: 50%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+.fa.fa-envelope {
+    font-size: 30px;
+}
+.social-links li {
+    margin-right: 18px;
+}
+.social-links li:first-of-type {
+    padding-left: 0;
+}
+.social-links .fa {
+    background-color: #403644;
+    color: #ffffff;
+}
+.social-links .fa:hover {
+  background-color: #ffffff;
+  border: 1px solid #403644;
+  color: #403644;
+}
+
+/* --------------------- icons ------------------------- */
+.col-circle i.fa {
+    font-size: 350px;
+    color: #f65940;
+}
+img.fa.fa-check {
+    width: 20px;
+    height: 20px;
+}
+img.fa-check.fa-lg {
+    width: 28px;
+    height: 28px;
+}
+img.fa.fa-certificate {
+    width: 20px;
+    height: 25px;
+}
+img.fa-certificate.fa-lg {
+    width: 22px;
+    height: 28px;
+}
+
+/* --------------------- stats ------------------------- */
+.stats-box {
+    margin-top: 50px;
+    margin-bottom: 20px;
+}
+.stats {
+    font-size: 60px;
+    display: block;
+}
+.stats-text {
+    margin-top: -20px;
+    font-weight: 700;
+    display: block;
+}
+
+/* ------------------- labels ------------------------- */
+.label {
+    display: inline-block;
+    padding: 5px 15px;
+    border-radius: 25px;
+}
diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
new file mode 100644
index 0000000..93cab53
--- /dev/null
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -0,0 +1,130 @@
+/* ------------- package-item --------------- */
+.dataset-title {
+    margin-top: 0;
+    margin-bottom: 0;
+}
+.dataset-org {
+    margin-bottom: 20px;
+}
+.package-item-row .dataset-desc {
+    margin-top: 20px;
+}
+.dataset-resources {
+    margin-top: 0;
+}
+
+/* ------------- package-detail ------------ */
+
+.resource-list {
+    margin-top: 20px;
+}
+.pkg_tags {
+    border-radius:30px;
+    padding: 5px 20px;
+    display:inline-flex;
+}
+.dataset-desc {
+    width:80%;
+    margin-bottom:20px;
+}
+.row.dataset-meta {
+    padding: 10px 0;
+}
+.org-box {
+    width: 350px;
+    height: 350px;
+    margin-top: -30px;
+}
+.activity {
+  background:none
+}
+.activity .item .date {
+  display:block
+}
+.actor .gravatar {
+    display:none
+}
+.activity .item a {
+    font-style: normal;
+}
+.activity .item .icon {
+    height: 45px;
+    width: 45px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 25px;
+}
+.activity .item {
+    margin: 25px;
+}
+.activity .item .fa {
+    margin-top: 10px;
+}
+.activity .item::after {
+    margin-bottom: 30px;
+}
+.page-section {
+    border-top: 2px solid #f65940;
+}
+.additional-info .table {
+    width: 65%;
+}
+.additional-info thead tr th,
+.additional-info tbody tr td {
+    padding: 10px;
+    padding-left: 5%;
+}
+
+/* -------------------------- dataset-edit ----------------------- */
+.btn-default .fa-bars+span {
+    display: none;
+}
+.btn-default .fa-bars::before {
+    display: none;
+}
+.btn-default .fa-bars:after {
+    content: ' REORDER';
+    font-family: 'Montserrat', sans-serif;
+    font-weight: 700;
+    font-size: 20px;
+}
+.stages {
+    border-bottom: 2px solid #f65940;
+    margin-left: -30px;
+    margin-top: -30px;
+}
+.stages li {
+    padding: 0;
+}
+.stages li .highlight {
+    position: static;
+    text-align: center;
+    padding: 20px 0;
+}
+.stages li:before {
+    content: none;
+}
+.stages li:after {
+    top: 0;
+    border:none;
+    margin: 0;
+}
+.metadata-heading {
+    padding: 10px 0;
+    width: 50%;
+    display: inline-block;
+    text-align: center;
+    margin-left: -30px;
+}
+
+/* --------------------- responsive ------------------------- */
+@media (max-device-width: 600px) and (orientation: portrait) {
+    .metadata-heading {
+            margin-left: 0;
+    }
+    .additional-info .table {
+        width: 100%;
+        margin-left: 0;
+    }
+}
diff --git a/ckanext/justicehub_theme/templates/scheming/organization/.group_form.html.swp b/ckanext/justicehub_theme/templates/scheming/organization/.group_form.html.swp
deleted file mode 100644
index 2d8d78f29905c97601eb8f71fc87543942d65381..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12288
zcmeI2L5mzk6vr!GH7XI}NqM#mvw`X9jmeUL(+lE3MAU;QNJyIM?wXlOy1Uw{>NT5X
zUHt&!_t2Aw7eT**@uVQ+6v!o?z?1J)ckfIRh-bqq_*ZvTy{dZeS2Y8}ynOew_dkTI
z^Id`EWg$NQ_0Jot_s)yI&k13T@zniaW%uHhy(?GuE|r(_y{FlJMGGcHStZ3S*(8<D
z!%M81gT&b)G}LV$-|U>%g<5xc=GUrL<3RGnfLC=}Nv~Yu3bfSCDlv8?8+}K5ZJK0d
zP1j~iW9#|a*VWUU<1r@i%o8{(F1>XzeAM5J-hfxmefrEt%mFe1Ccp%k025#WOn?b6
z0Vc2^;M+6e1e?zdU9S(%GmkxoCO?<}6JP>NfC(@GCcp%k025#WOn?b6f&U=^Sqky$
z^FsW9qW}NL-~WHTB*f3CZ&BZ%zDAv(6zV$aHPnL_g}8^hi~1dP19cwt@T?HOpiWS4
zqyBk8i2JBNP<K&3qP|1jM%~AKe?$E=`0zdX!G#Gh0Vco%m;e)C0!)AjFo8uviLCnq
zuq={NAM~%(JUW7q<Z9IyowlmXYUP|<shtaOd@RU<$|CQ)Hw_e(bS{l@-vBCZt*)g#
zgnShjm6A4sM%F5goIFqw_`{aoyS&yu+CQ2=UYX(+&|u~<TNftBxO=uU{RDg9<E`x5
zDQ%7uR8#hICdZ4UcVWx(N5)0)6RXpGN>wSZvcdC7AIt)SAEThSV_8tTuZ#9YSm9_A
z)2=uK@i2uJ9=i4NkzPPkul->bBAssM4^L-c@|&vg{aBw(OlFTQu+*w5(@@W#lwPJ(
z%|KaetV{dH3@S`&Zk%%I_%aLLl54$luF-9)JWNlsnTH-1jy?-JgiPk?W-3L6A@yTK
zBO8~|4jSW8&BkG}CN9AobOT{4d2Jdx-1PcsXk_Wonce_WSkFhdvX%1LHmIyO+Sw4g
z5Y}0cKjTRe6I?J3eN@G3WAz==cv(eIE59~n8nwpxC_s#BQ+5?zzFaz8glQ3;Rngzb
zx~sfyrS$<#OpDX;KY7NBq}^P%TCdhb#6zy2Fm;Q0;(4XuOYPS{S?QF2K87j6!C<us
zD@<+i<D*LO2FCpJIUJhK!hy05?;)5ay!*jBABFh~+<iDA+IDLxx|-xLT~$25;i6)j
wsBhV&P|UZQXoog9VXJRA=~69qgPsj0b!#kMrdk%(^f#!#J0M;7x*)rM0R{!UdjJ3c


From ee2ee6f84af15f040c60177db65c4b1a80f9b117 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 4 Jun 2020 16:19:42 +0530
Subject: [PATCH 051/127] fix edit button on members page

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

diff --git a/ckanext/justicehub_theme/templates/organization/jh_members.html b/ckanext/justicehub_theme/templates/organization/jh_members.html
index 05f7f66..35809d9 100644
--- a/ckanext/justicehub_theme/templates/organization/jh_members.html
+++ b/ckanext/justicehub_theme/templates/organization/jh_members.html
@@ -47,7 +47,7 @@ <h1 class="page-heading">
                 {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
                     <td>
                         <div class="btn-group member_action pull-right">
-                                <a class="btn-primary" href="{{ h.url_for(group_type + '_member_new', id=c.group_dict.id, user=user_id) }}" title="{{ _('Edit') }}">
+                                <a class="btn btn-primary bg-clear" href="{{ h.url_for(group_type + '_member_new', id=c.group_dict.id, user=user_id) }}" title="{{ _('Edit') }}">
                             {{ _('EDIT') }}
                             </a>
                         <a class="delete" href="{{ h.url_for(group_type + '_member_delete', id=c.group_dict.id, user=user_id) }}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this member?') }}" title="{{ _('Delete') }}">{% block delete_button_text %}<i class="fa fa-times"></i>{% endblock %}</a>

From 6cc38c484bd6d49815583742bf10b87d91e9b4ff Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 4 Jun 2020 20:12:38 +0530
Subject: [PATCH 052/127] mobile view fixes

- update fonts
- footer fix
- other minor updates
---
 ckanext/justicehub_theme/public/common.css    | 35 +++++++++++++++
 ckanext/justicehub_theme/public/dataset.css   |  8 +++-
 ckanext/justicehub_theme/public/form.css      |  2 +-
 .../public/justicehub_theme.css               | 45 +++++++++----------
 ckanext/justicehub_theme/public/resource.css  |  2 +-
 ckanext/justicehub_theme/public/search.css    | 33 +++++++++++---
 .../justicehub_theme/templates/footer.html    | 23 +++++-----
 .../templates/package/read_base.html          | 18 ++++----
 8 files changed, 115 insertions(+), 51 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 47368ec..ec5e323 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -342,3 +342,38 @@ img.fa-certificate.fa-lg {
     padding: 5px 15px;
     border-radius: 25px;
 }
+
+/* -------------------------------------- Mobile adjustments ----------------------------- */
+@media (min-width:320px) and (orientation: portrait) {
+    .meta-desc,
+    .dataset-meta {
+        font-size: 12px;
+    }
+    .btn,
+    .dataset-count-box,
+    .resource-item .heading,
+    body {
+        font-size: 14px;
+    }
+    .btn.bg-clear {
+        font-size: 16px;
+    }
+    .stages .highlight,
+    .nav-tabs li a {
+        font-size: 18px;
+    }
+    .footer-links .social-links .fa {
+        width: 29px;
+        height: 30px;
+        font-size: 20px;
+    }
+    .footer-links .social-links li {
+        margin-right: 0;
+    }
+    .subscribe-box {
+        background-color: #403644;
+    }
+    .footer-intro {
+        font-size: 18px;
+    }
+}
diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index 93cab53..20dfbd8 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -101,6 +101,7 @@
     position: static;
     text-align: center;
     padding: 20px 0;
+    text-indent: 5mm; /* important for responsive mode */
 }
 .stages li:before {
     content: none;
@@ -119,9 +120,12 @@
 }
 
 /* --------------------- responsive ------------------------- */
-@media (max-device-width: 600px) and (orientation: portrait) {
+@media (min-width: 320px) and (orientation: portrait) {
+    .page-section {
+        padding-right: 0;
+    }
     .metadata-heading {
-            margin-left: 0;
+        margin-left: 0;
     }
     .additional-info .table {
         width: 100%;
diff --git a/ckanext/justicehub_theme/public/form.css b/ckanext/justicehub_theme/public/form.css
index 577a86d..f5a1d6f 100644
--- a/ckanext/justicehub_theme/public/form.css
+++ b/ckanext/justicehub_theme/public/form.css
@@ -170,7 +170,7 @@ input[type="month"].form-control {
 }
 
 /* ----------------------------- responsive ---------------------------- */
-@media (max-device-width: 600px) and (orientation: portrait) {
+@media (min-width: 320px) and (orientation: portrait) {
     .form-group {
         padding-left: 10px;
     }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index dcdb6d9..9dbcd1c 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -323,14 +323,24 @@ aside .module [class^=module] {
 }
 
 /* -------------------------------------- Mobile adjustments ----------------------------- */
-@media (max-device-width: 600px) and (orientation: portrait) {
+@media (min-width:320px) and (orientation: portrait) {
+    .module-content {
+        padding: 10px;
+    }
+    .top-section {
+        margin: 0 5px;
+        padding: 5px;
+    }
+    .page-header .nav-tabs {
+        margin-top: 50px;
+    }
+    .page-heading {
+        display: none;
+    }
     .toolbar .breadcrumb,
     .toolbar .breadcrumb a {
         color: #403644;
     }
-    .footer-links:last-of-type div:last-of-type ul {
-        float: left !important;
-    }
     .masthead {
         margin-bottom: initial;
         padding: 10px 0;
@@ -338,11 +348,11 @@ aside .module [class^=module] {
     .masthead .logo {
         margin-top: 0;
         margin-bottom: 0;
-        height: 80px;
-        width: 390px;
+        height: 60px;
+        width: 340px;
     }
     .navbar-toggle {
-        font-size: 40px;
+        font-size: 30px;
         margin: 0;
     }
     .masthead .navbar-collapse {
@@ -364,12 +374,6 @@ aside .module [class^=module] {
         padding-top: 5px;
         border-bottom: none;
     }
-    .footer-links {
-        padding: 5px 10px;
-    }
-    .footer-links {
-        padding-bottom: 20px;
-    }
     .login-heading {
         padding-left: 20px;
         margin-bottom: 20px;
@@ -419,22 +423,17 @@ aside .module [class^=module] {
     .footer-disclaimer {
         display: none;
     }
-    .social-links .fa {
-        width: 37px;
-        height: 37px;
-        font-size: 22px;
-    }
     .footer-links .col {
         padding: 0;
     }
-    .social-links li {
-        margin-right: 0;
-    }
     .footer-links {
-        padding: 5px 0;
+        padding: 5px 5px;
     }
     .subscribe-box {
-        background: transparent;
+        background-color: #403644;
         min-height: 100%;
     }
+    .footer-links i.fa-circle.fa-sm {
+        padding: 0;
+    }
 }
diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index 2311848..6350d2a 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -19,7 +19,7 @@
     right: 0;
 }
 .social-heading {
-    background-color: #ffffff;
+    background-color: #ffffff !important;
     color: #f65940;
     height: 70px;
     padding-top: 20px;
diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index 51815e6..9ad500b 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -55,6 +55,10 @@
 .footer-links .input-group input {
     border-radius: 30px;
 }
+.footer-links .input-group-btn:last-child > .btn {
+    border-bottom-right-radius: 30px !important;
+    border-top-right-radius: 30px !important;
+}
 .footer-links .input-group .form-control:focus {
     border-color: #f65940;
     z-index: 0;
@@ -112,7 +116,12 @@
 }
 
 /* -------------------------------------- Mobile adjustments ----------------------------- */
-@media (max-device-width: 600px) and (orientation: portrait) {
+@media (min-width: 320px) and (orientation: portrait) {
+    .search-form .input-group-btn .btn,
+    .search-form .input-group >:first-child,
+    .search-form .input-group > select {
+        height: 50px;
+    }
     .search-form .search-input.search-giant .form-control {
         line-height: 1;
         height: 65px;
@@ -129,13 +138,27 @@
         background: transparent;
     }
     .footer-links input {
-        padding: 18px 10px;
+        padding: 0 10px;
+        line-height: 1;
+        font-size: 12px;
+    }
+    .footer-links .input-group .form-control {
+        border-top-right-radius: 30px;
+        border-bottom-right-radius: 30px;
+    }
+    .footer-links .input-group-btn .btn {
+        position: absolute;
+        top: 5px;
+        left: -10px;
     }
     .footer-links .input-group-btn .btn {
-        font-size: 14px;
-        padding: 9px 10px;
-        width: 100px;
         background-color: #f65940;
         border-color: #f65940;
+        padding: 0 5px;
+    }
+    .footer-links .input-group-btn .fa {
+        text-align: center;
+        font-size: 14px;
+        width: 10px;
     }
 }
diff --git a/ckanext/justicehub_theme/templates/footer.html b/ckanext/justicehub_theme/templates/footer.html
index 140817e..9e8a2ad 100644
--- a/ckanext/justicehub_theme/templates/footer.html
+++ b/ckanext/justicehub_theme/templates/footer.html
@@ -4,12 +4,12 @@
     {% block footer_content %}
     <div class="row">
 
-        <div class="col col-md-6 footer-links">
+        <div class="col col-md-6 col-sm-6 footer-links">
             <div class="col col-md-12 col-xs-12">
                 <div class="footer-intro">{{ _('GET IN TOUCH') }}</div>
             </div>
 
-            <div class="col col-md-12 col-xs-5 social-links">
+            <div class="col col-md-12 col-sm-12 col-xs-5 social-links">
                 <ul class="list-unstyled list-inline">
                     <li>
                         <a href="mailto:info@justicehub.in" aria-hidden="true" alt="Justice Hub's Email Address" role="link" title="Email Address" aria-label="Justice Hub's Email Address" target="_blank">
@@ -34,7 +34,7 @@
                 </ul>
             </div>
 
-            <div class="col col-md-10 footer-disclaimer">
+            <div class="col col-md-10 col-sm-10 hidden-xs footer-disclaimer">
                 <div>
                     This is an Alpha release, we will be working to add more datasets in the coming days to the Justice Hub.
                 </div>
@@ -44,24 +44,27 @@
             </div>
         </div>
 
-        <div class="col col-md-6 subscribe-box footer-links">
+        <div class="col col-md-6 col-sm-6 subscribe-box footer-links">
 
-            <div class="col col-md-12">
+            <div class="col col-md-12 col-sm-12 hidden-xs">
                 <div class="footer-intro footer-intro-invert">{{ _('SUBSCRIBE') }}</div>
             </div>
 
-            <div class="col col-md-12 col-xs-7" data-module="justicehub_theme_subscribe">
+            <div class="col col-md-12 col-sm-12 col-xs-7" data-module="justicehub_theme_subscribe">
                 <form id="subscribe-form" method="post" action="{{h.url_for('jhsubscribe')}}">
-                <div class="input-group">
+                <div class="input-group pull-right">
                     <input type="email" class="form-control" placeholder="Enter you email id" name="email">
                     <span class="input-group-btn">
-                        <button class="btn btn-default btn-lg" type="submit">{{ _('Subscribe') }}</button>
+                        <button class="btn btn-default btn-lg hidden-xs" type="submit">{{ _('SUBSCRIBE') }}</button>
+                        <button class="btn visible-xs" type="button">
+                            <i class="fa fa-bell"></i>
+                        </button>
                     </span>
                 </div>
                 </form>
             </div>
 
-            <div class="col col-md-12">
+            <div class="col col-md-12 hidden-xs">
                 <p class="footer-intro-invert">Be part of our mailing list, to keep up with the latest happenings and events of the Hub.</p>
             </div>
 
@@ -70,7 +73,7 @@
 
 
     <div class="row footer-links">
-        <div class="col col-md-12 col-xs-12 pull-left">
+        <div class="col col-md-12 col-xs-12">
             <ul class="list-unstyled list-inline">
                 {% block footer_links %}
                 <li class="nav-item">
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index dbd0ca6..9e627b3 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -65,7 +65,7 @@ <h1>{{h.dataset_display_name(pkg)}}
         </a>
         </div>
         <div class="row">
-            <div class="col col-md-12 partner-links social-links">
+            <div class="col col-md-12 col-xs-12 partner-links social-links">
             <ul class="list-unstyled list-inline">
                 <li>
                     <a href="{{ pkg.partner.website }}"
@@ -130,25 +130,25 @@ <h2>ACTIVITY</h2>
     {% if pkg.links %}
     {% set links = h.justicehub_theme_parse_json(pkg.links) %}
     <div class="col-xs-12 row page-section">
-        <div class="col col-sm-9 col-xs-12 pull-right">
+        <div class="col col-sm-9 col-sm-offset-3 col-xs-12">
         <h1 class="heading">{{ _('EXTERNAL LINKS') }}</h1>
         {% for item in links %}
-           <ul class="list-unstyled links-list list-inline">
+           <dl class="dl-horizontal links-list">
           {% set item = h.composite_get_as_dict(item) %}
-          <li>
+          <dt>
               <a href="{{ link }}">{{ item['title'] }}</a>
-          </li>
-          <li class="pull-right">
+          </dt>
+          <dd>
               <p>{{ item['description'] }}</p>
-          </li>
-          </ul>
+          </dd>
+          </dl>
         {% endfor %}
         </div>
     </div>
     {% endif %}
 
     <div class= "col-xs-12 row page-section">
-        <div class="col col-sm-9 col-xs-12 pull-right">
+        <div class="col col-sm-9 col-sm-offset-3 col-xs-12">
             {% block package_additional_info %}
             {% snippet "package/snippets/additional_info.html", pkg_dict=pkg %}
             {% endblock %}

From fc392a39d49dd21fcef41e5b7d3a1e3f09c60679 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 5 Jun 2020 14:44:45 +0530
Subject: [PATCH 053/127] home page fixes for responsiveness

---
 ckanext/justicehub_theme/public/common.css    |  11 +-
 .../public/justicehub_theme.css               | 116 ++++++++----------
 ckanext/justicehub_theme/public/search.css    |  11 +-
 .../templates/home/layout4.html               |   6 +-
 .../templates/home/snippets/search.html       |   4 +-
 5 files changed, 65 insertions(+), 83 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index ec5e323..dbe2759 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -350,11 +350,14 @@ img.fa-certificate.fa-lg {
         font-size: 12px;
     }
     .btn,
+    .col2 p,
+    .stats-box,
     .dataset-count-box,
     .resource-item .heading,
     body {
         font-size: 14px;
     }
+    .search-form .search-input.search-giant input,
     .btn.bg-clear {
         font-size: 16px;
     }
@@ -362,14 +365,6 @@ img.fa-certificate.fa-lg {
     .nav-tabs li a {
         font-size: 18px;
     }
-    .footer-links .social-links .fa {
-        width: 29px;
-        height: 30px;
-        font-size: 20px;
-    }
-    .footer-links .social-links li {
-        margin-right: 0;
-    }
     .subscribe-box {
         background-color: #403644;
     }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 9dbcd1c..6fa685e 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -23,26 +23,31 @@
     padding-bottom: 0;
 }
 .masthead .navigation .nav-pills li {
-    padding-top: 40px;
+    padding-top: 7%;
     height: 120px;
 }
 .masthead .navigation .nav-pills li.active {
-    border-bottom: 15px solid #f65940;
+    border-bottom: 1.5vh solid #f65940;
 }
 .masthead .navigation .nav-pills li:hover {
-    border-bottom: 15px solid #f65940;
+    border-bottom: 1.5vh solid #f65940;
 }
 .masthead .navigation .nav-pills li:last-child {
-    height: 120px;
     padding-left: 5px;
     padding-right: 10px;
 }
+.header-image {
+    width: 35%;
+    height: 10vh;
+}
 .masthead .logo {
-    margin-top: 10px;
-    margin-bottom: 10px;
-    margin-left: -45px;
-    width: 410px;
-    height: 100px;
+    margin-top: 1%;
+    width: 100%;
+    height: 100%;
+}
+.navbar-toggle {
+    font-size: 8vw;
+    margin: 0;
 }
 .logo img {
     min-width: 100%;
@@ -53,6 +58,9 @@
 
 /* -------------------- body layout ----------------------- */
 
+.container {
+    width: 80%;
+}
 [role="main"] .container,
 .site-footer .container {
     width: 100%;
@@ -275,17 +283,15 @@ aside .module [class^=module] {
 
 /* ----------------------------- homepage --------------------------- */
 [role="main"] .container .row .col1 {
-    padding: 10% 5%;
-    margin-top: -250px;
+    margin-top: 20vh;
 }
 [role="main"] .container .row .col2 {
-    padding: 13% 10%;
+    padding: 5% 5%;
     font-style: italic;
-    margin-top: -250px;
+    margin-top: 20vh;
 }
 [role="main"] .container .row .col3 {
-    padding: 20px 60px;
-    margin-top: -310px;
+    padding: 1% 4%;
 }
 [role="main"] .container .row .col3 h2 {
     border-bottom: 2px solid #f65940;
@@ -296,30 +302,27 @@ aside .module [class^=module] {
     padding: 10px 0;
 }
 .col-circle img {
-    width: 250px;
-    height: 250px;
+    width: 90%;
+    height: 90%;
 }
 .homepage .module-search {
-    min-height: 860px;
+    min-height: 30vh;
+    margin-top: 15%;
+    background: transparent;
+}
+.homepage .container {
     background: url('/uploads/admin/JH Logomark.png') no-repeat;
-    background-clip: border-box;
-    background-position: -270px -200px;
-    background-size: 75%;
-    padding-top: 320px;
-    padding-left: 150px;
+    background-position: -13vw -20vh;
+    background-size: 100vh;
 }
 .homepage .module-search .module-content {
     background: transparent;
 }
-.module-search .search-form {
-    margin-top: -50px;
-    padding: 0;
-}
 .search-meta {
-    width: 95%;
+    width: 90%;
 }
 .search-meta .stats-box {
-    margin-top: 0;
+    margin-top: 3%;
 }
 
 /* -------------------------------------- Mobile adjustments ----------------------------- */
@@ -341,37 +344,18 @@ aside .module [class^=module] {
     .toolbar .breadcrumb a {
         color: #403644;
     }
-    .masthead {
-        margin-bottom: initial;
-        padding: 10px 0;
+    .header-image {
+        width: 70%;
     }
     .masthead .logo {
         margin-top: 0;
-        margin-bottom: 0;
-        height: 60px;
-        width: 340px;
-    }
-    .navbar-toggle {
-        font-size: 30px;
-        margin: 0;
-    }
-    .masthead .navbar-collapse {
-        padding: 10px 0;
     }
     .masthead .navigation .nav-pills li {
         height: auto;
-        padding-top: 5px;
-        padding-bottom: 5px;
-    }
-    .masthead .navigation .nav-pills li.active {
-      border-bottom: 5px solid #f65940;
-    }
-    .masthead .navigation .nav-pills li:hover {
-      border-bottom: 5px solid #f65940;
+        padding-top: 0;
+        padding-bottom: 3%;
     }
     .masthead .navigation .nav-pills li:last-child {
-        height: auto;
-        padding-top: 5px;
         border-bottom: none;
     }
     .login-heading {
@@ -382,20 +366,17 @@ aside .module [class^=module] {
     .login-sidebar {
         height: 100%;
     }
+    .container {
+        width: 100%;
+    }
+    .homepage .container {
+        background-position: -27vw -10vh;
+        background-size: 50vh;
+    }
     .homepage .module-search {
-        background-clip: border-box;
-        background-position: -155px -95px;
-        background-size: 120%;
-        padding-top: 160px;
-        padding-left: 70px;
-        min-height: 500px;
         border-bottom: 2px solid #f65940;
         margin-bottom: 50px;
     }
-    .search-meta {
-        width: 120%;
-        margin-left: -80px;
-    }
     .search-meta .stats-text {
         margin-top: 0;
     }
@@ -416,9 +397,6 @@ aside .module [class^=module] {
     [role="main"] .container .row .col3 {
         margin-top: 0;
     }
-    .search-meta .stats-box {
-        margin-top: 50px;
-    }
     .footer-intro-invert,
     .footer-disclaimer {
         display: none;
@@ -436,4 +414,12 @@ aside .module [class^=module] {
     .footer-links i.fa-circle.fa-sm {
         padding: 0;
     }
+    .footer-links .social-links .fa {
+        width: 7.5vw;
+        height: 28px;
+        font-size: 5vw;
+    }
+    .footer-links .social-links li {
+        margin-right: 0;
+    }
 }
diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index 9ad500b..3cd7f13 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -28,8 +28,8 @@
     border-radius: 60px;
     line-height: 2;
     border: 4px solid #f65940;
-    padding-left: 30px;
-    height: 80px;
+    padding-left: 3%;
+    height: 50%;
 }
 .search-form .search-input.search-giant .fa {
     color: #ffffff;
@@ -49,7 +49,8 @@
     padding: 0 0;
 }
 .search-form .search-input.search-giant {
-    width: 94%;
+    width: 80%;
+    margin: auto;
 }
 .footer-links .input-group-btn .btn,
 .footer-links .input-group input {
@@ -124,11 +125,10 @@
     }
     .search-form .search-input.search-giant .form-control {
         line-height: 1;
-        height: 65px;
         border: 3px solid #f65940;
     }
     .search-form .search-input.search-giant {
-        width: 100%;
+        width: 90%;
         margin-bottom: 80px;
     }
     .search-form .search-input.search-giant .fa {
@@ -136,6 +136,7 @@
     }
     .search-form .search-input.search-giant button {
         background: transparent;
+        margin-right: -5%;
     }
     .footer-links input {
         padding: 0 10px;
diff --git a/ckanext/justicehub_theme/templates/home/layout4.html b/ckanext/justicehub_theme/templates/home/layout4.html
index 2b96307..40f6661 100644
--- a/ckanext/justicehub_theme/templates/home/layout4.html
+++ b/ckanext/justicehub_theme/templates/home/layout4.html
@@ -6,15 +6,15 @@
             {% endblock %}
         </div>
         <div class="row">
-            <div class="col col-xs-4 col-sm-2 col1 col-circle">
+            <div class="col col-xs-4 col-sm-3 col-lg-3 col-lg-offset-1 col1 col-circle">
                 <img src="{{ h.url_for_static('uploads/admin/landing-carousel-1.png') }}"/>
             </div>
-            <div class="col col-xs-8 col-sm-5 col2">
+            <div class="col col-xs-8 col-sm-4 col-lg-4 col2">
                 <p>
                 {{ _('An Open community to exchange justice related data, knowledge and other resources online and offline.') }}
                 </p>
             </div>
-            <div class="col col-xs-12 col-md-5 col3">
+            <div class="col col-xs-12 col-md-5 col-lg-4 col3">
                 <h2>{{ _('JUSTICE HUB') }}</h2>
                 <p>
                 {{ _('This is an intiative from CivicDataLab in collaboration with Agami.\
diff --git a/ckanext/justicehub_theme/templates/home/snippets/search.html b/ckanext/justicehub_theme/templates/home/snippets/search.html
index 69914ad..60e6dc6 100644
--- a/ckanext/justicehub_theme/templates/home/snippets/search.html
+++ b/ckanext/justicehub_theme/templates/home/snippets/search.html
@@ -19,11 +19,11 @@ <h3>{{ _('Popular tags') }}</h3>
           <a class="tag" href="{% url_for controller='package', action='search', tags=tag.name %}">{{ h.truncate(tag.display_name, 22) }}</a>
           {% endfor %}
       </div>
-      <div class="col col-xs-5 col-sm-2 stats-box pull-right">
+      <div class="col col-xs-6 col-sm-2 col-md-2 col-lg-2 col-xs-offset-1 col-sm-offset-8 col-md-offset-8 col-lg-offset-9 stats-box">
           <span class="stats">{{ stats.organization_count }}</span>
           <span class="stats-text">{{ _('CONTRIBUTORS') }}</span>
       </div>
-      <div class="col col-xs-5 col-sm-2 stats-box pull-right">
+      <div class="col col-xs-5 col-sm-2 col-md-2 col-lg-1 stats-box pull-right">
           <span class="stats">{{ stats.dataset_count }}</span>
           <span class="stats-text">{{ _('DATASETS') }}</span>
       </div>

From 2fc6400126dc26a1a309cf98797dffa298cb391b Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 5 Jun 2020 15:04:34 +0530
Subject: [PATCH 054/127] partner and dataset fix for responsiveness

---
 ckanext/justicehub_theme/public/common.css    |  1 +
 ckanext/justicehub_theme/public/dataset.css   |  3 +
 .../public/justicehub_theme.css               |  2 +-
 .../templates/organization/edit_base.html     |  4 +-
 .../templates/organization/read_base.html     | 80 ++++++++++---------
 5 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index dbe2759..5cd72d5 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -352,6 +352,7 @@ img.fa-certificate.fa-lg {
     .btn,
     .col2 p,
     .stats-box,
+    .content_action a,
     .dataset-count-box,
     .resource-item .heading,
     body {
diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index 20dfbd8..d64b488 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -131,4 +131,7 @@
         width: 100%;
         margin-left: 0;
     }
+    .partner-links.social-links {
+        margin-top: 5%;
+    }
 }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 6fa685e..29c14ed 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -94,7 +94,7 @@
     margin: 0 20px;
     margin-bottom: 250px;
 }
-.content_action {
+.nav-tabs .content_action {
     margin-right: 30px;
 }
 [class^="btn btn-"],
diff --git a/ckanext/justicehub_theme/templates/organization/edit_base.html b/ckanext/justicehub_theme/templates/organization/edit_base.html
index 83ce726..60efb40 100644
--- a/ckanext/justicehub_theme/templates/organization/edit_base.html
+++ b/ckanext/justicehub_theme/templates/organization/edit_base.html
@@ -31,7 +31,8 @@
 
   {% if organization and h.check_access('organization_update', {'id': organization.id}) %}
 
-    <div class="content_action">
+  <div class="content_action">
+    <div class="row">
     {% link_for _('VIEW'), controller='organization', action='read', id=organization.name, class_='btn btn-default', named_route=group_type + '_read' %}
 
     {% if h.check_access('organization_delete', {'id': organization.id})  %}
@@ -42,6 +43,7 @@
         </a>
     {% endif %}
     </div>
+  </div>
 
   {% endif %}
 {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index cb60395..cff8d18 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -52,45 +52,47 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
             {% endblock %}
         </div>
     </div>
-    <div class="partner-links social-links col-md-4 col-sm-4 col-xs-12">
-        <ul class="list-unstyled list-inline">
-            <li>
-                <a href="{{ c.group_dict.website }}"
-                   aria-hidden="true" alt="{{ c.group_dict.name }}'s Website"
-                   role="link" title="Official Website"
-                   aria-label="{{ c.group_dict.name }}'s Website"
-                   target="_blank">
-                    <i class="fa fa-link fa-lg"></i>
-                </a>
-            </li>
-            <li>
-                <a href="{{ c.group_dict.email }}"
-                   aria-hidden="true" alt="{{ c.group_dict.name }}'s Email Address"
-                   role="link" title="Email Address"
-                   aria-label="{{ c.group_dict.name }}'s Email Address"
-                   target="_blank">
-                <i class="fa fa-envelope fa-lg"></i>
-                </a>
-            </li>
-            <li>
-                <a href="{{ c.group_dict.twitter }}"
-                   aria-hidden="true" alt="{{ c.group_dict.name }}'s Twitter Handle"
-                   role="link" title="Official Twitter Handle"
-                   aria-label="{{ c.group_dict.name }}'s Twitter Handle"
-                   target="_blank">
-                    <i class="fa fa-twitter fa-lg"></i>
-                </a>
-            </li>
-            <li>
-                <a href="{{ c.group_dict.twitter }}"
-                   aria-hidden="true" alt="{{ c.group_dict.name }}'s Facebook Page"
-                   role="link" title="Official Facebook Page"
-                   aria-label="{{ c.group_dict.name }}'s Facebook Page"
-                   target="_blank">
-                    <i class="fa fa-facebook fa-lg"></i>
-                </a>
-            </li>
-        </ul>
+    <div class="row">
+        <div class="partner-links social-links col-md-4 col-sm-4 col-xs-12">
+            <ul class="list-unstyled list-inline">
+                <li>
+                    <a href="{{ c.group_dict.website }}"
+                       aria-hidden="true" alt="{{ c.group_dict.name }}'s Website"
+                       role="link" title="Official Website"
+                       aria-label="{{ c.group_dict.name }}'s Website"
+                       target="_blank">
+                        <i class="fa fa-link fa-lg"></i>
+                    </a>
+                </li>
+                <li>
+                    <a href="{{ c.group_dict.email }}"
+                       aria-hidden="true" alt="{{ c.group_dict.name }}'s Email Address"
+                       role="link" title="Email Address"
+                       aria-label="{{ c.group_dict.name }}'s Email Address"
+                       target="_blank">
+                    <i class="fa fa-envelope fa-lg"></i>
+                    </a>
+                </li>
+                <li>
+                    <a href="{{ c.group_dict.twitter }}"
+                       aria-hidden="true" alt="{{ c.group_dict.name }}'s Twitter Handle"
+                       role="link" title="Official Twitter Handle"
+                       aria-label="{{ c.group_dict.name }}'s Twitter Handle"
+                       target="_blank">
+                        <i class="fa fa-twitter fa-lg"></i>
+                    </a>
+                </li>
+                <li>
+                    <a href="{{ c.group_dict.twitter }}"
+                       aria-hidden="true" alt="{{ c.group_dict.name }}'s Facebook Page"
+                       role="link" title="Official Facebook Page"
+                       aria-label="{{ c.group_dict.name }}'s Facebook Page"
+                       target="_blank">
+                        <i class="fa fa-facebook fa-lg"></i>
+                    </a>
+                </li>
+            </ul>
+        </div>
     </div>
 </div>
 {% endblock %}

From 3325ffc94cc2d7c34f0cc53dded16038fa93e4d5 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 5 Jun 2020 15:14:07 +0530
Subject: [PATCH 055/127] filter facet fixes

---
 ckanext/justicehub_theme/public/resource.css                    | 2 +-
 .../justicehub_theme/templates/organization/bulk_process.html   | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index 6350d2a..6291dba 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -4,7 +4,7 @@
 .nav-simple li {
     border-bottom: none;
 }
-.nav-simple > .nav-item {
+.nav-simple:not(.nav-facet) > .nav-item {
     padding-left: 50px;
     padding-top: 30px;
 }
diff --git a/ckanext/justicehub_theme/templates/organization/bulk_process.html b/ckanext/justicehub_theme/templates/organization/bulk_process.html
index 7715b2e..03ace21 100644
--- a/ckanext/justicehub_theme/templates/organization/bulk_process.html
+++ b/ckanext/justicehub_theme/templates/organization/bulk_process.html
@@ -8,9 +8,11 @@
 {% block secondary_content %}
   {% if organization %}
     {% snippet 'snippets/organization.html', organization=organization %}
+    <div class="filters">
     {% for facet in c.facet_titles %}
           {{ h.snippet('snippets/facet_list.html', title=c.facet_titles[facet], name=facet, extras={'id':c.group_dict.id}) }}
     {% endfor %}
+    </div>
   {% else %}
     {{ super() }}
   {% endif %}

From fab4b1adb648f8255bf324811b8894c7fab1c02a Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 5 Jun 2020 15:41:51 +0530
Subject: [PATCH 056/127] partner page fixes for responsiveness

---
 ckanext/justicehub_theme/public/common.css            |  1 +
 ckanext/justicehub_theme/public/form.css              |  3 +++
 ckanext/justicehub_theme/public/justicehub_theme.css  | 11 +++++++++++
 ckanext/justicehub_theme/public/partner.css           |  9 +++++++--
 .../templates/organization/edit_base.html             |  2 --
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 5cd72d5..cfde51f 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -355,6 +355,7 @@ img.fa-certificate.fa-lg {
     .content_action a,
     .dataset-count-box,
     .resource-item .heading,
+    .table thead tr th.table-actions .btn,
     body {
         font-size: 14px;
     }
diff --git a/ckanext/justicehub_theme/public/form.css b/ckanext/justicehub_theme/public/form.css
index f5a1d6f..6d68bbf 100644
--- a/ckanext/justicehub_theme/public/form.css
+++ b/ckanext/justicehub_theme/public/form.css
@@ -171,6 +171,9 @@ input[type="month"].form-control {
 
 /* ----------------------------- responsive ---------------------------- */
 @media (min-width: 320px) and (orientation: portrait) {
+    .search-form {
+        margin-bottom: 0;
+    }
     .form-group {
         padding-left: 10px;
     }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 29c14ed..a63d11f 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -94,6 +94,7 @@
     margin: 0 20px;
     margin-bottom: 250px;
 }
+.context .content_action,
 .nav-tabs .content_action {
     margin-right: 30px;
 }
@@ -334,8 +335,18 @@ aside .module [class^=module] {
         margin: 0 5px;
         padding: 5px;
     }
+    .page_primary_action {
+        padding-right: 30px;
+    }
+    .context .content_action {
+        margin-right: 20px;
+    }
+    .nav-tabs .content_action {
+        margin-right: 10px;
+    }
     .page-header .nav-tabs {
         margin-top: 50px;
+        border-bottom: none;
     }
     .page-heading {
         display: none;
diff --git a/ckanext/justicehub_theme/public/partner.css b/ckanext/justicehub_theme/public/partner.css
index b5a1ad1..2aa9bc8 100644
--- a/ckanext/justicehub_theme/public/partner.css
+++ b/ckanext/justicehub_theme/public/partner.css
@@ -50,15 +50,20 @@
 /*----------------- org-edit dataset ----------------------*/
 .partner-dataset-table > tbody > tr > td {
     border-top:None;
-    height:150px;
+}
+.partner-dataset-table > thead tr th {
+    padding-bottom: 5%;
 }
 .partner-dataset-table > thead > tr > th {
     border-bottom:None;
-    height:150px;
     vertical-align:middle;
 }
 .btn-icon {
     border:None;
+    padding: 0;
+}
+.table thead tr th.table-actions {
+    padding-left: 15px;
 }
 .btn-icon:hover{
     background: #ffffff;
diff --git a/ckanext/justicehub_theme/templates/organization/edit_base.html b/ckanext/justicehub_theme/templates/organization/edit_base.html
index 60efb40..c79f57f 100644
--- a/ckanext/justicehub_theme/templates/organization/edit_base.html
+++ b/ckanext/justicehub_theme/templates/organization/edit_base.html
@@ -32,7 +32,6 @@
   {% if organization and h.check_access('organization_update', {'id': organization.id}) %}
 
   <div class="content_action">
-    <div class="row">
     {% link_for _('VIEW'), controller='organization', action='read', id=organization.name, class_='btn btn-default', named_route=group_type + '_read' %}
 
     {% if h.check_access('organization_delete', {'id': organization.id})  %}
@@ -42,7 +41,6 @@
             {% block delete_button_text %}{{ _('DELETE') }}{% endblock %}
         </a>
     {% endif %}
-    </div>
   </div>
 
   {% endif %}

From 2ee72527e2e1cb0acf50dce2ed95607afc375816 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 5 Jun 2020 23:09:28 +0530
Subject: [PATCH 057/127] add more links in navbar

- covid
- resources
- open source of jh
---
 ckanext/justicehub_theme/public/common.css    | 14 ++++++--
 .../public/justicehub_theme.css               | 12 +++----
 .../justicehub_theme/templates/header.html    | 36 ++++++++++++++++---
 .../templates/home/snippets/search.html       | 10 ++++++
 4 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index cfde51f..237872f 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -16,6 +16,7 @@ body {
 .input-group-addon,
 .package-item-row,
 .rsrc-list-side > li a,
+.dropdown-menu > li > a,
 .footer-links .input-group-btn .btn {
     font-size: 16px;
 }
@@ -41,8 +42,7 @@ body,
 .content_action a,
 .btn,
 #field-giant-search,
-.search-form .search-input.search-giant input,
-.nav-pills li:last-child {
+.search-form .search-input.search-giant input {
     font-size: 20px;
 }
 h1,
@@ -163,6 +163,8 @@ body,
 .btn-register:hover,
 .context-info .follow_button .btn:hover,
 .page-header .nav-tabs li.active a,
+.dropdown-menu > li > a,
+.dropdown-menu > li > a:hover,
 .select2-container-multi .select2-choices > li.select2-search-choice {
     color: #ffffff;
 }
@@ -181,6 +183,7 @@ body,
 .account-masthead,
 .nav-facet,
 .sidebar,
+.dropdown-menu,
 [class^="btn btn-"],
 .nav-tabs .content_action a,
 .res-actions a,
@@ -193,6 +196,8 @@ body,
 .btn-register:hover,
 .context-info .follow_button .btn:hover,
 .masthead .navigation .nav-pills li a:hover,
+.masthead .navigation .nav-pills li a:active,
+.masthead .navigation .nav-pills li a:focus,
 .masthead .navigation .nav-pills li.active a,
 .footer-links .social-links .fa:hover,
 [role="main"] .container .row .col3 {
@@ -210,7 +215,7 @@ h2.module-heading,
 .nav-facet .nav-item.active,
 .nav-facet .nav-item.active a,
 .select2-results .select2-highlighted,
-.masthead .navigation .nav-pills li:last-child {
+.masthead .navigation .nav-pills > li:last-child {
     background: none;
     background-color: #f65940;
     border-color: #f65940;
@@ -320,6 +325,9 @@ img.fa-certificate.fa-lg {
     width: 22px;
     height: 28px;
 }
+.dropdown-toggle .caret {
+    width: 10px;
+}
 
 /* --------------------- stats ------------------------- */
 .stats-box {
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index a63d11f..b2292cd 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -22,22 +22,22 @@
     padding-top: 0;
     padding-bottom: 0;
 }
-.masthead .navigation .nav-pills li {
+.masthead .navigation .nav-pills > li {
     padding-top: 7%;
     height: 120px;
 }
-.masthead .navigation .nav-pills li.active {
+.masthead .navigation .nav-pills > li.active {
     border-bottom: 1.5vh solid #f65940;
 }
-.masthead .navigation .nav-pills li:hover {
+.masthead .navigation .nav-pills > li:not(.dropdown):hover {
     border-bottom: 1.5vh solid #f65940;
 }
-.masthead .navigation .nav-pills li:last-child {
+.masthead .navigation .nav-pills > li:last-child {
     padding-left: 5px;
     padding-right: 10px;
 }
 .header-image {
-    width: 35%;
+    width: 28%;
     height: 10vh;
 }
 .masthead .logo {
@@ -59,7 +59,7 @@
 /* -------------------- body layout ----------------------- */
 
 .container {
-    width: 80%;
+    width: 90%;
 }
 [role="main"] .container,
 .site-footer .container {
diff --git a/ckanext/justicehub_theme/templates/header.html b/ckanext/justicehub_theme/templates/header.html
index e4e7bad..332bd40 100644
--- a/ckanext/justicehub_theme/templates/header.html
+++ b/ckanext/justicehub_theme/templates/header.html
@@ -3,8 +3,22 @@
 {% block header_site_navigation %}
     <nav class="section navigation">
     <ul class="nav nav-pills">
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">About<b class="caret"></b></a>
+            <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
+                <li>
+                    {% link_for _('The Hub'), named_route='home.about' %}
+                </li>
+                <li>
+                    <a href="https://github.com/justicehub-in">
+                        {{ _('Open Source') }}
+                        <i class="fa fa-sm fa-external-link"></i>
+                    </a>
+                </li>
+            </ul>
+        </li>
         {% block header_site_navigation_tabs %}
-            {{ h.build_nav_main( ('home.about', _('About Us')), ('search', _('Datasets')), ('organizations_index', _('Partners'))) }}
+            {{ h.build_nav_main( ('search', _('Datasets')), ('organizations_index', _('Partners'))) }}
         {% endblock %}
 
         {% if not c.userobj %}
@@ -21,10 +35,22 @@
           </li>
           {% endblock %}
         {% endif %}
-        <li>
-            <a href="https://justicehub.in/" title="{{ _('WIKI') }}">
-                <span class="text">{{ _('WIKI') }}</span>
-            </a>
+        <li class="dropdown">
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">WIKI<b class="caret"></b></a>
+            <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
+                <li>
+                    <a href="https://justicehub.in/resources/">
+                        {{ _('Resources') }}
+                        <i class="fa fa-sm fa-external-link"></i>
+                    </a>
+                </li>
+                <li>
+                    <a href="https://justicehub.in/covid-19/">
+                        {{ _('Covid-19') }}
+                        <i class="fa fa-sm fa-external-link"></i>
+                    </a>
+                </li>
+            </ul>
         </li>
     </ul>
     </nav>
diff --git a/ckanext/justicehub_theme/templates/home/snippets/search.html b/ckanext/justicehub_theme/templates/home/snippets/search.html
index 60e6dc6..af1d6f8 100644
--- a/ckanext/justicehub_theme/templates/home/snippets/search.html
+++ b/ckanext/justicehub_theme/templates/home/snippets/search.html
@@ -3,6 +3,16 @@
 {% set stats=h.get_site_statistics() %}
 
 <div class="module module-search module-narrow module-shallow box">
+  <div class="row">
+    <div class="col col-xs-6 col-lg-2 col-xs-offset-6 col-lg-offset-9">
+      {% if not c.userobj %}
+          {% link_for _('UPLOAD'), named_route='user.login', class_='btn btn-primary' %}
+      {% else %}
+          {% link_for _('UPLOAD'), controller='package', action='new', named_route='dataset_new', class_='btn btn-primary' %}
+      {% endif %}
+    </div>
+  </div>
+
   <form class="module-content search-form" method="get" action="{% url_for controller='package', action='search' %}">
     <div class="search-input form-group search-giant">
       <input aria-label="{% block header_site_search_label %}{{ _('Search datasets') }}{% endblock %}" id="field-main-search" type="text" class="form-control" name="q" value="" autocomplete="off" placeholder="{% block search_placeholder %}{{ placeholder }}{% endblock %}" />

From 1e0a558172a64592d9c5d428f8afb2953b470cf3 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 10 Jun 2020 15:18:28 +0530
Subject: [PATCH 058/127] move functions out of plugins to respective modules

- controllers
- helpers
---
 .../justicehub_theme/controllers/__init__.py  |    1 +
 .../controllers/controller.py                 |  100 +
 .../controllers/jhorg_controller.py           |   32 -
 .../justicehub_theme/controllers/package.py   | 1620 -----------------
 .../{controllers/stats.py => lib/__init__.py} |    0
 ckanext/justicehub_theme/lib/helpers.py       |   84 +
 ckanext/justicehub_theme/plugin.py            |  201 +-
 7 files changed, 198 insertions(+), 1840 deletions(-)
 create mode 100644 ckanext/justicehub_theme/controllers/controller.py
 delete mode 100644 ckanext/justicehub_theme/controllers/jhorg_controller.py
 delete mode 100644 ckanext/justicehub_theme/controllers/package.py
 rename ckanext/justicehub_theme/{controllers/stats.py => lib/__init__.py} (100%)
 create mode 100644 ckanext/justicehub_theme/lib/helpers.py

diff --git a/ckanext/justicehub_theme/controllers/__init__.py b/ckanext/justicehub_theme/controllers/__init__.py
index e69de29..b6b53cd 100644
--- a/ckanext/justicehub_theme/controllers/__init__.py
+++ b/ckanext/justicehub_theme/controllers/__init__.py
@@ -0,0 +1 @@
+from controller import JHOrgController
diff --git a/ckanext/justicehub_theme/controllers/controller.py b/ckanext/justicehub_theme/controllers/controller.py
new file mode 100644
index 0000000..ccda487
--- /dev/null
+++ b/ckanext/justicehub_theme/controllers/controller.py
@@ -0,0 +1,100 @@
+import requests
+from ckanext.justicehub_theme.lib import helpers
+
+import ckan.controllers.organization as org
+import ckan.lib.plugins as plugins
+import ckan.logic as logic
+import ckan.model as model
+from ckan.common import c
+
+NotFound = logic.NotFound
+
+
+class JHOrgController(org.OrganizationController):
+    def members(self, id):
+        '''
+        Modified core method from 'group' controller.
+        Enable view for non signed in user.
+
+        :param id: id of the organization for which the member list is requested
+        :type id: string
+        :return: the rendered template
+        :rtype: unicode
+        '''
+        group_type = self._ensure_controller_matches_group_type(id)
+
+        context = {'model': model, 'session': model.Session,
+                   'user': c.user}
+
+        data_dict = {'id': id}
+        try:
+            c.members = self._action('member_list')(
+                context, {'id': id, 'object_type': 'user'}
+            )
+            data_dict['include_datasets'] = False
+            c.group_dict = self._action('group_show')(context, data_dict)
+        except NotFound:
+            abort(404, _('Oraganization not found'))
+
+        return self._render_template('organization/jh_members.html', group_type)
+
+    def org_stats(self, id):
+        group_type = self._ensure_controller_matches_group_type(id)
+
+        context = {'model': model, 'session': model.Session,
+                   'user': c.user,
+                   'schema': self._db_to_form_schema(group_type=group_type),
+                   'for_view': True}
+        data_dict = {'id': id, 'type': group_type}
+        # unicode format (decoded from utf8)
+        c.q = ''
+
+        try:
+            data_dict['include_datasets'] = True
+            c.group_dict = self._action('group_show')(context, data_dict)
+            c.group = context['group']
+        except NotFound:
+            abort(404, _('Organization not found'))
+        self._read(id, 999, group_type)
+        downloads = 0
+        visits = 0
+        for package in c.page.items:
+            downloads += helpers.get_package_avg_downloads(package)
+            visits += helpers.get_package_visits(package)['total']
+        c.group_dict.update({'downloads':downloads, 'visits': visits})
+        return plugins.toolkit.render('organization/stats.html', extra_vars={'group_type': group_type, 'downloads': downloads})
+
+
+class SubscribeController(base.BaseController):
+    def subscribe(self):
+        basic_auth_key = config.get("mailchimp_api_key", "")
+        subscriber_list_id = config.get("mailchimp_list_id", "")
+        subscriber_tag_id = config.get("mailchimp_tag_id", "")
+        mailchimp_base_url = config.get("mailchimp_base_url", "")
+        url = mailchimp_base_url + subscriber_list_id + "/members"
+
+        request_body = clean_dict(dict_fns.unflatten(
+                    tuplize_dict(parse_params(request.params))))
+
+        payload = {
+            "email_address": str(request_body.get("email", "")),
+            "status": "subscribed"
+            }
+        headers = {
+        'Content-Type': 'application/json',
+        'Authorization': 'Basic '+ basic_auth_key
+        }
+
+        response = requests.request("POST", url, headers=headers, data = json.dumps(payload))
+
+        print(response.text.encode('utf8'))
+
+        tag_url = mailchimp_base_url + subscriber_list_id + "/segments/" + subscriber_tag_id + "/members"
+
+        payload = {
+            "email_address": str(request_body.get("email", ""))
+            }
+
+        response = requests.request("POST", tag_url, headers=headers, data = json.dumps(payload))
+
+        print response.text.encode('utf8')
diff --git a/ckanext/justicehub_theme/controllers/jhorg_controller.py b/ckanext/justicehub_theme/controllers/jhorg_controller.py
deleted file mode 100644
index 50c3421..0000000
--- a/ckanext/justicehub_theme/controllers/jhorg_controller.py
+++ /dev/null
@@ -1,32 +0,0 @@
-
-import ckan.controllers.organization as org
-import ckan.model as model
-from ckan.common import c
-
-class JHOrgController(org.OrganizationController):
-    def members(self, id):
-        '''
-        Modified core method from 'group' controller.
-        Enable view for non signed in user.
-
-        :param id: id of the organization for which the member list is requested
-        :type id: string
-        :return: the rendered template
-        :rtype: unicode
-        '''
-        group_type = self._ensure_controller_matches_group_type(id)
-
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user}
-
-        data_dict = {'id': id}
-        try:
-            c.members = self._action('member_list')(
-                context, {'id': id, 'object_type': 'user'}
-            )
-            data_dict['include_datasets'] = False
-            c.group_dict = self._action('group_show')(context, data_dict)
-        except NotFound:
-            abort(404, _('Group not found'))
-
-        return self._render_template('group/members.html', group_type)
\ No newline at end of file
diff --git a/ckanext/justicehub_theme/controllers/package.py b/ckanext/justicehub_theme/controllers/package.py
deleted file mode 100644
index 6c70633..0000000
--- a/ckanext/justicehub_theme/controllers/package.py
+++ /dev/null
@@ -1,1620 +0,0 @@
-# encoding: utf-8
-
-import logging
-from urllib import urlencode
-import datetime
-import mimetypes
-import cgi
-
-from ckan.common import config
-from paste.deploy.converters import asbool
-import paste.fileapp
-from six import string_types, text_type
-
-import ckan.logic as logic
-import ckan.lib.base as base
-import ckan.lib.i18n as i18n
-import ckan.lib.maintain as maintain
-import ckan.lib.navl.dictization_functions as dict_fns
-import ckan.lib.helpers as h
-import ckan.model as model
-import ckan.lib.datapreview as datapreview
-import ckan.lib.plugins
-import ckan.lib.uploader as uploader
-import ckan.plugins as p
-import ckan.lib.render
-
-from ckan.common import OrderedDict, _, json, request, c, response
-from home import CACHE_PARAMETERS
-
-log = logging.getLogger(__name__)
-
-render = base.render
-abort = base.abort
-
-NotFound = logic.NotFound
-NotAuthorized = logic.NotAuthorized
-ValidationError = logic.ValidationError
-check_access = logic.check_access
-get_action = logic.get_action
-tuplize_dict = logic.tuplize_dict
-clean_dict = logic.clean_dict
-parse_params = logic.parse_params
-flatten_to_string_key = logic.flatten_to_string_key
-
-lookup_package_plugin = ckan.lib.plugins.lookup_package_plugin
-
-
-def _encode_params(params):
-    return [(k, v.encode('utf-8') if isinstance(v, string_types) else str(v))
-            for k, v in params]
-
-
-def url_with_params(url, params):
-    params = _encode_params(params)
-    return url + u'?' + urlencode(params)
-
-
-def search_url(params, package_type=None):
-    if not package_type or package_type == 'dataset':
-        url = h.url_for(controller='package', action='search')
-    else:
-        url = h.url_for('{0}_search'.format(package_type))
-    return url_with_params(url, params)
-
-
-class PackageController(base.BaseController):
-
-    def _package_form(self, package_type=None):
-        return lookup_package_plugin(package_type).package_form()
-
-    def _setup_template_variables(self, context, data_dict, package_type=None):
-        return lookup_package_plugin(package_type).\
-            setup_template_variables(context, data_dict)
-
-    def _new_template(self, package_type):
-        return lookup_package_plugin(package_type).new_template()
-
-    def _edit_template(self, package_type):
-        return lookup_package_plugin(package_type).edit_template()
-
-    def _search_template(self, package_type):
-        return lookup_package_plugin(package_type).search_template()
-
-    def _read_template(self, package_type):
-        return lookup_package_plugin(package_type).read_template()
-
-    def _history_template(self, package_type):
-        return lookup_package_plugin(package_type).history_template()
-
-    def _resource_form(self, package_type):
-        # backwards compatibility with plugins not inheriting from
-        # DefaultDatasetPlugin and not implmenting resource_form
-        plugin = lookup_package_plugin(package_type)
-        if hasattr(plugin, 'resource_form'):
-            result = plugin.resource_form()
-            if result is not None:
-                return result
-        return lookup_package_plugin().resource_form()
-
-    def _resource_template(self, package_type):
-        # backwards compatibility with plugins not inheriting from
-        # DefaultDatasetPlugin and not implmenting resource_template
-        plugin = lookup_package_plugin(package_type)
-        if hasattr(plugin, 'resource_template'):
-            result = plugin.resource_template()
-            if result is not None:
-                return result
-        return lookup_package_plugin().resource_template()
-
-    def _guess_package_type(self, expecting_name=False):
-        """
-            Guess the type of package from the URL handling the case
-            where there is a prefix on the URL (such as /data/package)
-        """
-
-        # Special case: if the rot URL '/' has been redirected to the package
-        # controller (e.g. by an IRoutes extension) then there's nothing to do
-        # here.
-        if request.path == '/':
-            return 'dataset'
-
-        parts = [x for x in request.path.split('/') if x]
-
-        idx = -1
-        if expecting_name:
-            idx = -2
-
-        pt = parts[idx]
-        if pt == 'package':
-            pt = 'dataset'
-
-        return pt
-
-    def search(self):
-        from ckan.lib.search import SearchError, SearchQueryError
-
-        package_type = self._guess_package_type()
-
-        try:
-            context = {'model': model, 'user': c.user,
-                       'auth_user_obj': c.userobj}
-            check_access('site_read', context)
-        except NotAuthorized:
-            abort(403, _('Not authorized to see this page'))
-
-        # unicode format (decoded from utf8)
-        q = c.q = request.params.get('q', u'')
-        c.query_error = False
-        page = h.get_page_number(request.params)
-
-        limit = int(config.get('ckan.datasets_per_page', 20))
-
-        # most search operations should reset the page counter:
-        params_nopage = [(k, v) for k, v in request.params.items()
-                         if k != 'page']
-
-        def drill_down_url(alternative_url=None, **by):
-            return h.add_url_param(alternative_url=alternative_url,
-                                   controller='package', action='search',
-                                   new_params=by)
-
-        c.drill_down_url = drill_down_url
-
-        def remove_field(key, value=None, replace=None):
-            return h.remove_url_param(key, value=value, replace=replace,
-                                      controller='package', action='search',
-                                      alternative_url=package_type)
-
-        c.remove_field = remove_field
-
-        sort_by = request.params.get('sort', None)
-        params_nosort = [(k, v) for k, v in params_nopage if k != 'sort']
-
-        def _sort_by(fields):
-            """
-            Sort by the given list of fields.
-
-            Each entry in the list is a 2-tuple: (fieldname, sort_order)
-
-            eg - [('metadata_modified', 'desc'), ('name', 'asc')]
-
-            If fields is empty, then the default ordering is used.
-            """
-            params = params_nosort[:]
-
-            if fields:
-                sort_string = ', '.join('%s %s' % f for f in fields)
-                params.append(('sort', sort_string))
-            return search_url(params, package_type)
-
-        c.sort_by = _sort_by
-        if not sort_by:
-            c.sort_by_fields = []
-        else:
-            c.sort_by_fields = [field.split()[0]
-                                for field in sort_by.split(',')]
-
-        def pager_url(q=None, page=None):
-            params = list(params_nopage)
-            params.append(('page', page))
-            return search_url(params, package_type)
-
-        c.search_url_params = urlencode(_encode_params(params_nopage))
-
-        try:
-            c.fields = []
-            # c.fields_grouped will contain a dict of params containing
-            # a list of values eg {'tags':['tag1', 'tag2']}
-            c.fields_grouped = {}
-            search_extras = {}
-            fq = ''
-            for (param, value) in request.params.items():
-                if param not in ['q', 'page', 'sort'] \
-                        and len(value) and not param.startswith('_'):
-                    if not param.startswith('ext_'):
-                        c.fields.append((param, value))
-                        fq += ' %s:"%s"' % (param, value)
-                        if param not in c.fields_grouped:
-                            c.fields_grouped[param] = [value]
-                        else:
-                            c.fields_grouped[param].append(value)
-                    else:
-                        search_extras[param] = value
-
-            context = {'model': model, 'session': model.Session,
-                       'user': c.user, 'for_view': True,
-                       'auth_user_obj': c.userobj}
-
-            # Unless changed via config options, don't show other dataset
-            # types any search page. Potential alternatives are do show them
-            # on the default search page (dataset) or on one other search page
-            search_all_type = config.get(
-                                  'ckan.search.show_all_types', 'dataset')
-            search_all = False
-
-            try:
-                # If the "type" is set to True or False, convert to bool
-                # and we know that no type was specified, so use traditional
-                # behaviour of applying this only to dataset type
-                search_all = asbool(search_all_type)
-                search_all_type = 'dataset'
-            # Otherwise we treat as a string representing a type
-            except ValueError:
-                search_all = True
-
-            if not package_type:
-                package_type = 'dataset'
-
-            if not search_all or package_type != search_all_type:
-                # Only show datasets of this particular type
-                fq += ' +dataset_type:{type}'.format(type=package_type)
-
-            facets = OrderedDict()
-
-            default_facet_titles = {
-                'organization': _('Organizations'),
-                'groups': _('Groups'),
-                'tags': _('Tags'),
-                'res_format': _('Formats'),
-                'license_id': _('Licenses'),
-                }
-
-            for facet in h.facets():
-                if facet in default_facet_titles:
-                    facets[facet] = default_facet_titles[facet]
-                else:
-                    facets[facet] = facet
-
-            # Facet titles
-            for plugin in p.PluginImplementations(p.IFacets):
-                facets = plugin.dataset_facets(facets, package_type)
-
-            c.facet_titles = facets
-
-            data_dict = {
-                'q': q,
-                'fq': fq.strip(),
-                'facet.field': facets.keys(),
-                'rows': limit,
-                'start': (page - 1) * limit,
-                'sort': sort_by,
-                'extras': search_extras,
-                'include_private': asbool(config.get(
-                    'ckan.search.default_include_private', True)),
-            }
-
-            query = get_action('package_search')(context, data_dict)
-            c.sort_by_selected = query['sort']
-
-            c.page = h.Page(
-                collection=query['results'],
-                page=page,
-                url=pager_url,
-                item_count=query['count'],
-                items_per_page=limit
-            )
-            c.search_facets = query['search_facets']
-            c.page.items = query['results']
-        except SearchQueryError as se:
-            # User's search parameters are invalid, in such a way that is not
-            # achievable with the web interface, so return a proper error to
-            # discourage spiders which are the main cause of this.
-            log.info('Dataset search query rejected: %r', se.args)
-            abort(400, _('Invalid search query: {error_message}')
-                  .format(error_message=str(se)))
-        except SearchError as se:
-            # May be bad input from the user, but may also be more serious like
-            # bad code causing a SOLR syntax error, or a problem connecting to
-            # SOLR
-            log.error('Dataset search error: %r', se.args)
-            c.query_error = True
-            c.search_facets = {}
-            c.page = h.Page(collection=[])
-        except NotAuthorized:
-            abort(403, _('Not authorized to see this page'))
-
-        c.search_facets_limits = {}
-        for facet in c.search_facets.keys():
-            try:
-                limit = int(request.params.get('_%s_limit' % facet,
-                            int(config.get('search.facets.default', 10))))
-            except ValueError:
-                abort(400, _('Parameter "{parameter_name}" is not '
-                             'an integer').format(
-                      parameter_name='_%s_limit' % facet))
-            c.search_facets_limits[facet] = limit
-
-        self._setup_template_variables(context, {},
-                                       package_type=package_type)
-
-        return render(self._search_template(package_type),
-                      extra_vars={'dataset_type': package_type})
-
-    def resources(self, id):
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'for_view': True,
-                   'auth_user_obj': c.userobj}
-        data_dict = {'id': id, 'include_tracking': True}
-
-        try:
-            check_access('package_update', context, data_dict)
-        except NotFound:
-            abort(404, _('Dataset not found'))
-        except NotAuthorized:
-            abort(403, _('User %r not authorized to edit %s') % (c.user, id))
-        # check if package exists
-        try:
-            c.pkg_dict = get_action('package_show')(context, data_dict)
-            c.pkg = context['package']
-        except (NotFound, NotAuthorized):
-            abort(404, _('Dataset not found'))
-
-        package_type = c.pkg_dict['type'] or 'dataset'
-        self._setup_template_variables(context, {'id': id},
-                                       package_type=package_type)
-
-        return render('package/resources.html',
-                      extra_vars={'dataset_type': package_type})
-
-    def read(self, id):
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'for_view': True,
-                   'auth_user_obj': c.userobj}
-        data_dict = {'id': id, 'include_tracking': True}
-
-        # interpret @<revision_id> or @<date> suffix
-        split = id.split('@')
-        if len(split) == 2:
-            data_dict['id'], revision_ref = split
-            if model.is_id(revision_ref):
-                context['revision_id'] = revision_ref
-            else:
-                try:
-                    date = h.date_str_to_datetime(revision_ref)
-                    context['revision_date'] = date
-                except TypeError as e:
-                    abort(400, _('Invalid revision format: %r') % e.args)
-                except ValueError as e:
-                    abort(400, _('Invalid revision format: %r') % e.args)
-        elif len(split) > 2:
-            abort(400, _('Invalid revision format: %r') %
-                  'Too many "@" symbols')
-
-        # check if package exists
-        try:
-            c.pkg_dict = get_action('package_show')(context, data_dict)
-            c.pkg = context['package']
-	    c.package_activity_stream = get_action(
-		'package_activity_list_html')(
-		context, {'id': c.pkg_dict['id']})
-        except (NotFound, NotAuthorized):
-            abort(404, _('Dataset not found'))
-
-        # used by disqus plugin
-        c.current_package_id = c.pkg.id
-
-        # can the resources be previewed?
-        for resource in c.pkg_dict['resources']:
-            # Backwards compatibility with preview interface
-            resource['can_be_previewed'] = self._resource_preview(
-                {'resource': resource, 'package': c.pkg_dict})
-
-            resource_views = get_action('resource_view_list')(
-                context, {'id': resource['id']})
-            resource['has_views'] = len(resource_views) > 0
-
-        package_type = c.pkg_dict['type'] or 'dataset'
-        self._setup_template_variables(context, {'id': id},
-                                       package_type=package_type)
-
-        template = self._read_template(package_type)
-        try:
-            return render(template,
-                          extra_vars={'dataset_type': package_type})
-        except ckan.lib.render.TemplateNotFound as e:
-            msg = _(
-                "Viewing datasets of type \"{package_type}\" is "
-                "not supported ({file_!r}).".format(
-                    package_type=package_type,
-                    file_=e.message
-                )
-            )
-            abort(404, msg)
-
-        assert False, "We should never get here"
-
-    def history(self, id):
-
-        if 'diff' in request.params or 'selected1' in request.params:
-            try:
-                params = {'id': request.params.getone('pkg_name'),
-                          'diff': request.params.getone('selected1'),
-                          'oldid': request.params.getone('selected2'),
-                          }
-            except KeyError:
-                if 'pkg_name' in dict(request.params):
-                    id = request.params.getone('pkg_name')
-                c.error = \
-                    _('Select two revisions before doing the comparison.')
-            else:
-                params['diff_entity'] = 'package'
-                h.redirect_to(controller='revision', action='diff', **params)
-
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'auth_user_obj': c.userobj,
-                   'for_view': True}
-        data_dict = {'id': id}
-        try:
-            c.pkg_dict = get_action('package_show')(context, data_dict)
-            c.pkg_revisions = get_action('package_revision_list')(context,
-                                                                  data_dict)
-            # TODO: remove
-            # Still necessary for the authz check in group/layout.html
-            c.pkg = context['package']
-
-        except NotAuthorized:
-            abort(403, _('Unauthorized to read package %s') % '')
-        except NotFound:
-            abort(404, _('Dataset not found'))
-
-        format = request.params.get('format', '')
-        if format == 'atom':
-            # Generate and return Atom 1.0 document.
-            from webhelpers.feedgenerator import Atom1Feed
-            feed = Atom1Feed(
-                title=_(u'CKAN Dataset Revision History'),
-                link=h.url_for(controller='revision', action='read',
-                               id=c.pkg_dict['name']),
-                description=_(u'Recent changes to CKAN Dataset: ') +
-                (c.pkg_dict['title'] or ''),
-                language=text_type(i18n.get_lang()),
-            )
-            for revision_dict in c.pkg_revisions:
-                revision_date = h.date_str_to_datetime(
-                    revision_dict['timestamp'])
-                try:
-                    dayHorizon = int(request.params.get('days'))
-                except:
-                    dayHorizon = 30
-                dayAge = (datetime.datetime.now() - revision_date).days
-                if dayAge >= dayHorizon:
-                    break
-                if revision_dict['message']:
-                    item_title = u'%s' % revision_dict['message'].\
-                        split('\n')[0]
-                else:
-                    item_title = u'%s' % revision_dict['id']
-                item_link = h.url_for(controller='revision', action='read',
-                                      id=revision_dict['id'])
-                item_description = _('Log message: ')
-                item_description += '%s' % (revision_dict['message'] or '')
-                item_author_name = revision_dict['author']
-                item_pubdate = revision_date
-                feed.add_item(
-                    title=item_title,
-                    link=item_link,
-                    description=item_description,
-                    author_name=item_author_name,
-                    pubdate=item_pubdate,
-                )
-            response.headers['Content-Type'] = 'application/atom+xml'
-            return feed.writeString('utf-8')
-
-        package_type = c.pkg_dict['type'] or 'dataset'
-
-        return render(
-            self._history_template(c.pkg_dict.get('type', package_type)),
-            extra_vars={'dataset_type': package_type})
-
-    def new(self, data=None, errors=None, error_summary=None):
-        if data and 'type' in data:
-            package_type = data['type']
-        else:
-            package_type = self._guess_package_type(True)
-
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'auth_user_obj': c.userobj,
-                   'save': 'save' in request.params}
-
-        # Package needs to have a organization group in the call to
-        # check_access and also to save it
-        try:
-            check_access('package_create', context)
-        except NotAuthorized:
-            abort(403, _('Unauthorized to create a package'))
-
-        if context['save'] and not data and request.method == 'POST':
-            return self._save_new(context, package_type=package_type)
-
-        data = data or clean_dict(dict_fns.unflatten(tuplize_dict(parse_params(
-            request.params, ignore_keys=CACHE_PARAMETERS))))
-        c.resources_json = h.json.dumps(data.get('resources', []))
-        # convert tags if not supplied in data
-        if data and not data.get('tag_string'):
-            data['tag_string'] = ', '.join(
-                h.dict_list_reduce(data.get('tags', {}), 'name'))
-
-        errors = errors or {}
-        error_summary = error_summary or {}
-        # in the phased add dataset we need to know that
-        # we have already completed stage 1
-        stage = ['active']
-        if data.get('state', '').startswith('draft'):
-            stage = ['active', 'complete']
-
-        # if we are creating from a group then this allows the group to be
-        # set automatically
-        data['group_id'] = request.params.get('group') or \
-            request.params.get('groups__0__id')
-
-        form_snippet = self._package_form(package_type=package_type)
-        form_vars = {'data': data, 'errors': errors,
-                     'error_summary': error_summary,
-                     'action': 'new', 'stage': stage,
-                     'dataset_type': package_type,
-                     }
-        c.errors_json = h.json.dumps(errors)
-
-        self._setup_template_variables(context, {},
-                                       package_type=package_type)
-
-        new_template = self._new_template(package_type)
-        return render(new_template,
-                      extra_vars={'form_vars': form_vars,
-                                  'form_snippet': form_snippet,
-                                  'dataset_type': package_type})
-
-    def resource_edit(self, id, resource_id, data=None, errors=None,
-                      error_summary=None):
-
-        context = {'model': model, 'session': model.Session,
-                   'api_version': 3, 'for_edit': True,
-                   'user': c.user, 'auth_user_obj': c.userobj}
-        data_dict = {'id': id}
-
-        try:
-            check_access('package_update', context, data_dict)
-        except NotAuthorized:
-            abort(403, _('User %r not authorized to edit %s') % (c.user, id))
-
-        if request.method == 'POST' and not data:
-            data = data or \
-                clean_dict(dict_fns.unflatten(tuplize_dict(parse_params(
-                                                           request.POST))))
-            # we don't want to include save as it is part of the form
-            del data['save']
-
-            data['package_id'] = id
-            try:
-                if resource_id:
-                    data['id'] = resource_id
-                    get_action('resource_update')(context, data)
-                else:
-                    get_action('resource_create')(context, data)
-            except ValidationError as e:
-                errors = e.error_dict
-                error_summary = e.error_summary
-                return self.resource_edit(id, resource_id, data,
-                                          errors, error_summary)
-            except NotAuthorized:
-                abort(403, _('Unauthorized to edit this resource'))
-            h.redirect_to(controller='package', action='resource_read', id=id,
-                          resource_id=resource_id)
-
-        pkg_dict = get_action('package_show')(context, {'id': id})
-        if pkg_dict['state'].startswith('draft'):
-            # dataset has not yet been fully created
-            resource_dict = get_action('resource_show')(context,
-                                                        {'id': resource_id})
-            return self.new_resource(id, data=resource_dict)
-        # resource is fully created
-        try:
-            resource_dict = get_action('resource_show')(context,
-                                                        {'id': resource_id})
-        except NotFound:
-            abort(404, _('Resource not found'))
-        c.pkg_dict = pkg_dict
-        c.resource = resource_dict
-        # set the form action
-        c.form_action = h.url_for(controller='package',
-                                  action='resource_edit',
-                                  resource_id=resource_id,
-                                  id=id)
-        if not data:
-            data = resource_dict
-
-        package_type = pkg_dict['type'] or 'dataset'
-
-        errors = errors or {}
-        error_summary = error_summary or {}
-        vars = {'data': data, 'errors': errors,
-                'error_summary': error_summary, 'action': 'edit',
-                'resource_form_snippet': self._resource_form(package_type),
-                'dataset_type': package_type}
-        return render('package/resource_edit.html', extra_vars=vars)
-
-    def new_resource(self, id, data=None, errors=None, error_summary=None):
-        ''' FIXME: This is a temporary action to allow styling of the
-        forms. '''
-        if request.method == 'POST' and not data:
-            save_action = request.params.get('save')
-            data = data or \
-                clean_dict(dict_fns.unflatten(tuplize_dict(parse_params(
-                                                           request.POST))))
-            # we don't want to include save as it is part of the form
-            del data['save']
-            resource_id = data['id']
-            del data['id']
-
-            context = {'model': model, 'session': model.Session,
-                       'user': c.user, 'auth_user_obj': c.userobj}
-
-            # see if we have any data that we are trying to save
-            data_provided = False
-            for key, value in data.iteritems():
-                if ((value or isinstance(value, cgi.FieldStorage))
-                        and key != 'resource_type'):
-                    data_provided = True
-                    break
-
-            if not data_provided and save_action != "go-dataset-complete":
-                if save_action == 'go-dataset':
-                    # go to final stage of adddataset
-                    h.redirect_to(controller='package', action='edit', id=id)
-                # see if we have added any resources
-                try:
-                    data_dict = get_action('package_show')(context, {'id': id})
-                except NotAuthorized:
-                    abort(403, _('Unauthorized to update dataset'))
-                except NotFound:
-                    abort(404, _('The dataset {id} could not be found.'
-                                 ).format(id=id))
-                if not len(data_dict['resources']):
-                    # no data so keep on page
-                    msg = _('You must add at least one data resource')
-                    # On new templates do not use flash message
-
-                    if asbool(config.get('ckan.legacy_templates')):
-                        h.flash_error(msg)
-                        h.redirect_to(controller='package',
-                                      action='new_resource', id=id)
-                    else:
-                        errors = {}
-                        error_summary = {_('Error'): msg}
-                        return self.new_resource(id, data, errors,
-                                                 error_summary)
-                # XXX race condition if another user edits/deletes
-                data_dict = get_action('package_show')(context, {'id': id})
-                get_action('package_update')(
-                    dict(context, allow_state_change=True),
-                    dict(data_dict, state='active'))
-                h.redirect_to(controller='package', action='read', id=id)
-
-            data['package_id'] = id
-            try:
-                if resource_id:
-                    data['id'] = resource_id
-                    get_action('resource_update')(context, data)
-                else:
-                    get_action('resource_create')(context, data)
-            except ValidationError as e:
-                errors = e.error_dict
-                error_summary = e.error_summary
-                return self.new_resource(id, data, errors, error_summary)
-            except NotAuthorized:
-                abort(403, _('Unauthorized to create a resource'))
-            except NotFound:
-                abort(404, _('The dataset {id} could not be found.'
-                             ).format(id=id))
-            if save_action == 'go-metadata':
-                # XXX race condition if another user edits/deletes
-                data_dict = get_action('package_show')(context, {'id': id})
-                get_action('package_update')(
-                    dict(context, allow_state_change=True),
-                    dict(data_dict, state='active'))
-                h.redirect_to(controller='package', action='read', id=id)
-            elif save_action == 'go-dataset':
-                # go to first stage of add dataset
-                h.redirect_to(controller='package', action='edit', id=id)
-            elif save_action == 'go-dataset-complete':
-                # go to first stage of add dataset
-                h.redirect_to(controller='package', action='read', id=id)
-            else:
-                # add more resources
-                h.redirect_to(controller='package', action='new_resource',
-                              id=id)
-
-        # get resources for sidebar
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'auth_user_obj': c.userobj}
-        try:
-            pkg_dict = get_action('package_show')(context, {'id': id})
-        except NotFound:
-            abort(404, _('The dataset {id} could not be found.').format(id=id))
-        try:
-            check_access(
-                'resource_create', context, {"package_id": pkg_dict["id"]})
-        except NotAuthorized:
-            abort(403, _('Unauthorized to create a resource for this package'))
-
-        package_type = pkg_dict['type'] or 'dataset'
-
-        errors = errors or {}
-        error_summary = error_summary or {}
-        vars = {'data': data, 'errors': errors,
-                'error_summary': error_summary, 'action': 'new',
-                'resource_form_snippet': self._resource_form(package_type),
-                'dataset_type': package_type}
-        vars['pkg_name'] = id
-        # required for nav menu
-        vars['pkg_dict'] = pkg_dict
-        template = 'package/new_resource_not_draft.html'
-        if pkg_dict['state'].startswith('draft'):
-            vars['stage'] = ['complete', 'active']
-            template = 'package/new_resource.html'
-        return render(template, extra_vars=vars)
-
-    def edit(self, id, data=None, errors=None, error_summary=None):
-        package_type = self._get_package_type(id)
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'auth_user_obj': c.userobj,
-                   'save': 'save' in request.params}
-
-        if context['save'] and not data and request.method == 'POST':
-            return self._save_edit(id, context, package_type=package_type)
-        try:
-            c.pkg_dict = get_action('package_show')(dict(context,
-                                                         for_view=True),
-                                                    {'id': id})
-            context['for_edit'] = True
-            old_data = get_action('package_show')(context, {'id': id})
-            # old data is from the database and data is passed from the
-            # user if there is a validation error. Use users data if there.
-            if data:
-                old_data.update(data)
-            data = old_data
-        except (NotFound, NotAuthorized):
-            abort(404, _('Dataset not found'))
-        # are we doing a multiphase add?
-        if data.get('state', '').startswith('draft'):
-            c.form_action = h.url_for(controller='package', action='new')
-            c.form_style = 'new'
-            return self.new(data=data, errors=errors,
-                            error_summary=error_summary)
-
-        c.pkg = context.get("package")
-        c.resources_json = h.json.dumps(data.get('resources', []))
-
-        try:
-            check_access('package_update', context)
-        except NotAuthorized:
-            abort(403, _('User %r not authorized to edit %s') % (c.user, id))
-        # convert tags if not supplied in data
-        if data and not data.get('tag_string'):
-            data['tag_string'] = ', '.join(h.dict_list_reduce(
-                c.pkg_dict.get('tags', {}), 'name'))
-        errors = errors or {}
-        form_snippet = self._package_form(package_type=package_type)
-        form_vars = {'data': data, 'errors': errors,
-                     'error_summary': error_summary, 'action': 'edit',
-                     'dataset_type': package_type,
-                     }
-        c.errors_json = h.json.dumps(errors)
-
-        self._setup_template_variables(context, {'id': id},
-                                       package_type=package_type)
-
-        # we have already completed stage 1
-        form_vars['stage'] = ['active']
-        if data.get('state', '').startswith('draft'):
-            form_vars['stage'] = ['active', 'complete']
-
-        edit_template = self._edit_template(package_type)
-        return render(edit_template,
-                      extra_vars={'form_vars': form_vars,
-                                  'form_snippet': form_snippet,
-                                  'dataset_type': package_type})
-
-    def read_ajax(self, id, revision=None):
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'auth_user_obj': c.userobj,
-                   'revision_id': revision}
-        try:
-            data = get_action('package_show')(context, {'id': id})
-        except (NotFound, NotAuthorized):
-            abort(404, _('Dataset not found'))
-
-        data.pop('tags')
-        data = flatten_to_string_key(data)
-        response.headers['Content-Type'] = 'application/json;charset=utf-8'
-        return h.json.dumps(data)
-
-    def history_ajax(self, id):
-
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'auth_user_obj': c.userobj}
-        data_dict = {'id': id}
-        try:
-            pkg_revisions = get_action('package_revision_list')(
-                context, data_dict)
-        except NotAuthorized:
-            abort(403, _('Unauthorized to read package %s') % '')
-        except NotFound:
-            abort(404, _('Dataset not found'))
-
-        data = []
-        approved = False
-        for num, revision in enumerate(pkg_revisions):
-            if not approved and revision['approved_timestamp']:
-                current_approved, approved = True, True
-            else:
-                current_approved = False
-
-            data.append({'revision_id': revision['id'],
-                         'message': revision['message'],
-                         'timestamp': revision['timestamp'],
-                         'author': revision['author'],
-                         'approved': bool(revision['approved_timestamp']),
-                         'current_approved': current_approved})
-
-        response.headers['Content-Type'] = 'application/json;charset=utf-8'
-        return h.json.dumps(data)
-
-    def _get_package_type(self, id):
-        """
-        Given the id of a package this method will return the type of the
-        package, or 'dataset' if no type is currently set
-        """
-        pkg = model.Package.get(id)
-        if pkg:
-            return pkg.type or 'dataset'
-        return None
-
-    def _tag_string_to_list(self, tag_string):
-        ''' This is used to change tags from a sting to a list of dicts '''
-        out = []
-        for tag in tag_string.split(','):
-            tag = tag.strip()
-            if tag:
-                out.append({'name': tag,
-                            'state': 'active'})
-        return out
-
-    def _save_new(self, context, package_type=None):
-        # The staged add dataset used the new functionality when the dataset is
-        # partially created so we need to know if we actually are updating or
-        # this is a real new.
-        is_an_update = False
-        ckan_phase = request.params.get('_ckan_phase')
-        from ckan.lib.search import SearchIndexError
-        try:
-            data_dict = clean_dict(dict_fns.unflatten(
-                tuplize_dict(parse_params(request.POST))))
-            if ckan_phase:
-                # prevent clearing of groups etc
-                context['allow_partial_update'] = True
-                # sort the tags
-                if 'tag_string' in data_dict:
-                    data_dict['tags'] = self._tag_string_to_list(
-                        data_dict['tag_string'])
-                if data_dict.get('pkg_name'):
-                    is_an_update = True
-                    # This is actually an update not a save
-                    data_dict['id'] = data_dict['pkg_name']
-                    del data_dict['pkg_name']
-                    # don't change the dataset state
-                    data_dict['state'] = 'draft'
-                    # this is actually an edit not a save
-                    pkg_dict = get_action('package_update')(context, data_dict)
-
-                    if request.params['save'] == 'go-metadata':
-                        # redirect to add metadata
-                        url = h.url_for(controller='package',
-                                        action='new_metadata',
-                                        id=pkg_dict['name'])
-                    else:
-                        # redirect to add dataset resources
-                        url = h.url_for(controller='package',
-                                        action='new_resource',
-                                        id=pkg_dict['name'])
-                    h.redirect_to(url)
-                # Make sure we don't index this dataset
-                if request.params['save'] not in ['go-resource',
-                                                  'go-metadata']:
-                    data_dict['state'] = 'draft'
-                # allow the state to be changed
-                context['allow_state_change'] = True
-
-            data_dict['type'] = package_type
-            context['message'] = data_dict.get('log_message', '')
-            pkg_dict = get_action('package_create')(context, data_dict)
-
-            if ckan_phase:
-                # redirect to add dataset resources
-                url = h.url_for(controller='package',
-                                action='new_resource',
-                                id=pkg_dict['name'])
-                h.redirect_to(url)
-
-            self._form_save_redirect(pkg_dict['name'], 'new',
-                                     package_type=package_type)
-        except NotAuthorized:
-            abort(403, _('Unauthorized to read package %s') % '')
-        except NotFound as e:
-            abort(404, _('Dataset not found'))
-        except dict_fns.DataError:
-            abort(400, _(u'Integrity Error'))
-        except SearchIndexError as e:
-            try:
-                exc_str = text_type(repr(e.args))
-            except Exception:  # We don't like bare excepts
-                exc_str = text_type(str(e))
-            abort(500, _(u'Unable to add package to search index.') + exc_str)
-        except ValidationError as e:
-            errors = e.error_dict
-            error_summary = e.error_summary
-            if is_an_update:
-                # we need to get the state of the dataset to show the stage we
-                # are on.
-                pkg_dict = get_action('package_show')(context, data_dict)
-                data_dict['state'] = pkg_dict['state']
-                return self.edit(data_dict['id'], data_dict,
-                                 errors, error_summary)
-            data_dict['state'] = 'none'
-            return self.new(data_dict, errors, error_summary)
-
-    def _save_edit(self, name_or_id, context, package_type=None):
-        from ckan.lib.search import SearchIndexError
-        log.debug('Package save request name: %s POST: %r',
-                  name_or_id, request.POST)
-        try:
-            data_dict = clean_dict(dict_fns.unflatten(
-                tuplize_dict(parse_params(request.POST))))
-            if '_ckan_phase' in data_dict:
-                # we allow partial updates to not destroy existing resources
-                context['allow_partial_update'] = True
-                if 'tag_string' in data_dict:
-                    data_dict['tags'] = self._tag_string_to_list(
-                        data_dict['tag_string'])
-                del data_dict['_ckan_phase']
-                del data_dict['save']
-            context['message'] = data_dict.get('log_message', '')
-            data_dict['id'] = name_or_id
-            pkg = get_action('package_update')(context, data_dict)
-            c.pkg = context['package']
-            c.pkg_dict = pkg
-
-            self._form_save_redirect(pkg['name'], 'edit',
-                                     package_type=package_type)
-        except NotAuthorized:
-            abort(403, _('Unauthorized to read package %s') % id)
-        except NotFound as e:
-            abort(404, _('Dataset not found'))
-        except dict_fns.DataError:
-            abort(400, _(u'Integrity Error'))
-        except SearchIndexError as e:
-            try:
-                exc_str = text_type(repr(e.args))
-            except Exception:  # We don't like bare excepts
-                exc_str = text_type(str(e))
-            abort(500, _(u'Unable to update search index.') + exc_str)
-        except ValidationError as e:
-            errors = e.error_dict
-            error_summary = e.error_summary
-            return self.edit(name_or_id, data_dict, errors, error_summary)
-
-    def _form_save_redirect(self, pkgname, action, package_type=None):
-        '''This redirects the user to the CKAN package/read page,
-        unless there is request parameter giving an alternate location,
-        perhaps an external website.
-        @param pkgname - Name of the package just edited
-        @param action - What the action of the edit was
-        '''
-        assert action in ('new', 'edit')
-        url = request.params.get('return_to') or \
-            config.get('package_%s_return_url' % action)
-        if url:
-            url = url.replace('<NAME>', pkgname)
-        else:
-            if package_type is None or package_type == 'dataset':
-                url = h.url_for(controller='package', action='read',
-                                id=pkgname)
-            else:
-                url = h.url_for('{0}_read'.format(package_type), id=pkgname)
-        h.redirect_to(url)
-
-    def delete(self, id):
-
-        if 'cancel' in request.params:
-            h.redirect_to(controller='package', action='edit', id=id)
-
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'auth_user_obj': c.userobj}
-
-        try:
-            if request.method == 'POST':
-                get_action('package_delete')(context, {'id': id})
-                h.flash_notice(_('Dataset has been deleted.'))
-                h.redirect_to(controller='package', action='search')
-            c.pkg_dict = get_action('package_show')(context, {'id': id})
-            dataset_type = c.pkg_dict['type'] or 'dataset'
-        except NotAuthorized:
-            abort(403, _('Unauthorized to delete package %s') % '')
-        except NotFound:
-            abort(404, _('Dataset not found'))
-        return render('package/confirm_delete.html',
-                      extra_vars={'dataset_type': dataset_type})
-
-    def resource_delete(self, id, resource_id):
-
-        if 'cancel' in request.params:
-            h.redirect_to(controller='package', action='resource_edit',
-                          resource_id=resource_id, id=id)
-
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'auth_user_obj': c.userobj}
-
-        try:
-            check_access('package_delete', context, {'id': id})
-        except NotAuthorized:
-            abort(403, _('Unauthorized to delete package %s') % '')
-
-        try:
-            if request.method == 'POST':
-                get_action('resource_delete')(context, {'id': resource_id})
-                h.flash_notice(_('Resource has been deleted.'))
-                pkg_dict = get_action('package_show')(None, {'id': id})
-                if pkg_dict['state'].startswith('draft'):
-                    h.redirect_to(controller='package', action='new_resource',
-                                  id=id)
-                else:
-                    h.redirect_to(controller='package', action='read', id=id)
-            c.resource_dict = get_action('resource_show')(
-                context, {'id': resource_id})
-            c.pkg_id = id
-        except NotAuthorized:
-            abort(403, _('Unauthorized to delete resource %s') % '')
-        except NotFound:
-            abort(404, _('Resource not found'))
-        return render('package/confirm_delete_resource.html',
-                      {'dataset_type': self._get_package_type(id)})
-
-    def resource_read(self, 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
-
-        # Deprecated: c.datastore_api - use h.action_url instead
-        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}
-
-        template = self._resource_template(dataset_type)
-        return render(template, extra_vars=vars)
-
-    @maintain.deprecated('Resource preview is deprecated. Please use the new '
-                         'resource views')
-    def _resource_preview(self, data_dict):
-        '''Deprecated in 2.3'''
-        return bool(datapreview.get_preview_plugin(data_dict,
-                                                   return_first=True))
-
-    def resource_download(self, id, resource_id, filename=None):
-        """
-        Provides a direct download by either redirecting the user to the url
-        stored or downloading an uploaded file directly.
-        """
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'auth_user_obj': c.userobj}
-
-        try:
-            rsc = get_action('resource_show')(context, {'id': resource_id})
-            get_action('package_show')(context, {'id': id})
-        except (NotFound, NotAuthorized):
-            abort(404, _('Resource not found'))
-
-        if rsc.get('url_type') == 'upload':
-            upload = uploader.get_resource_uploader(rsc)
-            filepath = upload.get_path(rsc['id'])
-            fileapp = paste.fileapp.FileApp(filepath)
-            try:
-                status, headers, app_iter = request.call_application(fileapp)
-            except OSError:
-                abort(404, _('Resource data not found'))
-            response.headers.update(dict(headers))
-            content_type, content_enc = mimetypes.guess_type(
-                rsc.get('url', ''))
-            if content_type:
-                response.headers['Content-Type'] = content_type
-            response.status = status
-            return app_iter
-        elif 'url' not in rsc:
-            abort(404, _('No download is available'))
-        h.redirect_to(rsc['url'])
-
-    def follow(self, id):
-        '''Start following this dataset.'''
-        context = {'model': model,
-                   'session': model.Session,
-                   'user': c.user, 'auth_user_obj': c.userobj}
-        data_dict = {'id': id}
-        try:
-            get_action('follow_dataset')(context, data_dict)
-            package_dict = get_action('package_show')(context, data_dict)
-            h.flash_success(_("You are now following {0}").format(
-                package_dict['title']))
-        except ValidationError as e:
-            error_message = (e.message or e.error_summary
-                             or e.error_dict)
-            h.flash_error(error_message)
-        except NotAuthorized as e:
-            h.flash_error(e.message)
-        h.redirect_to(controller='package', action='read', id=id)
-
-    def unfollow(self, id):
-        '''Stop following this dataset.'''
-        context = {'model': model,
-                   'session': model.Session,
-                   'user': c.user, 'auth_user_obj': c.userobj}
-        data_dict = {'id': id}
-        try:
-            get_action('unfollow_dataset')(context, data_dict)
-            package_dict = get_action('package_show')(context, data_dict)
-            h.flash_success(_("You are no longer following {0}").format(
-                package_dict['title']))
-        except ValidationError as e:
-            error_message = (e.message or e.error_summary
-                             or e.error_dict)
-            h.flash_error(error_message)
-        except (NotFound, NotAuthorized) as e:
-            error_message = e.message
-            h.flash_error(error_message)
-        h.redirect_to(controller='package', action='read', id=id)
-
-    def followers(self, id=None):
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'for_view': True,
-                   'auth_user_obj': c.userobj}
-
-        data_dict = {'id': id}
-        try:
-            c.pkg_dict = get_action('package_show')(context, data_dict)
-            c.pkg = context['package']
-            c.followers = get_action('dataset_follower_list')(
-                context, {'id': c.pkg_dict['id']})
-
-            dataset_type = c.pkg.type or 'dataset'
-        except NotFound:
-            abort(404, _('Dataset not found'))
-        except NotAuthorized:
-            abort(403, _('Unauthorized to read package %s') % id)
-
-        return render('package/followers.html',
-                      {'dataset_type': dataset_type})
-
-    def groups(self, id):
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'for_view': True,
-                   'auth_user_obj': c.userobj, 'use_cache': False}
-        data_dict = {'id': id}
-        try:
-            c.pkg_dict = get_action('package_show')(context, data_dict)
-            dataset_type = c.pkg_dict['type'] or 'dataset'
-        except (NotFound, NotAuthorized):
-            abort(404, _('Dataset not found'))
-
-        if request.method == 'POST':
-            new_group = request.POST.get('group_added')
-            if new_group:
-                data_dict = {"id": new_group,
-                             "object": id,
-                             "object_type": 'package',
-                             "capacity": 'public'}
-                try:
-                    get_action('member_create')(context, data_dict)
-                except NotFound:
-                    abort(404, _('Group not found'))
-
-            removed_group = None
-            for param in request.POST:
-                if param.startswith('group_remove'):
-                    removed_group = param.split('.')[-1]
-                    break
-            if removed_group:
-                data_dict = {"id": removed_group,
-                             "object": id,
-                             "object_type": 'package'}
-
-                try:
-                    get_action('member_delete')(context, data_dict)
-                except NotFound:
-                    abort(404, _('Group not found'))
-            h.redirect_to(controller='package', action='groups', id=id)
-
-        context['is_member'] = True
-        users_groups = get_action('group_list_authz')(context, data_dict)
-
-        pkg_group_ids = set(group['id'] for group
-                            in c.pkg_dict.get('groups', []))
-        user_group_ids = set(group['id'] for group
-                             in users_groups)
-
-        c.group_dropdown = [[group['id'], group['display_name']]
-                            for group in users_groups if
-                            group['id'] not in pkg_group_ids]
-
-        for group in c.pkg_dict.get('groups', []):
-            group['user_member'] = (group['id'] in user_group_ids)
-
-        return render('package/group_list.html',
-                      {'dataset_type': dataset_type})
-
-    def activity(self, id):
-        '''Render this package's public activity stream page.'''
-
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'for_view': True,
-                   'auth_user_obj': c.userobj}
-        data_dict = {'id': id}
-        try:
-            c.pkg_dict = get_action('package_show')(context, data_dict)
-            c.pkg = context['package']
-            c.package_activity_stream = get_action(
-                'package_activity_list_html')(
-                context, {'id': c.pkg_dict['id']})
-            dataset_type = c.pkg_dict['type'] or 'dataset'
-        except NotFound:
-            abort(404, _('Dataset not found'))
-        except NotAuthorized:
-            abort(403, _('Unauthorized to read dataset %s') % id)
-
-        return render('package/activity.html',
-                      {'dataset_type': dataset_type})
-
-    def resource_embedded_dataviewer(self, id, resource_id,
-                                     width=500, height=500):
-        """
-        Embedded page for a read-only resource dataview. Allows
-        for width and height to be specified as part of the
-        querystring (as well as accepting them via routes).
-        """
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'auth_user_obj': c.userobj}
-
-        try:
-            c.resource = get_action('resource_show')(context,
-                                                     {'id': resource_id})
-            c.package = get_action('package_show')(context, {'id': id})
-            c.resource_json = h.json.dumps(c.resource)
-
-            # double check that the resource belongs to the specified package
-            if not c.resource['id'] in [r['id']
-                                        for r in c.package['resources']]:
-                raise NotFound
-            dataset_type = c.package['type'] or 'dataset'
-
-        except (NotFound, NotAuthorized):
-            abort(404, _('Resource not found'))
-
-        # Construct the recline state
-        state_version = int(request.params.get('state_version', '1'))
-        recline_state = self._parse_recline_state(request.params)
-        if recline_state is None:
-            abort(400, ('"state" parameter must be a valid recline '
-                        'state (version %d)' % state_version))
-
-        c.recline_state = h.json.dumps(recline_state)
-
-        c.width = max(int(request.params.get('width', width)), 100)
-        c.height = max(int(request.params.get('height', height)), 100)
-        c.embedded = True
-
-        return render('package/resource_embedded_dataviewer.html',
-                      extra_vars={'dataset_type': dataset_type})
-
-    def _parse_recline_state(self, params):
-        state_version = int(request.params.get('state_version', '1'))
-        if state_version != 1:
-            return None
-
-        recline_state = {}
-        for k, v in request.params.items():
-            try:
-                v = h.json.loads(v)
-            except ValueError:
-                pass
-            recline_state[k] = v
-
-        recline_state.pop('width', None)
-        recline_state.pop('height', None)
-        recline_state['readOnly'] = True
-
-        # previous versions of recline setup used elasticsearch_url attribute
-        # for data api url - see http://trac.ckan.org/ticket/2639
-        # fix by relocating this to url attribute which is the default location
-        if 'dataset' in recline_state and \
-                'elasticsearch_url' in recline_state['dataset']:
-            recline_state['dataset']['url'] = \
-                recline_state['dataset']['elasticsearch_url']
-
-        # Ensure only the currentView is available
-        # default to grid view if none specified
-        if not recline_state.get('currentView', None):
-            recline_state['currentView'] = 'grid'
-        for k in recline_state.keys():
-            if k.startswith('view-') and \
-                    not k.endswith(recline_state['currentView']):
-                recline_state.pop(k)
-        return recline_state
-
-    def resource_views(self, id, resource_id):
-        package_type = self._get_package_type(id.split('@')[0])
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'for_view': True,
-                   'auth_user_obj': c.userobj}
-        data_dict = {'id': id}
-
-        try:
-            check_access('package_update', context, data_dict)
-        except NotAuthorized:
-            abort(403, _('User %r not authorized to edit %s') % (c.user, id))
-        # check if package exists
-        try:
-            c.pkg_dict = get_action('package_show')(context, data_dict)
-            c.pkg = context['package']
-        except (NotFound, NotAuthorized):
-            abort(404, _('Dataset not found'))
-
-        try:
-            c.resource = get_action('resource_show')(context,
-                                                     {'id': resource_id})
-            c.views = get_action('resource_view_list')(context,
-                                                       {'id': resource_id})
-
-        except NotFound:
-            abort(404, _('Resource not found'))
-        except NotAuthorized:
-            abort(403, _('Unauthorized to read resource %s') % id)
-
-        self._setup_template_variables(context, {'id': id},
-                                       package_type=package_type)
-
-        return render('package/resource_views.html')
-
-    def edit_view(self, id, resource_id, view_id=None):
-        package_type = self._get_package_type(id.split('@')[0])
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'for_view': True,
-                   'auth_user_obj': c.userobj}
-
-        # update resource should tell us early if the user has privilages.
-        try:
-            check_access('resource_update', context, {'id': resource_id})
-        except NotAuthorized as e:
-            abort(403, _('User %r not authorized to edit %s') % (c.user, id))
-
-        # get resource and package data
-        try:
-            c.pkg_dict = get_action('package_show')(context, {'id': id})
-            c.pkg = context['package']
-        except (NotFound, NotAuthorized):
-            abort(404, _('Dataset not found'))
-        try:
-            c.resource = get_action('resource_show')(context,
-                                                     {'id': resource_id})
-        except (NotFound, NotAuthorized):
-            abort(404, _('Resource not found'))
-
-        data = {}
-        errors = {}
-        error_summary = {}
-        view_type = None
-        to_preview = False
-
-        if request.method == 'POST':
-            request.POST.pop('save', None)
-            to_preview = request.POST.pop('preview', False)
-            if to_preview:
-                context['preview'] = True
-            to_delete = request.POST.pop('delete', None)
-            data = clean_dict(dict_fns.unflatten(tuplize_dict(parse_params(
-                request.params, ignore_keys=CACHE_PARAMETERS))))
-            data['resource_id'] = resource_id
-
-            try:
-                if to_delete:
-                    data['id'] = view_id
-                    get_action('resource_view_delete')(context, data)
-                elif view_id:
-                    data['id'] = view_id
-                    data = get_action('resource_view_update')(context, data)
-                else:
-                    data = get_action('resource_view_create')(context, data)
-            except ValidationError as e:
-                # Could break preview if validation error
-                to_preview = False
-                errors = e.error_dict
-                error_summary = e.error_summary
-            except NotAuthorized:
-                # This should never happen unless the user maliciously changed
-                # the resource_id in the url.
-                abort(403, _('Unauthorized to edit resource'))
-            else:
-                if not to_preview:
-                    h.redirect_to(controller='package',
-                                  action='resource_views',
-                                  id=id, resource_id=resource_id)
-
-        # view_id exists only when updating
-        if view_id:
-            try:
-                old_data = get_action('resource_view_show')(context,
-                                                            {'id': view_id})
-                data = data or old_data
-                view_type = old_data.get('view_type')
-                # might as well preview when loading good existing view
-                if not errors:
-                    to_preview = True
-            except (NotFound, NotAuthorized):
-                abort(404, _('View not found'))
-
-        view_type = view_type or request.GET.get('view_type')
-        data['view_type'] = view_type
-        view_plugin = datapreview.get_view_plugin(view_type)
-        if not view_plugin:
-            abort(404, _('View Type Not found'))
-
-        self._setup_template_variables(context, {'id': id},
-                                       package_type=package_type)
-
-        data_dict = {'package': c.pkg_dict, 'resource': c.resource,
-                     'resource_view': data}
-
-        view_template = view_plugin.view_template(context, data_dict)
-        form_template = view_plugin.form_template(context, data_dict)
-
-        vars = {'form_template': form_template,
-                'view_template': view_template,
-                'data': data,
-                'errors': errors,
-                'error_summary': error_summary,
-                'to_preview': to_preview,
-                'datastore_available': p.plugin_loaded('datastore')}
-        vars.update(
-            view_plugin.setup_template_variables(context, data_dict) or {})
-        vars.update(data_dict)
-
-        if view_id:
-            return render('package/edit_view.html', extra_vars=vars)
-
-        return render('package/new_view.html', extra_vars=vars)
-
-    def resource_view(self, id, resource_id, view_id=None):
-        '''
-        Embedded page for a resource view.
-
-        Depending on the type, different views are loaded. This could be an
-        img tag where the image is loaded directly or an iframe that embeds a
-        webpage or a recline preview.
-        '''
-        context = {'model': model,
-                   'session': model.Session,
-                   'user': c.user,
-                   'auth_user_obj': c.userobj}
-
-        try:
-            package = get_action('package_show')(context, {'id': id})
-        except (NotFound, NotAuthorized):
-            abort(404, _('Dataset not found'))
-
-        try:
-            resource = get_action('resource_show')(
-                context, {'id': resource_id})
-        except (NotFound, NotAuthorized):
-            abort(404, _('Resource not found'))
-
-        view = None
-        if request.params.get('resource_view', ''):
-            try:
-                view = json.loads(request.params.get('resource_view', ''))
-            except ValueError:
-                abort(409, _('Bad resource view data'))
-        elif view_id:
-            try:
-                view = get_action('resource_view_show')(
-                    context, {'id': view_id})
-            except (NotFound, NotAuthorized):
-                abort(404, _('Resource view not found'))
-
-        if not view or not isinstance(view, dict):
-            abort(404, _('Resource view not supplied'))
-
-        return h.rendered_resource_view(view, resource, package, embed=True)
-
-    def resource_datapreview(self, id, resource_id):
-        '''
-        Embedded page for a resource data-preview.
-
-        Depending on the type, different previews are loaded.  This could be an
-        img tag where the image is loaded directly or an iframe that embeds a
-        webpage, or a recline preview.
-        '''
-        context = {
-            'model': model,
-            'session': model.Session,
-            'user': c.user,
-            'auth_user_obj': c.userobj
-        }
-
-        try:
-            c.resource = get_action('resource_show')(context,
-                                                     {'id': resource_id})
-            c.package = get_action('package_show')(context, {'id': id})
-
-            data_dict = {'resource': c.resource, 'package': c.package}
-
-            preview_plugin = datapreview.get_preview_plugin(data_dict)
-
-            if preview_plugin is None:
-                abort(409, _('No preview has been defined.'))
-
-            preview_plugin.setup_template_variables(context, data_dict)
-            c.resource_json = json.dumps(c.resource)
-            dataset_type = c.package['type'] or 'dataset'
-        except (NotFound, NotAuthorized):
-            abort(404, _('Resource not found'))
-        else:
-            return render(preview_plugin.preview_template(context, data_dict),
-                          extra_vars={'dataset_type': dataset_type})
diff --git a/ckanext/justicehub_theme/controllers/stats.py b/ckanext/justicehub_theme/lib/__init__.py
similarity index 100%
rename from ckanext/justicehub_theme/controllers/stats.py
rename to ckanext/justicehub_theme/lib/__init__.py
diff --git a/ckanext/justicehub_theme/lib/helpers.py b/ckanext/justicehub_theme/lib/helpers.py
new file mode 100644
index 0000000..81ff50c
--- /dev/null
+++ b/ckanext/justicehub_theme/lib/helpers.py
@@ -0,0 +1,84 @@
+import json
+
+from sqlalchemy import MetaData
+from sqlalchemy.sql import select
+
+import ckan.logic as logic
+import ckan.model as model
+from ckan.common import c
+
+cached_tables = {}
+
+def parse_json(string):
+    return json.loads(string)
+
+
+def get_package_avg_downloads(pkg):
+    '''
+    Returns the average of total downloads of all the resources of a package.
+    '''
+    total_downloads = 0
+    avg_downloads = 0
+
+    if not pkg['resources']:
+        return avg_downloads
+
+    for resource in pkg['resources']:
+        if isinstance(resource['downloads'], unicode):
+            resource['downloads'] = json.loads(resource['downloads'].replace("'", '"'))
+
+        total_downloads += resource['downloads']['total']
+
+    avg_downloads = total_downloads / float(len(pkg['resources']))
+    return int(avg_downloads)
+
+
+def package_activity_stream(id):
+    context = {'model': model, 'session': model.Session,
+               'user': c.user, 'for_view': True,
+               'auth_user_obj': c.userobj}
+    package_activity_stream = logic.get_action('package_activity_list_html')(context, {'id': id})
+    return package_activity_stream
+
+
+def get_table(name):
+    if name not in cached_tables:
+        meta = MetaData()
+        meta.reflect(bind=model.meta.engine)
+        table = meta.tables[name]
+        cached_tables[name] = table
+    return cached_tables[name]
+
+
+def get_resource_downloads(resource):
+    connection = model.Session.connection()
+    resource_stats = get_table('resource_stats')
+    s = select([resource_stats.c.resource_id,
+                resource_stats.c.visits_recently,
+                resource_stats.c.visits_ever]
+        ).where(resource_stats.c.resource_id == resource['id'])
+    res = connection.execute(s).fetchone()
+    if res:
+        return {'total' : res.visits_ever,
+                'recent': res.visits_recently}
+
+    return {'total': 0, 'recent': 0}
+
+
+def get_package_visits(pkg):
+    '''
+    Returns the number of times the package is accessed
+    '''
+    connection = model.Session.connection()
+    total = 0
+    recent = 0
+    tracking_summary = get_table('tracking_summary')
+    s = select([tracking_summary.c.package_id,
+                tracking_summary.c.recent_views,
+                tracking_summary.c.running_total]
+        ).where(tracking_summary.c.package_id == pkg['id'])
+    res = connection.execute(s).fetchone()
+    if res:
+        total = res.running_total
+        recent = res.recent_views
+    return {'total' : total, 'recent': recent}
diff --git a/ckanext/justicehub_theme/plugin.py b/ckanext/justicehub_theme/plugin.py
index 85d3493..90db5af 100644
--- a/ckanext/justicehub_theme/plugin.py
+++ b/ckanext/justicehub_theme/plugin.py
@@ -1,97 +1,11 @@
-import json
-
-import requests
-
 import ckanext.justicehub_theme.logic.action as jh_action
-from sqlalchemy import MetaData
-from sqlalchemy.sql import select
+from ckanext.justicehub_theme.lib import helpers
 
-import ckan.logic as logic
-import ckan.lib.base as base
 import ckan.model as model
 import ckan.plugins as plugins
 import ckan.plugins.toolkit as toolkit
-from ckan.common import c,request
-import ckan.lib.navl.dictization_functions as dict_fns
-
-from pylons import config
-
-import ckan.controllers.organization as org
-
-cached_tables = {}
-clean_dict = logic.clean_dict
-parse_params = logic.parse_params
-tuplize_dict = logic.tuplize_dict
-
-def parse_json(string):
-    return json.loads(string)
-
-def package_activity_stream(id):
-    context = {'model': model, 'session': model.Session,
-               'user': c.user, 'for_view': True,
-               'auth_user_obj': c.userobj}
-    package_activity_stream = logic.get_action('package_activity_list_html')(context, {'id': id})
-    return package_activity_stream
-
-def get_table(name):
-    if name not in cached_tables:
-        meta = MetaData()
-        meta.reflect(bind=model.meta.engine)
-        table = meta.tables[name]
-        cached_tables[name] = table
-    return cached_tables[name]
-
-def get_resource_downloads(resource):
-    connection = model.Session.connection()
-    resource_stats = get_table('resource_stats')
-    s = select([resource_stats.c.resource_id,
-                resource_stats.c.visits_recently,
-                resource_stats.c.visits_ever]
-        ).where(resource_stats.c.resource_id == resource['id'])
-    res = connection.execute(s).fetchone()
-    if res:
-        return {'total' : res.visits_ever,
-                'recent': res.visits_recently}
-
-    return {'total': 0, 'recent': 0}
+from ckan.common import c
 
-def get_package_avg_downloads(pkg):
-    '''
-    Returns the average of total downloads of all the resources of a package.
-    '''
-    total_downloads = 0
-    avg_downloads = 0
-
-    if not pkg['resources']:
-        return avg_downloads
-
-    for resource in pkg['resources']:
-        if isinstance(resource['downloads'], unicode):
-            resource['downloads'] = json.loads(resource['downloads'].replace("'", '"'))
-
-        total_downloads += resource['downloads']['total']
-
-    avg_downloads = total_downloads / float(len(pkg['resources']))
-    return int(avg_downloads)
-
-def get_package_visits(pkg):
-    '''
-    Returns the number of times the package is accessed
-    '''
-    connection = model.Session.connection()
-    total = 0
-    recent = 0
-    tracking_summary = get_table('tracking_summary')
-    s = select([tracking_summary.c.package_id,
-                tracking_summary.c.recent_views,
-                tracking_summary.c.running_total]
-        ).where(tracking_summary.c.package_id == pkg['id'])
-    res = connection.execute(s).fetchone()
-    if res:
-        total = res.running_total
-        recent = res.recent_views
-    return {'total' : total,
-            'recent': recent}
 
 class Justicehub_ThemePlugin(plugins.SingletonPlugin):
     plugins.implements(plugins.IConfigurer)
@@ -117,10 +31,10 @@ def get_helpers(self):
         # extension they belong to, to avoid clashing with functions from
         # other extensions.
         return {
-                'justicehub_theme_get_package_avg_downloads': get_package_avg_downloads,
-                'justicehub_theme_package_activity_stream': package_activity_stream,
-                'justicehub_theme_parse_json': parse_json
-                }
+            'justicehub_theme_get_package_avg_downloads': helpers.get_package_avg_downloads,
+            'justicehub_theme_package_activity_stream': helpers.package_activity_stream,
+            'justicehub_theme_parse_json': helpers.parse_json
+        }
 
     #IActions
     def get_actions(self):
@@ -142,7 +56,7 @@ def before_view(self, package_dict):
         and should return a modified (or not) version of it.
         '''
         for resource_dict in package_dict['resources']:
-            resource_dict['downloads'] = get_resource_downloads(resource_dict)
+            resource_dict['downloads'] = helpers.get_resource_downloads(resource_dict)
 
         package_dict['tracking_summary'] = (
             model.TrackingSummary.get_for_package(package_dict['id']))
@@ -194,113 +108,24 @@ def before_index(self, pkg_dict):
     # IRoute
     def after_map(self, map):
         map.connect('jhorg_members', '/jhorg/members/{id}',
-                    controller='ckanext.justicehub_theme.plugin:JHOrgController',
+                    controller='ckanext.justicehub_theme.controllers:JHOrgController',
                     action='members')
         map.connect('jhorg_stats', '/jhorg/stats/{id}',
-                    controller='ckanext.justicehub_theme.plugin:JHOrgController',
+                    controller='ckanext.justicehub_theme.controllers:JHOrgController',
                     action='org_stats')
         map.connect('jhsubscribe', '/subscribe',
-                    controller='ckanext.justicehub_theme.plugin:SubscribeController',
+                    controller='ckanext.justicehub_theme.controllers:SubscribeController',
                     action='subscribe')
         return map
     
     def before_map(self, map):
         map.connect('jhorg_members', '/organization/members/{id}',
-                    controller='ckanext.justicehub_theme.plugin:JHOrgController',
+                    controller='ckanext.justicehub_theme.controllers:JHOrgController',
                     action='members')
         map.connect('jhorg_stats', '/jhorg/stats/{id}',
-                    controller='ckanext.justicehub_theme.plugin:JHOrgController',
+                    controller='ckanext.justicehub_theme.controllers:JHOrgController',
                     action='org_stats')
         map.connect('jhsubscribe', '/subscribe',
-                    controller='ckanext.justicehub_theme.plugin:SubscribeController',
+                    controller='ckanext.justicehub_theme.controllers:SubscribeController',
                     action='subscribe')
         return map
-
-
-class JHOrgController(org.OrganizationController):
-    def members(self, id):
-        '''
-        Modified core method from 'group' controller.
-        Enable view for non signed in user.
-
-        :param id: id of the organization for which the member list is requested
-        :type id: string
-        :return: the rendered template
-        :rtype: unicode
-        '''
-        group_type = self._ensure_controller_matches_group_type(id)
-
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user}
-
-        data_dict = {'id': id}
-        try:
-            c.members = self._action('member_list')(
-                context, {'id': id, 'object_type': 'user'}
-            )
-            data_dict['include_datasets'] = False
-            c.group_dict = self._action('group_show')(context, data_dict)
-        except NotFound:
-            abort(404, _('Oraganization not found'))
-
-        return self._render_template('organization/jh_members.html', group_type)
-
-    def org_stats(self, id):
-        group_type = self._ensure_controller_matches_group_type(id)
-
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user,
-                   'schema': self._db_to_form_schema(group_type=group_type),
-                   'for_view': True}
-        data_dict = {'id': id, 'type': group_type}
-        # unicode format (decoded from utf8)
-        c.q = ''
-
-        try:
-            data_dict['include_datasets'] = True
-            c.group_dict = self._action('group_show')(context, data_dict)
-            c.group = context['group']
-        except NotFound:
-            abort(404, _('Organization not found'))
-        self._read(id, 999, group_type)
-        downloads = 0
-        visits = 0
-        for package in c.page.items:
-            downloads += get_package_avg_downloads(package)
-            visits += get_package_visits(package)['total']
-        c.group_dict.update({'downloads':downloads, 'visits': visits})
-        return plugins.toolkit.render('organization/stats.html', extra_vars={'group_type': group_type, 'downloads': downloads})
-
-class SubscribeController(base.BaseController):
-    def subscribe(self):
-        basic_auth_key = config.get("mailchimp_api_key", "")
-        subscriber_list_id = config.get("mailchimp_list_id", "")
-        subscriber_tag_id = config.get("mailchimp_tag_id", "")
-        mailchimp_base_url = config.get("mailchimp_base_url", "")
-        url = mailchimp_base_url + subscriber_list_id + "/members"
-
-        request_body = clean_dict(dict_fns.unflatten(
-                    tuplize_dict(parse_params(request.params))))
-
-        payload = {
-            "email_address": str(request_body.get("email", "")),
-            "status": "subscribed"
-            }
-        headers = {
-        'Content-Type': 'application/json',
-        'Authorization': 'Basic '+ basic_auth_key
-        }
-
-        response = requests.request("POST", url, headers=headers, data = json.dumps(payload))
-
-        print(response.text.encode('utf8'))
-
-        tag_url = mailchimp_base_url + subscriber_list_id + "/segments/" + subscriber_tag_id + "/members"
-
-        payload = {
-            "email_address": str(request_body.get("email", ""))
-            }
-
-        response = requests.request("POST", tag_url, headers=headers, data = json.dumps(payload))
-
-        print response.text.encode('utf8')
\ No newline at end of file

From 80c4be7635221327eb4d1d9656b60f07bb4c4381 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 10 Jun 2020 21:17:02 +0530
Subject: [PATCH 059/127] move external links and metadata to navigation tabs

---
 .../justicehub_theme/controllers/__init__.py  |  2 +-
 .../controllers/controller.py                 | 36 ++++++++
 ckanext/justicehub_theme/plugin.py            |  8 ++
 ckanext/justicehub_theme/public/common.css    |  5 +-
 ckanext/justicehub_theme/public/dataset.css   | 23 +++++
 .../templates/package/read_base.html          | 30 +------
 .../package/snippets/additional_info.html     | 90 +++++++++++++------
 .../templates/snippets/external_links.html    | 28 ++++++
 8 files changed, 163 insertions(+), 59 deletions(-)
 create mode 100644 ckanext/justicehub_theme/templates/snippets/external_links.html

diff --git a/ckanext/justicehub_theme/controllers/__init__.py b/ckanext/justicehub_theme/controllers/__init__.py
index b6b53cd..b46be9e 100644
--- a/ckanext/justicehub_theme/controllers/__init__.py
+++ b/ckanext/justicehub_theme/controllers/__init__.py
@@ -1 +1 @@
-from controller import JHOrgController
+from controller import JHOrgController, JHPkgController
diff --git a/ckanext/justicehub_theme/controllers/controller.py b/ckanext/justicehub_theme/controllers/controller.py
index ccda487..2b9345a 100644
--- a/ckanext/justicehub_theme/controllers/controller.py
+++ b/ckanext/justicehub_theme/controllers/controller.py
@@ -2,12 +2,48 @@
 from ckanext.justicehub_theme.lib import helpers
 
 import ckan.controllers.organization as org
+import ckan.lib.base as base
 import ckan.lib.plugins as plugins
 import ckan.logic as logic
 import ckan.model as model
 from ckan.common import c
 
 NotFound = logic.NotFound
+NotAuthorized = logic.NotAuthorized
+
+
+class JHPkgController(base.BaseController):
+    def links(self, dataset_id):
+        context = {'model': model, 'session': model.Session,
+                   'user': c.user, 'for_view': True,
+                   'auth_user_obj': c.userobj}
+        data_dict = {'id': dataset_id}
+
+        try:
+            c.pkg_dict = logic.get_action('package_show')(context, data_dict)
+            c.pkg = context['package']
+        except (NotFound, NotAuthorized):
+            abort(404, _('Dataset not found'))
+
+        package_type = c.pkg_dict['type'] or 'dataset'
+        return plugins.toolkit.render('snippets/external_links.html',
+                                      extra_vars={'dataset_type': package_type})
+
+    def metadata(self, dataset_id):
+        context = {'model': model, 'session': model.Session,
+                   'user': c.user, 'for_view': True,
+                   'auth_user_obj': c.userobj}
+        data_dict = {'id': dataset_id}
+
+        try:
+            c.pkg_dict = logic.get_action('package_show')(context, data_dict)
+            c.pkg = context['package']
+        except (NotFound, NotAuthorized):
+            abort(404, _('Dataset not found'))
+
+        package_type = c.pkg_dict['type'] or 'dataset'
+        return plugins.toolkit.render('scheming/package/snippets/additional_info.html',
+                                      extra_vars={'dataset_type': package_type})
 
 
 class JHOrgController(org.OrganizationController):
diff --git a/ckanext/justicehub_theme/plugin.py b/ckanext/justicehub_theme/plugin.py
index 90db5af..f607909 100644
--- a/ckanext/justicehub_theme/plugin.py
+++ b/ckanext/justicehub_theme/plugin.py
@@ -116,6 +116,14 @@ def after_map(self, map):
         map.connect('jhsubscribe', '/subscribe',
                     controller='ckanext.justicehub_theme.controllers:SubscribeController',
                     action='subscribe')
+
+        map.connect('jhpkg_links', '/dataset/:dataset_id/links',
+                controller='ckanext.justicehub_theme.controllers:JHPkgController',
+                action='links')
+
+        map.connect('jhpkg_metadata', '/dataset/:dataset_id/metadata',
+                controller='ckanext.justicehub_theme.controllers:JHPkgController',
+                action='metadata')
         return map
     
     def before_map(self, map):
diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 237872f..7b713e3 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -20,6 +20,7 @@ body {
 .footer-links .input-group-btn .btn {
     font-size: 16px;
 }
+.dl-horizontal,
 .resource-item .heading,
 .resource-item .description,
 .nav-simple .nav-item a,
@@ -121,7 +122,8 @@ h1,
 .dataset-org > a,
 .activity .item .date,
 .activity .item .actor a,
-.page-section .links-list a,
+.links-list a,
+.metadata-list dt,
 .footer-disclaimer div:last-child {
     color: #f65940;
 }
@@ -141,6 +143,7 @@ body,
 .page-header .nav-tabs li a,
 .footer-intro-invert,
 .stages li .highlight,
+.metadata-list dd,
 .stages li.complete .highlight {
     color: #403644;
 }
diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index d64b488..687f83d 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -76,6 +76,29 @@
     padding-left: 5%;
 }
 
+/* -------------------------- links ----------------------- */
+.links-list.dl-horizontal {
+    margin-left: -15px;
+}
+.links-list.dl-horizontal dt {
+    width: 30%;
+    text-align: left;
+}
+.links-list.dl-horizontal dd {
+    width: 70%;
+    margin-left: 35%;
+}
+
+/* -------------------------- metadata ----------------------- */
+.metadata-list.dl-horizontal dt {
+    width: 40%;
+    margin-left: -1%;
+    text-align: left;
+}
+.metadata-list.dl-horizontal dd {
+    width: 40%;
+    margin-left: 45%;
+}
 /* -------------------------- dataset-edit ----------------------- */
 .btn-default .fa-bars+span {
     display: none;
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index 9e627b3..40009f7 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -126,34 +126,6 @@ <h2>ACTIVITY</h2>
         {{ super() }}
         {% endblock %}
     </div>
-
-    {% if pkg.links %}
-    {% set links = h.justicehub_theme_parse_json(pkg.links) %}
-    <div class="col-xs-12 row page-section">
-        <div class="col col-sm-9 col-sm-offset-3 col-xs-12">
-        <h1 class="heading">{{ _('EXTERNAL LINKS') }}</h1>
-        {% for item in links %}
-           <dl class="dl-horizontal links-list">
-          {% set item = h.composite_get_as_dict(item) %}
-          <dt>
-              <a href="{{ link }}">{{ item['title'] }}</a>
-          </dt>
-          <dd>
-              <p>{{ item['description'] }}</p>
-          </dd>
-          </dl>
-        {% endfor %}
-        </div>
-    </div>
-    {% endif %}
-
-    <div class= "col-xs-12 row page-section">
-        <div class="col col-sm-9 col-sm-offset-3 col-xs-12">
-            {% block package_additional_info %}
-            {% snippet "package/snippets/additional_info.html", pkg_dict=pkg %}
-            {% endblock %}
-        </div>
-
     {% endblock %}
 </div>
 
@@ -165,6 +137,8 @@ <h1 class="heading">{{ _('EXTERNAL LINKS') }}</h1>
         {% if h.issues_enabled(pkg) %}
         {{ h.build_nav_icon('issues_dataset', _('ISSUES'), dataset_id=pkg.name) }}
         {% endif %}
+        {{ h.build_nav_icon('jhpkg_metadata', _('METADATA'), dataset_id=pkg.name) }}
+        {{ h.build_nav_icon('jhpkg_links', _('EXTERNAL LINKS'), dataset_id=pkg.name) }}
         {% endblock %}
     </ul>
 </div>
diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
index f37e81c..dbf56f8 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
@@ -1,3 +1,9 @@
+{% extends "package/read_base.html" %}
+{%- set schema = h.scheming_get_dataset_schema(dataset_type) -%}
+{% set pkg_dict = c.pkg_dict %}
+
+{% block subtitle %}{{ _('Metadata') }} - {{ super() }}{% endblock %}
+
 {%- set exclude_fields = [
     'id',
     'title',
@@ -6,42 +12,68 @@
     'tag_string',
     'license_id',
     'owner_org',
-    'links'
+    'links',
+    'state',
+    'verified',
+    'start_year',
+    'end_year',
+    'states',
+    'district',
+    'village'
     ] -%}
 
+{% block primary_content_inner %}
 <section class="additional-info">
-  <h1>{{ _('ADDITIONAL INFO') }}</h1>
-  <table class="table table-striped table-bordered table-condensed">
-    <thead>
-      <tr>
-        <th scope="col">{{ _('Field') }}</th>
-        <th scope="col">{{ _('Value') }}</th>
-      </tr>
-    </thead>
-
-    <tbody>
+    <div class="header">
+        <h1 class="page-heading">{{ _('Metadata') }}</h1>
+    </div>
+
     {% block package_additional_info %}
-      {%- for field in schema.dataset_fields -%}
+
+    <dl class="dl-horizontal metadata-list">
+        <dt title="{{ _('The time interval the dataset span.') }}">
+            {{ _('Timeline of Dataset') }}
+            <strong style="float: right; color: #403644;">:</strong>
+        </dt>
+        <dd>{{ pkg_dict['start_year'] }}-{{ pkg_dict['end_year'] }}</dd>
+    </dl>
+
+    <dl class="dl-horizontal metadata-list">
+        <dt title="{{ _('Geographical coverage.') }}">
+            {{ _('Geography') }}
+            <strong style="float: right; color: #403644;">:</strong>
+        </dt>
+        <dd>{{ pkg_dict['states'] }}
+            {% if pkg_dict['district'] %} {{ pkg_dict['district'] }}{% endif %}
+            {% if pkg_dict['village'] %} {{ pkg_dict['village'] }}{% endif %}
+        </dd>
+    </dl>
+    {%- for field in schema.dataset_fields -%}
         {%- if field.field_name not in exclude_fields
             and field.display_snippet is not none
             and pkg_dict[field.field_name] -%}
-          <tr>
-            <td scope="row" class="dataset-label" title="{{ field.description }}">{{
-              h.scheming_language_text(field.label) }}</th>
-            <td class="dataset-details"{%
-              if field.display_property %} property="{{ field.display_property
-              }}"{% endif %}>{%- snippet 'scheming/snippets/display_field.html',
-              field=field, data=pkg_dict, schema=schema -%}</td>
-          </tr>
+
+        <dl class="dl-horizontal metadata-list">
+            <dt title="{{field.description}}">
+              {{ h.scheming_language_text(field.label) }}
+              <strong style="float: right; color: #403644;">:</strong>
+            </dt>
+            <dd {% if field.display_property %} property="{{ field.display_property}}"{% endif %}>
+              {%- snippet 'scheming/snippets/display_field.html', field=field, data=pkg_dict, schema=schema -%}
+            </dd>
+        </dl>
         {%- endif -%}
-      {%- endfor -%}
-      {% if h.check_access('package_update',{'id':pkg_dict.id}) %}
-        <tr>
-          <td scope="row" class="dataset-label">{{ _("State") }}</th>
-          <td class="dataset-details">{{ _(pkg_dict.state) }}</td>
-        </tr>
-      {% endif %}
+
+    {% endfor %}
+    {% if h.check_access('package_update',{'id':pkg_dict.id}) %}
+        <dl class="dl-horizontal metadata-list">
+          <dt>
+              {{ _("State") }}
+              <strong style="float: right; color: #403644;">:</strong>
+          </dt>
+          <dd class="dataset-details">{{ _(pkg_dict.state) }}</dd>
+        </dl>
+    {% endif %}
     {% endblock %}
-    </tbody>
-  </table>
 </section>
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/snippets/external_links.html b/ckanext/justicehub_theme/templates/snippets/external_links.html
new file mode 100644
index 0000000..468059b
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/snippets/external_links.html
@@ -0,0 +1,28 @@
+{% extends "package/read_base.html" %}
+{% set pkg = c.pkg %}
+
+{% block subtitle %}{{ _('External Links') }} - {{ super() }}{% endblock %}
+
+{% block primary_content_inner %}
+<section class="module">
+    <div class="header">
+        <h1 class="page-heading">{{ _('External Links') }}</h1>
+    </div>
+    {% if pkg.links %}
+        {% set links = h.justicehub_theme_parse_json(pkg.links) %}
+        {% for item in links %}
+           <dl class="dl-horizontal links-list">
+          {% set item = h.composite_get_as_dict(item) %}
+          <dt>
+              <a href="{{ link }}">{{ item['title'] }}</a>
+          </dt>
+          <dd>
+              <p>{{ item['description'] }}</p>
+          </dd>
+          </dl>
+        {% endfor %}
+    {% else %}
+        <p class="empty">{{ _('No Links') }}</p>
+    {% endif %}
+</section>
+{% endblock %}

From 72c54968961573d10f8ebce9f9f421d6af59385b Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 10 Jun 2020 21:17:24 +0530
Subject: [PATCH 060/127] remove validation related template

---
 .../scheming/form_snippets/metadata_autocomplete.html     | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 ckanext/justicehub_theme/templates/scheming/form_snippets/metadata_autocomplete.html

diff --git a/ckanext/justicehub_theme/templates/scheming/form_snippets/metadata_autocomplete.html b/ckanext/justicehub_theme/templates/scheming/form_snippets/metadata_autocomplete.html
deleted file mode 100644
index 0d2dffc..0000000
--- a/ckanext/justicehub_theme/templates/scheming/form_snippets/metadata_autocomplete.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div class="form-group control-medium">
-    <label for="field-{{ field.field_name }}" class="control-label">{{ field.label }}</label>
-    <div class="controls">
-        <input id="field-{{ field.field_name }}" name="{{ field.field_name }}" type="text" placeholder="{{ field.form_placeholder }}"
-               value="{{ data[field.field_name] }}" class="form-control" data-module="autocomplete-action-api"
-               data-module-source="{{ field.form_attrs['data-module-source'] }}">
-    </div>
-</div>

From 5599bd9106deab382d3878cb6e3f06b2fc99d08c Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 11 Jun 2020 12:52:21 +0530
Subject: [PATCH 061/127] fix responsive view for description lists

---
 ckanext/justicehub_theme/public/dataset.css   | 34 ++++++++++++++++---
 .../package/snippets/additional_info.html     |  8 ++---
 2 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index 687f83d..73f0f36 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -78,7 +78,7 @@
 
 /* -------------------------- links ----------------------- */
 .links-list.dl-horizontal {
-    margin-left: -15px;
+    margin-left: -1%;
 }
 .links-list.dl-horizontal dt {
     width: 30%;
@@ -91,13 +91,19 @@
 
 /* -------------------------- metadata ----------------------- */
 .metadata-list.dl-horizontal dt {
-    width: 40%;
+    display: inline;
+}
+.metadata-list.dl-horizontal dd {
+    display: inline-block;
+    margin-left: 10%;
+}
+.metadata-list.dl-horizontal dt {
+    width: 30%;
     margin-left: -1%;
     text-align: left;
 }
-.metadata-list.dl-horizontal dd {
-    width: 40%;
-    margin-left: 45%;
+.metadata-list.dl-horizontal dt strong {
+    float: right;
 }
 /* -------------------------- dataset-edit ----------------------- */
 .btn-default .fa-bars+span {
@@ -157,4 +163,22 @@
     .partner-links.social-links {
         margin-top: 5%;
     }
+    .links-list.dl-horizontal dt,
+    .links-list.dl-horizontal dd {
+        width: 100%;
+    }
+    .links-list.dl-horizontal dd {
+        margin-left: 0;
+    }
+
+    /* -------------------------- metadata ----------------------- */
+    .metadata-list.dl-horizontal dt strong {
+        float: none;
+    }
+    .metadata-list.dl-horizontal dt {
+        margin-left: 0;
+    }
+    .metadata-list.dl-horizontal dd {
+        margin-left: 5%;
+}
 }
diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
index dbf56f8..28b3b16 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
@@ -33,7 +33,7 @@ <h1 class="page-heading">{{ _('Metadata') }}</h1>
     <dl class="dl-horizontal metadata-list">
         <dt title="{{ _('The time interval the dataset span.') }}">
             {{ _('Timeline of Dataset') }}
-            <strong style="float: right; color: #403644;">:</strong>
+            <strong style="color: #403644;">:</strong>
         </dt>
         <dd>{{ pkg_dict['start_year'] }}-{{ pkg_dict['end_year'] }}</dd>
     </dl>
@@ -41,7 +41,7 @@ <h1 class="page-heading">{{ _('Metadata') }}</h1>
     <dl class="dl-horizontal metadata-list">
         <dt title="{{ _('Geographical coverage.') }}">
             {{ _('Geography') }}
-            <strong style="float: right; color: #403644;">:</strong>
+            <strong style="color: #403644;">:</strong>
         </dt>
         <dd>{{ pkg_dict['states'] }}
             {% if pkg_dict['district'] %} {{ pkg_dict['district'] }}{% endif %}
@@ -56,7 +56,7 @@ <h1 class="page-heading">{{ _('Metadata') }}</h1>
         <dl class="dl-horizontal metadata-list">
             <dt title="{{field.description}}">
               {{ h.scheming_language_text(field.label) }}
-              <strong style="float: right; color: #403644;">:</strong>
+              <strong style="color: #403644;">:</strong>
             </dt>
             <dd {% if field.display_property %} property="{{ field.display_property}}"{% endif %}>
               {%- snippet 'scheming/snippets/display_field.html', field=field, data=pkg_dict, schema=schema -%}
@@ -69,7 +69,7 @@ <h1 class="page-heading">{{ _('Metadata') }}</h1>
         <dl class="dl-horizontal metadata-list">
           <dt>
               {{ _("State") }}
-              <strong style="float: right; color: #403644;">:</strong>
+              <strong style="color: #403644;">:</strong>
           </dt>
           <dd class="dataset-details">{{ _(pkg_dict.state) }}</dd>
         </dl>

From 8416a7fac0b013c75149ec312f2ca42722a5db5b Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 12 Jun 2020 14:15:37 +0530
Subject: [PATCH 062/127] fix autocomplete api

---
 .../justicehub_theme/logic/action/action.py   | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/ckanext/justicehub_theme/logic/action/action.py b/ckanext/justicehub_theme/logic/action/action.py
index 19327d7..4739d58 100644
--- a/ckanext/justicehub_theme/logic/action/action.py
+++ b/ckanext/justicehub_theme/logic/action/action.py
@@ -55,18 +55,34 @@ def get_package_owner_details(context, data_dict):
 def metadata_autocomplete(context, data_dict):
     session = context['session']
     field = data_dict['field']
+    is_list = data_dict.get('islist', False)
     term = data_dict['incomplete']
     limit = data_dict.get('limit', 10)
     matching = []
 
-    if term and isinstance(term, string_types):
+    if term and isinstance(term, string_types) and is_list:
+        results = session.execute(
+            """
+            select term
+            from (
+                select unnest(string_to_array(value, ',')) as term
+                from package_extra where key='{field}'
+            ) terms
+            where term ilike '%{term}%'
+            limit {limit};
+            """.format(field=field, term=term, limit=limit)
+        ).fetchall()
+        if results:
+            matching = [result for result in results[0]]
+
+    elif term and isinstance(term, string_types):
         q = model.Session.query(model.PackageExtra)
         results = q.filter(model.PackageExtra.key == field)\
                 .filter(model.PackageExtra.value.ilike('{0}%'.format(term)))\
                 .distinct()\
                 .limit(limit)
-        matching = [result.value for result in results]
 
+        matching = [result.value for result in results]
     return matching
 
 @p.toolkit.side_effect_free

From 8ca833c668141e54b4688a3c87c3c37f3b529ebe Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 12 Jun 2020 14:15:53 +0530
Subject: [PATCH 063/127] fix responsivness of header toggle

---
 ckanext/justicehub_theme/public/common.css           | 4 ++++
 ckanext/justicehub_theme/public/justicehub_theme.css | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 7b713e3..947d466 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -378,6 +378,10 @@ img.fa-certificate.fa-lg {
     .nav-tabs li a {
         font-size: 18px;
     }
+    .nav-pills li:last-child a.dropdown-toggle:active,
+    .nav-pills li:last-child a.dropdown-toggle:focus {
+        background-color: #f65940;
+    }
     .subscribe-box {
         background-color: #403644;
     }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index b2292cd..8857da5 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -433,4 +433,7 @@ aside .module [class^=module] {
     .footer-links .social-links li {
         margin-right: 0;
     }
+    .navigation .dropdown:last-child .dropdown-menu {
+        position: static;
+    }
 }

From f2d769fa2d37a447b99dc29f763030b4bee1f3b6 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 12 Jun 2020 19:08:16 +0530
Subject: [PATCH 064/127] fix resource edit view

---
 .../templates/package/edit_base.html             |  3 +--
 .../templates/package/resource_edit_base.html    | 16 ++++++++++++----
 .../package/snippets/resource_info.html          | 10 ++--------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/package/edit_base.html b/ckanext/justicehub_theme/templates/package/edit_base.html
index 1af72bb..8450583 100644
--- a/ckanext/justicehub_theme/templates/package/edit_base.html
+++ b/ckanext/justicehub_theme/templates/package/edit_base.html
@@ -1,8 +1,7 @@
 {% ckan_extends %}
 
 {% block pre_primary %}
-<div class="col-xs-12 row top-section">
-</div>
+<div class="col-xs-12 row top-section"></div>
 {% endblock %}
 
 {% block content_primary_nav %}
diff --git a/ckanext/justicehub_theme/templates/package/resource_edit_base.html b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
index 9d28cf7..e8f1b2c 100644
--- a/ckanext/justicehub_theme/templates/package/resource_edit_base.html
+++ b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
@@ -14,10 +14,10 @@
 {% endblock %} 
 
 {% block content_action %}
-  {% link_for _('ALL RESOURCES'), controller='package', action='resources', id=pkg.name, class_='btn btn-default rsrc-edit-actn-btn', icon='arrow-left' %}
-  {% if res %}
-    {% link_for _('VIEW'), controller='package', action='resource_read', id=pkg.name, resource_id=res.id, class_='btn btn-default rsrc-edit-actn-btn' %}
-  {% endif %}
+{% endblock %}
+
+{% block pre_primary %}
+<div class="col-xs-12 row top-section"></div>
 {% endblock %}
 
 {% block content_primary_nav %}
@@ -25,6 +25,14 @@
   {% block inner_primary_nav %}{% endblock %}
   <!--NOTE: Removing for Alpha -->
   {#{ h.build_nav_icon('views', _('Views'), id=pkg.name, resource_id=res.id) }#}
+
+  <div class="content_action">
+      {% link_for _('ALL RESOURCES'), controller='package', action='resources', id=pkg.name, class_='btn btn-default', icon='arrow-left' %}
+      {% if res %}
+        {% link_for _('VIEW'), controller='package', action='resource_read', id=pkg.name, resource_id=res.id, class_='btn btn-default' %}
+      {% endif %}
+  </div>
+
 {% endblock %}
 
 {% block primary_content_inner %}
diff --git a/ckanext/justicehub_theme/templates/package/snippets/resource_info.html b/ckanext/justicehub_theme/templates/package/snippets/resource_info.html
index 5a86806..15f5b08 100644
--- a/ckanext/justicehub_theme/templates/package/snippets/resource_info.html
+++ b/ckanext/justicehub_theme/templates/package/snippets/resource_info.html
@@ -9,13 +9,7 @@
 
 #}
 <div class="module context-info">
-  <div class="module-content">
-    <h1 class="heading">{{ h.resource_display_name(res) or res.id }}</h1>
-    <div class="nums">
-      <dl>
-        <dt>{{ _('Format') }}</dt>
-        <dd>{{ h.get_translated(res, 'format') }}</dd>
-      </dl>
-    </div>
+  <div class="sidebar">
+    <h2>{{ h.resource_display_name(res) or res.id }}</h2>
   </div>
 </div>

From df0c3ec36a42f90576e284cd9b5de8b43fbe4995 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 12 Jun 2020 19:15:38 +0530
Subject: [PATCH 065/127] update delete button placement on resource edit page

---
 .../templates/package/resource_edit_base.html                | 5 +++++
 .../templates/scheming/package/snippets/resource_form.html   | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/ckanext/justicehub_theme/templates/package/resource_edit_base.html b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
index e8f1b2c..5052c77 100644
--- a/ckanext/justicehub_theme/templates/package/resource_edit_base.html
+++ b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
@@ -31,6 +31,11 @@
       {% if res %}
         {% link_for _('VIEW'), controller='package', action='resource_read', id=pkg.name, resource_id=res.id, class_='btn btn-default' %}
       {% endif %}
+      {% if data.id %}
+        {% if h.check_access('resource_delete', {'id': data.id})  %}
+          <a class="btn btn-danger" href="{% url_for controller='package', action='resource_delete', resource_id=data.id, id=pkg_name %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this resource?') }}">{% block delete_button_text %}{{ _('DELETE') }}{% endblock %}</a>
+        {% endif %}
+      {% endif %}
   </div>
 
 {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/resource_form.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/resource_form.html
index f8fe91c..4c35f95 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/resource_form.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/resource_form.html
@@ -1,5 +1,8 @@
 {% ckan_extends %}
 
+{% block delete_button %}
+{% endblock %}
+
 {% block previous_button %}
     <button class="btn btn-primary btn-default bg-clear" name="save" value="go-dataset" type="submit"><i class="fa fa-chevron-left"></i><i class="fa fa-chevron-left"></i>{{ _('Previous') }}</button>
 {% endblock %}

From 87fb518f4a1df3b8646bbe7caf1598a6b0e43f8f Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 15 Jun 2020 13:19:15 +0530
Subject: [PATCH 066/127] update dataset page metadata layout

---
 ckanext/justicehub_theme/public/common.css    | 36 ++++++------
 ckanext/justicehub_theme/public/dataset.css   |  7 ++-
 .../public/justicehub_theme.css               | 11 +++-
 ckanext/justicehub_theme/public/partner.css   |  4 ++
 .../templates/home/snippets/search.html       |  8 +--
 .../templates/organization/stats.html         | 12 ++--
 .../templates/package/read_base.html          | 57 ++++++++++++-------
 .../package/snippets/additional_info.html     |  6 +-
 .../templates/snippets/external_links.html    |  2 +-
 9 files changed, 88 insertions(+), 55 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 947d466..dc7afd3 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -12,6 +12,7 @@ body {
 }
 .count,
 .sort-box,
+.dataset-meta,
 .control-label,
 .input-group-addon,
 .package-item-row,
@@ -27,13 +28,13 @@ body {
 .nav-facet .nav-item a,
 .filters .module-content.empty,
 .dataset-desc,
-.downloads, .dataset-meta,
-.nav-pills li {
+.downloads,
+.nav-pills li,
+.partner-links.social-links .fa.fa-envelope {
    font-size: 18px;
 }
 body,
 .page-heading,
-.stats-box,
 .dataset-title,
 .dataset-org,
 .action a,
@@ -43,6 +44,7 @@ body,
 .content_action a,
 .btn,
 #field-giant-search,
+.partner-links.social-links .fa,
 .search-form .search-input.search-giant input {
     font-size: 20px;
 }
@@ -58,6 +60,9 @@ h1,
 .col3 h2 {
     font-size: 30px;
 }
+.stats.stats-big {
+    font-size: 60px;
+}
 .footer-links .nav-item a,
 #field-giant-search,
 .footer-links .input-group input::placeholder,
@@ -77,6 +82,7 @@ h1,
 .media-item .media-heading {
     font-weight: 600; /* Semi Bold */
 }
+.stats-box,
 .pkg_tags a,
 .sort-box,
 .input-group-addon,
@@ -92,7 +98,7 @@ h1,
 .footer-links .input-group-btn .btn {
     font-weight: 700; /* Bold */
 }
-.stats-box,
+.stats.stats-big,
 .footer-intro,
 .nav-pills li:last-child {
     font-weight: 800; /* Extra Bold */
@@ -109,6 +115,7 @@ h1,
 }
 
 /* ----------------------- colors ------------------------- */
+a,
 .stats,
 .count,
 .media-item,
@@ -123,17 +130,19 @@ h1,
 .activity .item .date,
 .activity .item .actor a,
 .links-list a,
-.metadata-list dt,
 .footer-disclaimer div:last-child {
     color: #f65940;
 }
 .homepage .col2,
-.activity .item a,
-.downloads, .dataset-meta {
+.metadata-list dt,
+.activity .item a {
     color: #bcb4bf;
 }
+.downloads, .dataset-meta {
+    color: #707070;
+}
 body,
-.stats-text,
+.stats-box,
 .res-title a,
 .fa.fa-lock,
 .fa.fa-trash,
@@ -292,7 +301,7 @@ h2.module-heading,
     font-size: 30px;
 }
 .social-links li {
-    margin-right: 18px;
+    margin-right: 12px;
 }
 .social-links li:first-of-type {
     padding-left: 0;
@@ -337,14 +346,9 @@ img.fa-certificate.fa-lg {
     margin-top: 50px;
     margin-bottom: 20px;
 }
-.stats {
-    font-size: 60px;
-    display: block;
-}
-.stats-text {
-    margin-top: -20px;
-    font-weight: 700;
+.stats.stats-big {
     display: block;
+    line-height: 1;
 }
 
 /* ------------------- labels ------------------------- */
diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index 73f0f36..d86be48 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -14,7 +14,9 @@
 }
 
 /* ------------- package-detail ------------ */
-
+h1+.dataset-meta {
+    margin-bottom: 30px;
+}
 .resource-list {
     margin-top: 20px;
 }
@@ -90,6 +92,9 @@
 }
 
 /* -------------------------- metadata ----------------------- */
+.metadata-list {
+    margin-left: 15px;
+}
 .metadata-list.dl-horizontal dt {
     display: inline;
 }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 8857da5..07a8e3a 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -92,7 +92,7 @@
 /* ----------------------- pre-primary-blocks ----------------- */
 .top-section {
     margin: 0 20px;
-    margin-bottom: 250px;
+    margin-bottom: 230px;
 }
 .context .content_action,
 .nav-tabs .content_action {
@@ -134,7 +134,7 @@
 .page-heading {
     border-bottom: 2px solid #f65940;
     padding-top: 6px;
-    padding-left: 15px;
+    padding-left: 30px;
     padding-bottom: 20px;
     margin-bottom: 10px !important;
     margin-left: -30px;
@@ -152,6 +152,7 @@
 }
 .page-header .nav-tabs li a {
     border-radius: 0;
+    padding-left: 30px;
 }
 .page-header .nav-tabs li a:hover {
     border-bottom: 1.5px solid #f65940;
@@ -223,6 +224,9 @@ aside .module [class^=module] {
     padding-top: 20px;
     padding-bottom: 20px;
 }
+.social-links.col-sm-7 {
+    width: 55%;
+}
 
 
 /* ------------------------ footer ------------------------ */
@@ -436,4 +440,7 @@ aside .module [class^=module] {
     .navigation .dropdown:last-child .dropdown-menu {
         position: static;
     }
+    .social-links.col-xs-12 {
+        width: 100%;
+    }
 }
diff --git a/ckanext/justicehub_theme/public/partner.css b/ckanext/justicehub_theme/public/partner.css
index 2aa9bc8..fa96454 100644
--- a/ckanext/justicehub_theme/public/partner.css
+++ b/ckanext/justicehub_theme/public/partner.css
@@ -16,6 +16,10 @@
 }
 
 /* ------------------------- org-detail ---------------------- */
+.partner-links.social-links .fa {
+    width: 31px;
+    height: 31px;
+}
 .partner-logo {
     height: 200px;
 }
diff --git a/ckanext/justicehub_theme/templates/home/snippets/search.html b/ckanext/justicehub_theme/templates/home/snippets/search.html
index af1d6f8..1d93812 100644
--- a/ckanext/justicehub_theme/templates/home/snippets/search.html
+++ b/ckanext/justicehub_theme/templates/home/snippets/search.html
@@ -30,12 +30,12 @@ <h3>{{ _('Popular tags') }}</h3>
           {% endfor %}
       </div>
       <div class="col col-xs-6 col-sm-2 col-md-2 col-lg-2 col-xs-offset-1 col-sm-offset-8 col-md-offset-8 col-lg-offset-9 stats-box">
-          <span class="stats">{{ stats.organization_count }}</span>
-          <span class="stats-text">{{ _('CONTRIBUTORS') }}</span>
+          <span class="stats stats-big">{{ stats.organization_count }}</span>
+          <span>{{ _('CONTRIBUTORS') }}</span>
       </div>
       <div class="col col-xs-5 col-sm-2 col-md-2 col-lg-1 stats-box pull-right">
-          <span class="stats">{{ stats.dataset_count }}</span>
-          <span class="stats-text">{{ _('DATASETS') }}</span>
+          <span class="stats stats-big">{{ stats.dataset_count }}</span>
+          <span>{{ _('DATASETS') }}</span>
       </div>
   </div>
 </div>
diff --git a/ckanext/justicehub_theme/templates/organization/stats.html b/ckanext/justicehub_theme/templates/organization/stats.html
index 22d10a4..cf0575b 100644
--- a/ckanext/justicehub_theme/templates/organization/stats.html
+++ b/ckanext/justicehub_theme/templates/organization/stats.html
@@ -17,16 +17,16 @@ <h1 class="page-heading">
   {% endblock %}
 	<div class="row stats-box">
         <div class="col-xs-6 col-sm-4">
-            <span class="stats">{{ c.group_dict.downloads }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
-            <span class="stats-text">{{ _('DOWNLOADS') }}</span>
+            <span class="stats stats-big">{{ c.group_dict.downloads }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
+            <span>{{ _('DOWNLOADS') }}</span>
         </div>
         <div class="col-xs-6 col-sm-4">
-            <span class="stats">{{ c.group_dict.visits }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
-            <span class="stats-text">{{ _('VISITS') }}</span>
+            <span class="stats stats-big">{{ c.group_dict.visits }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
+            <span>{{ _('VISITS') }}</span>
         </div>
         <div class="col-xs-6 col-sm-4">
-            <span class="stats">{{ c.group_dict.num_followers }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
-            <span class="stats-text">{{ _('FOLLOWERS') }}</span>
+            <span class="stats stats-big">{{ c.group_dict.num_followers }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
+            <span>{{ _('FOLLOWERS') }}</span>
         </div>
     </div>
     {% block page_pagination %}
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index 40009f7..d8e7ac5 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -18,9 +18,13 @@ <h1>{{h.dataset_display_name(pkg)}}
                 <img class="fa fa-check fa-lg" src="{{ h.url_for_static('uploads/admin/verified_icon.png') }}" alt="verified" title="verified"></img>
             {% endif %}
             </h1>
+            <div class="dataset-meta">
+                <span>{{ _('Maintained by ') }}
+                    <a href="mailto:{{ pkg.maintainer_email }}">{{ pkg.maintainer }}</a>
+                </span>
+            </div>
             <p class="dataset-desc"> {{h.get_translated(pkg, 'notes')}}</p>
         </div>
-
         <div class="row">
             {% for tag in pkg.tags %}
             <div class="pkg_tags">
@@ -31,17 +35,24 @@ <h1>{{h.dataset_display_name(pkg)}}
         <div class="row dataset-meta">
             <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
         </div>
-        <div class="row stats-box">
-            <div class="col-xs-6 col-sm-4">
+        <div class="row" style="height: 40px;">
+        </div>
+        <div class="row text-center dataset-meta">
+            <span class="col-xs-4 col-sm-2">
                 {% set downloads = h.justicehub_theme_get_package_avg_downloads(pkg) %}
                 <span class="stats">{{ downloads }}{% if downloads %}{{ _('+') }}{% endif %}</span>
-                <span class="stats-text">{{ _('DOWNLOADS') }}</span>
-            </div>
-            <div class="col-xs-6 col-sm-4">
+                <span>{{ _('Downloads') }}</span>
+            </span>
+            <span class="hidden-xs" style="float: left;">{{ _('|') }}</span>
+            <span class="col-xs-3 col-sm-2">
                 {% set views = pkg.tracking_summary.total %}
                 <span class="stats">{{ views }}{% if views %}{{ _('+') }}{% endif %}</span>
-                <span class="stats-text">{{ _('VIEWS') }}</span>
-            </div>
+                <span>{{ _('Views') }}</span>
+            </span>
+            <span class="hidden-xs" style="float: left;">{{ _('|') }}</span>
+            <span class="col-xs-5 col-sm-3">
+                <span>{{ _('Updated ') }}{{ h.justicehub_theme_days_ago(pkg.last_updated) }}</span>
+            </span>
         </div>
 
         {% if self.content_action() | trim %}
@@ -54,18 +65,24 @@ <h1>{{h.dataset_display_name(pkg)}}
         </div>
         {% endif %}
     </div>
-    <div class="col-sm-1">
-    </div>
-    <div class="col-sm-4 col-xs-12">
-        <div class="row org-box image-box">
-        <a href="{{ h.url_for(controller='organization', action='read', id=pkg.organization.id) }}">
-        {% set image_path = h.url_for_static('uploads/group/' + pkg.organization.image_url, qualified=True) %}
-        <img src="{{ image_path or h.url_for_static('/base/images/placeholder-organization.png') }}" alt="{{ pkg.organization.name }}" class="img-responsive media-image" >
-        {{ c.group_dict.display_name }}
-        </a>
+    <div class="col-sm-4 col-xs-12 text-center">
+        <div class="row">
+            <div class="col col-sm-8 col-sm-offset-3 org-box image-box">
+            <a href="{{ h.url_for(controller='organization', action='read', id=pkg.organization.id) }}">
+            {% set image_path = h.url_for_static('uploads/group/' + pkg.organization.image_url, qualified=True) %}
+            <img src="{{ image_path or h.url_for_static('/base/images/placeholder-organization.png') }}" alt="{{ pkg.organization.name }}" class="img-responsive media-image" >
+            {{ c.group_dict.display_name }}
+            </a>
+            </div>
         </div>
         <div class="row">
-            <div class="col col-md-12 col-xs-12 partner-links social-links">
+            <div class="col col-sm-5 col-xs-12 dataset-meta">
+                <span>{{ _('Email ') }}
+                <a href="mailto:{{ pkg.maintainer_email }}">{{ pkg.maintainer }}</a>
+                </span>
+            </div>
+            <span class="hidden-xs" style="float: left;">{{ _('|') }}</span>
+            <div class="col col-sm-7 col-xs-12 partner-links social-links">
             <ul class="list-unstyled list-inline">
                 <li>
                     <a href="{{ pkg.partner.website }}"
@@ -134,11 +151,11 @@ <h2>ACTIVITY</h2>
     <ul class="nav nav-tabs">
         {% block content_primary_nav %}
         {{ h.build_nav_icon('dataset_read', _('FILES'), id=pkg.name) }}
+        {{ h.build_nav_icon('jhpkg_metadata', _('METADATA'), dataset_id=pkg.name) }}
+        {{ h.build_nav_icon('jhpkg_links', _('EXTERNAL LINKS'), dataset_id=pkg.name) }}
         {% if h.issues_enabled(pkg) %}
         {{ h.build_nav_icon('issues_dataset', _('ISSUES'), dataset_id=pkg.name) }}
         {% endif %}
-        {{ h.build_nav_icon('jhpkg_metadata', _('METADATA'), dataset_id=pkg.name) }}
-        {{ h.build_nav_icon('jhpkg_links', _('EXTERNAL LINKS'), dataset_id=pkg.name) }}
         {% endblock %}
     </ul>
 </div>
diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
index 28b3b16..1efd86c 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
@@ -25,7 +25,7 @@
 {% block primary_content_inner %}
 <section class="additional-info">
     <div class="header">
-        <h1 class="page-heading">{{ _('Metadata') }}</h1>
+        <h1 class="page-heading">{{ _('METADATA') }}</h1>
     </div>
 
     {% block package_additional_info %}
@@ -33,7 +33,6 @@ <h1 class="page-heading">{{ _('Metadata') }}</h1>
     <dl class="dl-horizontal metadata-list">
         <dt title="{{ _('The time interval the dataset span.') }}">
             {{ _('Timeline of Dataset') }}
-            <strong style="color: #403644;">:</strong>
         </dt>
         <dd>{{ pkg_dict['start_year'] }}-{{ pkg_dict['end_year'] }}</dd>
     </dl>
@@ -41,7 +40,6 @@ <h1 class="page-heading">{{ _('Metadata') }}</h1>
     <dl class="dl-horizontal metadata-list">
         <dt title="{{ _('Geographical coverage.') }}">
             {{ _('Geography') }}
-            <strong style="color: #403644;">:</strong>
         </dt>
         <dd>{{ pkg_dict['states'] }}
             {% if pkg_dict['district'] %} {{ pkg_dict['district'] }}{% endif %}
@@ -56,7 +54,6 @@ <h1 class="page-heading">{{ _('Metadata') }}</h1>
         <dl class="dl-horizontal metadata-list">
             <dt title="{{field.description}}">
               {{ h.scheming_language_text(field.label) }}
-              <strong style="color: #403644;">:</strong>
             </dt>
             <dd {% if field.display_property %} property="{{ field.display_property}}"{% endif %}>
               {%- snippet 'scheming/snippets/display_field.html', field=field, data=pkg_dict, schema=schema -%}
@@ -69,7 +66,6 @@ <h1 class="page-heading">{{ _('Metadata') }}</h1>
         <dl class="dl-horizontal metadata-list">
           <dt>
               {{ _("State") }}
-              <strong style="color: #403644;">:</strong>
           </dt>
           <dd class="dataset-details">{{ _(pkg_dict.state) }}</dd>
         </dl>
diff --git a/ckanext/justicehub_theme/templates/snippets/external_links.html b/ckanext/justicehub_theme/templates/snippets/external_links.html
index 468059b..4e41544 100644
--- a/ckanext/justicehub_theme/templates/snippets/external_links.html
+++ b/ckanext/justicehub_theme/templates/snippets/external_links.html
@@ -6,7 +6,7 @@
 {% block primary_content_inner %}
 <section class="module">
     <div class="header">
-        <h1 class="page-heading">{{ _('External Links') }}</h1>
+        <h1 class="page-heading">{{ _('EXTERNAL LINKS') }}</h1>
     </div>
     {% if pkg.links %}
         {% set links = h.justicehub_theme_parse_json(pkg.links) %}

From 7027b9f0fb3efc232b0189ebc5e513fc133ff605 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 15 Jun 2020 13:19:31 +0530
Subject: [PATCH 067/127] add new helper function

- calculate days/months/years ago for a given date
---
 ckanext/justicehub_theme/lib/helpers.py | 22 ++++++++++++++++++++++
 ckanext/justicehub_theme/plugin.py      |  3 ++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/lib/helpers.py b/ckanext/justicehub_theme/lib/helpers.py
index 81ff50c..80b4cfd 100644
--- a/ckanext/justicehub_theme/lib/helpers.py
+++ b/ckanext/justicehub_theme/lib/helpers.py
@@ -1,5 +1,7 @@
 import json
+from datetime import datetime
 
+from dateutil.parser import parse as parse_dates
 from sqlalchemy import MetaData
 from sqlalchemy.sql import select
 
@@ -9,6 +11,26 @@
 
 cached_tables = {}
 
+def days_ago(date):
+    date = parse_dates(date)
+    diff = (datetime.today() - date).days
+
+    elapsed = '{0} Days ago'.format(diff)
+    if diff > 31:
+        months = int(diff/31.0)
+        if months > 1:
+            elapsed = '{0} Months ago'.format(months)
+        else:
+            elapsed = '{0} Month ago'.format(months)
+    if diff > 365:
+        years = int(diff/365.0)
+        if years > 1:
+            elapsed = '{0} Years ago'.format(years)
+        else:
+            elapsed = '{0} Year ago'.format(years)
+
+    return elapsed
+
 def parse_json(string):
     return json.loads(string)
 
diff --git a/ckanext/justicehub_theme/plugin.py b/ckanext/justicehub_theme/plugin.py
index f607909..a4bb553 100644
--- a/ckanext/justicehub_theme/plugin.py
+++ b/ckanext/justicehub_theme/plugin.py
@@ -33,7 +33,8 @@ def get_helpers(self):
         return {
             'justicehub_theme_get_package_avg_downloads': helpers.get_package_avg_downloads,
             'justicehub_theme_package_activity_stream': helpers.package_activity_stream,
-            'justicehub_theme_parse_json': helpers.parse_json
+            'justicehub_theme_parse_json': helpers.parse_json,
+            'justicehub_theme_days_ago': helpers.days_ago
         }
 
     #IActions

From 6c47c5f43e6858222bbb3c5ee154f38a5c84fe76 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 15 Jun 2020 16:04:54 +0530
Subject: [PATCH 068/127] style the issues list page.

---
 ckanext/justicehub_theme/lib/helpers.py       | 17 ++++++
 ckanext/justicehub_theme/plugin.py            |  1 +
 ckanext/justicehub_theme/public/common.css    |  1 +
 ckanext/justicehub_theme/public/issues.css    |  9 +++
 .../templates/issues/dataset.html             | 57 ++++++++++++++-----
 .../templates/snippets/search_form.html       |  5 +-
 6 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/ckanext/justicehub_theme/lib/helpers.py b/ckanext/justicehub_theme/lib/helpers.py
index 80b4cfd..9b42fdf 100644
--- a/ckanext/justicehub_theme/lib/helpers.py
+++ b/ckanext/justicehub_theme/lib/helpers.py
@@ -11,7 +11,23 @@
 
 cached_tables = {}
 
+def get_assignee_user(user_id):
+    '''
+    return user object for a user id.
+    '''
+    context = {'model': model, 'session': model.Session,
+               'user': c.user, 'for_view': True,
+               'auth_user_obj': c.userobj}
+    user = model.Session.query(model.User)\
+            .filter(model.User.id == user_id)\
+            .distinct()\
+            .first()
+    return user
+
 def days_ago(date):
+    '''
+    Calculates days elapsed for the given date.
+    '''
     date = parse_dates(date)
     diff = (datetime.today() - date).days
 
@@ -31,6 +47,7 @@ def days_ago(date):
 
     return elapsed
 
+
 def parse_json(string):
     return json.loads(string)
 
diff --git a/ckanext/justicehub_theme/plugin.py b/ckanext/justicehub_theme/plugin.py
index a4bb553..0abffcd 100644
--- a/ckanext/justicehub_theme/plugin.py
+++ b/ckanext/justicehub_theme/plugin.py
@@ -34,6 +34,7 @@ def get_helpers(self):
             'justicehub_theme_get_package_avg_downloads': helpers.get_package_avg_downloads,
             'justicehub_theme_package_activity_stream': helpers.package_activity_stream,
             'justicehub_theme_parse_json': helpers.parse_json,
+            'justicehub_theme_get_assignee_user': helpers.get_assignee_user,
             'justicehub_theme_days_ago': helpers.days_ago
         }
 
diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index dc7afd3..78baf05 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -153,6 +153,7 @@ body,
 .footer-intro-invert,
 .stages li .highlight,
 .metadata-list dd,
+.issue-list-group li a,
 .stages li.complete .highlight {
     color: #403644;
 }
diff --git a/ckanext/justicehub_theme/public/issues.css b/ckanext/justicehub_theme/public/issues.css
index 1430111..bc080dc 100644
--- a/ckanext/justicehub_theme/public/issues.css
+++ b/ckanext/justicehub_theme/public/issues.css
@@ -4,6 +4,15 @@
     margin-left: 0;
     margin-top: 0;
 }
+.issues-home .gravatar {
+    border-radius: 50%;
+}
+.issues-home .page-heading {
+    padding-bottom: 40px;
+}
+.issues-home .input-group {
+    border-bottom: 1px solid #f65940;
+}
 .issues-home .input-group .btn {
     border-left: none;
 }
diff --git a/ckanext/justicehub_theme/templates/issues/dataset.html b/ckanext/justicehub_theme/templates/issues/dataset.html
index 9268bdd..1573c57 100644
--- a/ckanext/justicehub_theme/templates/issues/dataset.html
+++ b/ckanext/justicehub_theme/templates/issues/dataset.html
@@ -5,25 +5,56 @@
   <link rel="stylesheet" href="/ckanext-issues/style.css" />
 {% endblock %}
 
+{% block content_primary_nav %}
+    {{ super() }}
+    <div class="issues-actions">
+        {{ h.nav_link(_('New Issue'), named_route='issues_new', dataset_id=pkg.name, class_='btn btn-success pull-right') }}
+    </div>
+{% endblock %}
+
 {% block primary_content_inner %}
 <section class="module issues-home">
 
-    {% snippet 'snippets/search_form.html', type='issue', query=q, fields=(('page', pagination.page), ('per_page', pagination.per_page), ('status', status), ('visibility', visibility)), sorting=filters, sorting_selected=sort, placeholder=_('Search issues...'), no_bottom_border=true, no_title=true %}
-    <h1 class="row">
-        <div class="issues-actions page_primary_action">
-            {{ h.nav_link(_('New Issue'), named_route='issues_new', dataset_id=pkg.name, class_='btn btn-success pull-right') }}
-        </div>
-    </h1>
+    {% snippet 'snippets/search_form.html', type='issue', query=q, fields=(('page', pagination.page), ('per_page', pagination.per_page), ('status', status), ('visibility', visibility)), sorting=filters, sorting_selected=sort, placeholder=_('Search issues...'), no_bottom_border=true, no_title=true, count=pagination.total_count %}
 
-   <h2 id="issues-found">
-       {{ ungettext('{number} issue found', '{number} issues found', pagination.total_count) .format(number=pagination.total_count) }}
+   {% if issues %}
+   <h2 class="page-heading">
+       <div class="col col-sm-6">
+           {{ _('Issue') }}
+       </div>
+       <div class="col col-sm-2 col-sm-offset-2">
+           {{ _('Replies') }}
+       </div>
+       <div class="col col-sm-2">
+           {{ _('Activity') }}
+       </div>
    </h2>
 
-   {% if issues %}
-   <ul id="issue-list" class="issue-list-group list-group">
-       {% for issue in issues %}
-       {{ common.issue_item(issue, pkg, c.user) }}
-       {% endfor %}
+   <ul id="issue-list" class="issue-list-group list-group list-unstyled">
+   {% for issue in issues %}
+       <li>
+       <a href="{{ h.url_for('issues_show', dataset_id=pkg.id, issue_number=issue.number) }}" {% if issue.visibility == 'hidden'%} class="issue-abuse"{% endif%}>
+       <div class="row">
+           <h2>{{ issue.title }}</h2>
+       </div>
+       <div class="row">
+           <div class="col col-sm-6">
+               {{ issue.description | truncate }}
+           </div>
+           <div class="col col-sm-2">
+           {% if issue.assignee_id %}
+               {{ h.gravatar(h.justicehub_theme_get_assignee_user(issue.assignee_id).email_hash, size=32) }}
+           {% endif %}
+           </div>
+           <div class="col col-sm-2">
+               {{ issue.comment_count }}
+           </div>
+           <div class="col col-sm-2">
+               {{ h.time_ago_from_timestamp(issue.created) }}
+           </div>
+       </a>
+       </li>
+   {% endfor %}
    </ul>
    {% else %}
    <p class="empty">{{ _('No issues') }}</p>
diff --git a/ckanext/justicehub_theme/templates/snippets/search_form.html b/ckanext/justicehub_theme/templates/snippets/search_form.html
index 0044ba4..3b0f140 100644
--- a/ckanext/justicehub_theme/templates/snippets/search_form.html
+++ b/ckanext/justicehub_theme/templates/snippets/search_form.html
@@ -6,6 +6,9 @@
 {% set no_bottom_border = no_bottom_border if no_bottom_border else false %}
 {% set form_id = form_id if form_id else false %}
 
+{# have to set for issue count #}
+{% set count = count if count else 0 %}
+
 <form {% if form_id %}id="{{ form_id }}" {% endif %}class="search-form{% if no_bottom_border %} no-bottom-border{% endif %}" method="get" data-module="select-switch">
 <div class="col col-md-3 col-xs-5 input-group pull-left">
     <div class="form-control input-lg square-border dataset-count-box">
@@ -17,7 +20,7 @@
             {% else %}
               {{_('DATA')}}
             {% endif %}
-            <span class="count">{{ _('[') }}{{ c.page.items | length }}{{ _(']') }}</span>
+            <span class="count">{{ _('[') }}{{ c.page.items | length  or count}}{{ _(']') }}</span>
         </span>
     </div>
 </div>

From 6112f4031f392d71e3947a43ef3b73986ced20f3 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 15 Jun 2020 17:01:12 +0530
Subject: [PATCH 069/127] update dataset page metadata display

---
 ckanext/justicehub_theme/public/dataset.css   |   9 +-
 .../public/justicehub_theme.css               |   4 +-
 .../templates/package/read_base.html          | 113 ++++++++++--------
 3 files changed, 71 insertions(+), 55 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index d86be48..d0c1fa2 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -185,5 +185,12 @@ h1+.dataset-meta {
     }
     .metadata-list.dl-horizontal dd {
         margin-left: 5%;
-}
+    }
+    .dataset-desc {
+        width:100%;
+    }
+    .org-box {
+        width: 200px;
+        height: 200px;
+    }
 }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 07a8e3a..e6f766d 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -91,7 +91,7 @@
 
 /* ----------------------- pre-primary-blocks ----------------- */
 .top-section {
-    margin: 0 20px;
+    margin: 0 40px;
     margin-bottom: 230px;
 }
 .context .content_action,
@@ -336,7 +336,7 @@ aside .module [class^=module] {
         padding: 10px;
     }
     .top-section {
-        margin: 0 5px;
+        margin: 0 20px;
         padding: 5px;
     }
     .page_primary_action {
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index d8e7ac5..caf0edb 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -7,38 +7,56 @@
 {% endblock %}
 
 {% block pre_primary %}
-<div class="col-xs-12 row top-section">
-    <div class="col-sm-7 col-xs-12">
-        <div class="row">
-            <h1>{{h.dataset_display_name(pkg)}}
-            {% if pkg.private %}
-                <i style="margin-left: 10px;" class="fa fa-lock fa-lg"></i>
-            {% endif %}
-            {% if pkg.verified %}
-                <img class="fa fa-check fa-lg" src="{{ h.url_for_static('uploads/admin/verified_icon.png') }}" alt="verified" title="verified"></img>
-            {% endif %}
-            </h1>
-            <div class="dataset-meta">
-                <span>{{ _('Maintained by ') }}
-                    <a href="mailto:{{ pkg.maintainer_email }}">{{ pkg.maintainer }}</a>
-                </span>
+<div class="top-section">
+    <div class="row">
+        <div class="col col-sm-7 col-xs-12">
+            <div class="row">
+                <h1>{{h.dataset_display_name(pkg)}}
+                {% if pkg.private %}
+                    <i style="margin-left: 10px;" class="fa fa-lock fa-lg"></i>
+                {% endif %}
+                {% if pkg.verified %}
+                    <img class="fa fa-check fa-lg" src="{{ h.url_for_static('uploads/admin/verified_icon.png') }}" alt="verified" title="verified"></img>
+                {% endif %}
+                </h1>
+                <div class="dataset-meta">
+                    <span>{{ _('Maintained by ') }}
+                        <a href="mailto:{{ pkg.maintainer_email }}">{{ pkg.maintainer }}</a>
+                    </span>
+                </div>
+                <div class="row col col-sm-8 col-xs-12">
+                    <p class="dataset-desc"> {{h.get_translated(pkg, 'notes')}}</p>
+                </div>
             </div>
-            <p class="dataset-desc"> {{h.get_translated(pkg, 'notes')}}</p>
-        </div>
-        <div class="row">
-            {% for tag in pkg.tags %}
-            <div class="pkg_tags">
-                <a href="{% url_for controller='package', action='search', tags=tag.name %}">{{ h.truncate(tag.display_name, 22) }}</a>
+            <div class="row">
+                <div class="row col col-sm-8 col-xs-12">
+                {% for tag in pkg.tags %}
+                    <div class="pkg_tags">
+                        <a href="{% url_for controller='package', action='search', tags=tag.name %}">{{ h.truncate(tag.display_name, 22) }}</a>
+                    </div>
+                {% endfor %}
+                </div>
             </div>
-            {% endfor %}
-        </div>
-        <div class="row dataset-meta">
-            <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
+            <div class="row dataset-meta">
+                <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
+            </div>
+            <div class="row" style="height: 40px;"></div>
         </div>
-        <div class="row" style="height: 40px;">
+
+        <div class="col col-sm-5 col-xs-12 text-center">
+            <div class="col col-sm-8 col-sm-offset-3 org-box image-box">
+                <a href="{{ h.url_for(controller='organization', action='read', id=pkg.organization.id) }}">
+                {% set image_path = h.url_for_static('uploads/group/' + pkg.organization.image_url, qualified=True) %}
+                <img src="{{ image_path or h.url_for_static('/base/images/placeholder-organization.png') }}" alt="{{ pkg.organization.name }}" class="img-responsive media-image" >
+                {{ c.group_dict.display_name }}
+                </a>
+            </div>
         </div>
-        <div class="row text-center dataset-meta">
-            <span class="col-xs-4 col-sm-2">
+    </div>
+
+    <div class="row">
+        <div class="col col-sm-6 col-xs-12 text-center">
+            <span class="col-xs-4 col-sm-3">
                 {% set downloads = h.justicehub_theme_get_package_avg_downloads(pkg) %}
                 <span class="stats">{{ downloads }}{% if downloads %}{{ _('+') }}{% endif %}</span>
                 <span>{{ _('Downloads') }}</span>
@@ -50,38 +68,18 @@ <h1>{{h.dataset_display_name(pkg)}}
                 <span>{{ _('Views') }}</span>
             </span>
             <span class="hidden-xs" style="float: left;">{{ _('|') }}</span>
-            <span class="col-xs-5 col-sm-3">
+            <span class="col-xs-5 col-sm-4">
                 <span>{{ _('Updated ') }}{{ h.justicehub_theme_days_ago(pkg.last_updated) }}</span>
             </span>
         </div>
-
-        {% if self.content_action() | trim %}
-        <div class="row content_action pull-left">
-            {% block content_action %}
-            {% if h.check_access('package_update', {'id':pkg.id }) %}
-            {% link_for _('EDIT'), controller='package', action='edit', id=pkg.name, class_='btn btn-default' %}
-            {% endif %}
-            {% endblock %}
-        </div>
-        {% endif %}
-    </div>
-    <div class="col-sm-4 col-xs-12 text-center">
-        <div class="row">
-            <div class="col col-sm-8 col-sm-offset-3 org-box image-box">
-            <a href="{{ h.url_for(controller='organization', action='read', id=pkg.organization.id) }}">
-            {% set image_path = h.url_for_static('uploads/group/' + pkg.organization.image_url, qualified=True) %}
-            <img src="{{ image_path or h.url_for_static('/base/images/placeholder-organization.png') }}" alt="{{ pkg.organization.name }}" class="img-responsive media-image" >
-            {{ c.group_dict.display_name }}
-            </a>
-            </div>
-        </div>
-        <div class="row">
-            <div class="col col-sm-5 col-xs-12 dataset-meta">
+        <div class="col col-sm-5 col-sm-offset-1 col-xs-12 text-center">
+            <div class="col col-sm-5 col-xs-12">
                 <span>{{ _('Email ') }}
                 <a href="mailto:{{ pkg.maintainer_email }}">{{ pkg.maintainer }}</a>
                 </span>
             </div>
             <span class="hidden-xs" style="float: left;">{{ _('|') }}</span>
+
             <div class="col col-sm-7 col-xs-12 partner-links social-links">
             <ul class="list-unstyled list-inline">
                 <li>
@@ -124,7 +122,18 @@ <h1>{{h.dataset_display_name(pkg)}}
             </div>
         </div>
     </div>
+
+    {% if self.content_action() | trim %}
+        <div class="row content_action pull-left">
+            {% block content_action %}
+            {% if h.check_access('package_update', {'id':pkg.id }) %}
+            {% link_for _('EDIT'), controller='package', action='edit', id=pkg.name, class_='btn btn-default' %}
+            {% endif %}
+            {% endblock %}
+        </div>
+    {% endif %}
 </div>
+
 {% endblock %}
 
 <div class="col-xs-12 row">

From a66dafcd7e9025eda78e686022a8a212cfad47f3 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 15 Jun 2020 17:16:26 +0530
Subject: [PATCH 070/127] fix metadata alignment

---
 ckanext/justicehub_theme/public/dataset.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index d0c1fa2..66ddbde 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -93,7 +93,7 @@ h1+.dataset-meta {
 
 /* -------------------------- metadata ----------------------- */
 .metadata-list {
-    margin-left: 15px;
+    margin: 30px 15px;
 }
 .metadata-list.dl-horizontal dt {
     display: inline;

From 658c2ad94db1e1a2cc89ee2c03096684cc101240 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 15 Jun 2020 20:26:05 +0530
Subject: [PATCH 071/127] udpate resource page layout

- remove additional info and list of resources
- add important information in top section
---
 ckanext/justicehub_theme/public/common.css    |   2 -
 ckanext/justicehub_theme/public/resource.css  |  35 +-----
 .../templates/organization/read_base.html     |   2 +-
 .../templates/package/resource_read.html      | 108 +++++++-----------
 4 files changed, 46 insertions(+), 101 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 78baf05..1db12c9 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -6,7 +6,6 @@ body {
     font-weight: 400; /* Regular */
 }
 .pkg_tags,
-.meta-desc,
 .footer-links .nav-item a {
     font-size: 14px;
 }
@@ -361,7 +360,6 @@ img.fa-certificate.fa-lg {
 
 /* -------------------------------------- Mobile adjustments ----------------------------- */
 @media (min-width:320px) and (orientation: portrait) {
-    .meta-desc,
     .dataset-meta {
         font-size: 12px;
     }
diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index 6291dba..a6b5a4c 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -1,43 +1,14 @@
-.resource-item {
-    margin-bottom: 20px;
-}
-.nav-simple li {
-    border-bottom: none;
-}
-.nav-simple:not(.nav-facet) > .nav-item {
-    padding-left: 50px;
-    padding-top: 30px;
-}
-.nav-simple .nav-item a:hover,
-.nav-simple .nav-item:hover {
-    background: #ffffff;
-    color: #403644;
-}
-.res-social {
-    position: absolute; 
-    bottom: 17px; 
-    right: 0;
+.module-resource h1 {
+    margin-bottom: 0;
 }
 .social-heading {
     background-color: #ffffff !important;
     color: #f65940;
     height: 70px;
-    padding-top: 20px;
-    padding-left:0px;
+    padding-left: 0 !important;
     border-bottom: none;
 }
 .res-actions {
     margin-top: 20px;
     margin-bottom: 50px;
 }
-.module-content .res-actions ul {
-    padding-left: 0;
-}
-
-/* ------------------------------- responsive ---------------------- */
-@media only screen and (max-width: 768px){
-    .res-social{
-       position:unset; 
-    }
-
-}
diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index cff8d18..2b6e502 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -53,7 +53,7 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
         </div>
     </div>
     <div class="row">
-        <div class="partner-links social-links col-md-4 col-sm-4 col-xs-12">
+        <div class="social-links col-md-4 col-sm-4 col-xs-12">
             <ul class="list-unstyled list-inline">
                 <li>
                     <a href="{{ c.group_dict.website }}"
diff --git a/ckanext/justicehub_theme/templates/package/resource_read.html b/ckanext/justicehub_theme/templates/package/resource_read.html
index 06d18ec..0c50eac 100644
--- a/ckanext/justicehub_theme/templates/package/resource_read.html
+++ b/ckanext/justicehub_theme/templates/package/resource_read.html
@@ -1,41 +1,73 @@
 {% ckan_extends %}
 
 {% block resource_inner %}
-    <div class="module-content top-section">
+    <div class="top-section">
 
     {% block resource_content %}
 
+    <div class="row">
+        <div class="col col-sm-6 col-xs-12">
         {% block resource_read_title %}
             <h1>{{ h.resource_display_name(res) | truncate(50) }}</h1>
         {% endblock %}
 
+        <div class="dataset-meta">
+            {{ _('Updated') }}
+            {{ h.justicehub_theme_days_ago(res.last_modified) or h.justicehub_theme_days_ago(res.created) or _('unknown') }}
+        </div>
+
         <div class="prose notes resource-desc" property="rdfs:label">
             {% if res.description %}
               {{ h.render_markdown(res.description) }}
             {% endif %}
             {% if not res.description and c.package.notes %}
               <h3>{{ _('From the dataset abstract') }}</h3>
-              <blockquote>{{ h.markdown_extract(h.get_translated(c.package, 'notes')) }}</blockquote>
-              <p class="res-title">{% trans dataset=c.package.title, url=h.url_for(controller='package', action='read', id=c.package['name']) %}Source: <a href="{{ url }}">{{ dataset }}</a>{% endtrans %}
+              <blockquote>
+                  {{ h.markdown_extract(h.get_translated(c.package, 'notes')) }}
+                  <p class="res-title">
+                  {% trans dataset=c.package.title, url=h.url_for(controller='package', action='read', id=c.package['name']) %}
+                  Source: <a href="{{ url }}">{{ dataset }}</a>
+                  {% endtrans %}
+                  </p>
+              </blockquote>
             {% endif %}
         </div>
 
-        <div class="meta-desc">
+        <div class="dataset-meta">
             <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
         </div>
 
         {% block resource_read_url %}
             {% if res.url and h.is_url(res.url) %}
-              <p class="text-muted ellipsis res-title meta-desc">{{ _('URL:') }} <a class="resource-url-analytics" href="{{ res.url }}" title="{{ res.url }}">{{ res.url }}</a></p>
+              <p class="text-muted ellipsis res-title dataset-meta">
+                  <strong>{{ _('URL:') }}</strong><br>
+                  <a class="resource-url-analytics" href="{{ res.url }}" title="{{ res.url }}">{{ res.url | truncate(100) }}</a>
+              </p>
             {% elif res.url %}
-              <p class="text-muted break-word res-title meta-desc">{{ _('URL:') }} {{ res.url }}</p>
+              <p class="text-muted break-word res-title dataset-meta">
+                  <strong>{{ _('URL:') }}</strong><br>
+                  {{ res.url | truncate(100) }}
+              </p>
             {% endif %}
         {% endblock %}
 
-		<div class="row">
-		<div class="actions res-actions pull-left">
+        {% if res.variable_measured %}
+        <div class="dataset-desc">
+            {{ _('Resource captures: ') }}
+            {{ res.variable_measured }}
+        </div>
+        {% endif %}
+
+        </div>
+
+        <div class="col col-sm-3 col-sm-offset-3 col-xs-12">
+            {% snippet "snippets/social.html" %}
+        </div>
+    </div>
+    <div class="row">
+		<div class="res-actions col-sm-6 col-xs-12">
 		  {% block resource_actions %}
-		  <ul>
+		  <ul class="list-unstyled list-inline">
 		  {% block resource_actions_inner %}
 		    {% if h.check_access('package_update', {'id':pkg.id }) %}
 		        {% link_for _('EDIT'), controller='package', action='resource_edit', id=pkg.name, resource_id=res.id, class_='btn btn-default btn-action' %}
@@ -66,7 +98,7 @@ <h3>{{ _('From the dataset abstract') }}</h3>
 		  </ul>
 		  {% endblock %}
 		</div>
-		</div>
+    </div>
     {% endblock %}
 
     {% if res.format == 'CSV' %}
@@ -77,63 +109,7 @@ <h3>{{ _('From the dataset abstract') }}</h3>
 {% endblock %}
 
 {% block primary_content %}
-  <div class="col-sm-9 col-xs-12">
-  {% block resource_additional_information %}
-  {% if res %}
-      <section class="module">
-          <h1 class="page-heading">{{ _('ADDITIONAL INFORMATION') }}</h2>
-          {% block resource_additional_information_inner %}
-          <div class="module-content">
-          <table class="table table-striped table-bordered table-condensed" data-module="table-toggle-more">
-            <thead>
-              <tr>
-                <th scope="col">{{ _('Field') }}</th>
-                <th scope="col">{{ _('Value') }}</th>
-              </tr>
-            </thead>
-            <tbody>
-              <tr>
-                <td scope="row">{{ _('Data last updated') }}</th>
-                <td>{{ h.render_datetime(res.last_modified) or h.render_datetime(res.created) or _('unknown') }}</td>
-              </tr>
-              <tr>
-                <td scope="row">{{ _('Metadata last updated') }}</th>
-                <td>{{ h.render_datetime(res.revision_timestamp) or h.render_datetime(res.created) or _('unknown') }}</td>
-              </tr>
-              <tr>
-                <td scope="row">{{ _('Created') }}</th>
-                <td>{{ h.render_datetime(res.created) or _('unknown') }}</td>
-              </tr>
-              <tr>
-                <td scope="row">{{ _('Format') }}</th>
-                <td>{{ res.mimetype_inner or res.mimetype or res.format or _('unknown') }}</td>
-              </tr>
-              <tr>
-                <td scope="row">{{ _('License') }}</th>
-                <td>{% snippet "snippets/license.html", pkg_dict=pkg, text_only=True %}</td>
-              </tr>
-              {% for key, value in h.format_resource_items(res.items()) %}
-                <tr class="toggle-more"><td scope="row">{{ key }}</th><td>{{ value }}</td></tr>
-              {% endfor %}
-            </tbody>
-          </table>
-          </div>
-          {% endblock %}
-      </section>
-  {% endif %}
-  {% endblock %}
-  </div>
-
-  <div class="col-sm-3  col-xs-12 res-social">
-    {% snippet "snippets/social.html" %}
-  </div>
 {% endblock %}
 
 {% block secondary_content %}
-
-  {% block resources_list %}
-    {% snippet "package/snippets/resources.html", pkg=pkg, active=res.id %}
-  {% endblock %}
-
 {% endblock %}
-

From 0d5736f046242d520e571d3aa502a3d3adb9d8fe Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 16 Jun 2020 14:54:28 +0530
Subject: [PATCH 072/127] remove ununsed package controller

---
 .../justicehub_theme/controllers/__init__.py  |  2 +-
 .../controllers/controller.py                 | 39 -------------------
 ckanext/justicehub_theme/plugin.py            |  7 ----
 3 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/ckanext/justicehub_theme/controllers/__init__.py b/ckanext/justicehub_theme/controllers/__init__.py
index b46be9e..b6b53cd 100644
--- a/ckanext/justicehub_theme/controllers/__init__.py
+++ b/ckanext/justicehub_theme/controllers/__init__.py
@@ -1 +1 @@
-from controller import JHOrgController, JHPkgController
+from controller import JHOrgController
diff --git a/ckanext/justicehub_theme/controllers/controller.py b/ckanext/justicehub_theme/controllers/controller.py
index 2b9345a..07ff88c 100644
--- a/ckanext/justicehub_theme/controllers/controller.py
+++ b/ckanext/justicehub_theme/controllers/controller.py
@@ -2,49 +2,10 @@
 from ckanext.justicehub_theme.lib import helpers
 
 import ckan.controllers.organization as org
-import ckan.lib.base as base
 import ckan.lib.plugins as plugins
-import ckan.logic as logic
 import ckan.model as model
 from ckan.common import c
 
-NotFound = logic.NotFound
-NotAuthorized = logic.NotAuthorized
-
-
-class JHPkgController(base.BaseController):
-    def links(self, dataset_id):
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'for_view': True,
-                   'auth_user_obj': c.userobj}
-        data_dict = {'id': dataset_id}
-
-        try:
-            c.pkg_dict = logic.get_action('package_show')(context, data_dict)
-            c.pkg = context['package']
-        except (NotFound, NotAuthorized):
-            abort(404, _('Dataset not found'))
-
-        package_type = c.pkg_dict['type'] or 'dataset'
-        return plugins.toolkit.render('snippets/external_links.html',
-                                      extra_vars={'dataset_type': package_type})
-
-    def metadata(self, dataset_id):
-        context = {'model': model, 'session': model.Session,
-                   'user': c.user, 'for_view': True,
-                   'auth_user_obj': c.userobj}
-        data_dict = {'id': dataset_id}
-
-        try:
-            c.pkg_dict = logic.get_action('package_show')(context, data_dict)
-            c.pkg = context['package']
-        except (NotFound, NotAuthorized):
-            abort(404, _('Dataset not found'))
-
-        package_type = c.pkg_dict['type'] or 'dataset'
-        return plugins.toolkit.render('scheming/package/snippets/additional_info.html',
-                                      extra_vars={'dataset_type': package_type})
-
 
 class JHOrgController(org.OrganizationController):
     def members(self, id):
diff --git a/ckanext/justicehub_theme/plugin.py b/ckanext/justicehub_theme/plugin.py
index 0abffcd..9cfe674 100644
--- a/ckanext/justicehub_theme/plugin.py
+++ b/ckanext/justicehub_theme/plugin.py
@@ -119,13 +119,6 @@ def after_map(self, map):
                     controller='ckanext.justicehub_theme.controllers:SubscribeController',
                     action='subscribe')
 
-        map.connect('jhpkg_links', '/dataset/:dataset_id/links',
-                controller='ckanext.justicehub_theme.controllers:JHPkgController',
-                action='links')
-
-        map.connect('jhpkg_metadata', '/dataset/:dataset_id/metadata',
-                controller='ckanext.justicehub_theme.controllers:JHPkgController',
-                action='metadata')
         return map
     
     def before_map(self, map):

From 3d8b6afb6210570c75a6241596489fa068963c0f Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 16 Jun 2020 14:57:00 +0530
Subject: [PATCH 073/127] enable nav tabs toggle instead of full page load for
 dataset tabs

---
 .../public/justicehub_theme.css               |  5 +-
 .../templates/package/read.html               | 22 -------
 .../templates/package/read_base.html          | 57 +++++++++++++++++--
 .../package/snippets/additional_info.html     | 23 +++-----
 .../templates/snippets/external_links.html    | 45 +++++++--------
 5 files changed, 84 insertions(+), 68 deletions(-)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index e6f766d..3da43bc 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -167,8 +167,11 @@
 .nav-tabs > li >  a > i {
     display: None;
 }
+.js .tab-content {
+    display: block;
+}
 
-/* ------------- sidebar --------- */
+/* ------------------------- sidebar ------------------------ */
 .context-info .module-content {
     padding: 0;
 }
diff --git a/ckanext/justicehub_theme/templates/package/read.html b/ckanext/justicehub_theme/templates/package/read.html
index e63008a..dc87af8 100644
--- a/ckanext/justicehub_theme/templates/package/read.html
+++ b/ckanext/justicehub_theme/templates/package/read.html
@@ -4,26 +4,4 @@
 
 {% block primary_content_inner %}
   {{ super() }}
-  {% block package_description %}
-    <h1 class="page-heading">
-        {{ _('FILES') }}
-    </h1>
-  {% endblock %}
-
-  {% block package_resources %}
-    {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources %}
-  {% endblock %}
-
-  {#
-  {% block package_tags %}
-    {% snippet "package/snippets/tags.html", tags=pkg.tags %}
-  {% endblock %}
-
-
-  {% block package_additional_info %}
-    {% snippet "package/snippets/additional_info.html", pkg_dict=pkg %}
-  {% endblock %}
-  #}
-
-
 {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index caf0edb..99f7d53 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -133,7 +133,6 @@ <h1>{{h.dataset_display_name(pkg)}}
         </div>
     {% endif %}
 </div>
-
 {% endblock %}
 
 <div class="col-xs-12 row">
@@ -159,13 +158,61 @@ <h2>ACTIVITY</h2>
 <div class="row page-header">
     <ul class="nav nav-tabs">
         {% block content_primary_nav %}
-        {{ h.build_nav_icon('dataset_read', _('FILES'), id=pkg.name) }}
-        {{ h.build_nav_icon('jhpkg_metadata', _('METADATA'), dataset_id=pkg.name) }}
-        {{ h.build_nav_icon('jhpkg_links', _('EXTERNAL LINKS'), dataset_id=pkg.name) }}
+
+        <li class="active">
+            <a href='#resources' data-toggle="tab">
+                {{ _('FILES') }}
+            </a>
+        </li>
+        <li>
+            <a href='#metadata' data-toggle="tab">
+                {{ _('METADATA') }}
+            </a>
+        </li>
+        <li>
+            <a href='#links' data-toggle="tab">
+                {{ _('EXTERNAL LINKS') }}
+            </a>
+        </li>
         {% if h.issues_enabled(pkg) %}
-        {{ h.build_nav_icon('issues_dataset', _('ISSUES'), dataset_id=pkg.name) }}
+            <li>
+            <a href='#issues' data-toggle="tab">
+                {{ _('ISSUES') }}
+            </a>
+            </li>
+
+            <!-- NOTE: need to figure out how to conditionally show, disabling for Alpha
+            <div class="issues-actions">
+                {{ h.nav_link(_('New Issue'), named_route='issues_new', dataset_id=pkg.name, class_='btn btn-success pull-right') }}
+            </div-->
         {% endif %}
         {% endblock %}
     </ul>
 </div>
 {% endblock %}
+{% block primary_content_inner %}
+    <div class="tab-content">
+        <div class="tab-pane active" id="resources">
+        {% block package_resources %}
+            <h1 class="page-heading">
+                {{ _('FILES') }}
+            </h1>
+            {% snippet "package/snippets/resources_list.html", pkg=pkg, resources=pkg.resources %}
+        {% endblock %}
+        </div>
+
+        <div class="tab-pane" id="metadata">
+        {% block indicator_additional_info %}
+            {% snippet "scheming/package/snippets/additional_info.html", pkg_dict=pkg %}
+        {% endblock %}
+        </div>
+
+        <div class="tab-pane" id="links">
+            {% snippet "snippets/external_links.html", pkg_dict=pkg %}
+        </div>
+
+        <div class="tab-pane" id="issues">
+            {% snippet "issues/dataset.html", pkg=pkg %}
+        </div>
+    </div>
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
index 1efd86c..c7a619d 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
@@ -1,9 +1,6 @@
-{% extends "package/read_base.html" %}
-{%- set schema = h.scheming_get_dataset_schema(dataset_type) -%}
+{%- set schema = h.scheming_get_dataset_schema(pkg_dict.type) -%}
 {% set pkg_dict = c.pkg_dict %}
 
-{% block subtitle %}{{ _('Metadata') }} - {{ super() }}{% endblock %}
-
 {%- set exclude_fields = [
     'id',
     'title',
@@ -19,17 +16,17 @@
     'end_year',
     'states',
     'district',
-    'village'
+    'village',
+    'update_frequency',
+    'maintainer',
+    'maintainer_email'
     ] -%}
 
-{% block primary_content_inner %}
-<section class="additional-info">
-    <div class="header">
-        <h1 class="page-heading">{{ _('METADATA') }}</h1>
-    </div>
-
-    {% block package_additional_info %}
+<div class="header">
+    <h1 class="page-heading">{{ _('METADATA') }}</h1>
+</div>
 
+{% block package_additional_info %}
     <dl class="dl-horizontal metadata-list">
         <dt title="{{ _('The time interval the dataset span.') }}">
             {{ _('Timeline of Dataset') }}
@@ -70,6 +67,4 @@ <h1 class="page-heading">{{ _('METADATA') }}</h1>
           <dd class="dataset-details">{{ _(pkg_dict.state) }}</dd>
         </dl>
     {% endif %}
-    {% endblock %}
-</section>
 {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/snippets/external_links.html b/ckanext/justicehub_theme/templates/snippets/external_links.html
index 4e41544..47ee3f7 100644
--- a/ckanext/justicehub_theme/templates/snippets/external_links.html
+++ b/ckanext/justicehub_theme/templates/snippets/external_links.html
@@ -1,28 +1,21 @@
-{% extends "package/read_base.html" %}
 {% set pkg = c.pkg %}
 
-{% block subtitle %}{{ _('External Links') }} - {{ super() }}{% endblock %}
-
-{% block primary_content_inner %}
-<section class="module">
-    <div class="header">
-        <h1 class="page-heading">{{ _('EXTERNAL LINKS') }}</h1>
-    </div>
-    {% if pkg.links %}
-        {% set links = h.justicehub_theme_parse_json(pkg.links) %}
-        {% for item in links %}
-           <dl class="dl-horizontal links-list">
-          {% set item = h.composite_get_as_dict(item) %}
-          <dt>
-              <a href="{{ link }}">{{ item['title'] }}</a>
-          </dt>
-          <dd>
-              <p>{{ item['description'] }}</p>
-          </dd>
-          </dl>
-        {% endfor %}
-    {% else %}
-        <p class="empty">{{ _('No Links') }}</p>
-    {% endif %}
-</section>
-{% endblock %}
+<div class="header">
+    <h1 class="page-heading">{{ _('EXTERNAL LINKS') }}</h1>
+</div>
+{% if pkg.links %}
+    {% set links = h.justicehub_theme_parse_json(pkg.links) %}
+    {% for item in links %}
+       <dl class="dl-horizontal links-list">
+      {% set item = h.composite_get_as_dict(item) %}
+      <dt>
+          <a href="{{ link }}">{{ item['title'] }}</a>
+      </dt>
+      <dd>
+          <p>{{ item['description'] }}</p>
+      </dd>
+      </dl>
+    {% endfor %}
+{% else %}
+    <p class="empty">{{ _('No Links') }}</p>
+{% endif %}

From c840b99086afc565e3a36308faf131a1d1631b3e Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 16 Jun 2020 15:06:55 +0530
Subject: [PATCH 074/127] update issues interface to incorporate dataset tabs

- add helper for explicitly loading issues for dataset as we are not
using the issues controller here anymore
---
 ckanext/justicehub_theme/lib/helpers.py       |  5 +++
 ckanext/justicehub_theme/plugin.py            |  3 +-
 ckanext/justicehub_theme/public/issues.css    |  5 ++-
 .../templates/issues/dataset.html             | 44 +++++++++----------
 4 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/ckanext/justicehub_theme/lib/helpers.py b/ckanext/justicehub_theme/lib/helpers.py
index 9b42fdf..2665647 100644
--- a/ckanext/justicehub_theme/lib/helpers.py
+++ b/ckanext/justicehub_theme/lib/helpers.py
@@ -1,6 +1,7 @@
 import json
 from datetime import datetime
 
+from ckanext.issues.controller.controller import issues_for_dataset
 from dateutil.parser import parse as parse_dates
 from sqlalchemy import MetaData
 from sqlalchemy.sql import select
@@ -11,6 +12,10 @@
 
 cached_tables = {}
 
+def issues_vars(dataset_id, request):
+    extra_vars = issues_for_dataset(dataset_id, request.GET)
+    return extra_vars
+
 def get_assignee_user(user_id):
     '''
     return user object for a user id.
diff --git a/ckanext/justicehub_theme/plugin.py b/ckanext/justicehub_theme/plugin.py
index 9cfe674..68b5695 100644
--- a/ckanext/justicehub_theme/plugin.py
+++ b/ckanext/justicehub_theme/plugin.py
@@ -35,7 +35,8 @@ def get_helpers(self):
             'justicehub_theme_package_activity_stream': helpers.package_activity_stream,
             'justicehub_theme_parse_json': helpers.parse_json,
             'justicehub_theme_get_assignee_user': helpers.get_assignee_user,
-            'justicehub_theme_days_ago': helpers.days_ago
+            'justicehub_theme_days_ago': helpers.days_ago,
+            'justicehub_theme_issue_vars': helpers.issues_vars
         }
 
     #IActions
diff --git a/ckanext/justicehub_theme/public/issues.css b/ckanext/justicehub_theme/public/issues.css
index bc080dc..907d5e3 100644
--- a/ckanext/justicehub_theme/public/issues.css
+++ b/ckanext/justicehub_theme/public/issues.css
@@ -1,6 +1,6 @@
 #issues-found,
 .issue-list-group {
-    padding-left: 30px;
+    padding-left: 15px;
     margin-left: 0;
     margin-top: 0;
 }
@@ -8,7 +8,8 @@
     border-radius: 50%;
 }
 .issues-home .page-heading {
-    padding-bottom: 40px;
+    padding-bottom: 50px;
+    padding-left: 15px;
 }
 .issues-home .input-group {
     border-bottom: 1px solid #f65940;
diff --git a/ckanext/justicehub_theme/templates/issues/dataset.html b/ckanext/justicehub_theme/templates/issues/dataset.html
index 1573c57..d55e5e7 100644
--- a/ckanext/justicehub_theme/templates/issues/dataset.html
+++ b/ckanext/justicehub_theme/templates/issues/dataset.html
@@ -1,21 +1,22 @@
-{% ckan_extends %}
+{% import "issues/common.html" as common with context %}
 
-{% block styles %}
-  {{ super() }}
-  <link rel="stylesheet" href="/ckanext-issues/style.css" />
-{% endblock %}
+{% set filters = h.get_issue_filter_types() %}
+{% set issues_per_page = h.get_issues_per_page() %}
+{% set extra_vars = h.justicehub_theme_issue_vars(pkg.id, request) %}
+{% set pagination = extra_vars.pagination %}
+{% set issues = extra_vars.issues %}
 
-{% block content_primary_nav %}
-    {{ super() }}
-    <div class="issues-actions">
-        {{ h.nav_link(_('New Issue'), named_route='issues_new', dataset_id=pkg.name, class_='btn btn-success pull-right') }}
-    </div>
-{% endblock %}
-
-{% block primary_content_inner %}
 <section class="module issues-home">
-
-    {% snippet 'snippets/search_form.html', type='issue', query=q, fields=(('page', pagination.page), ('per_page', pagination.per_page), ('status', status), ('visibility', visibility)), sorting=filters, sorting_selected=sort, placeholder=_('Search issues...'), no_bottom_border=true, no_title=true, count=pagination.total_count %}
+    <!-- NOTE: disabled for Alpha -->
+    {#% snippet 'snippets/search_form.html',
+                type='issue', query=extra_vars.q,
+                fields=(('page', pagination.page), ('per_page', pagination.per_page), ('status', extra_vars.status), ('visibility', visibility)),
+                sorting=filters,
+                sorting_selected=extra_vars.sort,
+                placeholder=_('Search issues...'),
+                no_bottom_border=true,
+                count=pagination.total_count,
+                no_title=true %#}
 
    {% if issues %}
    <h2 class="page-heading">
@@ -33,13 +34,14 @@ <h2 class="page-heading">
    <ul id="issue-list" class="issue-list-group list-group list-unstyled">
    {% for issue in issues %}
        <li>
-       <a href="{{ h.url_for('issues_show', dataset_id=pkg.id, issue_number=issue.number) }}" {% if issue.visibility == 'hidden'%} class="issue-abuse"{% endif%}>
+       <!-- NOTE: disabled issue show for Alpha
+       <a href="{{ h.url_for('issues_show', dataset_id=pkg.id, issue_number=issue.number) }}" {% if issue.visibility == 'hidden'%} class="issue-abuse"{% endif%}-->
        <div class="row">
            <h2>{{ issue.title }}</h2>
        </div>
        <div class="row">
            <div class="col col-sm-6">
-               {{ issue.description | truncate }}
+               {{ issue.description | urlize }}
            </div>
            <div class="col col-sm-2">
            {% if issue.assignee_id %}
@@ -52,7 +54,7 @@ <h2>{{ issue.title }}</h2>
            <div class="col col-sm-2">
                {{ h.time_ago_from_timestamp(issue.created) }}
            </div>
-       </a>
+       <!--/a-->
        </li>
    {% endfor %}
    </ul>
@@ -62,9 +64,3 @@ <h2>{{ issue.title }}</h2>
 
    {{ common.page_selector(pagination, issues_per_page, url_params={'dataset_id': pkg['id']}) }}
 </section>
-{% endblock %}
-
-{% block secondary_content %}
-  {% snippet "package/snippets/info.html", pkg=pkg %}
-  {{ common.search_options_sidebar(user_can_change_visibility=h.check_access('package_update', {'id': pkg.id }), url_params={'dataset_id':pkg['id']}) }}
-{% endblock %}

From 813668bb61ad63e78b21d847d17907ce8546d467 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 16 Jun 2020 15:25:29 +0530
Subject: [PATCH 075/127] responsive fixes for dataset tabs

---
 ckanext/justicehub_theme/public/dataset.css   |  6 ++--
 .../public/justicehub_theme.css               |  3 --
 .../templates/issues/dataset.html             | 28 +++++++++++--------
 .../templates/snippets/external_links.html    |  6 ++--
 4 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index 66ddbde..be72712 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -79,9 +79,6 @@ h1+.dataset-meta {
 }
 
 /* -------------------------- links ----------------------- */
-.links-list.dl-horizontal {
-    margin-left: -1%;
-}
 .links-list.dl-horizontal dt {
     width: 30%;
     text-align: left;
@@ -177,6 +174,9 @@ h1+.dataset-meta {
     }
 
     /* -------------------------- metadata ----------------------- */
+    .metadata-list {
+        margin-left: 0;
+    }
     .metadata-list.dl-horizontal dt strong {
         float: none;
     }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 3da43bc..0cad1ee 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -355,9 +355,6 @@ aside .module [class^=module] {
         margin-top: 50px;
         border-bottom: none;
     }
-    .page-heading {
-        display: none;
-    }
     .toolbar .breadcrumb,
     .toolbar .breadcrumb a {
         color: #403644;
diff --git a/ckanext/justicehub_theme/templates/issues/dataset.html b/ckanext/justicehub_theme/templates/issues/dataset.html
index d55e5e7..4fae0cd 100644
--- a/ckanext/justicehub_theme/templates/issues/dataset.html
+++ b/ckanext/justicehub_theme/templates/issues/dataset.html
@@ -20,13 +20,13 @@
 
    {% if issues %}
    <h2 class="page-heading">
-       <div class="col col-sm-6">
+       <div class="col col-sm-6 col-xs-5">
            {{ _('Issue') }}
        </div>
-       <div class="col col-sm-2 col-sm-offset-2">
+       <div class="col col-sm-2 col-sm-offset-2 col-xs-3">
            {{ _('Replies') }}
        </div>
-       <div class="col col-sm-2">
+       <div class="col col-sm-2 col-xs-4">
            {{ _('Activity') }}
        </div>
    </h2>
@@ -40,18 +40,22 @@ <h2 class="page-heading">
            <h2>{{ issue.title }}</h2>
        </div>
        <div class="row">
-           <div class="col col-sm-6">
-               {{ issue.description | urlize }}
+           <div class="col col-sm-8 col-xs-5">
+               <div class="row">
+                   <div class="col col-sm-10 col-xs-12">
+                       {{ issue.description | urlize }}
+                   </div>
+                   <div class="col col-sm-2 col-xs-12">
+                   {% if issue.assignee_id %}
+                       {{ h.gravatar(h.justicehub_theme_get_assignee_user(issue.assignee_id).email_hash, size=32) }}
+                   {% endif %}
+                   </div>
+               </div>
            </div>
-           <div class="col col-sm-2">
-           {% if issue.assignee_id %}
-               {{ h.gravatar(h.justicehub_theme_get_assignee_user(issue.assignee_id).email_hash, size=32) }}
-           {% endif %}
-           </div>
-           <div class="col col-sm-2">
+           <div class="col col-sm-2 col-xs-3">
                {{ issue.comment_count }}
            </div>
-           <div class="col col-sm-2">
+           <div class="col col-sm-2 col-xs-4">
                {{ h.time_ago_from_timestamp(issue.created) }}
            </div>
        <!--/a-->
diff --git a/ckanext/justicehub_theme/templates/snippets/external_links.html b/ckanext/justicehub_theme/templates/snippets/external_links.html
index 47ee3f7..7aeee4e 100644
--- a/ckanext/justicehub_theme/templates/snippets/external_links.html
+++ b/ckanext/justicehub_theme/templates/snippets/external_links.html
@@ -1,10 +1,8 @@
-{% set pkg = c.pkg %}
-
 <div class="header">
     <h1 class="page-heading">{{ _('EXTERNAL LINKS') }}</h1>
 </div>
-{% if pkg.links %}
-    {% set links = h.justicehub_theme_parse_json(pkg.links) %}
+{% if pkg_dict.links %}
+    {% set links = h.justicehub_theme_parse_json(pkg_dict.links) %}
     {% for item in links %}
        <dl class="dl-horizontal links-list">
       {% set item = h.composite_get_as_dict(item) %}

From 748edce8a83b0af0d397ceff34408e3efc1c1bfb Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 16 Jun 2020 18:59:46 +0530
Subject: [PATCH 076/127] rename partner to data contributor

---
 ckanext/justicehub_theme/templates/header.html  |  2 +-
 .../templates/organization/edit_base.html       |  4 ++--
 .../templates/organization/index.html           | 17 +++++++++++++----
 .../templates/organization/new.html             | 17 +++++++++++++++++
 .../templates/organization/read_base.html       |  4 ++--
 .../templates/organization/snippets/helper.html |  2 +-
 .../scheming/organization/group_form.html       |  2 +-
 .../templates/user/dashboard.html               |  2 +-
 .../templates/user/dashboard_organizations.html |  2 +-
 9 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 ckanext/justicehub_theme/templates/organization/new.html

diff --git a/ckanext/justicehub_theme/templates/header.html b/ckanext/justicehub_theme/templates/header.html
index 332bd40..81e7edf 100644
--- a/ckanext/justicehub_theme/templates/header.html
+++ b/ckanext/justicehub_theme/templates/header.html
@@ -18,7 +18,7 @@
             </ul>
         </li>
         {% block header_site_navigation_tabs %}
-            {{ h.build_nav_main( ('search', _('Datasets')), ('organizations_index', _('Partners'))) }}
+            {{ h.build_nav_main( ('search', _('Datasets')), ('organizations_index', _('Data Contributors'))) }}
         {% endblock %}
 
         {% if not c.userobj %}
diff --git a/ckanext/justicehub_theme/templates/organization/edit_base.html b/ckanext/justicehub_theme/templates/organization/edit_base.html
index c79f57f..3109b60 100644
--- a/ckanext/justicehub_theme/templates/organization/edit_base.html
+++ b/ckanext/justicehub_theme/templates/organization/edit_base.html
@@ -1,9 +1,9 @@
 {% ckan_extends %}
 
-{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Partners') }}{% endblock %}
+{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Data Contributors') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li>{% link_for _('Partners'), controller='organization', action='index', named_route=group_type + '_index' %}</li>
+  <li>{% link_for _('Data Contributors'), controller='organization', action='index', named_route=group_type + '_index' %}</li>
   {% block breadcrumb_content_inner %}
     <li>{% link_for organization.display_name|truncate(35), controller='organization', action='read', id=organization.name, named_route=group_type + '_read' %}</li>
     <li class="active">{% link_for _('Manage'), controller='organization', action='edit', id=organization.name, named_route=group_type + '_edit' %}</li>
diff --git a/ckanext/justicehub_theme/templates/organization/index.html b/ckanext/justicehub_theme/templates/organization/index.html
index 2b6a8d9..96adbed 100644
--- a/ckanext/justicehub_theme/templates/organization/index.html
+++ b/ckanext/justicehub_theme/templates/organization/index.html
@@ -1,9 +1,9 @@
 {% ckan_extends %}
 
-{% block subtitle %}{{ _('Partners') }}{% endblock %}
+{% block subtitle %}{{ _('Data Contributors') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li class="active">{% link_for _('Partners'), controller='organization', action='index', named_route=group_type + '_index' %}</li>
+  <li class="active">{% link_for _('Data Contributors'), controller='organization', action='index', named_route=group_type + '_index' %}</li>
 {% endblock %}
 
 {% block pre_primary %}
@@ -11,13 +11,22 @@
   {% block page_primary_action %}
     {% if h.check_access('organization_create') %}
       <div class="page_primary_action row">
-      {% link_for _('ADD PARTNER'), controller='organization', action='new', class_='btn btn-primary pull-right', named_route=group_type + '_new' %}
+      {% link_for _('ADD DATA CONTRIBUTOR'), controller='organization', action='new', class_='btn btn-primary pull-right', named_route=group_type + '_new' %}
       </div>
     {% endif %}
   {% endblock %}
 
   {% block organizations_search_form %}
-    {% snippet 'snippets/search_form.html', form_id='organization-search-form', type='organization', query=c.q, sorting_selected=c.sort_by_selected, count=c.page.item_count, placeholder=_('Search Partners...'), show_empty=request.params if c.page.items, sorting = [(_('Name (A-Z)'), 'title asc'), (_('Name (Z-A)'), 'title desc')] %}
+    {% snippet 'snippets/search_form.html',
+               form_id='organization-search-form',
+               type='organization',
+               query=c.q,
+               sorting_selected=c.sort_by_selected,
+               count=c.page.item_count,
+               placeholder=_('Search Data Contributors...'),
+               show_empty=request.params if c.page.items,
+               sorting = [(_('Name (A-Z)'),'title asc'), (_('Name (Z-A)'), 'title desc')],
+               count_box_title='DATA CONTRIBUTORS' %}
   {% endblock %}
 {% endblock %}
 
diff --git a/ckanext/justicehub_theme/templates/organization/new.html b/ckanext/justicehub_theme/templates/organization/new.html
new file mode 100644
index 0000000..9ed11f8
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/organization/new.html
@@ -0,0 +1,17 @@
+{% extends "organization/base_form_page.html" %}
+
+{% block subtitle %}{{ _('Add Data Contributor') }}{% endblock %}
+
+{% block breadcrumb_link %}{{ h.nav_link(_('Add Data Contributor'), controller='organization', action='edit', id=c.organization.name) }}{% endblock %}
+
+{% block page_heading %}{{ _('Add Data Contributor') }}{% endblock %}
+
+{% block page_header %}{% endblock %}
+
+{% block breadcrumb_content_inner %}
+  <li class="active"><a href="#">{{ _('Add Data Contributor') }}</a></li>
+{% endblock %}
+
+{% block secondary_content %}
+  {% snippet "organization/snippets/helper.html" %}
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index 2b6e502..4644465 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -1,9 +1,9 @@
 {% ckan_extends %}
 {% set url = h.url_for(c.group_dict.type + '_read', id=c.group_dict.name, ) %}
-{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Partners') }}{% endblock %}
+{% block subtitle %}{{ c.group_dict.display_name }} - {{ _('Data Contributor') }}{% endblock %}
 
 {% block breadcrumb_content %}
-  <li>{% link_for _('Partners'), controller='organization', action='index', named_route=group_type + '_index' %}</li>
+  <li>{% link_for _('Data Contributors'), controller='organization', action='index', named_route=group_type + '_index' %}</li>
   <li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='organization', action='read', id=c.group_dict.name, named_route=group_type + '_read' %}</li>
 {% endblock %}
 
diff --git a/ckanext/justicehub_theme/templates/organization/snippets/helper.html b/ckanext/justicehub_theme/templates/organization/snippets/helper.html
index 33514b3..004f53a 100644
--- a/ckanext/justicehub_theme/templates/organization/snippets/helper.html
+++ b/ckanext/justicehub_theme/templates/organization/snippets/helper.html
@@ -1,7 +1,7 @@
 <div class="module module-narrow module-shallow">
   <h2 class="module-heading">
     {#<i class="fa fa-info-circle"></i>#}
-    {{ _('PARTNERS') }}
+    {{ _('DATA CONTRIBUTORS') }}
   </h2>
   <div class="module-content">
     <p>
diff --git a/ckanext/justicehub_theme/templates/scheming/organization/group_form.html b/ckanext/justicehub_theme/templates/scheming/organization/group_form.html
index 4f172ce..d4a7eb7 100644
--- a/ckanext/justicehub_theme/templates/scheming/organization/group_form.html
+++ b/ckanext/justicehub_theme/templates/scheming/organization/group_form.html
@@ -24,7 +24,7 @@
     <div class="form-actions">
         {% block delete_button %}
         {% endblock %}
-        <button class="btn btn-primary bg-clear" name="save" type="submit">{% block save_text %}{{ _('Save Organization') }}{% endblock %}</button>
+        <button class="btn btn-primary bg-clear" name="save" type="submit">{% block save_text %}{{ _('Save Data Contributor') }}{% endblock %}</button>
         {{ form.required_message() }}
     </div>
 </form>
diff --git a/ckanext/justicehub_theme/templates/user/dashboard.html b/ckanext/justicehub_theme/templates/user/dashboard.html
index 21ed0bf..61042f3 100644
--- a/ckanext/justicehub_theme/templates/user/dashboard.html
+++ b/ckanext/justicehub_theme/templates/user/dashboard.html
@@ -10,7 +10,7 @@
     <ul class="nav nav-tabs">
       {{ h.build_nav_icon('dashboard.index', _('MY FEED')) }}
       {{ h.build_nav_icon('dashboard.datasets', _('DATASETS')) }}
-      {{ h.build_nav_icon('dashboard.organizations', _('PARTNERS')) }}
+      {{ h.build_nav_icon('dashboard.organizations', _('DATA CONTRIBUTORS')) }}
       {{ h.build_nav_icon('dashboard.groups', _('SECTORS')) }}
 
       <div class="content_action">
diff --git a/ckanext/justicehub_theme/templates/user/dashboard_organizations.html b/ckanext/justicehub_theme/templates/user/dashboard_organizations.html
index b96e790..b91a8ab 100644
--- a/ckanext/justicehub_theme/templates/user/dashboard_organizations.html
+++ b/ckanext/justicehub_theme/templates/user/dashboard_organizations.html
@@ -2,6 +2,6 @@
 
 {% block page_primary_action %}
   {% if h.check_access('organization_create') %}
-    {% link_for _('ADD PARTNER'), controller='organization', action='new', class_="btn btn-primary" %}
+    {% link_for _('ADD DATA CONTRIBUTOR'), controller='organization', action='new', class_="btn btn-primary" %}
   {% endif %}
 {% endblock %}

From a76859e574ba4db73f6acedd37ad29397dcf8428 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 16 Jun 2020 19:10:08 +0530
Subject: [PATCH 077/127] update header navigation

- create a separate tab for resources
- move open source to quick links
---
 .../public/justicehub_theme.css               |  2 +-
 .../justicehub_theme/templates/header.html    | 21 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 0cad1ee..e93328f 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -23,7 +23,7 @@
     padding-bottom: 0;
 }
 .masthead .navigation .nav-pills > li {
-    padding-top: 7%;
+    padding-top: 5%;
     height: 120px;
 }
 .masthead .navigation .nav-pills > li.active {
diff --git a/ckanext/justicehub_theme/templates/header.html b/ckanext/justicehub_theme/templates/header.html
index 81e7edf..8941458 100644
--- a/ckanext/justicehub_theme/templates/header.html
+++ b/ckanext/justicehub_theme/templates/header.html
@@ -9,18 +9,17 @@
                 <li>
                     {% link_for _('The Hub'), named_route='home.about' %}
                 </li>
-                <li>
-                    <a href="https://github.com/justicehub-in">
-                        {{ _('Open Source') }}
-                        <i class="fa fa-sm fa-external-link"></i>
-                    </a>
-                </li>
             </ul>
         </li>
         {% block header_site_navigation_tabs %}
             {{ h.build_nav_main( ('search', _('Datasets')), ('organizations_index', _('Data Contributors'))) }}
         {% endblock %}
 
+        <li>
+            <a href="https://justicehub.in/resources/">
+                {{ _('Resources') }}
+            </a>
+        </li>
         {% if not c.userobj %}
           {% block header_account_notlogged %}
           <li>{% link_for _('Log in'), named_route='user.login' %}</li>
@@ -36,17 +35,17 @@
           {% endblock %}
         {% endif %}
         <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">WIKI<b class="caret"></b></a>
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">QUICK LINKS<b class="caret"></b></a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
                 <li>
-                    <a href="https://justicehub.in/resources/">
-                        {{ _('Resources') }}
+                    <a href="https://justicehub.in/covid-19/">
+                        {{ _('Covid-19') }}
                         <i class="fa fa-sm fa-external-link"></i>
                     </a>
                 </li>
                 <li>
-                    <a href="https://justicehub.in/covid-19/">
-                        {{ _('Covid-19') }}
+                    <a href="https://github.com/justicehub-in">
+                        {{ _('Open Source') }}
                         <i class="fa fa-sm fa-external-link"></i>
                     </a>
                 </li>

From 9450039e32e566574c68043b67419c35081e9018 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 17 Jun 2020 16:20:29 +0530
Subject: [PATCH 078/127] update landing page and footer

---
 ckanext/justicehub_theme/public/common.css    |  41 +++--
 .../public/justicehub_theme.css               | 136 +++++++-------
 ckanext/justicehub_theme/public/search.css    |   4 +-
 .../justicehub_theme/templates/footer.html    | 168 +++++++++---------
 .../templates/home/layout4.html               |  66 ++++---
 .../templates/home/snippets/search.html       |  31 ++--
 .../templates/organization/stats.html         |   6 +-
 .../templates/package/read_base.html          |   4 +-
 8 files changed, 253 insertions(+), 203 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 1db12c9..e357d6f 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -59,26 +59,38 @@ h1,
 .col3 h2 {
     font-size: 30px;
 }
-.stats.stats-big {
+.landing-desc {
+    font-size: 40px;
+}
+.intro-box span {
+    font-size: 50px;
+}
+.stats-big {
     font-size: 60px;
 }
+.fa.fa-circle {
+    font-size: 90px;
+}
 .footer-links .nav-item a,
 #field-giant-search,
 .footer-links .input-group input::placeholder,
 .search-form .search-input.search-giant input {
     font-weight: 300; /* Light */
 }
+.intro-box,
+.landing-desc,
 .resource-item .description,
 .dataset-org,
 .dataset-meta,
 .nav-pills li,
-.footer-disclaimer div:last-child {
+.footer-disclaimer {
     font-weight: 500; /* Medium */
 }
 .count,
 .activity .item a,
 .rsrc-list-side > li a,
-.media-item .media-heading {
+.media-item .media-heading,
+.footer-disclaimer div:last-child {
     font-weight: 600; /* Semi Bold */
 }
 .stats-box,
@@ -97,7 +109,7 @@ h1,
 .footer-links .input-group-btn .btn {
     font-weight: 700; /* Bold */
 }
-.stats.stats-big,
+.stats-big,
 .footer-intro,
 .nav-pills li:last-child {
     font-weight: 800; /* Extra Bold */
@@ -105,6 +117,7 @@ h1,
 .col2 p,
 .downloads,
 .activity .item,
+.intro-box span:nth-child(2),
 .footer-disclaimer div:last-child,
 .filters .module-content.empty,
 #field-giant-search,
@@ -115,12 +128,12 @@ h1,
 
 /* ----------------------- colors ------------------------- */
 a,
-.stats,
 .count,
 .media-item,
 .res-title,
 .fa-check,
 .btn-xs,
+.primary-color,
 .btn-xs:active:hover,
 .bg-clear.btn,
 .bg-clear.btn:hover,
@@ -145,6 +158,7 @@ body,
 .res-title a,
 .fa.fa-lock,
 .fa.fa-trash,
+.secondary-color,
 .fa.fa-unlock-alt,
 .dataset-title a,
 .resource-item .heading,
@@ -159,6 +173,7 @@ body,
 .context-info .nums dl,
 .homepage .col3,
 .secondary,
+.landing-desc,
 .site-footer,
 .pkg_tags a,
 .nav-facet,
@@ -191,6 +206,7 @@ body,
 }
 .secondary,
 .masthead,
+.landing-desc,
 .site-footer,
 .account-masthead,
 .nav-facet,
@@ -211,6 +227,7 @@ body,
 .masthead .navigation .nav-pills li a:active,
 .masthead .navigation .nav-pills li a:focus,
 .masthead .navigation .nav-pills li.active a,
+.landing-desc .social-links .fa:hover,
 .footer-links .social-links .fa:hover,
 [role="main"] .container .row .col3 {
     background: none;
@@ -317,10 +334,6 @@ h2.module-heading,
 }
 
 /* --------------------- icons ------------------------- */
-.col-circle i.fa {
-    font-size: 350px;
-    color: #f65940;
-}
 img.fa.fa-check {
     width: 20px;
     height: 20px;
@@ -346,7 +359,7 @@ img.fa-certificate.fa-lg {
     margin-top: 50px;
     margin-bottom: 20px;
 }
-.stats.stats-big {
+.stats-big {
     display: block;
     line-height: 1;
 }
@@ -373,18 +386,26 @@ img.fa-certificate.fa-lg {
     body {
         font-size: 14px;
     }
+    .landing-desc,
     .search-form .search-input.search-giant input,
     .btn.bg-clear {
         font-size: 16px;
     }
+    .intro-box span,
     .stages .highlight,
     .nav-tabs li a {
         font-size: 18px;
     }
+    .fa.fa-circle {
+        font-size: 60px;
+    }
     .nav-pills li:last-child a.dropdown-toggle:active,
     .nav-pills li:last-child a.dropdown-toggle:focus {
         background-color: #f65940;
     }
+    .footer-intro-invert {
+        color: #ffffff;
+    }
     .subscribe-box {
         background-color: #403644;
     }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index e93328f..ee34af6 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -59,10 +59,9 @@
 /* -------------------- body layout ----------------------- */
 
 .container {
-    width: 90%;
+    width: 95%;
 }
-[role="main"] .container,
-.site-footer .container {
+[role="main"] .container {
     width: 100%;
 }
 .box {
@@ -234,36 +233,28 @@ aside .module [class^=module] {
 
 /* ------------------------ footer ------------------------ */
 .site-footer {
-    padding: 0;
+    padding: 0 30px;
 }
 .footer-links {
-    padding: 20px 30px;
+    padding: 50px 0;
 }
-.footer-links [class*="col-md"] {
-    margin-top: 20px;
+.footer-links > .row {
+    margin-bottom: 20px;
 }
-.footer-links .nav-item > a:hover, 
-.footer-links .nav-item > a {
-    margin: 0;
-    padding: 0;
+.footer-links .nav-item {
+    display: inline;
+}
+.footer-disclaimer {
+    margin-bottom: 10px;
 }
 .footer-links i.fa-circle.fa-sm {
     font-size: 9px;
     color: #f65940;
     padding: 10px;
 }
-.footer-links .social-links .fa {
-    background-color: #f65940;
-    color: #ffffff;
-}
-.footer-links .social-links .fa:hover {
-    border-color: #ffffff;
-    color: #ffffff;
-}
 .subscribe-box {
-    min-height: 300px;
     padding-right: 60px;
-    padding-left: 30px;
+    padding-left: 50px;
 }
 .subscribe-box .btn.btn-default {
     padding: 10px 25px;
@@ -290,44 +281,61 @@ aside .module [class^=module] {
 }
 
 /* ----------------------------- homepage --------------------------- */
-[role="main"] .container .row .col1 {
-    margin-top: 20vh;
+.intro-box span:first-child {
+    display: inline-block;
+    width: 400px;
 }
-[role="main"] .container .row .col2 {
-    padding: 5% 5%;
-    font-style: italic;
-    margin-top: 20vh;
+.intro-box span:nth-child(2) {
+    display: inline-block;
+    width: 500px;
 }
-[role="main"] .container .row .col3 {
-    padding: 1% 4%;
+.search-meta .content_action {
+    margin-bottom: 5%;
+    padding-left: 20px;
 }
-[role="main"] .container .row .col3 h2 {
-    border-bottom: 2px solid #f65940;
-    padding-bottom: 10px;
-    margin-bottom: 30px;
+.landing-desc {
+    padding: 40px 40px;
 }
-[role="main"] .container .row .col3 p {
-    padding: 10px 0;
+.landing-desc .row:first-child {
+    margin-bottom: 40px;
 }
-.col-circle img {
-    width: 90%;
-    height: 90%;
+.landing-desc .row:nth-child(2) {
+    margin-bottom: 3%;
+}
+.landing-desc .nav-item > a {
+    margin: 0;
+    padding: 0;
+}
+.landing-desc .social-links .fa {
+    background-color: #f65940;
+    color: #ffffff;
+}
+.landing-desc .social-links .fa:hover {
+    border-color: #ffffff;
+    color: #ffffff;
+}
+.landing-quotes-top {
+	position: relative;
+	top: 35px;
+	left: 5%;
+	z-index: 1;
+}
+.landing-quotes-bottom {
+	position: relative;
+	top: -40px;
+	right: -60%;
 }
 .homepage .module-search {
     min-height: 30vh;
-    margin-top: 15%;
+    margin-top: 5%;
     background: transparent;
 }
-.homepage .container {
-    background: url('/uploads/admin/JH Logomark.png') no-repeat;
-    background-position: -13vw -20vh;
-    background-size: 100vh;
-}
 .homepage .module-search .module-content {
     background: transparent;
 }
 .search-meta {
-    width: 90%;
+    width: 80%;
+    margin: auto;
 }
 .search-meta .stats-box {
     margin-top: 3%;
@@ -384,38 +392,23 @@ aside .module [class^=module] {
     .container {
         width: 100%;
     }
-    .homepage .container {
-        background-position: -27vw -10vh;
-        background-size: 50vh;
+    .intro-box span:first-child {
+        width: 100%;
     }
-    .homepage .module-search {
-        border-bottom: 2px solid #f65940;
-        margin-bottom: 50px;
+    .search-meta {
+        width: 90%;
     }
     .search-meta .stats-text {
         margin-top: 0;
     }
-    .col-circle i.fa {
-        font-size: 100px;
-        color: #f65940;
-        text-align: center;
-    }
-    [role="main"] .container .row .col2 {
-        padding: 2% 0;
-        margin-bottom: 30px;
+    .landing-quotes-bottom {
+        position: relative;
+        top: -35px;
+        right: -80%;
     }
     [role="main"] .secondary {
         display: none;
     }
-    [role="main"] .container .row .col1,
-    [role="main"] .container .row .col2,
-    [role="main"] .container .row .col3 {
-        margin-top: 0;
-    }
-    .footer-intro-invert,
-    .footer-disclaimer {
-        display: none;
-    }
     .footer-links .col {
         padding: 0;
     }
@@ -424,11 +417,14 @@ aside .module [class^=module] {
     }
     .subscribe-box {
         background-color: #403644;
-        min-height: 100%;
     }
     .footer-links i.fa-circle.fa-sm {
-        padding: 0;
+        padding: 5px;
+    }
+    .footer-links > .row {
+        margin-bottom: 10px;
     }
+    .landing-desc .social-links .fa,
     .footer-links .social-links .fa {
         width: 7.5vw;
         height: 28px;
diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index 3cd7f13..9497773 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -129,7 +129,6 @@
     }
     .search-form .search-input.search-giant {
         width: 90%;
-        margin-bottom: 80px;
     }
     .search-form .search-input.search-giant .fa {
         color: #403644;
@@ -143,6 +142,9 @@
         line-height: 1;
         font-size: 12px;
     }
+    .footer-links .input-group {
+        display: block;
+    }
     .footer-links .input-group .form-control {
         border-top-right-radius: 30px;
         border-bottom-right-radius: 30px;
diff --git a/ckanext/justicehub_theme/templates/footer.html b/ckanext/justicehub_theme/templates/footer.html
index 9e8a2ad..16baf4c 100644
--- a/ckanext/justicehub_theme/templates/footer.html
+++ b/ckanext/justicehub_theme/templates/footer.html
@@ -5,105 +5,109 @@
     <div class="row">
 
         <div class="col col-md-6 col-sm-6 footer-links">
-            <div class="col col-md-12 col-xs-12">
-                <div class="footer-intro">{{ _('GET IN TOUCH') }}</div>
-            </div>
-
-            <div class="col col-md-12 col-sm-12 col-xs-5 social-links">
-                <ul class="list-unstyled list-inline">
-                    <li>
-                        <a href="mailto:info@justicehub.in" aria-hidden="true" alt="Justice Hub's Email Address" role="link" title="Email Address" aria-label="Justice Hub's Email Address" target="_blank">
-                        <i class="fa fa-envelope"></i>
-                        </a>
-                    </li><!--
-                    --><li>
-                        <a href="https://twitter.com/JusticeHubIndia" aria-hidden="true" alt="Justice Hub India's Official Twitter Handle" role="link" title="Official Twitter Handle" aria-label="Justice Hub India's Official Twitter Handle" target="_blank">
-                            <i class="fa fa-twitter fa-lg"></i>
-                        </a>
-                    </li><!--
-                    --><li>
-                        <a href="https://www.facebook.com/JusticeHubIndia" aria-hidden="true" role="link" alt="Justice Hub India's Official Facebook Page" title="Official Facebook Page" aria-label="Justice Hub India's Official Facebook Page" target="_blank">
-                            <i class="fa fa-facebook fa-lg"></i>
-                        </a>
-                    </li><!--
-                    --><li>
-                        <a href="https://github.com/justicehub-in" alt="Justice Hub India's Official Github handle" aria-label="Justice Hub India's Official Github handle" title="Official Github Handle" aria-hidden="true" role="link" target="_blank">
-                            <i class="fa fa-github fa-lg"></i>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-
-            <div class="col col-md-10 col-sm-10 hidden-xs footer-disclaimer">
-                <div>
+            <div class="row hidden-xs">
+                <div class="col col-md-7 col-sm-7 footer-disclaimer">
+                    <div>
                     This is an Alpha release, we will be working to add more datasets in the coming days to the Justice Hub.
-                </div>
-                <div>
+                    </div>
+                    <div>
                     So please stay tuned.
+                    </div>
+                </div>
+            </div>
+
+            <div class="row hidden-xs">
+                <div class="col col-md-12 col-xs-12">
+                    <ul class="list-unstyled list-inline">
+                        {% block footer_links %}
+                        <li class="nav-item">
+                            <a href="{{ h.url_for(controller='home', action='about') }}">{{ _('About {0}').format(g.site_title) }}</a></li>
+                        </li>
+                        {% endblock %}
+                        <i class="fa fa-circle fa-sm"></i>
+                        {% block footer_links_legal %}
+                        <li class="nav-item">
+                            <a href="https://justicehub.in/terms">{{ _('Terms & Conditions') }}</a>
+                        </li>
+                        <i class="fa fa-circle fa-sm"></i>
+                        <li class="nav-item">
+                            <a href="https://github.com/justicehub-in/Justice-Hub/blob/master/CODE_OF_CONDUCT.md">{{ _('Code of Conduct') }}</a>
+                        </li>
+                        {% endblock %}
+                        <i class="fa fa-circle fa-sm"></i>
+                        {% block footer_links_ckan %}
+                        {% set api_url = 'http://docs.ckan.org/en/{0}/api/'.format(g.ckan_doc_version) %}
+                        <li class="nav-item">
+                            <a href="{{ api_url }}">{{ _('CKAN API') }}</a>
+                        </li>
+                        <i class="fa fa-circle fa-sm"></i>
+                        <li class="nav-item">
+                            <a href="http://www.opendefinition.org/okd/"><img src="{{ h.url_for_static('/base/images/od_80x15_blue.png') }}" alt="Open Data"></a>
+                        </li>
+                        {% endblock %}
+                    </ul>
                 </div>
             </div>
         </div>
 
-        <div class="col col-md-6 col-sm-6 subscribe-box footer-links">
+        <div class="col col-xs-12 col-md-6 col-sm-6 subscribe-box footer-links">
 
-            <div class="col col-md-12 col-sm-12 hidden-xs">
-                <div class="footer-intro footer-intro-invert">{{ _('SUBSCRIBE') }}</div>
+            <div class="row hidden-xs">
+                <div class="col col-md-12 col-sm-12">
+                    <div class="footer-intro footer-intro-invert">{{ _('SUBSCRIBE') }}</div>
+                </div>
             </div>
 
-            <div class="col col-md-12 col-sm-12 col-xs-7" data-module="justicehub_theme_subscribe">
-                <form id="subscribe-form" method="post" action="{{h.url_for('jhsubscribe')}}">
-                <div class="input-group pull-right">
-                    <input type="email" class="form-control" placeholder="Enter you email id" name="email">
-                    <span class="input-group-btn">
-                        <button class="btn btn-default btn-lg hidden-xs" type="submit">{{ _('SUBSCRIBE') }}</button>
-                        <button class="btn visible-xs" type="button">
-                            <i class="fa fa-bell"></i>
-                        </button>
-                    </span>
+            <div class="row">
+                <div class="col col-md-10 col-sm-10 col-xs-12" data-module="justicehub_theme_subscribe">
+                    <form id="subscribe-form" method="post" action="{{h.url_for('jhsubscribe')}}">
+                    <div class="input-group">
+                        <input type="email" class="form-control" placeholder="Enter you email id" name="email">
+                        <span class="input-group-btn">
+                            <button class="btn btn-default btn-lg hidden-xs" type="submit">{{ _('SUBSCRIBE') }}</button>
+                            <button class="btn visible-xs" type="button">
+                                <i class="fa fa-bell"></i>
+                            </button>
+                        </span>
+                    </div>
+                    </form>
                 </div>
-                </form>
             </div>
 
-            <div class="col col-md-12 hidden-xs">
-                <p class="footer-intro-invert">Be part of our mailing list, to keep up with the latest happenings and events of the Hub.</p>
+            <div class="row">
+                <div class="col col-xs-12 col-sm-10 col-md-10 col-lg-10">
+                    <p class="footer-intro-invert">Be part of our mailing list, to keep up with the latest happenings and events of the Hub.</p>
+                </div>
             </div>
 
+            <div class="row visible-xs">
+                <div class="col col-md-12 col-xs-12">
+                    <ul class="list-unstyled">
+                        <li class="nav-item">
+                            <a href="{{ h.url_for(controller='home', action='about') }}">{{ _('About') }}</a></li>
+                        </li>
+                        <i class="fa fa-circle fa-sm"></i>
+                        <li class="nav-item">
+                            <a href="https://justicehub.in/terms">{{ _('Terms & Conditions') }}</a>
+                        </li>
+                        <i class="fa fa-circle fa-sm"></i>
+                        <li class="nav-item">
+                            <a href="https://github.com/justicehub-in/Justice-Hub/blob/master/CODE_OF_CONDUCT.md">{{ _('Code of Conduct') }}</a>
+                        </li>
+                        <i class="fa fa-circle fa-sm"></i>
+                        <li class="nav-item">
+                            <a href="{{ api_url }}">{{ _('CKAN API') }}</a>
+                        </li>
+                        <i class="fa fa-circle fa-sm"></i>
+                        <li class="nav-item">
+                            <a href="http://www.opendefinition.org/okd/"><img src="{{ h.url_for_static('/base/images/od_80x15_blue.png') }}" alt="Open Data"></a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
         </div>
     </div>
 
-
-    <div class="row footer-links">
-        <div class="col col-md-12 col-xs-12">
-            <ul class="list-unstyled list-inline">
-                {% block footer_links %}
-                <li class="nav-item">
-                    <a href="{{ h.url_for(controller='home', action='about') }}">{{ _('About {0}').format(g.site_title) }}</a></li>
-                </li>
-                {% endblock %}
-                <i class="fa fa-circle fa-sm"></i>
-                {% block footer_links_legal %}
-                <li class="nav-item">
-                    <a href="https://justicehub.in/terms">{{ _('Terms & Conditions') }}</a>
-                </li>
-                <i class="fa fa-circle fa-sm"></i>
-                <li class="nav-item">
-                    <a href="https://github.com/justicehub-in/Justice-Hub/blob/master/CODE_OF_CONDUCT.md">{{ _('Code of Conduct') }}</a>
-                </li>
-                {% endblock %}
-                <i class="fa fa-circle fa-sm"></i>
-                {% block footer_links_ckan %}
-                {% set api_url = 'http://docs.ckan.org/en/{0}/api/'.format(g.ckan_doc_version) %}
-                <li class="nav-item">
-                    <a href="{{ api_url }}">{{ _('CKAN API') }}</a>
-                </li>
-                <i class="fa fa-circle fa-sm"></i>
-                <li class="nav-item">
-                    <a href="http://www.opendefinition.org/okd/"><img src="{{ h.url_for_static('/base/images/od_80x15_blue.png') }}" alt="Open Data"></a>
-                </li>
-                {% endblock %}
-            </ul>
-        </div>
-    </div>
     {% endblock %}
     </div>
 
diff --git a/ckanext/justicehub_theme/templates/home/layout4.html b/ckanext/justicehub_theme/templates/home/layout4.html
index 40f6661..14bc140 100644
--- a/ckanext/justicehub_theme/templates/home/layout4.html
+++ b/ckanext/justicehub_theme/templates/home/layout4.html
@@ -2,33 +2,53 @@
     <div class="container">
         <div class="row">
             {% block search %}
-            {% snippet 'home/snippets/search.html' %}
+                {% snippet 'home/snippets/search.html' %}
             {% endblock %}
         </div>
-        <div class="row">
-            <div class="col col-xs-4 col-sm-3 col-lg-3 col-lg-offset-1 col1 col-circle">
-                <img src="{{ h.url_for_static('uploads/admin/landing-carousel-1.png') }}"/>
-            </div>
-            <div class="col col-xs-8 col-sm-4 col-lg-4 col2">
-                <p>
-                {{ _('An Open community to exchange justice related data, knowledge and other resources online and offline.') }}
-                </p>
-            </div>
-            <div class="col col-xs-12 col-md-5 col-lg-4 col3">
-                <h2>{{ _('JUSTICE HUB') }}</h2>
-                <p>
-                {{ _('This is an intiative from CivicDataLab in collaboration with Agami.\
-                The hub initiated as part of the Agami Data for Justice Challenge 2019.') }}
-                </p>
-                <p>
-                {{ _('Justice Hub is a collobarative data platform that focuses on legal and justice related datasets and other resources.') }}
-                </p>
-                <p>
-                {{ _('Our objective is to build  a common platform for members of the legal data and tech community\
-                (Civil Society Organizations, researchers, journalists, law firms etc.) to share, build and collaborate on the common.') }}
-                </p>
+        <i class="fa fa-circle primary-color landing-quotes-top"></i>
+        <div class="row landing-desc">
+            <div class="col col-xs-12 col-sm-6 col-sm-offset-1">
+                <div class="row">
+                    <div class="col col-sm-12">
+                        {{ _('We enable all kinds of organizations
+                              and individuals to create, share,
+                              manage and harness datasets for justice.') }}
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col col-sm-12">
+                        <div class="footer-intro">{{ _('GET IN TOUCH') }}</div>
+                    </div>
+                </div>
+                <div class="row social-links">
+                    <div class="col col-sm-12">
+                        <ul class="list-unstyled list-inline">
+                            <li>
+                                <a href="mailto:info@justicehub.in" aria-hidden="true" alt="Justice Hub's Email Address" role="link" title="Email Address" aria-label="Justice Hub's Email Address" target="_blank">
+                                <i class="fa fa-envelope"></i>
+                                </a>
+                            </li><!--
+                            --><li>
+                                <a href="https://twitter.com/JusticeHubIndia" aria-hidden="true" alt="Justice Hub India's Official Twitter Handle" role="link" title="Official Twitter Handle" aria-label="Justice Hub India's Official Twitter Handle" target="_blank">
+                                    <i class="fa fa-twitter fa-lg"></i>
+                                </a>
+                            </li><!--
+                            --><li>
+                                <a href="https://www.facebook.com/JusticeHubIndia" aria-hidden="true" role="link" alt="Justice Hub India's Official Facebook Page" title="Official Facebook Page" aria-label="Justice Hub India's Official Facebook Page" target="_blank">
+                                    <i class="fa fa-facebook fa-lg"></i>
+                                </a>
+                            </li><!--
+                            --><li>
+                                <a href="https://github.com/justicehub-in" alt="Justice Hub India's Official Github handle" aria-label="Justice Hub India's Official Github handle" title="Official Github Handle" aria-hidden="true" role="link" target="_blank">
+                                    <i class="fa fa-github fa-lg"></i>
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
             </div>
         </div>
+        <i class="fa fa-circle primary-color landing-quotes-bottom"></i>
     </div>
 </div>
 
diff --git a/ckanext/justicehub_theme/templates/home/snippets/search.html b/ckanext/justicehub_theme/templates/home/snippets/search.html
index 1d93812..1cf081a 100644
--- a/ckanext/justicehub_theme/templates/home/snippets/search.html
+++ b/ckanext/justicehub_theme/templates/home/snippets/search.html
@@ -3,12 +3,19 @@
 {% set stats=h.get_site_statistics() %}
 
 <div class="module module-search module-narrow module-shallow box">
-  <div class="row">
-    <div class="col col-xs-6 col-lg-2 col-xs-offset-6 col-lg-offset-9">
+  <div class="row search-meta">
+    <div class="col col-xs-12 col-sm-5 intro-box">
+        <span class="secondary-color">{{ _('Find, Share & Co-create')}}</span>
+        <span class="primary-color">{{ _('data for justice') }}</span>
+    </div>
+  </div>
+
+  <div class="row search-meta">
+    <div class="col col-xs-6 col-sm-2 content_action">
       {% if not c.userobj %}
-          {% link_for _('UPLOAD'), named_route='user.login', class_='btn btn-primary' %}
+          {% link_for _('ADD DATA'), named_route='user.login', class_='btn btn-primary' %}
       {% else %}
-          {% link_for _('UPLOAD'), controller='package', action='new', named_route='dataset_new', class_='btn btn-primary' %}
+          {% link_for _('ADD DATA'), controller='package', action='new', named_route='dataset_new', class_='btn btn-primary' %}
       {% endif %}
     </div>
   </div>
@@ -23,19 +30,19 @@
     </div>
   </form>
   <div class="row search-meta">
+      <div class="col col-xs-6 col-sm-3 stats-box">
+          <span class="primary-color stats-big">{{ stats.organization_count }}</span>
+          <span>{{ _('CONTRIBUTORS') }}</span>
+      </div>
+      <div class="col col-xs-5 col-sm-1 stats-box">
+          <span class="primary-color stats-big">{{ stats.dataset_count }}</span>
+          <span>{{ _('DATASETS') }}</span>
+      </div>
       <div class="col col-sm-3 stats-box hidden col-xs-hidden">
           <h3>{{ _('Popular tags') }}</h3>
           {% for tag in tags %}
           <a class="tag" href="{% url_for controller='package', action='search', tags=tag.name %}">{{ h.truncate(tag.display_name, 22) }}</a>
           {% endfor %}
       </div>
-      <div class="col col-xs-6 col-sm-2 col-md-2 col-lg-2 col-xs-offset-1 col-sm-offset-8 col-md-offset-8 col-lg-offset-9 stats-box">
-          <span class="stats stats-big">{{ stats.organization_count }}</span>
-          <span>{{ _('CONTRIBUTORS') }}</span>
-      </div>
-      <div class="col col-xs-5 col-sm-2 col-md-2 col-lg-1 stats-box pull-right">
-          <span class="stats stats-big">{{ stats.dataset_count }}</span>
-          <span>{{ _('DATASETS') }}</span>
-      </div>
   </div>
 </div>
diff --git a/ckanext/justicehub_theme/templates/organization/stats.html b/ckanext/justicehub_theme/templates/organization/stats.html
index cf0575b..6e52112 100644
--- a/ckanext/justicehub_theme/templates/organization/stats.html
+++ b/ckanext/justicehub_theme/templates/organization/stats.html
@@ -17,15 +17,15 @@ <h1 class="page-heading">
   {% endblock %}
 	<div class="row stats-box">
         <div class="col-xs-6 col-sm-4">
-            <span class="stats stats-big">{{ c.group_dict.downloads }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
+            <span class="primary-color stats-big">{{ c.group_dict.downloads }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
             <span>{{ _('DOWNLOADS') }}</span>
         </div>
         <div class="col-xs-6 col-sm-4">
-            <span class="stats stats-big">{{ c.group_dict.visits }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
+            <span class="primary-color stats-big">{{ c.group_dict.visits }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
             <span>{{ _('VISITS') }}</span>
         </div>
         <div class="col-xs-6 col-sm-4">
-            <span class="stats stats-big">{{ c.group_dict.num_followers }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
+            <span class="primary-color stats-big">{{ c.group_dict.num_followers }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
             <span>{{ _('FOLLOWERS') }}</span>
         </div>
     </div>
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index 99f7d53..4dd3c36 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -58,13 +58,13 @@ <h1>{{h.dataset_display_name(pkg)}}
         <div class="col col-sm-6 col-xs-12 text-center">
             <span class="col-xs-4 col-sm-3">
                 {% set downloads = h.justicehub_theme_get_package_avg_downloads(pkg) %}
-                <span class="stats">{{ downloads }}{% if downloads %}{{ _('+') }}{% endif %}</span>
+                <span class="primary-color">{{ downloads }}{% if downloads %}{{ _('+') }}{% endif %}</span>
                 <span>{{ _('Downloads') }}</span>
             </span>
             <span class="hidden-xs" style="float: left;">{{ _('|') }}</span>
             <span class="col-xs-3 col-sm-2">
                 {% set views = pkg.tracking_summary.total %}
-                <span class="stats">{{ views }}{% if views %}{{ _('+') }}{% endif %}</span>
+                <span class="primary-color">{{ views }}{% if views %}{{ _('+') }}{% endif %}</span>
                 <span>{{ _('Views') }}</span>
             </span>
             <span class="hidden-xs" style="float: left;">{{ _('|') }}</span>

From 22ba32b9bc5230c68df0306d49fa6804a9eae8fa Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 18 Jun 2020 12:16:23 +0530
Subject: [PATCH 079/127] add links to homepage stats and update landing page
 desc text

---
 ckanext/justicehub_theme/public/justicehub_theme.css |  3 +++
 ckanext/justicehub_theme/templates/home/layout4.html |  2 +-
 .../templates/home/snippets/search.html              | 12 ++++++++----
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index ee34af6..790df24 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -340,6 +340,9 @@ aside .module [class^=module] {
 .search-meta .stats-box {
     margin-top: 3%;
 }
+.search-meta .stats-box a:hover {
+    text-decoration: none;
+}
 
 /* -------------------------------------- Mobile adjustments ----------------------------- */
 @media (min-width:320px) and (orientation: portrait) {
diff --git a/ckanext/justicehub_theme/templates/home/layout4.html b/ckanext/justicehub_theme/templates/home/layout4.html
index 14bc140..ae2c49c 100644
--- a/ckanext/justicehub_theme/templates/home/layout4.html
+++ b/ckanext/justicehub_theme/templates/home/layout4.html
@@ -10,7 +10,7 @@
             <div class="col col-xs-12 col-sm-6 col-sm-offset-1">
                 <div class="row">
                     <div class="col col-sm-12">
-                        {{ _('We enable all kinds of organizations
+                        {{ _('We enable organizations
                               and individuals to create, share,
                               manage and harness datasets for justice.') }}
                     </div>
diff --git a/ckanext/justicehub_theme/templates/home/snippets/search.html b/ckanext/justicehub_theme/templates/home/snippets/search.html
index 1cf081a..f3a1869 100644
--- a/ckanext/justicehub_theme/templates/home/snippets/search.html
+++ b/ckanext/justicehub_theme/templates/home/snippets/search.html
@@ -31,12 +31,16 @@
   </form>
   <div class="row search-meta">
       <div class="col col-xs-6 col-sm-3 stats-box">
-          <span class="primary-color stats-big">{{ stats.organization_count }}</span>
-          <span>{{ _('CONTRIBUTORS') }}</span>
+          <a href={{ h.url_for('organization') }}>
+              <span class="primary-color stats-big">{{ stats.organization_count }}</span>
+              <span class="secondary-color">{{ _('CONTRIBUTORS') }}</span>
+          </a>
       </div>
       <div class="col col-xs-5 col-sm-1 stats-box">
-          <span class="primary-color stats-big">{{ stats.dataset_count }}</span>
-          <span>{{ _('DATASETS') }}</span>
+          <a href={{ h.url_for('search') }}>
+              <span class="primary-color stats-big">{{ stats.dataset_count }}</span>
+              <span class="secondary-color">{{ _('DATASETS') }}</span>
+          </a>
       </div>
       <div class="col col-sm-3 stats-box hidden col-xs-hidden">
           <h3>{{ _('Popular tags') }}</h3>

From d42625235bdadcd3862e0ab61c54b558e6d6fd40 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 18 Jun 2020 15:04:55 +0530
Subject: [PATCH 080/127] add more information on resource list

---
 ckanext/justicehub_theme/public/common.css    |  9 ++++++-
 ckanext/justicehub_theme/public/dataset.css   |  4 +++
 .../package/snippets/resource_item.html       | 26 ++++++++++++++++++-
 3 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index e357d6f..f41aaae 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -5,6 +5,9 @@ body {
     font-family: 'Montserrat', sans-serif;
     font-weight: 400; /* Regular */
 }
+.res-meta {
+    font-size: 12px;
+}
 .pkg_tags,
 .footer-links .nav-item a {
     font-size: 14px;
@@ -81,6 +84,7 @@ h1,
 .landing-desc,
 .resource-item .description,
 .dataset-org,
+.res-meta,
 .dataset-meta,
 .nav-pills li,
 .footer-disclaimer {
@@ -150,7 +154,9 @@ a,
 .activity .item a {
     color: #bcb4bf;
 }
-.downloads, .dataset-meta {
+.res-meta,
+.downloads,
+.dataset-meta {
     color: #707070;
 }
 body,
@@ -373,6 +379,7 @@ img.fa-certificate.fa-lg {
 
 /* -------------------------------------- Mobile adjustments ----------------------------- */
 @media (min-width:320px) and (orientation: portrait) {
+    .res-meta,
     .dataset-meta {
         font-size: 12px;
     }
diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index be72712..edb3e6e 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -78,6 +78,10 @@ h1+.dataset-meta {
     padding-left: 5%;
 }
 
+/* -------------------------- files ----------------------- */
+.resource-item .heading:hover {
+    text-decoration: none;
+}
 /* -------------------------- links ----------------------- */
 .links-list.dl-horizontal dt {
     width: 30%;
diff --git a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
index d1f4036..c577214 100644
--- a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
+++ b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
@@ -1,6 +1,30 @@
 {% ckan_extends %}
 
-{% block resource_item_description %}
+{% block resource_item_title %}
+    <a class="heading" href="{{ url }}" title="{{ res.name or res.description }}">
+        {{ h.resource_display_name(res) | truncate(50) }}
+        <span class="format-label" property="dc:format" data-format="{{ res.format.lower() or 'data' }}">
+            {{ h.get_translated(res, 'format') }}
+        </span>
+        {{ h.popular('views', res.tracking_summary.total, min=10) }}
+
+        {% if res.variable_measured %}
+            <p class="res-meta">
+            {{ _('Each row represents:') }}
+            {{ res.variable_measured }}
+            </p>
+        {% endif %}
+
+        <p class="res-meta" style="font-style: italic;">
+                {{ _('Updated:') }}
+                {{ h.justicehub_theme_days_ago(res.last_modified) or h.justicehub_theme_days_ago(res.created) }}
+            {% if res.Created %}
+            <br>
+                {{ _('Created:') }}
+                {{ h.render_datetime(res.Created) }}
+            {% endif %}
+        </p>
+  </a>
 {% endblock %}
 
 {% block resource_item_explore %}

From 9dbbf6a956ea3320aa405a8a202d4ac6b58b356d Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 18 Jun 2020 15:05:05 +0530
Subject: [PATCH 081/127] fix resource delete

---
 .../justicehub_theme/templates/package/resource_edit_base.html  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/templates/package/resource_edit_base.html b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
index 5052c77..a2af5d4 100644
--- a/ckanext/justicehub_theme/templates/package/resource_edit_base.html
+++ b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
@@ -33,7 +33,7 @@
       {% endif %}
       {% if data.id %}
         {% if h.check_access('resource_delete', {'id': data.id})  %}
-          <a class="btn btn-danger" href="{% url_for controller='package', action='resource_delete', resource_id=data.id, id=pkg_name %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this resource?') }}">{% block delete_button_text %}{{ _('DELETE') }}{% endblock %}</a>
+          <a class="btn btn-danger" href="{% url_for controller='package', action='resource_delete', resource_id=data.id, id=pkg.name %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this resource?') }}">{% block delete_button_text %}{{ _('DELETE') }}{% endblock %}</a>
         {% endif %}
       {% endif %}
   </div>

From c4a7216d0b39b0910deac39639aeac0ec6c53036 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 18 Jun 2020 20:13:52 +0530
Subject: [PATCH 082/127] update header

- unhighlight the last element
- fix logo alignment
---
 ckanext/justicehub_theme/public/common.css    | 12 +++---
 .../public/justicehub_theme.css               | 38 +++++++++----------
 .../justicehub_theme/templates/header.html    |  2 +-
 3 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index f41aaae..eb7abe6 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -110,12 +110,12 @@ h1,
 .content_action a,
 .dataset-title,
 .module-heading,
+.intro-box span:nth-child(2),
 .footer-links .input-group-btn .btn {
     font-weight: 700; /* Bold */
 }
 .stats-big,
-.footer-intro,
-.nav-pills li:last-child {
+.footer-intro {
     font-weight: 800; /* Extra Bold */
 }
 .col2 p,
@@ -249,8 +249,8 @@ h2.module-heading,
 .member_action .delete,
 .nav-facet .nav-item.active,
 .nav-facet .nav-item.active a,
-.select2-results .select2-highlighted,
-.masthead .navigation .nav-pills > li:last-child {
+.nav-pills .dropdown .dropdown-menu > li a:hover,
+.select2-results .select2-highlighted {
     background: none;
     background-color: #f65940;
     border-color: #f65940;
@@ -406,8 +406,8 @@ img.fa-certificate.fa-lg {
     .fa.fa-circle {
         font-size: 60px;
     }
-    .nav-pills li:last-child a.dropdown-toggle:active,
-    .nav-pills li:last-child a.dropdown-toggle:focus {
+    .nav-pills li.dropdown a.dropdown-toggle:active,
+    .nav-pills li.dropdown a.dropdown-toggle:focus {
         background-color: #f65940;
     }
     .footer-intro-invert {
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 790df24..97debb3 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -22,9 +22,20 @@
     padding-top: 0;
     padding-bottom: 0;
 }
+.masthead .navigation .nav-pills > li a {
+    padding: 10px 10px;
+}
+/* .masthead .navigation .nav-pills > li a {
+    line-height: 1;
+}
 .masthead .navigation .nav-pills > li {
     padding-top: 5%;
-    height: 120px;
+    min-height: 100px;
+}*/
+.masthead .navigation .nav-pills > li {
+    min-height: 100px;
+    display: flex;
+    align-items: center;
 }
 .masthead .navigation .nav-pills > li.active {
     border-bottom: 1.5vh solid #f65940;
@@ -32,27 +43,19 @@
 .masthead .navigation .nav-pills > li:not(.dropdown):hover {
     border-bottom: 1.5vh solid #f65940;
 }
-.masthead .navigation .nav-pills > li:last-child {
-    padding-left: 5px;
-    padding-right: 10px;
-}
 .header-image {
     width: 28%;
-    height: 10vh;
 }
 .masthead .logo {
-    margin-top: 1%;
-    width: 100%;
-    height: 100%;
+    min-height: 100px;
+    display: flex;
+    align-items: center;
 }
 .navbar-toggle {
     font-size: 8vw;
     margin: 0;
 }
 .logo img {
-    min-width: 100%;
-    max-width: 100%;
-    min-height: 100%;
     object-fit: cover;
 }
 
@@ -374,15 +377,12 @@ aside .module [class^=module] {
         width: 70%;
     }
     .masthead .logo {
-        margin-top: 0;
+        min-height: 60px;
     }
-    .masthead .navigation .nav-pills li {
+    .masthead .navigation .nav-pills > li {
         height: auto;
-        padding-top: 0;
-        padding-bottom: 3%;
-    }
-    .masthead .navigation .nav-pills li:last-child {
-        border-bottom: none;
+        min-height: 50px;
+        display: block;
     }
     .login-heading {
         padding-left: 20px;
diff --git a/ckanext/justicehub_theme/templates/header.html b/ckanext/justicehub_theme/templates/header.html
index 8941458..a13b414 100644
--- a/ckanext/justicehub_theme/templates/header.html
+++ b/ckanext/justicehub_theme/templates/header.html
@@ -35,7 +35,7 @@
           {% endblock %}
         {% endif %}
         <li class="dropdown">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">QUICK LINKS<b class="caret"></b></a>
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">Quick Links<b class="caret"></b></a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
                 <li>
                     <a href="https://justicehub.in/covid-19/">

From 60aff5ec7194abe1ba1143018c14acf022773df8 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 18 Jun 2020 20:16:13 +0530
Subject: [PATCH 083/127] update homepage

- change button text and color
- change font case for intro line
---
 ckanext/justicehub_theme/public/justicehub_theme.css      | 2 +-
 .../justicehub_theme/templates/home/snippets/search.html  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 97debb3..0190228 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -292,7 +292,7 @@ aside .module [class^=module] {
     display: inline-block;
     width: 500px;
 }
-.search-meta .content_action {
+.search-meta .page_primary_action {
     margin-bottom: 5%;
     padding-left: 20px;
 }
diff --git a/ckanext/justicehub_theme/templates/home/snippets/search.html b/ckanext/justicehub_theme/templates/home/snippets/search.html
index f3a1869..eb83410 100644
--- a/ckanext/justicehub_theme/templates/home/snippets/search.html
+++ b/ckanext/justicehub_theme/templates/home/snippets/search.html
@@ -6,16 +6,16 @@
   <div class="row search-meta">
     <div class="col col-xs-12 col-sm-5 intro-box">
         <span class="secondary-color">{{ _('Find, Share & Co-create')}}</span>
-        <span class="primary-color">{{ _('data for justice') }}</span>
+        <span class="primary-color">{{ _('Data for Justice') }}</span>
     </div>
   </div>
 
   <div class="row search-meta">
-    <div class="col col-xs-6 col-sm-2 content_action">
+    <div class="col col-xs-6 col-sm-2 page_primary_action">
       {% if not c.userobj %}
-          {% link_for _('ADD DATA'), named_route='user.login', class_='btn btn-primary' %}
+          {% link_for _('PUBLISH DATA'), named_route='user.login', class_='btn btn-primary' %}
       {% else %}
-          {% link_for _('ADD DATA'), controller='package', action='new', named_route='dataset_new', class_='btn btn-primary' %}
+          {% link_for _('PUBLISH DATA'), controller='package', action='new', named_route='dataset_new', class_='btn btn-primary' %}
       {% endif %}
     </div>
   </div>

From 959f05dccc2c6b9f9ee1d5a10b04237cc660290b Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 18 Jun 2020 20:16:42 +0530
Subject: [PATCH 084/127] fix dashboard upper margin

---
 ckanext/justicehub_theme/public/justicehub_theme.css   | 3 +++
 ckanext/justicehub_theme/templates/user/dashboard.html | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 0190228..c32e13e 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -365,6 +365,9 @@ aside .module [class^=module] {
     .nav-tabs .content_action {
         margin-right: 10px;
     }
+    .hug.page-header .nav-tabs {
+        margin-top: 0;
+    }
     .page-header .nav-tabs {
         margin-top: 50px;
         border-bottom: none;
diff --git a/ckanext/justicehub_theme/templates/user/dashboard.html b/ckanext/justicehub_theme/templates/user/dashboard.html
index 61042f3..3523393 100644
--- a/ckanext/justicehub_theme/templates/user/dashboard.html
+++ b/ckanext/justicehub_theme/templates/user/dashboard.html
@@ -1,7 +1,7 @@
 {% ckan_extends %}
 
 {% block pre_primary %}
-<div class="col-xs-12 row" style="margin-top: 100px;">
+<div class="row col-sm-12 hidden-xs" style="margin-top: 100px;">
 </div>
 {% endblock %}
 

From d02e7ee74b768ec1f1ceb8c2656f412ae9f6f0ed Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 18 Jun 2020 20:16:57 +0530
Subject: [PATCH 085/127] change links to tos and coc.

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

diff --git a/ckanext/justicehub_theme/templates/footer.html b/ckanext/justicehub_theme/templates/footer.html
index 16baf4c..223b10f 100644
--- a/ckanext/justicehub_theme/templates/footer.html
+++ b/ckanext/justicehub_theme/templates/footer.html
@@ -27,11 +27,11 @@
                         <i class="fa fa-circle fa-sm"></i>
                         {% block footer_links_legal %}
                         <li class="nav-item">
-                            <a href="https://justicehub.in/terms">{{ _('Terms & Conditions') }}</a>
+                            <a href="{{ h.url_for('/pages/tos')}}">{{ _('Terms & Conditions') }}</a>
                         </li>
                         <i class="fa fa-circle fa-sm"></i>
                         <li class="nav-item">
-                            <a href="https://github.com/justicehub-in/Justice-Hub/blob/master/CODE_OF_CONDUCT.md">{{ _('Code of Conduct') }}</a>
+                            <a href="{{ h.url_for('/pages/coc')}}">{{ _('Code of Conduct') }}</a>
                         </li>
                         {% endblock %}
                         <i class="fa fa-circle fa-sm"></i>

From deaf23811ff405bfe44972168fd74ed5fdd0c416 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 18 Jun 2020 20:17:10 +0530
Subject: [PATCH 086/127] update sidebar description and tooltip content

---
 .../templates/organization/snippets/helper.html            | 7 ++++---
 .../justicehub_theme/templates/package/base_form_page.html | 3 ++-
 .../scheming/package/snippets/additional_info.html         | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/organization/snippets/helper.html b/ckanext/justicehub_theme/templates/organization/snippets/helper.html
index 004f53a..1c0911e 100644
--- a/ckanext/justicehub_theme/templates/organization/snippets/helper.html
+++ b/ckanext/justicehub_theme/templates/organization/snippets/helper.html
@@ -6,9 +6,10 @@ <h2 class="module-heading">
   <div class="module-content">
     <p>
       {% trans %}
-        CKAN Organizations are used to create, manage and publish collections
-        of datasets. Users can have different roles within an Organization,
-        depending on their level of authorisation to create, edit and publish.
+       One of the key stakeholders of the Justice Hub,
+       these are organisations and individual
+       who help us curate well documented and good quality-data
+       that is of trustworthy provenance.
       {% endtrans %}
     </p>
   </div>
diff --git a/ckanext/justicehub_theme/templates/package/base_form_page.html b/ckanext/justicehub_theme/templates/package/base_form_page.html
index 4b3b76b..376d729 100644
--- a/ckanext/justicehub_theme/templates/package/base_form_page.html
+++ b/ckanext/justicehub_theme/templates/package/base_form_page.html
@@ -9,7 +9,8 @@ <h2 class="module-heading">{{ _('CREATE DATASET') }}</h2>
               <h2 class="desc-heading">{{ _("TITLE & DESCRIPTION") }}</h2>
               <p>
               {% trans %}
-              A CKAN Dataset is a collection of data resources (such as files),
+              A Dataset is a collection of data resources
+              (such as data dictionary, data processing methodologies, raw & processed datasets, etc),
               together with a description and other information, at a fixed URL.
               Datasets are what users see when searching for data.
               {% endtrans %}
diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
index c7a619d..64115bd 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
@@ -28,14 +28,14 @@ <h1 class="page-heading">{{ _('METADATA') }}</h1>
 
 {% block package_additional_info %}
     <dl class="dl-horizontal metadata-list">
-        <dt title="{{ _('The time interval the dataset span.') }}">
+        <dt title="{{ _('Timeline of the data. Start and End dates/years.') }}">
             {{ _('Timeline of Dataset') }}
         </dt>
         <dd>{{ pkg_dict['start_year'] }}-{{ pkg_dict['end_year'] }}</dd>
     </dl>
 
     <dl class="dl-horizontal metadata-list">
-        <dt title="{{ _('Geographical coverage.') }}">
+        <dt title="{{ _('What is the geographical scope of this dataset (PAN India, selected states/districts, etc).') }}">
             {{ _('Geography') }}
         </dt>
         <dd>{{ pkg_dict['states'] }}

From af175f2ad6cda174aba25f95fa3c2a489a6ea2ba Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 18 Jun 2020 20:17:32 +0530
Subject: [PATCH 087/127] update about page layout

---
 .../justicehub_theme/templates/home/about.html    | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 ckanext/justicehub_theme/templates/home/about.html

diff --git a/ckanext/justicehub_theme/templates/home/about.html b/ckanext/justicehub_theme/templates/home/about.html
new file mode 100644
index 0000000..316d2cb
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/home/about.html
@@ -0,0 +1,15 @@
+{% ckan_extends %}
+
+{% block about %}
+  <div class="row">
+      <div class="col col-xs-12 col-sm-8 col-sm-offset-2 text-center">
+        {% if g.site_about %}
+          {{ h.render_markdown(g.site_about) }}
+        {% else %}
+          <h1 class="page-heading">{{ _('About') }}</h1>
+          {% snippet 'home/snippets/about_text.html' %}
+        {% endif %}
+      {% endblock %}
+      </div>
+  </div>
+</div>

From d22a7c4b8b3ebe2b0809e4e11cdd4e4a416b7f6f Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 18 Jun 2020 20:55:17 +0530
Subject: [PATCH 088/127] add logos in footer

---
 ckanext/justicehub_theme/public/common.css    |  1 +
 .../public/justicehub_theme.css               | 22 ++++++++++---
 .../justicehub_theme/templates/footer.html    | 32 +++++++++++++------
 .../templates/home/snippets/search.html       |  4 +--
 4 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index eb7abe6..7044a24 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -87,6 +87,7 @@ h1,
 .res-meta,
 .dataset-meta,
 .nav-pills li,
+.footer-intro-invert,
 .footer-disclaimer {
     font-weight: 500; /* Medium */
 }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index c32e13e..7598c90 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -235,6 +235,20 @@ aside .module [class^=module] {
 
 
 /* ------------------------ footer ------------------------ */
+.footer-links .image-box {
+    margin-top: -20px;
+    height: 70px;
+    width: 30%;
+    display: inline-block;
+}
+.footer-links .agami-logo {
+    width: 162px;
+    height: 44px;
+}
+.footer-links .cdl-logo {
+    width: 204.07px;
+    height: 70px;
+}
 .site-footer {
     padding: 0 30px;
 }
@@ -242,7 +256,7 @@ aside .module [class^=module] {
     padding: 50px 0;
 }
 .footer-links > .row {
-    margin-bottom: 20px;
+    margin-bottom: 10px;
 }
 .footer-links .nav-item {
     display: inline;
@@ -387,6 +401,9 @@ aside .module [class^=module] {
         min-height: 50px;
         display: block;
     }
+    .navigation .dropdown:last-child .dropdown-menu {
+        position: static;
+    }
     .login-heading {
         padding-left: 20px;
         margin-bottom: 20px;
@@ -439,9 +456,6 @@ aside .module [class^=module] {
     .footer-links .social-links li {
         margin-right: 0;
     }
-    .navigation .dropdown:last-child .dropdown-menu {
-        position: static;
-    }
     .social-links.col-xs-12 {
         width: 100%;
     }
diff --git a/ckanext/justicehub_theme/templates/footer.html b/ckanext/justicehub_theme/templates/footer.html
index 223b10f..03e01a0 100644
--- a/ckanext/justicehub_theme/templates/footer.html
+++ b/ckanext/justicehub_theme/templates/footer.html
@@ -4,9 +4,22 @@
     {% block footer_content %}
     <div class="row">
 
-        <div class="col col-md-6 col-sm-6 footer-links">
+        <div class="col col-sm-6 footer-links">
             <div class="row hidden-xs">
-                <div class="col col-md-7 col-sm-7 footer-disclaimer">
+                <div class="col col-xs-12">
+                    <i style="font-size: 16px; font-weight: 500;">{{ _('Created by:') }}</i>
+                </div>
+            </div>
+            <div class="hidden-xs">
+                <div class="image-box">
+                    <img class="agami-logo" src="{{ h.url_for_static('/uploads/admin/agami_logo.png')}}"></img>
+                </div>
+                <div class="image-box">
+                    <img class="cdl-logo" src="{{ h.url_for_static('/uploads/admin/cdl_logo.png')}}"></img>
+                </div>
+            </div>
+            <div class="row hidden-xs">
+                <div class="col col-sm-7 footer-disclaimer">
                     <div>
                     This is an Alpha release, we will be working to add more datasets in the coming days to the Justice Hub.
                     </div>
@@ -17,7 +30,7 @@
             </div>
 
             <div class="row hidden-xs">
-                <div class="col col-md-12 col-xs-12">
+                <div class="col col-sm-12 col-xs-12">
                     <ul class="list-unstyled list-inline">
                         {% block footer_links %}
                         <li class="nav-item">
@@ -50,22 +63,21 @@
             </div>
         </div>
 
-        <div class="col col-xs-12 col-md-6 col-sm-6 subscribe-box footer-links">
-
+        <div class="col col-xs-12 col-sm-6 subscribe-box footer-links">
             <div class="row hidden-xs">
-                <div class="col col-md-12 col-sm-12">
+                <div class="col col-sm-12">
                     <div class="footer-intro footer-intro-invert">{{ _('SUBSCRIBE') }}</div>
                 </div>
             </div>
 
             <div class="row">
-                <div class="col col-md-10 col-sm-10 col-xs-12" data-module="justicehub_theme_subscribe">
+                <div class="col col-sm-10 col-xs-12" data-module="justicehub_theme_subscribe">
                     <form id="subscribe-form" method="post" action="{{h.url_for('jhsubscribe')}}">
                     <div class="input-group">
                         <input type="email" class="form-control" placeholder="Enter you email id" name="email">
                         <span class="input-group-btn">
                             <button class="btn btn-default btn-lg hidden-xs" type="submit">{{ _('SUBSCRIBE') }}</button>
-                            <button class="btn visible-xs" type="button">
+                            <button class="btn visible-xs" type="submit">
                                 <i class="fa fa-bell"></i>
                             </button>
                         </span>
@@ -75,13 +87,13 @@
             </div>
 
             <div class="row">
-                <div class="col col-xs-12 col-sm-10 col-md-10 col-lg-10">
+                <div class="col col-xs-12 col-sm-10 col-lg-10">
                     <p class="footer-intro-invert">Be part of our mailing list, to keep up with the latest happenings and events of the Hub.</p>
                 </div>
             </div>
 
             <div class="row visible-xs">
-                <div class="col col-md-12 col-xs-12">
+                <div class="col col-sm-12 col-xs-12">
                     <ul class="list-unstyled">
                         <li class="nav-item">
                             <a href="{{ h.url_for(controller='home', action='about') }}">{{ _('About') }}</a></li>
diff --git a/ckanext/justicehub_theme/templates/home/snippets/search.html b/ckanext/justicehub_theme/templates/home/snippets/search.html
index eb83410..19711d6 100644
--- a/ckanext/justicehub_theme/templates/home/snippets/search.html
+++ b/ckanext/justicehub_theme/templates/home/snippets/search.html
@@ -13,9 +13,9 @@
   <div class="row search-meta">
     <div class="col col-xs-6 col-sm-2 page_primary_action">
       {% if not c.userobj %}
-          {% link_for _('PUBLISH DATA'), named_route='user.login', class_='btn btn-primary' %}
+          {% link_for _('Publish Data'), named_route='user.login', class_='btn btn-primary' %}
       {% else %}
-          {% link_for _('PUBLISH DATA'), controller='package', action='new', named_route='dataset_new', class_='btn btn-primary' %}
+          {% link_for _('Publish Data'), controller='package', action='new', named_route='dataset_new', class_='btn btn-primary' %}
       {% endif %}
     </div>
   </div>

From e716277dd2531ec4874c15c74c28b5c65f099219 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 18 Jun 2020 20:59:26 +0530
Subject: [PATCH 089/127] fix resource created date variable name

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

diff --git a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
index c577214..e7cddb4 100644
--- a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
+++ b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
@@ -17,7 +17,7 @@
 
         <p class="res-meta" style="font-style: italic;">
                 {{ _('Updated:') }}
-                {{ h.justicehub_theme_days_ago(res.last_modified) or h.justicehub_theme_days_ago(res.created) }}
+                {{ h.justicehub_theme_days_ago(res.last_modified) or h.justicehub_theme_days_ago(res.Created) }}
             {% if res.Created %}
             <br>
                 {{ _('Created:') }}

From a9ea5cfe93019f1529b96cb7fcc4bab17fe1e7de Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 18 Jun 2020 21:03:37 +0530
Subject: [PATCH 090/127] fix helper to calculate days ago

---
 ckanext/justicehub_theme/lib/helpers.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/lib/helpers.py b/ckanext/justicehub_theme/lib/helpers.py
index 2665647..f7ebd50 100644
--- a/ckanext/justicehub_theme/lib/helpers.py
+++ b/ckanext/justicehub_theme/lib/helpers.py
@@ -33,7 +33,11 @@ def days_ago(date):
     '''
     Calculates days elapsed for the given date.
     '''
-    date = parse_dates(date)
+    try:
+        date = parse_dates(date)
+    except:
+        return ''
+
     diff = (datetime.today() - date).days
 
     elapsed = '{0} Days ago'.format(diff)

From 4a7f0b26ac25156269f469f8056c4b760150a6be Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 19 Jun 2020 11:12:19 +0530
Subject: [PATCH 091/127] fix organization info.

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

diff --git a/ckanext/justicehub_theme/templates/organization/snippets/helper.html b/ckanext/justicehub_theme/templates/organization/snippets/helper.html
index 1c0911e..68fef97 100644
--- a/ckanext/justicehub_theme/templates/organization/snippets/helper.html
+++ b/ckanext/justicehub_theme/templates/organization/snippets/helper.html
@@ -7,7 +7,7 @@ <h2 class="module-heading">
     <p>
       {% trans %}
        One of the key stakeholders of the Justice Hub,
-       these are organisations and individual
+       these are organisations and individuals
        who help us curate well documented and good quality-data
        that is of trustworthy provenance.
       {% endtrans %}

From b8bf15f5fa2b1df9a586766e8693bd7a27d0fd0d Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 19 Jun 2020 11:44:11 +0530
Subject: [PATCH 092/127] make navtab resources an external link

---
 ckanext/justicehub_theme/templates/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/templates/header.html b/ckanext/justicehub_theme/templates/header.html
index a13b414..bc539d2 100644
--- a/ckanext/justicehub_theme/templates/header.html
+++ b/ckanext/justicehub_theme/templates/header.html
@@ -16,7 +16,7 @@
         {% endblock %}
 
         <li>
-            <a href="https://justicehub.in/resources/">
+            <a href="https://justicehub.in/resources/" target="_blank">
                 {{ _('Resources') }}
             </a>
         </li>

From 83a4b03596831dd8c49cf119683b2f428a052d4f Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 19 Jun 2020 11:53:45 +0530
Subject: [PATCH 093/127] fix footer subscribe box and links

- update input box border color
- adjust space between footer links
---
 ckanext/justicehub_theme/public/common.css           | 1 +
 ckanext/justicehub_theme/public/justicehub_theme.css | 6 +++++-
 ckanext/justicehub_theme/templates/footer.html       | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 7044a24..cb656ff 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -297,6 +297,7 @@ h2.module-heading,
 .module-heading {
     border-bottom-color: #f65940;
 }
+.subscribe-box .input-group .form-control,
 .btn-register:hover,
 .context-info .follow_button .btn:hover {
     border-color: #ffffff;
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 7598c90..9f93366 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -261,13 +261,17 @@ aside .module [class^=module] {
 .footer-links .nav-item {
     display: inline;
 }
+.footer-links .list-inline > li {
+    padding-left: 0.1em;
+    padding-right: 0.2em;
+}
 .footer-disclaimer {
     margin-bottom: 10px;
 }
 .footer-links i.fa-circle.fa-sm {
     font-size: 9px;
     color: #f65940;
-    padding: 10px;
+    padding: 0;
 }
 .subscribe-box {
     padding-right: 60px;
diff --git a/ckanext/justicehub_theme/templates/footer.html b/ckanext/justicehub_theme/templates/footer.html
index 03e01a0..f2023a5 100644
--- a/ckanext/justicehub_theme/templates/footer.html
+++ b/ckanext/justicehub_theme/templates/footer.html
@@ -71,7 +71,7 @@
             </div>
 
             <div class="row">
-                <div class="col col-sm-10 col-xs-12" data-module="justicehub_theme_subscribe">
+                <div class="col col-sm-9 col-xs-12" data-module="justicehub_theme_subscribe">
                     <form id="subscribe-form" method="post" action="{{h.url_for('jhsubscribe')}}">
                     <div class="input-group">
                         <input type="email" class="form-control" placeholder="Enter you email id" name="email">

From 68087d45a5e72ad9ed1e81a2be1bac2bcaa66758 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 19 Jun 2020 12:53:37 +0530
Subject: [PATCH 094/127] minor fixes in partner and dataset pages

---
 .../justicehub_theme/logic/action/action.py    |  5 +++++
 ckanext/justicehub_theme/public/common.css     |  4 ++++
 ckanext/justicehub_theme/public/dataset.css    |  4 +---
 .../public/justicehub_theme.css                |  2 +-
 ckanext/justicehub_theme/templates/header.html |  4 ++--
 .../templates/package/read_base.html           | 18 +++++++++++++-----
 .../templates/snippets/package_item.html       |  4 ++--
 7 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/ckanext/justicehub_theme/logic/action/action.py b/ckanext/justicehub_theme/logic/action/action.py
index 4739d58..4d9b6b3 100644
--- a/ckanext/justicehub_theme/logic/action/action.py
+++ b/ckanext/justicehub_theme/logic/action/action.py
@@ -48,6 +48,11 @@ def get_package_owner_details(context, data_dict):
     # partner, errors = lib_plugins.plugin_validate(
     #     group_plugin, context, partner_dict, schema, 'organization_show'
     # )
+    for item in partner_dict['extras']:
+        if item['state'] == 'active':
+            partner_dict[item['key']] = item['value']
+
+    partner_dict.pop('extras')
     return partner_dict
 
 
diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index cb656ff..325f879 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -236,9 +236,11 @@ body,
 .masthead .navigation .nav-pills li.active a,
 .landing-desc .social-links .fa:hover,
 .footer-links .social-links .fa:hover,
+.composite-control-repeating .btn-success,
 [role="main"] .container .row .col3 {
     background: none;
     background-color: #403644;
+    border-color: #403644;
 }
 .context-info .follow_button .btn,
 .subscribe-box,
@@ -250,6 +252,7 @@ h2.module-heading,
 .member_action .delete,
 .nav-facet .nav-item.active,
 .nav-facet .nav-item.active a,
+.composite-control-repeating .btn-danger,
 .nav-pills .dropdown .dropdown-menu > li a:hover,
 .select2-results .select2-highlighted {
     background: none;
@@ -389,6 +392,7 @@ img.fa-certificate.fa-lg {
     .col2 p,
     .stats-box,
     .content_action a,
+    .dataset-desc,
     .dataset-count-box,
     .resource-item .heading,
     .table thead tr th.table-actions .btn,
diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index edb3e6e..752a6af 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -6,9 +6,6 @@
 .dataset-org {
     margin-bottom: 20px;
 }
-.package-item-row .dataset-desc {
-    margin-top: 20px;
-}
 .dataset-resources {
     margin-top: 0;
 }
@@ -28,6 +25,7 @@ h1+.dataset-meta {
 .dataset-desc {
     width:80%;
     margin-bottom:20px;
+    text-align: justify;
 }
 .row.dataset-meta {
     padding: 10px 0;
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 9f93366..39be25f 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -94,7 +94,7 @@
 /* ----------------------- pre-primary-blocks ----------------- */
 .top-section {
     margin: 0 40px;
-    margin-bottom: 230px;
+    margin-bottom: 200px;
 }
 .context .content_action,
 .nav-tabs .content_action {
diff --git a/ckanext/justicehub_theme/templates/header.html b/ckanext/justicehub_theme/templates/header.html
index bc539d2..7219f7c 100644
--- a/ckanext/justicehub_theme/templates/header.html
+++ b/ckanext/justicehub_theme/templates/header.html
@@ -38,13 +38,13 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Quick Links<b class="caret"></b></a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
                 <li>
-                    <a href="https://justicehub.in/covid-19/">
+                    <a href="https://justicehub.in/covid-19/" target="_blank">
                         {{ _('Covid-19') }}
                         <i class="fa fa-sm fa-external-link"></i>
                     </a>
                 </li>
                 <li>
-                    <a href="https://github.com/justicehub-in">
+                    <a href="https://github.com/justicehub-in" target="_blank">
                         {{ _('Open Source') }}
                         <i class="fa fa-sm fa-external-link"></i>
                     </a>
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index 4dd3c36..db530e8 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -9,7 +9,7 @@
 {% block pre_primary %}
 <div class="top-section">
     <div class="row">
-        <div class="col col-sm-7 col-xs-12">
+        <div class="col col-sm-8 col-xs-12">
             <div class="row">
                 <h1>{{h.dataset_display_name(pkg)}}
                 {% if pkg.private %}
@@ -24,7 +24,7 @@ <h1>{{h.dataset_display_name(pkg)}}
                         <a href="mailto:{{ pkg.maintainer_email }}">{{ pkg.maintainer }}</a>
                     </span>
                 </div>
-                <div class="row col col-sm-8 col-xs-12">
+                <div class="row col col-sm-10 col-xs-12">
                     <p class="dataset-desc"> {{h.get_translated(pkg, 'notes')}}</p>
                 </div>
             </div>
@@ -43,8 +43,8 @@ <h1>{{h.dataset_display_name(pkg)}}
             <div class="row" style="height: 40px;"></div>
         </div>
 
-        <div class="col col-sm-5 col-xs-12 text-center">
-            <div class="col col-sm-8 col-sm-offset-3 org-box image-box">
+        <div class="col col-sm-4 col-xs-12 text-center">
+            <div class="col col-sm-8 org-box image-box">
                 <a href="{{ h.url_for(controller='organization', action='read', id=pkg.organization.id) }}">
                 {% set image_path = h.url_for_static('uploads/group/' + pkg.organization.image_url, qualified=True) %}
                 <img src="{{ image_path or h.url_for_static('/base/images/placeholder-organization.png') }}" alt="{{ pkg.organization.name }}" class="img-responsive media-image" >
@@ -83,6 +83,7 @@ <h1>{{h.dataset_display_name(pkg)}}
             <div class="col col-sm-7 col-xs-12 partner-links social-links">
             <ul class="list-unstyled list-inline">
                 <li>
+                {% if pkg.partner.website %}
                     <a href="{{ pkg.partner.website }}"
                        aria-hidden="true" alt="{{ pkg.organization.name }}'s Website"
                        role="link" title="Official Website"
@@ -90,8 +91,10 @@ <h1>{{h.dataset_display_name(pkg)}}
                        target="_blank">
                         <i class="fa fa-link fa-lg"></i>
                     </a>
+                {% endif %}
                 </li>
                 <li>
+                {% if pkg.partner.email %}
                     <a href="{{ pkg.partner.email }}"
                        aria-hidden="true" alt="{{ pkg.organization.name }}'s Email Address"
                        role="link" title="Email Address"
@@ -99,8 +102,10 @@ <h1>{{h.dataset_display_name(pkg)}}
                        target="_blank">
                     <i class="fa fa-envelope fa-lg"></i>
                     </a>
+                {% endif %}
                 </li>
                 <li>
+                {% if pkg.partner.twitter %}
                     <a href="{{ pkg.partner.twitter }}"
                        aria-hidden="true" alt="{{ pkg.organization.name }}'s Twitter Handle"
                        role="link" title="Official Twitter Handle"
@@ -108,15 +113,18 @@ <h1>{{h.dataset_display_name(pkg)}}
                        target="_blank">
                         <i class="fa fa-twitter fa-lg"></i>
                     </a>
+                {% endif %}
                 </li>
                 <li>
-                    <a href="{{ pkg.partner.twitter }}"
+                {% if pkg.partner.facebook %}
+                    <a href="{{ pkg.partner.facebook }}"
                        aria-hidden="true" alt="{{ pkg.organization.name }}'s Facebook Page"
                        role="link" title="Official Facebook Page"
                        aria-label="{{ pkg.organization.name }}'s Facebook Page"
                        target="_blank">
                         <i class="fa fa-facebook fa-lg"></i>
                     </a>
+                {% endif %}
                 </li>
             </ul>
             </div>
diff --git a/ckanext/justicehub_theme/templates/snippets/package_item.html b/ckanext/justicehub_theme/templates/snippets/package_item.html
index 613d0c0..51bb0f8 100644
--- a/ckanext/justicehub_theme/templates/snippets/package_item.html
+++ b/ckanext/justicehub_theme/templates/snippets/package_item.html
@@ -16,7 +16,7 @@ <h3 class="dataset-title">
                 <i class="fa fa-lock" data-toggle="tooltip"></i>
             {% endif %}
             {% if package.verified %}
-                <img class="fa fa-check" src="{{ h.url_for_static('uploads/admin/verified_icon.png') }}" alt="verified" title="verified"></img>
+                <img class="fa fa-check" src="{{ h.url_for_static('uploads/admin/verified_icon.png') }}" alt="Verified" title="Verified"></img>
             {% endif %}
           {% endblock %}
 
@@ -41,7 +41,7 @@ <h3 class="dataset-title">
               {% if item['key'] == 'signed_pledge' %}
                   {% set signed_pledge = item['value'] %}
                   {% if signed_pledge == 'true' %}
-                    <img class="fa fa-certificate" src="{{ h.url_for_static('uploads/admin/signed_pledge_icon.png') }}" alt="verified" title="verified"></img>
+                    <img class="fa fa-certificate" src="{{ h.url_for_static('uploads/admin/signed_pledge_icon.png') }}" alt="Signed Open Data Pledge" title="Signed Open Data Pledge"></img>
                   {% endif %}
               {% endif %}
               {% endfor %}

From 6d4b69b7526b1d8a6b0af87812849ad98475ed11 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 19 Jun 2020 16:54:00 +0530
Subject: [PATCH 095/127] fix social links for partners

---
 .../templates/organization/read_base.html            | 12 ++++++++++--
 .../templates/package/read_base.html                 |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index 4644465..df005fe 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -56,6 +56,7 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
         <div class="social-links col-md-4 col-sm-4 col-xs-12">
             <ul class="list-unstyled list-inline">
                 <li>
+                {% if c.group_dict.website %}
                     <a href="{{ c.group_dict.website }}"
                        aria-hidden="true" alt="{{ c.group_dict.name }}'s Website"
                        role="link" title="Official Website"
@@ -63,17 +64,21 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
                        target="_blank">
                         <i class="fa fa-link fa-lg"></i>
                     </a>
+                {% endif %}
                 </li>
                 <li>
-                    <a href="{{ c.group_dict.email }}"
+                {% if c.group_dict.email %}
+                    <a href="mailto:{{ c.group_dict.email }}"
                        aria-hidden="true" alt="{{ c.group_dict.name }}'s Email Address"
                        role="link" title="Email Address"
                        aria-label="{{ c.group_dict.name }}'s Email Address"
                        target="_blank">
                     <i class="fa fa-envelope fa-lg"></i>
                     </a>
+                {% endif %}
                 </li>
                 <li>
+                {% if c.group_dict.twitter %}
                     <a href="{{ c.group_dict.twitter }}"
                        aria-hidden="true" alt="{{ c.group_dict.name }}'s Twitter Handle"
                        role="link" title="Official Twitter Handle"
@@ -81,15 +86,18 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
                        target="_blank">
                         <i class="fa fa-twitter fa-lg"></i>
                     </a>
+                {% endif %}
                 </li>
                 <li>
-                    <a href="{{ c.group_dict.twitter }}"
+                {% if c.group_dict.facebook %}
+                    <a href="{{ c.group_dict.facebook }}"
                        aria-hidden="true" alt="{{ c.group_dict.name }}'s Facebook Page"
                        role="link" title="Official Facebook Page"
                        aria-label="{{ c.group_dict.name }}'s Facebook Page"
                        target="_blank">
                         <i class="fa fa-facebook fa-lg"></i>
                     </a>
+                {% endif %}
                 </li>
             </ul>
         </div>
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index db530e8..d779a59 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -95,7 +95,7 @@ <h1>{{h.dataset_display_name(pkg)}}
                 </li>
                 <li>
                 {% if pkg.partner.email %}
-                    <a href="{{ pkg.partner.email }}"
+                    <a href="mailto:{{ pkg.partner.email }}"
                        aria-hidden="true" alt="{{ pkg.organization.name }}'s Email Address"
                        role="link" title="Email Address"
                        aria-label="{{ pkg.organization.name }}'s Email Address"

From c431b9e89a79617da1c63e019331fcac674384b6 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 22 Jun 2020 14:51:43 +0530
Subject: [PATCH 096/127] fix bootstrap nav-tabs

- add javascript module for justicehub_theme
- change page url on clicking a tab
- load specific tab when a url is opened with a tab location
---
 .../fanstatic/justicehub_theme.js             | 26 +++++++++++++++++++
 ckanext/justicehub_theme/templates/base.html  |  1 +
 .../templates/package/read_base.html          |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 ckanext/justicehub_theme/fanstatic/justicehub_theme.js

diff --git a/ckanext/justicehub_theme/fanstatic/justicehub_theme.js b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
new file mode 100644
index 0000000..b5b88a4
--- /dev/null
+++ b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
@@ -0,0 +1,26 @@
+ckan.module('justicehub_theme_tabs', function ($) {
+    return {
+        initialize: function () {
+
+            // change the page location to a tab on first load if the url has a hash.
+            this.onHashChange();
+
+            // on every url hash change, load the relevant tab.
+            window.onhashchange = this.onHashChange;
+
+            // on clicking any tab, change the url hash.
+            $('.nav-tabs li a').on('click', this.onTabClick);
+        },
+
+        onHashChange: function () {
+            // https://stackoverflow.com/a/9393768/3860168
+            hash = window.location.hash;
+            $('.nav-tabs li a[href="'+hash+'"]').tab('show');
+        },
+
+        onTabClick: function () {
+            // https://stackoverflow.com/a/9393768/3860168
+            window.location.hash = this.hash;
+        }
+    };
+});
diff --git a/ckanext/justicehub_theme/templates/base.html b/ckanext/justicehub_theme/templates/base.html
index 92c66f5..69129d1 100644
--- a/ckanext/justicehub_theme/templates/base.html
+++ b/ckanext/justicehub_theme/templates/base.html
@@ -16,4 +16,5 @@
 {%- block scripts %}
   {{ super() }}
   {% resource 'ckanext_issues/autocomplete-action-api.js' %}
+  {% resource 'justicehub_theme/justicehub_theme.js' %}
 {% endblock -%}
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index d779a59..1ae41f0 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -164,7 +164,7 @@ <h2>ACTIVITY</h2>
 
 {% block page_header %}
 <div class="row page-header">
-    <ul class="nav nav-tabs">
+    <ul class="nav nav-tabs" data-module="justicehub_theme_tabs">
         {% block content_primary_nav %}
 
         <li class="active">

From f168a4b56ea061d38892708d583d36e178bb017d Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 22 Jun 2020 17:11:08 +0530
Subject: [PATCH 097/127] enable bootstrap tooltips

---
 .../fanstatic/justicehub_theme.js             |  2 ++
 ckanext/justicehub_theme/public/common.css    |  1 +
 .../templates/package/read_base.html          | 12 ++++++++--
 .../package/snippets/additional_info.html     |  9 ++++---
 .../templates/snippets/package_item.html      | 24 +++++++++----------
 5 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/ckanext/justicehub_theme/fanstatic/justicehub_theme.js b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
index b5b88a4..02523ee 100644
--- a/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
+++ b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
@@ -1,3 +1,5 @@
+$('[data-toggle="tooltip"]').tooltip();
+
 ckan.module('justicehub_theme_tabs', function ($) {
     return {
         initialize: function () {
diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 325f879..69a8dcc 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -8,6 +8,7 @@ body {
 .res-meta {
     font-size: 12px;
 }
+.tooltip,
 .pkg_tags,
 .footer-links .nav-item a {
     font-size: 14px;
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index 1ae41f0..f381b52 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -13,10 +13,18 @@
             <div class="row">
                 <h1>{{h.dataset_display_name(pkg)}}
                 {% if pkg.private %}
-                    <i style="margin-left: 10px;" class="fa fa-lock fa-lg"></i>
+                    <i style="margin-left: 10px;"
+                       class="fa fa-lock fa-lg"
+                       data-toggle="tooltip"
+                       alt="Private Dataset"
+                       title="Private Dataset"></i>
                 {% endif %}
                 {% if pkg.verified %}
-                    <img class="fa fa-check fa-lg" src="{{ h.url_for_static('uploads/admin/verified_icon.png') }}" alt="verified" title="verified"></img>
+                    <img class="fa fa-check fa-lg"
+                         src="{{ h.url_for_static('uploads/admin/verified_icon.png') }}"
+                         data-toggle="tooltip"
+                         alt="Verified"
+                         title="Verified"></img>
                 {% endif %}
                 </h1>
                 <div class="dataset-meta">
diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
index 64115bd..7ecea4d 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/additional_info.html
@@ -28,14 +28,16 @@ <h1 class="page-heading">{{ _('METADATA') }}</h1>
 
 {% block package_additional_info %}
     <dl class="dl-horizontal metadata-list">
-        <dt title="{{ _('Timeline of the data. Start and End dates/years.') }}">
+        <dt data-toggle="tooltip"
+            title="{{ _('Timeline of the data. Start and End dates/years.') }}">
             {{ _('Timeline of Dataset') }}
         </dt>
         <dd>{{ pkg_dict['start_year'] }}-{{ pkg_dict['end_year'] }}</dd>
     </dl>
 
     <dl class="dl-horizontal metadata-list">
-        <dt title="{{ _('What is the geographical scope of this dataset (PAN India, selected states/districts, etc).') }}">
+        <dt data-toggle="tooltip"
+            title="{{ _('What is the geographical scope of this dataset (PAN India, selected states/districts, etc).') }}">
             {{ _('Geography') }}
         </dt>
         <dd>{{ pkg_dict['states'] }}
@@ -49,7 +51,8 @@ <h1 class="page-heading">{{ _('METADATA') }}</h1>
             and pkg_dict[field.field_name] -%}
 
         <dl class="dl-horizontal metadata-list">
-            <dt title="{{field.description}}">
+            <dt data-toggle="tooltip"
+                title="{{field.description}}">
               {{ h.scheming_language_text(field.label) }}
             </dt>
             <dd {% if field.display_property %} property="{{ field.display_property}}"{% endif %}>
diff --git a/ckanext/justicehub_theme/templates/snippets/package_item.html b/ckanext/justicehub_theme/templates/snippets/package_item.html
index 51bb0f8..15ae2b5 100644
--- a/ckanext/justicehub_theme/templates/snippets/package_item.html
+++ b/ckanext/justicehub_theme/templates/snippets/package_item.html
@@ -13,10 +13,14 @@ <h3 class="dataset-title">
 
           {% block heading_private %}
             {% if package.private %}
-                <i class="fa fa-lock" data-toggle="tooltip"></i>
+                <i class="fa fa-lock" data-toggle="tooltip" title="Private Dataset"></i>
             {% endif %}
             {% if package.verified %}
-                <img class="fa fa-check" src="{{ h.url_for_static('uploads/admin/verified_icon.png') }}" alt="Verified" title="Verified"></img>
+                <img class="fa fa-check"
+                     src="{{ h.url_for_static('uploads/admin/verified_icon.png') }}"
+                     data-toggle="tooltip"
+                     alt="Verified"
+                     title="Verified"></img>
             {% endif %}
           {% endblock %}
 
@@ -34,17 +38,13 @@ <h3 class="dataset-title">
           {% block organization %}
           <div class="dataset-org">
               {{ h.link_to(h.truncate(package.organization.title, truncate_title), h.url_for(controller='organization', action='read', id=package.organization.name)) }}
-
-              {# HACK: need to fix #}
-              {% set org_extras = package.partner['extras'] %}
-              {% for item in org_extras %}
-              {% if item['key'] == 'signed_pledge' %}
-                  {% set signed_pledge = item['value'] %}
-                  {% if signed_pledge == 'true' %}
-                    <img class="fa fa-certificate" src="{{ h.url_for_static('uploads/admin/signed_pledge_icon.png') }}" alt="Signed Open Data Pledge" title="Signed Open Data Pledge"></img>
-                  {% endif %}
+              {% if package.partner.signed_pledge %}
+                <img class="fa fa-certificate"
+                     src="{{ h.url_for_static('uploads/admin/signed_pledge_icon.png') }}"
+                     data-toggle="tooltip"
+                     alt="Signed Open Data Pledge"
+                     title="Signed Open Data Pledge"></img>
               {% endif %}
-              {% endfor %}
           </div>
           {% endblock %}
         </div>

From 83421e6d08a08b693dec4fbc274bc7854d5dc9b5 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 22 Jun 2020 19:07:03 +0530
Subject: [PATCH 098/127] update subscribe us module

- move the javascript to theme js module
- use bootstrap popovers to display appropriate messages
---
 .../justicehub_theme/controllers/__init__.py  |  2 +-
 .../controllers/controller.py                 | 24 ++++++----
 .../fanstatic/justicehub_theme.js             | 47 +++++++++++++++++++
 .../justicehub_theme/fanstatic/subscribe.js   | 26 ----------
 .../justicehub_theme/templates/footer.html    | 15 ++++--
 5 files changed, 76 insertions(+), 38 deletions(-)
 delete mode 100644 ckanext/justicehub_theme/fanstatic/subscribe.js

diff --git a/ckanext/justicehub_theme/controllers/__init__.py b/ckanext/justicehub_theme/controllers/__init__.py
index b6b53cd..78d539b 100644
--- a/ckanext/justicehub_theme/controllers/__init__.py
+++ b/ckanext/justicehub_theme/controllers/__init__.py
@@ -1 +1 @@
-from controller import JHOrgController
+from controller import JHOrgController, SubscribeController
diff --git a/ckanext/justicehub_theme/controllers/controller.py b/ckanext/justicehub_theme/controllers/controller.py
index 07ff88c..a27b1a1 100644
--- a/ckanext/justicehub_theme/controllers/controller.py
+++ b/ckanext/justicehub_theme/controllers/controller.py
@@ -1,10 +1,20 @@
+import json
+
 import requests
 from ckanext.justicehub_theme.lib import helpers
+from pylons import config
 
 import ckan.controllers.organization as org
+import ckan.lib.base as base
+import ckan.lib.navl.dictization_functions as dict_fns
 import ckan.lib.plugins as plugins
+import ckan.logic as logic
 import ckan.model as model
-from ckan.common import c
+from ckan.common import c, request
+
+clean_dict = logic.clean_dict
+parse_params = logic.parse_params
+tuplize_dict = logic.tuplize_dict
 
 
 class JHOrgController(org.OrganizationController):
@@ -78,20 +88,18 @@ def subscribe(self):
             "status": "subscribed"
             }
         headers = {
-        'Content-Type': 'application/json',
-        'Authorization': 'Basic '+ basic_auth_key
+            'Content-Type': 'application/json',
+            'Authorization': 'Basic '+ basic_auth_key
         }
 
         response = requests.request("POST", url, headers=headers, data = json.dumps(payload))
 
-        print(response.text.encode('utf8'))
-
         tag_url = mailchimp_base_url + subscriber_list_id + "/segments/" + subscriber_tag_id + "/members"
 
         payload = {
             "email_address": str(request_body.get("email", ""))
-            }
+        }
 
-        response = requests.request("POST", tag_url, headers=headers, data = json.dumps(payload))
+        tag_response = requests.request("POST", tag_url, headers=headers, data = json.dumps(payload))
 
-        print response.text.encode('utf8')
+        return response.text.encode('utf8')
diff --git a/ckanext/justicehub_theme/fanstatic/justicehub_theme.js b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
index 02523ee..b044854 100644
--- a/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
+++ b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
@@ -26,3 +26,50 @@ ckan.module('justicehub_theme_tabs', function ($) {
         }
     };
 });
+
+ckan.module('justicehub_theme_subscribe', function ($) {
+    return {
+        initialize: function () {
+            $('[data-toggle="popover"]').popover();
+
+            function subscribeSubmit(event) {
+                $('[data-toggle="popover"]').popover('hide');
+
+                console.log(event);
+                var url = event.target.action;
+                var request = new XMLHttpRequest();
+
+                request.open('POST', url, true);
+
+                request.onload = function() {
+                    // success
+                    response = JSON.parse(request.response)
+
+                    if (response.errors) {
+                        msg = response.errors[0].message;
+
+                    }
+                    else if (response.status == 400 && response.errors==undefined) {
+                        msg = response.detail.split('. ')[0];
+                    }
+                    else if (response.status == 'subscribed') {
+                        msg = 'Subscribed!';
+                    }
+
+                    console.log(msg);
+                    $('[data-toggle="popover"]').data('bs.popover').options.content=msg;
+                    $('[data-toggle="popover"]').popover('show');
+                };
+
+                request.onerror = function() {
+                    // request failed
+                };
+
+                request.send(new FormData(event.target));
+                event.preventDefault();
+            }
+            console.log("initialized");
+            document.getElementById("subscribe-form").addEventListener("submit", subscribeSubmit);
+        }
+    };
+});
diff --git a/ckanext/justicehub_theme/fanstatic/subscribe.js b/ckanext/justicehub_theme/fanstatic/subscribe.js
deleted file mode 100644
index fade516..0000000
--- a/ckanext/justicehub_theme/fanstatic/subscribe.js
+++ /dev/null
@@ -1,26 +0,0 @@
-ckan.module('justicehub_theme_subscribe', function ($) {
-    return {
-      initialize: function () {
-        function subscribeSubmit(event) {
-            console.log(event);
-            var url = event.target.action;
-            var request = new XMLHttpRequest();
-            request.open('POST', url, true);
-            request.onload = function() { 
-            // success
-              console.log(request.responseText);
-            };
-          
-            request.onerror = function() {
-              // request failed
-            };
-          
-            request.send(new FormData(event.target));
-            event.preventDefault();
-        }
-        console.log("initialized");  
-        document.getElementById("subscribe-form").addEventListener("submit", subscribeSubmit);
-      }
-    };
-  });
-  
\ No newline at end of file
diff --git a/ckanext/justicehub_theme/templates/footer.html b/ckanext/justicehub_theme/templates/footer.html
index f2023a5..4baa809 100644
--- a/ckanext/justicehub_theme/templates/footer.html
+++ b/ckanext/justicehub_theme/templates/footer.html
@@ -1,5 +1,4 @@
 <footer class="site-footer">
-    {% resource "justicehub_theme/subscribe.js"%}
     <div class="container">
     {% block footer_content %}
     <div class="row">
@@ -76,8 +75,18 @@
                     <div class="input-group">
                         <input type="email" class="form-control" placeholder="Enter you email id" name="email">
                         <span class="input-group-btn">
-                            <button class="btn btn-default btn-lg hidden-xs" type="submit">{{ _('SUBSCRIBE') }}</button>
-                            <button class="btn visible-xs" type="submit">
+                            <button class="btn btn-default btn-lg hidden-xs"
+                                    type="submit"
+                                    data-toggle="popover"
+                                    data-placement="top"
+                                    data-trigger="focus">
+                                {{ _('SUBSCRIBE') }}
+                            </button>
+                            <button class="btn visible-xs"
+                                    type="submit"
+                                    data-toggle="popover"
+                                    data-placement="top"
+                                    data-trigger="focus">
                                 <i class="fa fa-bell"></i>
                             </button>
                         </span>

From 1d6a8f9e75f2a3af11ab01b3e44d4790e238a0e9 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 23 Jun 2020 13:17:19 +0530
Subject: [PATCH 099/127] fix organization description display.

---
 .../justicehub_theme/templates/organization/read_base.html    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index df005fe..3085028 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -27,9 +27,9 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
             {% endif %}
         </h1>
         {% block description %}
-        {% if c.group_dict.description %}
+        {% if c.group_dict.notes %}
             <p>
-            {{ h.markdown_extract(c.group_dict.description) }}
+            {{ h.markdown_extract(c.group_dict.notes) }}
             </p>
         {% else %}
             <p class="empty">{{ _('There is no description for this partner') }}</p>

From b1cf7254cd8cf4464276cc29015c245744c8adaf Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 23 Jun 2020 13:53:26 +0530
Subject: [PATCH 100/127] fix markdown description render for dataset and org

---
 ckanext/justicehub_theme/templates/organization/read_base.html | 2 +-
 ckanext/justicehub_theme/templates/package/read_base.html      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index 3085028..18952e1 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -29,7 +29,7 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
         {% block description %}
         {% if c.group_dict.notes %}
             <p>
-            {{ h.markdown_extract(c.group_dict.notes) }}
+            {{ h.render_markdown(c.group_dict.notes) }}
             </p>
         {% else %}
             <p class="empty">{{ _('There is no description for this partner') }}</p>
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index f381b52..74df6bc 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -33,7 +33,7 @@ <h1>{{h.dataset_display_name(pkg)}}
                     </span>
                 </div>
                 <div class="row col col-sm-10 col-xs-12">
-                    <p class="dataset-desc"> {{h.get_translated(pkg, 'notes')}}</p>
+                    <p class="dataset-desc"> {{h.render_markdown(h.get_translated(pkg, 'notes'))}}</p>
                 </div>
             </div>
             <div class="row">

From 50af950def32315c846c3fd6752680cfd47c1f46 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 23 Jun 2020 20:33:39 +0530
Subject: [PATCH 101/127] minor ui fixes

https://docs.google.com/document/d/1R-ftWXQiG77T5FA1UtPh668rsiYiMEhr-UVrDf7lGoI/edit
---
 ckanext/justicehub_theme/public/common.css    |  8 +++--
 ckanext/justicehub_theme/public/dataset.css   |  3 +-
 ckanext/justicehub_theme/public/form.css      |  2 ++
 .../public/justicehub_theme.css               | 36 +++++++++++++++----
 .../justicehub_theme/templates/header.html    | 28 ++++++++-------
 .../templates/package/read_base.html          | 10 +++---
 .../templates/snippets/facet_list.html        | 36 +++++++++++++++++++
 .../templates/snippets/search_form.html       |  2 +-
 .../justicehub_theme/templates/user/new.html  |  2 +-
 .../templates/user/request_reset.html         | 23 ++++++------
 10 files changed, 110 insertions(+), 40 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 69a8dcc..df5608d 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -13,12 +13,14 @@ body {
 .footer-links .nav-item a {
     font-size: 14px;
 }
+.badge,
 .count,
 .sort-box,
 .dataset-meta,
 .control-label,
 .input-group-addon,
 .package-item-row,
+.dataset-desc,
 .rsrc-list-side > li a,
 .dropdown-menu > li > a,
 .footer-links .input-group-btn .btn {
@@ -30,7 +32,6 @@ body {
 .nav-simple .nav-item a,
 .nav-facet .nav-item a,
 .filters .module-content.empty,
-.dataset-desc,
 .downloads,
 .nav-pills li,
 .partner-links.social-links .fa.fa-envelope {
@@ -81,6 +82,7 @@ h1,
 .search-form .search-input.search-giant input {
     font-weight: 300; /* Light */
 }
+.badge,
 .intro-box,
 .landing-desc,
 .resource-item .description,
@@ -102,6 +104,7 @@ h1,
 .stats-box,
 .pkg_tags a,
 .sort-box,
+.dataset-count-box,
 .input-group-addon,
 .col3 h2,
 .stages li,
@@ -143,11 +146,13 @@ a,
 .btn-xs:active:hover,
 .bg-clear.btn,
 .bg-clear.btn:hover,
+.bg-clear.btn:active:focus,
 .fa-certificate,
 .dataset-org > a,
 .activity .item .date,
 .activity .item .actor a,
 .links-list a,
+.page-header .nav-tabs li.active a,
 .footer-disclaimer div:last-child {
     color: #f65940;
 }
@@ -197,7 +202,6 @@ body,
 .footer-links .nav-item > a:hover,
 .btn-register:hover,
 .context-info .follow_button .btn:hover,
-.page-header .nav-tabs li.active a,
 .dropdown-menu > li > a,
 .dropdown-menu > li > a:hover,
 .select2-container-multi .select2-choices > li.select2-search-choice {
diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index 752a6af..5e6c0f9 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -99,7 +99,8 @@ h1+.dataset-meta {
 }
 .metadata-list.dl-horizontal dd {
     display: inline-block;
-    margin-left: 10%;
+    margin-left: 0;
+    width: 70%;
 }
 .metadata-list.dl-horizontal dt {
     width: 30%;
diff --git a/ckanext/justicehub_theme/public/form.css b/ckanext/justicehub_theme/public/form.css
index 6d68bbf..6d26b44 100644
--- a/ckanext/justicehub_theme/public/form.css
+++ b/ckanext/justicehub_theme/public/form.css
@@ -39,6 +39,7 @@
 .btn-xs,
 .btn-xs:hover,
 .bg-clear.btn,
+.bg-clear.btn:active:hover,
 .controls .select2-container,
 .checkbox-other.select2-container {
     border: none;
@@ -52,6 +53,7 @@
 .bg-clear:focus,
 .bg-clear:hover,
 .bg-clear:active:hover,
+.bg-clear:active:focus,
 .bg-clear[disabled]:hover,
 .controls .select2-container > a.select2-choice,
 .checkbox-other.select2-container > .select2-choices {
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 39be25f..4aa9d45 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -23,7 +23,7 @@
     padding-bottom: 0;
 }
 .masthead .navigation .nav-pills > li a {
-    padding: 10px 10px;
+    padding: 10px 15px;
 }
 /* .masthead .navigation .nav-pills > li a {
     line-height: 1;
@@ -39,9 +39,18 @@
 }
 .masthead .navigation .nav-pills > li.active {
     border-bottom: 1.5vh solid #f65940;
+    padding-top: 14px;
 }
-.masthead .navigation .nav-pills > li:not(.dropdown):hover {
+.masthead .navigation .nav-pills > li:hover {
     border-bottom: 1.5vh solid #f65940;
+    padding-top: 14px;
+}
+.navigation .dropdown .dropdown-menu {
+    padding: 0;
+    width: 100%;
+    min-width: 50px;
+    border-radius: 0;
+    border: none;
 }
 .header-image {
     width: 28%;
@@ -55,8 +64,9 @@
     font-size: 8vw;
     margin: 0;
 }
-.logo img {
+.masthead .logo img {
     object-fit: cover;
+    max-height: 50px;
 }
 
 /* -------------------- body layout ----------------------- */
@@ -96,6 +106,12 @@
     margin: 0 40px;
     margin-bottom: 200px;
 }
+.top-section > .row:first-child {
+    margin-bottom: 3%;
+}
+.top-section > .row:nth-child(2) {
+    margin-bottom: 1%;
+}
 .context .content_action,
 .nav-tabs .content_action {
     margin-right: 30px;
@@ -187,7 +203,8 @@
     border-top: 2px solid #f65940;
 }
 .module-shallow .module-content p {
-    padding: 20px 10px;
+    padding: 20px 20px;
+    padding-left: 0;
 }
 .module-shallow .module-content:first-child,
 .module-shallow .module-content:last-child {
@@ -256,11 +273,15 @@ aside .module [class^=module] {
     padding: 50px 0;
 }
 .footer-links > .row {
-    margin-bottom: 10px;
+    margin-top: 15px;
 }
 .footer-links .nav-item {
     display: inline;
 }
+.footer-links .nav-item a {
+    text-underline-offset: 3px;
+    text-decoration-color: #f65940;
+}
 .footer-links .list-inline > li {
     padding-left: 0.1em;
     padding-right: 0.2em;
@@ -287,8 +308,9 @@ aside .module [class^=module] {
     height: 700px;
 }
 .login-sidebar-heading {
-    padding: 50px 70px;
+    padding-top: 50px;
     padding-bottom: 10px;
+    text-align: center;
 }
 .login-sidebar p {
     display: flex;
@@ -297,7 +319,7 @@ aside .module [class^=module] {
 }
 .login-heading {
     border-bottom: 1px solid #f65940;
-    padding: 0 50px;
+    padding: 0 80px;
     margin-bottom: -1.5px;
 }
 
diff --git a/ckanext/justicehub_theme/templates/header.html b/ckanext/justicehub_theme/templates/header.html
index 7219f7c..b7d2996 100644
--- a/ckanext/justicehub_theme/templates/header.html
+++ b/ckanext/justicehub_theme/templates/header.html
@@ -20,20 +20,7 @@
                 {{ _('Resources') }}
             </a>
         </li>
-        {% if not c.userobj %}
-          {% block header_account_notlogged %}
-          <li>{% link_for _('Log in'), named_route='user.login' %}</li>
-          {% endblock %}
 
-        {% else %}
-          {% block header_account_log_out_link %}
-          <li>
-              <a href="{{ h.url_for('/user/_logout') }}" title="{{ _('Log out') }}">
-                  <span class="text">{{ _('Log out') }}</span>
-              </a>
-          </li>
-          {% endblock %}
-        {% endif %}
         <li class="dropdown">
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">Quick Links<b class="caret"></b></a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
@@ -51,6 +38,21 @@
                 </li>
             </ul>
         </li>
+
+        {% if not c.userobj %}
+          {% block header_account_notlogged %}
+          <li>{% link_for _('Log in'), named_route='user.login' %}</li>
+          {% endblock %}
+
+        {% else %}
+          {% block header_account_log_out_link %}
+          <li>
+              <a href="{{ h.url_for('/user/_logout') }}" title="{{ _('Log out') }}">
+                  <span class="text">{{ _('Log out') }}</span>
+              </a>
+          </li>
+          {% endblock %}
+        {% endif %}
     </ul>
     </nav>
 {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index 74df6bc..745513b 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -32,8 +32,11 @@ <h1>{{h.dataset_display_name(pkg)}}
                         <a href="mailto:{{ pkg.maintainer_email }}">{{ pkg.maintainer }}</a>
                     </span>
                 </div>
+                <div class="dataset-meta">
+                    <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
+                </div>
                 <div class="row col col-sm-10 col-xs-12">
-                    <p class="dataset-desc"> {{h.render_markdown(h.get_translated(pkg, 'notes'))}}</p>
+                    <div class="dataset-desc"> {{h.render_markdown(h.get_translated(pkg, 'notes'))}}</div>
                 </div>
             </div>
             <div class="row">
@@ -45,9 +48,6 @@ <h1>{{h.dataset_display_name(pkg)}}
                 {% endfor %}
                 </div>
             </div>
-            <div class="row dataset-meta">
-                <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
-            </div>
             <div class="row" style="height: 40px;"></div>
         </div>
 
@@ -76,7 +76,7 @@ <h1>{{h.dataset_display_name(pkg)}}
                 <span>{{ _('Views') }}</span>
             </span>
             <span class="hidden-xs" style="float: left;">{{ _('|') }}</span>
-            <span class="col-xs-5 col-sm-4">
+            <span class="col-xs-5 col-sm-5">
                 <span>{{ _('Updated ') }}{{ h.justicehub_theme_days_ago(pkg.last_updated) }}</span>
             </span>
         </div>
diff --git a/ckanext/justicehub_theme/templates/snippets/facet_list.html b/ckanext/justicehub_theme/templates/snippets/facet_list.html
index 9712e85..ff61735 100644
--- a/ckanext/justicehub_theme/templates/snippets/facet_list.html
+++ b/ckanext/justicehub_theme/templates/snippets/facet_list.html
@@ -6,3 +6,39 @@ <h1 class="module-heading">
   {{ title | upper }}
 </h1>
 {% endblock %}
+
+{% block facet_list_items %}
+    {% with items = items or h.get_facet_items_dict(name) %}
+    {% if items %}
+    <nav>
+        <ul class="{{ nav_class or 'list-unstyled nav nav-simple nav-facet' }}">
+            {% for item in items %}
+            {% set href = h.remove_url_param(name, item.name, extras=extras, alternative_url=alternative_url) if item.active else h.add_url_param(new_params={name: item.name}, extras=extras, alternative_url=alternative_url) %}
+            {% set label = label_function(item) if label_function else item.display_name %}
+            {% set label_truncated = h.truncate(label, 22) if not label_function else label %}
+            {% set count = count_label(item['count']) if count_label else ('%d' % item['count']) %}
+            <li class="{{ nav_item_class or 'nav-item' }}{% if item.active %} active{% endif %}">
+                <a href="{{ href }}" title="{{ label if label != label_truncated else '' }}">
+                    <span class="item-label">{{ label_truncated }}</span>
+                    <span class="hidden separator"> - </span>
+                    <span class="item-count">({{ count }})</span>
+                </a>
+            </li>
+            {% endfor %}
+        </ul>
+    </nav>
+
+        <p class="module-footer">
+        {% if h.get_param_int('_%s_limit' % name) %}
+            {% if h.has_more_facets(name) %}
+            <a href="{{ h.remove_url_param('_%s_limit' % name, replace=0, extras=extras, alternative_url=alternative_url) }}" class="read-more">{{ _('Show More {facet_type}').format(facet_type=title) }}</a>
+            {% endif %}
+        {% else %}
+            <a href="{{ h.remove_url_param('_%s_limit' % name, extras=extras, alternative_url=alternative_url) }}" class="read-more">{{ _('Show Only Popular {facet_type}').format(facet_type=title) }}</a>
+        {% endif %}
+        </p>
+    {% else %}
+      <p class="module-content empty">{{ _('There are no {facet_type} that match this search').format(facet_type=title) }}</p>
+    {% endif %}
+    {% endwith %}
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/snippets/search_form.html b/ckanext/justicehub_theme/templates/snippets/search_form.html
index 3b0f140..1f16a2d 100644
--- a/ckanext/justicehub_theme/templates/snippets/search_form.html
+++ b/ckanext/justicehub_theme/templates/snippets/search_form.html
@@ -28,7 +28,7 @@
 {% block search_sortby %}
 {% if sorting %}
   <div class="col col-md-3 col-xs-7 input-group pull-right">
-    <span class="input-group-addon square-border bg-clear">{{ _('SORT BY') }}</span>
+    <span class="input-group-addon square-border bg-clear">{{ _('SORT BY:') }}</span>
     <select id="field-order-by" name="sort" class="form-control input-lg square-border sort-box">
       {% for label, value in sorting %}
         {% if label and value %}
diff --git a/ckanext/justicehub_theme/templates/user/new.html b/ckanext/justicehub_theme/templates/user/new.html
index eb60ecb..3a22b4c 100644
--- a/ckanext/justicehub_theme/templates/user/new.html
+++ b/ckanext/justicehub_theme/templates/user/new.html
@@ -22,7 +22,7 @@ <h1>{% block page_heading %}{{ _('REGISTER') }}{% endblock %}</h1>
 
 {% block secondary_content %}
   {% block help %}
-  <section class="login-sidebar">
+  <section class="module module-narrow module-shallow login-sidebar">
     {% block help_inner %}
     <h2 class="login-sidebar-heading">{{ _('Why Sign Up?') }}</h2>
     <div class="module-content">
diff --git a/ckanext/justicehub_theme/templates/user/request_reset.html b/ckanext/justicehub_theme/templates/user/request_reset.html
index dd25b78..ba731fd 100644
--- a/ckanext/justicehub_theme/templates/user/request_reset.html
+++ b/ckanext/justicehub_theme/templates/user/request_reset.html
@@ -1,21 +1,24 @@
-{% extends "page.html" %}
+{% ckan_extends %}
 
-{% block subtitle %}{{ _('Reset your password') }}{% endblock %}
-
-{% block breadcrumb_content %}
-  <li class="active">{% link_for _('Password Reset'), named_route='user.request_reset' %}</li>
+{% block pre_primary %}
+  <div class="row">
+      <div class="col col-md-3">
+      </div>
+      <div class="col col-md-9 login-heading">
+          <h1>{% block page_heading %}{{ _('RESET YOUR PASSWORD') }}{% endblock %}</h1>
+      </div>
+  </div>
 {% endblock %}
 
 {% block primary_content %}
   <article class="module">
     <div class="module-content">
       {% block primary_content_inner %}
-      <h1 class="page-heading">{{ _('Reset your password') }}</h1>
       {% block form %}
-        <form action="" method="post">
+        <form action="" method="post" class="login-form">
             <div class="controls">
                 <div class="form-group">
-                    <label for="field-username">{{ _('Username') }}</label>
+                    <label class="control-label" for="field-username">{{ _('Username') }}</label>
                     <input id="field-username" class="control-medium form-control" name="user" value="" type="text" />
                 </div>
             </div>
@@ -33,9 +36,9 @@ <h1 class="page-heading">{{ _('Reset your password') }}</h1>
 
 {% block secondary_content %}
   {% block help %}
-  <section class="module module-narrow module-shallow">
+  <section class="module module-narrow module-shallow login-sidebar">
     {% block help_inner %}
-    <h2 class="module-heading">{{ _('How does this work?') }}</h2>
+    <h2 class="login-sidebar-heading">{{ _('How does this work?') }}</h2>
     <div class="module-content">
       <p>{% trans %}Enter your username into the box and we will send you
       an email with a link to enter a new password.{% endtrans %}</p>

From f5a76ede0653a2f839f7a04af3d7d7da3353da78 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 23 Jun 2020 20:34:06 +0530
Subject: [PATCH 102/127] add counting animation on landing page

---
 .../justicehub_theme/fanstatic/justicehub_theme.js   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/ckanext/justicehub_theme/fanstatic/justicehub_theme.js b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
index b044854..fdb6525 100644
--- a/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
+++ b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
@@ -1,5 +1,17 @@
 $('[data-toggle="tooltip"]').tooltip();
 
+// https://stackoverflow.com/a/23006629/3860168
+$('.stats-big').each(function () {
+    var $this = $(this);
+    $({ value: 0 }).animate({ Counter: $this.text() }, {
+    duration: 500, /* NOTE: this duration should later be increased if the count goes up. */
+    easing: 'swing',
+    step: function () {
+      $this.text(Math.ceil(this.Counter));
+    }
+  });
+});
+
 ckan.module('justicehub_theme_tabs', function ($) {
     return {
         initialize: function () {

From 3c531a7ba1f69b0ff67d0bc89c07d739c2718c99 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 23 Jun 2020 20:34:28 +0530
Subject: [PATCH 103/127] style subscribe message popover

---
 .../fanstatic/justicehub_theme.js             |  5 ++++-
 ckanext/justicehub_theme/public/common.css    | 20 +++++++++++++++++++
 .../public/justicehub_theme.css               | 13 ++++++++++++
 .../justicehub_theme/templates/footer.html    |  2 ++
 4 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/fanstatic/justicehub_theme.js b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
index fdb6525..21eeb15 100644
--- a/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
+++ b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
@@ -59,13 +59,16 @@ ckan.module('justicehub_theme_subscribe', function ($) {
 
                     if (response.errors) {
                         msg = response.errors[0].message;
+                        msg = "<i class='fa fa-times subscribe-error'></i> " + msg;
 
                     }
                     else if (response.status == 400 && response.errors==undefined) {
                         msg = response.detail.split('. ')[0];
+                        msg = "<i class='fa fa-times subscribe-error'></i> " + msg;
                     }
                     else if (response.status == 'subscribed') {
-                        msg = 'Subscribed!';
+                        msg = "You've been successfully Subscribed!";
+                        msg = "<i class='fa fa-check subscribe-success'></i> " + msg;
                     }
 
                     console.log(msg);
diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index df5608d..5705608 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -1,5 +1,6 @@
 /* ---------------------- Site Fonts ------------------- */
 .radios label,
+.popover .popover-content,
 .footer-links .input-group input,
 body {
     font-family: 'Montserrat', sans-serif;
@@ -10,6 +11,7 @@ body {
 }
 .tooltip,
 .pkg_tags,
+.popover .popover-content,
 .footer-links .nav-item a {
     font-size: 14px;
 }
@@ -115,6 +117,7 @@ h1,
 .content_action a,
 .dataset-title,
 .module-heading,
+.popover .popover-content,
 .intro-box span:nth-child(2),
 .footer-links .input-group-btn .btn {
     font-weight: 700; /* Bold */
@@ -152,6 +155,7 @@ a,
 .activity .item .date,
 .activity .item .actor a,
 .links-list a,
+.subscribe-error,
 .page-header .nav-tabs li.active a,
 .footer-disclaimer div:last-child {
     color: #f65940;
@@ -166,6 +170,9 @@ a,
 .dataset-meta {
     color: #707070;
 }
+.subscribe-success {
+    color: #10c6a0;
+}
 body,
 .stats-box,
 .res-title a,
@@ -183,6 +190,7 @@ body,
 .stages li.complete .highlight {
     color: #403644;
 }
+.popover .popover-content,
 .context-info .nums dl,
 .homepage .col3,
 .secondary,
@@ -223,6 +231,7 @@ body,
 .account-masthead,
 .nav-facet,
 .sidebar,
+.popover,
 .dropdown-menu,
 [class^="btn btn-"],
 .nav-tabs .content_action a,
@@ -369,6 +378,17 @@ img.fa-certificate.fa-lg {
 .dropdown-toggle .caret {
     width: 10px;
 }
+.subscribe-error,
+.subscribe-success {
+    font-size: 26px;
+    width: 35px;
+    height: 35px;
+    border-radius: 50%;
+    text-align: center;
+    background-color: #ffffff;
+    padding: 3px;
+    margin-right: 10px;
+}
 
 /* --------------------- stats ------------------------- */
 .stats-box {
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 4aa9d45..6787ebb 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -301,6 +301,19 @@ aside .module [class^=module] {
 .subscribe-box .btn.btn-default {
     padding: 10px 25px;
 }
+.popover {
+    border-radius: 0;
+    box-shadow: 5px 5px 1px #403644;
+    max-width: 400px;
+    width: 350px;
+}
+.popover .popover-content {
+    display: flex;
+    align-items: center;
+}
+.popover > .arrow {
+    display: none;
+}
 
 /* ------------------------------- Login ------------------------- */
 .login-sidebar {
diff --git a/ckanext/justicehub_theme/templates/footer.html b/ckanext/justicehub_theme/templates/footer.html
index 4baa809..263edf6 100644
--- a/ckanext/justicehub_theme/templates/footer.html
+++ b/ckanext/justicehub_theme/templates/footer.html
@@ -79,6 +79,7 @@
                                     type="submit"
                                     data-toggle="popover"
                                     data-placement="top"
+                                    data-html=true
                                     data-trigger="focus">
                                 {{ _('SUBSCRIBE') }}
                             </button>
@@ -86,6 +87,7 @@
                                     type="submit"
                                     data-toggle="popover"
                                     data-placement="top"
+                                    data-html=true
                                     data-trigger="focus">
                                 <i class="fa fa-bell"></i>
                             </button>

From 6ccf80d1e1ce072d386e492c88a91094c7e2892b Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 24 Jun 2020 12:48:13 +0530
Subject: [PATCH 104/127] minor ui fixes

---
 ckanext/justicehub_theme/public/common.css    | 25 ++++++++++++-----
 ckanext/justicehub_theme/public/dataset.css   |  3 +++
 .../public/justicehub_theme.css               | 10 +++----
 ckanext/justicehub_theme/public/partner.css   |  7 +++++
 ckanext/justicehub_theme/public/resource.css  | 11 ++++++++
 .../templates/package/resource_read.html      | 27 +++++++++++++++----
 .../package/snippets/resource_item.html       | 10 ++++++-
 7 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 5705608..f31c267 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -6,9 +6,7 @@ body {
     font-family: 'Montserrat', sans-serif;
     font-weight: 400; /* Regular */
 }
-.res-meta {
-    font-size: 12px;
-}
+.res-meta,
 .tooltip,
 .pkg_tags,
 .popover .popover-content,
@@ -156,7 +154,7 @@ a,
 .activity .item .actor a,
 .links-list a,
 .subscribe-error,
-.page-header .nav-tabs li.active a,
+.footer-links .nav-item > a:hover,
 .footer-disclaimer div:last-child {
     color: #f65940;
 }
@@ -207,11 +205,14 @@ body,
 .nav-facet .nav-item > a,
 .member_action .delete,
 .footer-links .nav-item > a,
-.footer-links .nav-item > a:hover,
 .btn-register:hover,
 .context-info .follow_button .btn:hover,
 .dropdown-menu > li > a,
 .dropdown-menu > li > a:hover,
+.nav-tabs-plain li.active a:hover,
+.page-header .nav-tabs li a:hover,
+.nav-tabs-plain li.active a,
+.page-header .nav-tabs li.active a,
 .select2-container-multi .select2-choices > li.select2-search-choice {
     color: #ffffff;
 }
@@ -233,11 +234,12 @@ body,
 .sidebar,
 .popover,
 .dropdown-menu,
+.dropdown-menu > li a,
 [class^="btn btn-"],
 .nav-tabs .content_action a,
-.res-actions a,
 .stages li.active .highlight,
 .metadata-heading,
+.nav-tabs-plain li.active a,
 .page-header .nav-tabs li.active a,
 .filters .module-heading,
 .filters .module-content.empty,
@@ -267,7 +269,9 @@ h2.module-heading,
 .nav-facet .nav-item.active,
 .nav-facet .nav-item.active a,
 .composite-control-repeating .btn-danger,
-.nav-pills .dropdown .dropdown-menu > li a:hover,
+.dropdown-menu > li a:hover,
+.nav-tabs-plain li.active a:hover,
+.page-header .nav-tabs li a:hover,
 .select2-results .select2-highlighted {
     background: none;
     background-color: #f65940;
@@ -322,6 +326,10 @@ h2.module-heading,
 .subscribe-box .btn.btn-default:hover {
     border-color: #f65940;
 }
+.nav-tabs-plain,
+.page-header .nav-tabs {
+    border-bottom: 2px solid #f65940;
+}
 
 /* ---------------------- social links ------------------ */
 /* https://www.w3schools.com/howto/howto_css_social_media_buttons.asp */
@@ -450,4 +458,7 @@ img.fa-certificate.fa-lg {
     .footer-intro {
         font-size: 18px;
     }
+    .page-header .nav-tabs {
+        border-bottom: none;
+    }
 }
diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index 5e6c0f9..cf0968c 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -14,6 +14,9 @@
 h1+.dataset-meta {
     margin-bottom: 30px;
 }
+.dataset-meta {
+    margin-bottom: 10px;
+}
 .resource-list {
     margin-top: 20px;
 }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 6787ebb..3d1d249 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -39,11 +39,11 @@
 }
 .masthead .navigation .nav-pills > li.active {
     border-bottom: 1.5vh solid #f65940;
-    padding-top: 14px;
+    padding-top: 8px;
 }
 .masthead .navigation .nav-pills > li:hover {
     border-bottom: 1.5vh solid #f65940;
-    padding-top: 14px;
+    padding-top: 8px;
 }
 .navigation .dropdown .dropdown-menu {
     padding: 0;
@@ -139,6 +139,7 @@
 [class^="btn btn-"]:hover,
 [class^="btn btn-"]:active,
 [class^="btn btn-"]:focus,
+.open > .dropdown-toggle.btn,
 .bg-clear:active:hover,
 .res-actions a:hover,
 .content_action a:hover {
@@ -165,7 +166,6 @@
 }
 .page-header .nav-tabs {
     width: 100%;
-    border-bottom: 2px solid #f65940;
     margin-top: -55px;
 }
 .page-header .nav-tabs li a {
@@ -279,8 +279,7 @@ aside .module [class^=module] {
     display: inline;
 }
 .footer-links .nav-item a {
-    text-underline-offset: 3px;
-    text-decoration-color: #f65940;
+    text-decoration: none;
 }
 .footer-links .list-inline > li {
     padding-left: 0.1em;
@@ -423,7 +422,6 @@ aside .module [class^=module] {
     }
     .page-header .nav-tabs {
         margin-top: 50px;
-        border-bottom: none;
     }
     .toolbar .breadcrumb,
     .toolbar .breadcrumb a {
diff --git a/ckanext/justicehub_theme/public/partner.css b/ckanext/justicehub_theme/public/partner.css
index fa96454..3b8afe0 100644
--- a/ckanext/justicehub_theme/public/partner.css
+++ b/ckanext/justicehub_theme/public/partner.css
@@ -20,6 +20,13 @@
     width: 31px;
     height: 31px;
 }
+.partner-links.social-links .fa-twitter {
+    padding-left: 6px;
+}
+.partner-links.social-links .fa-facebook {
+    padding-top: 13px;
+    padding-left: 4px;
+}
 .partner-logo {
     height: 200px;
 }
diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index a6b5a4c..667c5f9 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -12,3 +12,14 @@
     margin-top: 20px;
     margin-bottom: 50px;
 }
+.res-actions .dropdown-menu {
+    padding: 0;
+    width: 100%;
+    min-width: 50px;
+    border: none;
+    margin: 0;
+}
+.res-actions .dropdown-menu a {
+    border-radius: 0;
+    margin-top: 0;
+}
diff --git a/ckanext/justicehub_theme/templates/package/resource_read.html b/ckanext/justicehub_theme/templates/package/resource_read.html
index 0c50eac..b34eec7 100644
--- a/ckanext/justicehub_theme/templates/package/resource_read.html
+++ b/ckanext/justicehub_theme/templates/package/resource_read.html
@@ -16,6 +16,10 @@ <h1>{{ h.resource_display_name(res) | truncate(50) }}</h1>
             {{ h.justicehub_theme_days_ago(res.last_modified) or h.justicehub_theme_days_ago(res.created) or _('unknown') }}
         </div>
 
+        <div class="dataset-meta">
+            <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
+        </div>
+
         <div class="prose notes resource-desc" property="rdfs:label">
             {% if res.description %}
               {{ h.render_markdown(res.description) }}
@@ -33,10 +37,6 @@ <h3>{{ _('From the dataset abstract') }}</h3>
             {% endif %}
         </div>
 
-        <div class="dataset-meta">
-            <a href="{{ pkg.license_url }}">{{ pkg.license_title }}</a>
-        </div>
-
         {% block resource_read_url %}
             {% if res.url and h.is_url(res.url) %}
               <p class="text-muted ellipsis res-title dataset-meta">
@@ -86,10 +86,27 @@ <h3>{{ _('From the dataset abstract') }}</h3>
 		          {% else %}
                       {{ _('DOWNLOAD') }}
 		          {% endif %}
+
 		        </a>
+                {%if res.datastore_active %}
+                    <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
+                        <span class="caret"></span>
+                    </a>
+                    <ul class="dropdown-menu">
+                        <li>
+                            <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, bom=True) }}"
+                                 target="_blank"><span>CSV</span></a>
+                             <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='tsv', bom=True) }}"
+                                 target="_blank"><span>TSV</span></a>
+                             <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='json') }}"
+                                 target="_blank"><span>JSON</span></a>
+                             <a href="{{ h.url_for(controller='ckanext.datastore.controller:DatastoreController', action='dump', resource_id=res.id, format='xml') }}"
+                                 target="_blank"><span>XML</span></a>
+                         </li>
+                     </ul>
+                {%endif%}
 
 		        {% block download_resource_button %}
-                    {{ super() }}
                 {% endblock %}
 		        </div>
 		      </li>
diff --git a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
index e7cddb4..fcc3fb5 100644
--- a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
+++ b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
@@ -15,7 +15,7 @@
             </p>
         {% endif %}
 
-        <p class="res-meta" style="font-style: italic;">
+        <p class="res-meta">
                 {{ _('Updated:') }}
                 {{ h.justicehub_theme_days_ago(res.last_modified) or h.justicehub_theme_days_ago(res.Created) }}
             {% if res.Created %}
@@ -27,6 +27,14 @@
   </a>
 {% endblock %}
 
+{% block resource_item_description %}
+    <p class="description res-meta">
+      {% if res.description %}
+        {{ h.markdown_extract(h.get_translated(res, 'description'), extract_length=80) }}
+      {% endif %}
+    </p>
+{% endblock %}
+
 {% block resource_item_explore %}
 {% if not url_is_edit %}
   <div class="dropdown btn-group">

From 23902b4e254347a8618e98e8f27019b416074dc5 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 25 Jun 2020 11:18:10 +0530
Subject: [PATCH 105/127] add website links to footer logos for agami and cdl

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

diff --git a/ckanext/justicehub_theme/templates/footer.html b/ckanext/justicehub_theme/templates/footer.html
index 263edf6..9b97de8 100644
--- a/ckanext/justicehub_theme/templates/footer.html
+++ b/ckanext/justicehub_theme/templates/footer.html
@@ -11,10 +11,14 @@
             </div>
             <div class="hidden-xs">
                 <div class="image-box">
+                    <a href="https://agami.in/" target="_blank">
                     <img class="agami-logo" src="{{ h.url_for_static('/uploads/admin/agami_logo.png')}}"></img>
+                    </a>
                 </div>
                 <div class="image-box">
+                    <a href="https://www.civicdatalab.in/" target="_blank">
                     <img class="cdl-logo" src="{{ h.url_for_static('/uploads/admin/cdl_logo.png')}}"></img>
+                    </a>
                 </div>
             </div>
             <div class="row hidden-xs">

From 9076d214516026e6e3345018d02ef9d2e8d695db Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 25 Jun 2020 11:40:20 +0530
Subject: [PATCH 106/127] fix variable missing error on resource edit

---
 .../templates/package/resource_edit_base.html               | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/package/resource_edit_base.html b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
index a2af5d4..0faff2c 100644
--- a/ckanext/justicehub_theme/templates/package/resource_edit_base.html
+++ b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
@@ -31,9 +31,9 @@
       {% if res %}
         {% link_for _('VIEW'), controller='package', action='resource_read', id=pkg.name, resource_id=res.id, class_='btn btn-default' %}
       {% endif %}
-      {% if data.id %}
-        {% if h.check_access('resource_delete', {'id': data.id})  %}
-          <a class="btn btn-danger" href="{% url_for controller='package', action='resource_delete', resource_id=data.id, id=pkg.name %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this resource?') }}">{% block delete_button_text %}{{ _('DELETE') }}{% endblock %}</a>
+      {% if res.id %}
+        {% if h.check_access('resource_delete', {'id': res.id})  %}
+          <a class="btn btn-danger" href="{% url_for controller='package', action='resource_delete', resource_id=res.id, id=pkg.name %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this resource?') }}">{% block delete_button_text %}{{ _('DELETE') }}{% endblock %}</a>
         {% endif %}
       {% endif %}
   </div>

From ac8ae002e3318a9109532c242b42e7f500c8aaa8 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 25 Jun 2020 12:04:29 +0530
Subject: [PATCH 107/127] hide data api button on resource page

---
 ckanext/justicehub_theme/public/resource.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index 667c5f9..7d50297 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -23,3 +23,7 @@
     border-radius: 0;
     margin-top: 0;
 }
+/* NOTE: hiding for Alpha */
+.res-actions ul > li a[data-module=api-info] {
+    display: none;
+}

From b61f82bfefae2a92efa68ffa5355a287fc8a8ca6 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 25 Jun 2020 12:30:52 +0530
Subject: [PATCH 108/127] update social buttons on resource page

---
 ckanext/justicehub_theme/public/resource.css  |  1 +
 .../templates/package/resource_read.html      |  6 ++--
 .../templates/snippets/social.html            | 32 ++++++++++++-------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index 7d50297..f762500 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -8,6 +8,7 @@
     padding-left: 0 !important;
     border-bottom: none;
 }
+.res-social,
 .res-actions {
     margin-top: 20px;
     margin-bottom: 50px;
diff --git a/ckanext/justicehub_theme/templates/package/resource_read.html b/ckanext/justicehub_theme/templates/package/resource_read.html
index b34eec7..ba08ec6 100644
--- a/ckanext/justicehub_theme/templates/package/resource_read.html
+++ b/ckanext/justicehub_theme/templates/package/resource_read.html
@@ -60,9 +60,6 @@ <h3>{{ _('From the dataset abstract') }}</h3>
 
         </div>
 
-        <div class="col col-sm-3 col-sm-offset-3 col-xs-12">
-            {% snippet "snippets/social.html" %}
-        </div>
     </div>
     <div class="row">
 		<div class="res-actions col-sm-6 col-xs-12">
@@ -115,6 +112,9 @@ <h3>{{ _('From the dataset abstract') }}</h3>
 		  </ul>
 		  {% endblock %}
 		</div>
+        <div class="col col-sm-3 col-sm-offset-3 col-xs-12 res-social">
+            {% snippet "snippets/social.html" %}
+        </div>
     </div>
     {% endblock %}
 
diff --git a/ckanext/justicehub_theme/templates/snippets/social.html b/ckanext/justicehub_theme/templates/snippets/social.html
index 00163d5..f31407f 100644
--- a/ckanext/justicehub_theme/templates/snippets/social.html
+++ b/ckanext/justicehub_theme/templates/snippets/social.html
@@ -1,16 +1,24 @@
 {% set current_url = h.full_current_url() %}
 {% block social %}
-  <section class="module module-narrow social">
-    {% block social_title %}
-      <h2 class="module-heading social-heading"> {{ _('Share on') }}</h2>
-    {% endblock %}
-    {% block social_nav %}
-    <div class="social-links">
-      <ul class="list-unstyled list-inline">
-        <li><a href="https://twitter.com/share?url={{ current_url }}" target="_blank"><i class="fa fa-twitter fa-lg"></i></a></li>
-        <li><a href="https://www.facebook.com/sharer.php?u={{ current_url }}" target="_blank"><i class="fa fa-facebook fa-lg"></i></a></li>
-      </ul>
+    <div class="partner-links social-links">
+        {% block social_nav %}
+        <ul class="list-unstyled list-inline">
+            <li>
+            {% block social_title %}
+                <span class="social-heading"> {{ _('Share on') }}</span>
+            {% endblock %}
+            </li>
+            <li>
+                <a href="https://twitter.com/share?url={{ current_url }}" target="_blank">
+                    <i class="fa fa-twitter fa-lg"></i>
+                </a>
+            </li>
+            <li>
+                <a href="https://www.facebook.com/sharer.php?u={{ current_url }}" target="_blank">
+                    <i class="fa fa-facebook fa-lg"></i>
+                </a>
+            </li>
+        </ul>
+        {% endblock %}
     </div>
-    {% endblock %}
-  </section>
 {% endblock %}

From 8eb372db41e45ca3df7659b6f2b82d9e2eb95949 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 26 Jun 2020 16:41:07 +0530
Subject: [PATCH 109/127] update header

- fixed logo size
- fixed hover issues
---
 ckanext/justicehub_theme/public/common.css          | 13 +++++++------
 .../justicehub_theme/public/justicehub_theme.css    | 10 +++++-----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index f31c267..271e3cc 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -234,7 +234,6 @@ body,
 .sidebar,
 .popover,
 .dropdown-menu,
-.dropdown-menu > li a,
 [class^="btn btn-"],
 .nav-tabs .content_action a,
 .stages li.active .highlight,
@@ -246,10 +245,12 @@ body,
 .footer-links .input-group-btn .btn,
 .btn-register:hover,
 .context-info .follow_button .btn:hover,
-.masthead .navigation .nav-pills li a:hover,
-.masthead .navigation .nav-pills li a:active,
-.masthead .navigation .nav-pills li a:focus,
-.masthead .navigation .nav-pills li.active a,
+.dropdown-menu > li a,
+.masthead .navigation .nav-pills > li > a:hover,
+.masthead .navigation .nav-pills > li > a:active,
+.masthead .navigation .nav-pills > li > a:focus,
+.masthead .navigation .nav-pills > li.active > a,
+.navigation .open a.dropdown-toggle,
 .landing-desc .social-links .fa:hover,
 .footer-links .social-links .fa:hover,
 .composite-control-repeating .btn-success,
@@ -269,7 +270,7 @@ h2.module-heading,
 .nav-facet .nav-item.active,
 .nav-facet .nav-item.active a,
 .composite-control-repeating .btn-danger,
-.dropdown-menu > li a:hover,
+.masthead .navigation .nav-pills .dropdown-menu > li a:hover,
 .nav-tabs-plain li.active a:hover,
 .page-header .nav-tabs li a:hover,
 .select2-results .select2-highlighted {
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 3d1d249..d3bde8f 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -39,11 +39,12 @@
 }
 .masthead .navigation .nav-pills > li.active {
     border-bottom: 1.5vh solid #f65940;
-    padding-top: 8px;
+    padding-top: 14px;
 }
+.navigation .open,
 .masthead .navigation .nav-pills > li:hover {
     border-bottom: 1.5vh solid #f65940;
-    padding-top: 8px;
+    padding-top: 14px;
 }
 .navigation .dropdown .dropdown-menu {
     padding: 0;
@@ -66,7 +67,7 @@
 }
 .masthead .logo img {
     object-fit: cover;
-    max-height: 50px;
+    max-height: 40px;
 }
 
 /* -------------------- body layout ----------------------- */
@@ -131,7 +132,6 @@
     padding: 5px 25px;
     color: #ffffff;
 }
-.res-actions a,
 .content_action a {
     margin-top: 10px;
 }
@@ -428,7 +428,7 @@ aside .module [class^=module] {
         color: #403644;
     }
     .header-image {
-        width: 70%;
+        width: 50%;
     }
     .masthead .logo {
         min-height: 60px;

From 449a08dc4e91dcfe98829af60286971ea77b4533 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 26 Jun 2020 16:43:35 +0530
Subject: [PATCH 110/127] change image paths from ckan uploads to public/images

---
 .../public/images/JH Logomark-favicon.png     | Bin 0 -> 396 bytes
 .../public/images/agami_logo.png              | Bin 0 -> 3546728 bytes
 .../public/images/cdl_logo.png                | Bin 0 -> 72463 bytes
 .../public/images/signed_pledge_icon.png      | Bin 0 -> 1767 bytes
 .../public/images/verified_icon.png           | Bin 0 -> 1674 bytes
 .../justicehub_theme/templates/footer.html    |   4 ++--
 .../templates/organization/read_base.html     |   2 +-
 .../snippets/organization_item.html           |   2 +-
 .../templates/package/read_base.html          |   2 +-
 .../templates/snippets/package_item.html      |   4 ++--
 10 files changed, 7 insertions(+), 7 deletions(-)
 create mode 100644 ckanext/justicehub_theme/public/images/JH Logomark-favicon.png
 create mode 100644 ckanext/justicehub_theme/public/images/agami_logo.png
 create mode 100644 ckanext/justicehub_theme/public/images/cdl_logo.png
 create mode 100644 ckanext/justicehub_theme/public/images/signed_pledge_icon.png
 create mode 100644 ckanext/justicehub_theme/public/images/verified_icon.png

diff --git a/ckanext/justicehub_theme/public/images/JH Logomark-favicon.png b/ckanext/justicehub_theme/public/images/JH Logomark-favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1cb05c9f161fe79895a5e020d547a34dccc0f05
GIT binary patch
literal 396
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b
z3=G^tAk28_ZrvZCAbW|YuPgf#Hb!<O^+K)|dj<wZNlzEY5R21yCvEg%F_dW8|AcRg
zg`-Uli}u#dyOes*u3xfogFvhGeCI766>GQzk9xVdEM6ki+rL02f>UXcMp*T3v3G~0
z?yy=HDomKEa@a@cN3cM0{a*j6uJSTTYqVYq8ae!az}C8;+p}&5=aK{2c0vgPAIoA*
zWIy^EmMvb_)ORhYq2E+e>*G9$-)hI~IyTO|@n&`-f8X+Ze>e&z%Sz0xl~g&PV!%G9
zYoo4wOe#~@FW&8cS4_W><soX)=q!Jyn|~eu9j47wIgi}PWbIx1x%+nzE9-{MI}Dh&
z)E0!7ioR<oG~71TJNAK8LZ!)Go0(o#ALB3D-+5!TLI0Q>v%B4n%`x*O?tOh<m>T-g
nrnT@@^W&Y`J#Q=jY1%Qq{~zD9-9Fv{7;X%nu6{1-oD!M<t6rPC

literal 0
HcmV?d00001

diff --git a/ckanext/justicehub_theme/public/images/agami_logo.png b/ckanext/justicehub_theme/public/images/agami_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..0c979a87b319e5e713128d1e386a671abaf794ce
GIT binary patch
literal 3546728
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

literal 0
HcmV?d00001

diff --git a/ckanext/justicehub_theme/public/images/cdl_logo.png b/ckanext/justicehub_theme/public/images/cdl_logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..f30cb9365314bd9522fdca825d7caf48078e8cd8
GIT binary patch
literal 72463
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
Kayqw|6Z?M!>xIw&

literal 0
HcmV?d00001

diff --git a/ckanext/justicehub_theme/public/images/signed_pledge_icon.png b/ckanext/justicehub_theme/public/images/signed_pledge_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2da36a2787272a0a67e6c35f563212795c067bc7
GIT binary patch
literal 1767
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
JPDHLkV1nG+7Zv~j

literal 0
HcmV?d00001

diff --git a/ckanext/justicehub_theme/public/images/verified_icon.png b/ckanext/justicehub_theme/public/images/verified_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab6c81ab6bc11a75e02e79a4ca778c98f8ad1e96
GIT binary patch
literal 1674
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
U(1J+fP5=M^07*qoM6N<$f=<H*E&u=k

literal 0
HcmV?d00001

diff --git a/ckanext/justicehub_theme/templates/footer.html b/ckanext/justicehub_theme/templates/footer.html
index 9b97de8..88a6c1e 100644
--- a/ckanext/justicehub_theme/templates/footer.html
+++ b/ckanext/justicehub_theme/templates/footer.html
@@ -12,12 +12,12 @@
             <div class="hidden-xs">
                 <div class="image-box">
                     <a href="https://agami.in/" target="_blank">
-                    <img class="agami-logo" src="{{ h.url_for_static('/uploads/admin/agami_logo.png')}}"></img>
+                    <img class="agami-logo" src="{{ h.url_for_static('/images/agami_logo.png')}}"></img>
                     </a>
                 </div>
                 <div class="image-box">
                     <a href="https://www.civicdatalab.in/" target="_blank">
-                    <img class="cdl-logo" src="{{ h.url_for_static('/uploads/admin/cdl_logo.png')}}"></img>
+                    <img class="cdl-logo" src="{{ h.url_for_static('/images/cdl_logo.png')}}"></img>
                     </a>
                 </div>
             </div>
diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index 18952e1..ccc2b28 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -23,7 +23,7 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
             [{{ _('Deleted') }}]
             {% endif %}
             {% if c.group_dict.signed_pledge %}
-                <img class="fa fa-lg fa-certificate" src="{{ h.url_for_static('uploads/admin/signed_pledge_icon.png') }}" alt="signed_pledge" title="signed_pledge"></img>
+                <img class="fa fa-lg fa-certificate" src="{{ h.url_for_static('/images/signed_pledge_icon.png') }}" alt="signed_pledge" title="signed_pledge"></img>
             {% endif %}
         </h1>
         {% block description %}
diff --git a/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html b/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html
index cbba134..f0759e0 100644
--- a/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html
+++ b/ckanext/justicehub_theme/templates/organization/snippets/organization_item.html
@@ -10,7 +10,7 @@
     <h3 class="media-heading">
         {{ organization.display_name }}
     {% if organization.signed_pledge %}
-        <img class="fa fa-certificate" src="{{ h.url_for_static('uploads/admin/signed_pledge_icon.png') }}" alt="signed_pledge" title="signed_pledge"></img>
+        <img class="fa fa-certificate" src="{{ h.url_for_static('/images/signed_pledge_icon.png') }}" alt="signed_pledge" title="signed_pledge"></img>
     {% endif %}
     </h3>
 {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index 745513b..f55f07f 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -21,7 +21,7 @@ <h1>{{h.dataset_display_name(pkg)}}
                 {% endif %}
                 {% if pkg.verified %}
                     <img class="fa fa-check fa-lg"
-                         src="{{ h.url_for_static('uploads/admin/verified_icon.png') }}"
+                         src="{{ h.url_for_static('/images/verified_icon.png') }}"
                          data-toggle="tooltip"
                          alt="Verified"
                          title="Verified"></img>
diff --git a/ckanext/justicehub_theme/templates/snippets/package_item.html b/ckanext/justicehub_theme/templates/snippets/package_item.html
index 15ae2b5..9ab61d5 100644
--- a/ckanext/justicehub_theme/templates/snippets/package_item.html
+++ b/ckanext/justicehub_theme/templates/snippets/package_item.html
@@ -17,7 +17,7 @@ <h3 class="dataset-title">
             {% endif %}
             {% if package.verified %}
                 <img class="fa fa-check"
-                     src="{{ h.url_for_static('uploads/admin/verified_icon.png') }}"
+                     src="{{ h.url_for_static('/images/verified_icon.png') }}"
                      data-toggle="tooltip"
                      alt="Verified"
                      title="Verified"></img>
@@ -40,7 +40,7 @@ <h3 class="dataset-title">
               {{ h.link_to(h.truncate(package.organization.title, truncate_title), h.url_for(controller='organization', action='read', id=package.organization.name)) }}
               {% if package.partner.signed_pledge %}
                 <img class="fa fa-certificate"
-                     src="{{ h.url_for_static('uploads/admin/signed_pledge_icon.png') }}"
+                     src="{{ h.url_for_static('/images/signed_pledge_icon.png') }}"
                      data-toggle="tooltip"
                      alt="Signed Open Data Pledge"
                      title="Signed Open Data Pledge"></img>

From b66707f3ed4521385369279e875bbdc69fc262c7 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 26 Jun 2020 21:30:31 +0530
Subject: [PATCH 111/127] update partner detail page, add read more effect

---
 .../fanstatic/justicehub_theme.js             |  35 ++++++
 .../public/justicehub_theme.css               |  10 ++
 .../templates/organization/read_base.html     | 119 +++++++++---------
 3 files changed, 107 insertions(+), 57 deletions(-)

diff --git a/ckanext/justicehub_theme/fanstatic/justicehub_theme.js b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
index 21eeb15..a0fb9dd 100644
--- a/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
+++ b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
@@ -1,3 +1,38 @@
+// https://www.viralpatel.net/dynamically-shortened-text-show-more-link-jquery/
+$(document).ready(function() {
+	var showChar = 215;
+	var ellipsestext = "...";
+	var moretext = "more";
+	var lesstext = "less";
+	$('.more').each(function() {
+		var content = $(this).html();
+
+		if(content.length > showChar) {
+
+			var c = content.substr(0, showChar);
+			var h = content.substr(showChar-1, content.length - showChar);
+
+			var html = c + '<span class="moreellipses">' + ellipsestext+ '&nbsp;</span><span class="morecontent"><span>' + h + '</span>&nbsp;&nbsp;<a href="" class="morelink">' + moretext + '</a></span>';
+
+			$(this).html(html);
+		}
+	});
+
+	$(".morelink").click(function(){
+		if($(this).hasClass("less")) {
+			$(this).removeClass("less");
+			$(this).html(moretext);
+		} else {
+			$(this).addClass("less");
+			$(this).html(lesstext);
+		}
+		$(this).parent().prev().toggle();
+		$(this).prev().toggle();
+		return false;
+	});
+});
+
+
 $('[data-toggle="tooltip"]').tooltip();
 
 // https://stackoverflow.com/a/23006629/3860168
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index d3bde8f..7d6a96b 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -103,6 +103,16 @@
 }
 
 /* ----------------------- pre-primary-blocks ----------------- */
+.morecontent span {
+	display: none;
+}
+a.morelink {
+	text-decoration:none;
+	outline: none;
+}
+a.morelink:visited {
+	color: #f65940;
+}
 .top-section {
     margin: 0 40px;
     margin-bottom: 200px;
diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index ccc2b28..72f4160 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -17,7 +17,7 @@
         </a>
         </div>
     {% endblock %}
-    <div class="col-md-5 col-sm-5 col-xs-12">
+    <div class="col-sm-9 col-xs-12">
         <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
             {% if c.group_dict.state == 'deleted' %}
             [{{ _('Deleted') }}]
@@ -27,18 +27,20 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
             {% endif %}
         </h1>
         {% block description %}
+        <div class="row">
         {% if c.group_dict.notes %}
-            <p>
-            {{ h.render_markdown(c.group_dict.notes) }}
-            </p>
+            <div class="col col-sm-8 col-xs-12 more">
+                {{ c.group_dict.notes }}
+            </div>
         {% else %}
             <p class="empty">{{ _('There is no description for this partner') }}</p>
         {% endif %}
+        </div>
         {% endblock %}
 
-        <div class="row">
+        <div class="row" style="margin-top: 60px;">
             {% block content_action %}
-            <div class="col col-md-4 col-xs-6 content_action">
+            <div class="col col-sm-2 col-xs-6 content_action">
                 {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
                     {% link_for _('EDIT'), controller='organization', action='edit', id=c.group_dict.name, class_='btn btn-default', named_route=group_type + '_edit'  %}
                 {% endif %}
@@ -46,60 +48,63 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
             {% endblock %}
 
             {% block follow %}
-            <div class="col col-md-4 col-xs-6 follow_button">
+            <div class="col col-sm-2 col-xs-6 follow_button">
               {{ h.follow_button('group', c.group_dict.id) }}
             </div>
             {% endblock %}
-        </div>
-    </div>
-    <div class="row">
-        <div class="social-links col-md-4 col-sm-4 col-xs-12">
-            <ul class="list-unstyled list-inline">
-                <li>
-                {% if c.group_dict.website %}
-                    <a href="{{ c.group_dict.website }}"
-                       aria-hidden="true" alt="{{ c.group_dict.name }}'s Website"
-                       role="link" title="Official Website"
-                       aria-label="{{ c.group_dict.name }}'s Website"
-                       target="_blank">
-                        <i class="fa fa-link fa-lg"></i>
-                    </a>
-                {% endif %}
-                </li>
-                <li>
-                {% if c.group_dict.email %}
-                    <a href="mailto:{{ c.group_dict.email }}"
-                       aria-hidden="true" alt="{{ c.group_dict.name }}'s Email Address"
-                       role="link" title="Email Address"
-                       aria-label="{{ c.group_dict.name }}'s Email Address"
-                       target="_blank">
-                    <i class="fa fa-envelope fa-lg"></i>
-                    </a>
-                {% endif %}
-                </li>
-                <li>
-                {% if c.group_dict.twitter %}
-                    <a href="{{ c.group_dict.twitter }}"
-                       aria-hidden="true" alt="{{ c.group_dict.name }}'s Twitter Handle"
-                       role="link" title="Official Twitter Handle"
-                       aria-label="{{ c.group_dict.name }}'s Twitter Handle"
-                       target="_blank">
-                        <i class="fa fa-twitter fa-lg"></i>
-                    </a>
-                {% endif %}
-                </li>
-                <li>
-                {% if c.group_dict.facebook %}
-                    <a href="{{ c.group_dict.facebook }}"
-                       aria-hidden="true" alt="{{ c.group_dict.name }}'s Facebook Page"
-                       role="link" title="Official Facebook Page"
-                       aria-label="{{ c.group_dict.name }}'s Facebook Page"
-                       target="_blank">
-                        <i class="fa fa-facebook fa-lg"></i>
-                    </a>
-                {% endif %}
-                </li>
-            </ul>
+
+            <div class="col col-sm-2 col-sm-offset-2 col-xs-12 text-right" style="margin-top: 15px;">
+                <span>{{ _('Contact ') }}</span>
+            </div>
+                <span class="hidden-xs pull-left" style="margin-top: 15px;">{{ _('|') }}</span>
+            <div class="partner-links social-links col-sm-3 col-xs-12" style="margin-top: 15px;">
+                <ul class="list-unstyled list-inline">
+                    <li>
+                    {% if c.group_dict.website %}
+                        <a href="{{ c.group_dict.website }}"
+                           aria-hidden="true" alt="{{ c.group_dict.name }}'s Website"
+                           role="link" title="Official Website"
+                           aria-label="{{ c.group_dict.name }}'s Website"
+                           target="_blank">
+                            <i class="fa fa-link fa-lg"></i>
+                        </a>
+                    {% endif %}
+                    </li>
+                    <li>
+                    {% if c.group_dict.email %}
+                        <a href="mailto:{{ c.group_dict.email }}"
+                           aria-hidden="true" alt="{{ c.group_dict.name }}'s Email Address"
+                           role="link" title="Email Address"
+                           aria-label="{{ c.group_dict.name }}'s Email Address"
+                           target="_blank">
+                        <i class="fa fa-envelope fa-lg"></i>
+                        </a>
+                    {% endif %}
+                    </li>
+                    <li>
+                    {% if c.group_dict.twitter %}
+                        <a href="{{ c.group_dict.twitter }}"
+                           aria-hidden="true" alt="{{ c.group_dict.name }}'s Twitter Handle"
+                           role="link" title="Official Twitter Handle"
+                           aria-label="{{ c.group_dict.name }}'s Twitter Handle"
+                           target="_blank">
+                            <i class="fa fa-twitter fa-lg"></i>
+                        </a>
+                    {% endif %}
+                    </li>
+                    <li>
+                    {% if c.group_dict.facebook %}
+                        <a href="{{ c.group_dict.facebook }}"
+                           aria-hidden="true" alt="{{ c.group_dict.name }}'s Facebook Page"
+                           role="link" title="Official Facebook Page"
+                           aria-label="{{ c.group_dict.name }}'s Facebook Page"
+                           target="_blank">
+                            <i class="fa fa-facebook fa-lg"></i>
+                        </a>
+                    {% endif %}
+                    </li>
+                </ul>
+            </div>
         </div>
     </div>
 </div>

From 606c26575e639f31a40da21608bdf1010cf6f2cf Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 26 Jun 2020 21:31:10 +0530
Subject: [PATCH 112/127] minor fixes

---
 ckanext/justicehub_theme/public/common.css          |  4 ++++
 .../justicehub_theme/public/justicehub_theme.css    |  9 ++++++---
 ckanext/justicehub_theme/public/partner.css         |  3 +++
 ckanext/justicehub_theme/public/resource.css        |  8 ++++++++
 .../justicehub_theme/templates/user/dashboard.html  |  2 +-
 .../templates/user/new_user_form.html               |  4 +++-
 .../templates/user/snippets/login_form.html         | 13 +++++++++++--
 7 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 271e3cc..429b1f8 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -47,6 +47,7 @@ body,
 .res-actions a,
 .content_action a,
 .btn,
+.login-form .checkbox,
 #field-giant-search,
 .partner-links.social-links .fa,
 .search-form .search-input.search-giant input {
@@ -154,6 +155,7 @@ a,
 .activity .item .actor a,
 .links-list a,
 .subscribe-error,
+.login-form .checkbox,
 .footer-links .nav-item > a:hover,
 .footer-disclaimer div:last-child {
     color: #f65940;
@@ -265,12 +267,14 @@ body,
 .content_action a,
 .content_action .btn.btn-danger,
 .res-actions a,
+.login-sidebar-heading,
 h2.module-heading,
 .member_action .delete,
 .nav-facet .nav-item.active,
 .nav-facet .nav-item.active a,
 .composite-control-repeating .btn-danger,
 .masthead .navigation .nav-pills .dropdown-menu > li a:hover,
+.dropdown-menu > li a:hover,
 .nav-tabs-plain li.active a:hover,
 .page-header .nav-tabs li a:hover,
 .select2-results .select2-highlighted {
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 7d6a96b..05fe076 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -114,7 +114,7 @@ a.morelink:visited {
 	color: #f65940;
 }
 .top-section {
-    margin: 0 40px;
+    margin-left: 40px;
     margin-bottom: 200px;
 }
 .top-section > .row:first-child {
@@ -330,8 +330,8 @@ aside .module [class^=module] {
     height: 700px;
 }
 .login-sidebar-heading {
-    padding-top: 50px;
-    padding-bottom: 10px;
+    padding-top: 20px;
+    padding-bottom: 20px;
     text-align: center;
 }
 .login-sidebar p {
@@ -344,6 +344,9 @@ aside .module [class^=module] {
     padding: 0 80px;
     margin-bottom: -1.5px;
 }
+.btn-forgot {
+    margin-top: 5px;
+}
 
 /* ----------------------------- homepage --------------------------- */
 .intro-box span:first-child {
diff --git a/ckanext/justicehub_theme/public/partner.css b/ckanext/justicehub_theme/public/partner.css
index 3b8afe0..c812e7a 100644
--- a/ckanext/justicehub_theme/public/partner.css
+++ b/ckanext/justicehub_theme/public/partner.css
@@ -16,6 +16,9 @@
 }
 
 /* ------------------------- org-detail ---------------------- */
+.partner-links li {
+    margin-right: 0;
+}
 .partner-links.social-links .fa {
     width: 31px;
     height: 31px;
diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index f762500..860e863 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -28,3 +28,11 @@
 .res-actions ul > li a[data-module=api-info] {
     display: none;
 }
+.res-actions .btn:active,
+.open > .dropdown-toggle.btn,
+.open > .dropdown-toggle.btn:hover,
+.res-actions .btn:hover {
+    background-color: #f65940;
+    border-color: #f65940;
+    color: #fff;
+}
diff --git a/ckanext/justicehub_theme/templates/user/dashboard.html b/ckanext/justicehub_theme/templates/user/dashboard.html
index 3523393..12130ac 100644
--- a/ckanext/justicehub_theme/templates/user/dashboard.html
+++ b/ckanext/justicehub_theme/templates/user/dashboard.html
@@ -11,7 +11,7 @@
       {{ h.build_nav_icon('dashboard.index', _('MY FEED')) }}
       {{ h.build_nav_icon('dashboard.datasets', _('DATASETS')) }}
       {{ h.build_nav_icon('dashboard.organizations', _('DATA CONTRIBUTORS')) }}
-      {{ h.build_nav_icon('dashboard.groups', _('SECTORS')) }}
+      {#{ h.build_nav_icon('dashboard.groups', _('SECTORS')) }#}
 
       <div class="content_action">
           {% link_for _('Edit settings'), named_route='user.edit', id=user.name, class_='btn btn-default' %}
diff --git a/ckanext/justicehub_theme/templates/user/new_user_form.html b/ckanext/justicehub_theme/templates/user/new_user_form.html
index b42d54d..5473915 100644
--- a/ckanext/justicehub_theme/templates/user/new_user_form.html
+++ b/ckanext/justicehub_theme/templates/user/new_user_form.html
@@ -12,7 +12,9 @@
     {% snippet "user/snippets/recaptcha.html", public_key=g.recaptcha_publickey %}
   {% endif %}
 
-  {{ form.required_message() }}
+  <p class="form-group control-required-message">
+    <span class="control-required">*</span> {{ _("Required field") }}
+  </p>
 
   <div class="form-actions">
     {% block form_actions %}
diff --git a/ckanext/justicehub_theme/templates/user/snippets/login_form.html b/ckanext/justicehub_theme/templates/user/snippets/login_form.html
index 81a34d3..b9f2ae3 100644
--- a/ckanext/justicehub_theme/templates/user/snippets/login_form.html
+++ b/ckanext/justicehub_theme/templates/user/snippets/login_form.html
@@ -20,9 +20,18 @@
   {{ form.input('login', label=_("Username"), id='field-login', value="", error=username_error, classes=["control-medium"]) }}
 
   {{ form.input('password', label=_("Password"), id='field-password', type="password", value="", error=password_error, classes=["control-medium"]) }}
-  <a class="btn btn-default btn-forgot bg-clear pull-right" href="{{ h.url_for('user.request_reset') }}">{{ _('Forgot password') }}</a>
 
-  {{ form.checkbox('remember', label=_("Remember me"), id='field-remember', checked=true, value="63072000") }}
+  <div class="row form-group">
+      <div class="col col-sm-6 col-xs-6">
+          <label class="checkbox" for="field-remember">
+              <input id="field-remember" type="checkbox" name="remember" value="63072000" checked="">
+              {{ _('Remember me') }}
+          </label>
+      </div>
+      <div class="col col-sm-6 col-xs-6 text-right">
+          <a class="btn btn-default btn-forgot bg-clear" href="{{ h.url_for('user.request_reset') }}">{{ _('Forgot password') }}</a>
+      </div>
+  </div>
 
   <div class="form-actions">
     {% block login_button %}

From 9d9859020188432c2715d47b436eeb49405c1d57 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 26 Jun 2020 21:38:53 +0530
Subject: [PATCH 113/127] update tooltips

---
 .../justicehub_theme/templates/organization/read_base.html  | 4 ++++
 ckanext/justicehub_theme/templates/package/read_base.html   | 6 +++++-
 ckanext/justicehub_theme/templates/snippets/popular.html    | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 ckanext/justicehub_theme/templates/snippets/popular.html

diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index 72f4160..ed3fa4d 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -62,6 +62,7 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
                     <li>
                     {% if c.group_dict.website %}
                         <a href="{{ c.group_dict.website }}"
+                           data-toggle="tooltip"
                            aria-hidden="true" alt="{{ c.group_dict.name }}'s Website"
                            role="link" title="Official Website"
                            aria-label="{{ c.group_dict.name }}'s Website"
@@ -73,6 +74,7 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
                     <li>
                     {% if c.group_dict.email %}
                         <a href="mailto:{{ c.group_dict.email }}"
+                           data-toggle="tooltip"
                            aria-hidden="true" alt="{{ c.group_dict.name }}'s Email Address"
                            role="link" title="Email Address"
                            aria-label="{{ c.group_dict.name }}'s Email Address"
@@ -84,6 +86,7 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
                     <li>
                     {% if c.group_dict.twitter %}
                         <a href="{{ c.group_dict.twitter }}"
+                           data-toggle="tooltip"
                            aria-hidden="true" alt="{{ c.group_dict.name }}'s Twitter Handle"
                            role="link" title="Official Twitter Handle"
                            aria-label="{{ c.group_dict.name }}'s Twitter Handle"
@@ -95,6 +98,7 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
                     <li>
                     {% if c.group_dict.facebook %}
                         <a href="{{ c.group_dict.facebook }}"
+                           data-toggle="tooltip"
                            aria-hidden="true" alt="{{ c.group_dict.name }}'s Facebook Page"
                            role="link" title="Official Facebook Page"
                            aria-label="{{ c.group_dict.name }}'s Facebook Page"
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index f55f07f..d7c6462 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -93,6 +93,7 @@ <h1>{{h.dataset_display_name(pkg)}}
                 <li>
                 {% if pkg.partner.website %}
                     <a href="{{ pkg.partner.website }}"
+                       data-toggle="tooltip"
                        aria-hidden="true" alt="{{ pkg.organization.name }}'s Website"
                        role="link" title="Official Website"
                        aria-label="{{ pkg.organization.name }}'s Website"
@@ -104,8 +105,9 @@ <h1>{{h.dataset_display_name(pkg)}}
                 <li>
                 {% if pkg.partner.email %}
                     <a href="mailto:{{ pkg.partner.email }}"
+                       data-toggle="tooltip"
                        aria-hidden="true" alt="{{ pkg.organization.name }}'s Email Address"
-                       role="link" title="Email Address"
+                       role="link" title="Organization Email Address"
                        aria-label="{{ pkg.organization.name }}'s Email Address"
                        target="_blank">
                     <i class="fa fa-envelope fa-lg"></i>
@@ -115,6 +117,7 @@ <h1>{{h.dataset_display_name(pkg)}}
                 <li>
                 {% if pkg.partner.twitter %}
                     <a href="{{ pkg.partner.twitter }}"
+                       data-toggle="tooltip"
                        aria-hidden="true" alt="{{ pkg.organization.name }}'s Twitter Handle"
                        role="link" title="Official Twitter Handle"
                        aria-label="{{ pkg.organization.name }}'s Twitter Handle"
@@ -126,6 +129,7 @@ <h1>{{h.dataset_display_name(pkg)}}
                 <li>
                 {% if pkg.partner.facebook %}
                     <a href="{{ pkg.partner.facebook }}"
+                       data-toggle="tooltip"
                        aria-hidden="true" alt="{{ pkg.organization.name }}'s Facebook Page"
                        role="link" title="Official Facebook Page"
                        aria-label="{{ pkg.organization.name }}'s Facebook Page"
diff --git a/ckanext/justicehub_theme/templates/snippets/popular.html b/ckanext/justicehub_theme/templates/snippets/popular.html
new file mode 100644
index 0000000..42b1f6a
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/snippets/popular.html
@@ -0,0 +1,4 @@
+{# show the popularity icon #}
+{% if number >= min %}
+<span class="popular ckan-icon ckan-icon-flame" data-toggle="tooltip" title="{{ title.format(number=number) }}" xmlns="http://www.w3.org/1999/xhtml">{{ _('Popular') }}</span>
+{% endif %}

From fdd1031c51565a4ed0a184e68bc493d51fe89cb7 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 29 Jun 2020 12:52:04 +0530
Subject: [PATCH 114/127] fix login flow pages, add link to dashboard in header

---
 ckanext/justicehub_theme/public/common.css    |  2 ++
 .../public/justicehub_theme.css               |  8 +++++
 .../justicehub_theme/templates/header.html    | 23 ++++++++-----
 .../templates/user/logout.html                | 27 +++++++++++++++
 .../templates/user/logout_first.html          | 34 +++++++++++++++++++
 5 files changed, 86 insertions(+), 8 deletions(-)
 create mode 100644 ckanext/justicehub_theme/templates/user/logout.html
 create mode 100644 ckanext/justicehub_theme/templates/user/logout_first.html

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 429b1f8..333e46f 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -208,6 +208,7 @@ body,
 .member_action .delete,
 .footer-links .nav-item > a,
 .btn-register:hover,
+[class^="btn btn-"].disabled:hover,
 .context-info .follow_button .btn:hover,
 .dropdown-menu > li > a,
 .dropdown-menu > li > a:hover,
@@ -237,6 +238,7 @@ body,
 .popover,
 .dropdown-menu,
 [class^="btn btn-"],
+[class^="btn btn-"].disabled:hover,
 .nav-tabs .content_action a,
 .stages li.active .highlight,
 .metadata-heading,
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 05fe076..6192b44 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -37,6 +37,9 @@
     display: flex;
     align-items: center;
 }
+.masthead .navigation .nav-pills > li:last-child {
+    min-width: 120px;
+}
 .masthead .navigation .nav-pills > li.active {
     border-bottom: 1.5vh solid #f65940;
     padding-top: 14px;
@@ -347,6 +350,11 @@ aside .module [class^=module] {
 .btn-forgot {
     margin-top: 5px;
 }
+.alert-danger a {
+    font-weight: 600;
+    color: #f65940;
+    text-decoration: none;
+}
 
 /* ----------------------------- homepage --------------------------- */
 .intro-box span:first-child {
diff --git a/ckanext/justicehub_theme/templates/header.html b/ckanext/justicehub_theme/templates/header.html
index b7d2996..d26c047 100644
--- a/ckanext/justicehub_theme/templates/header.html
+++ b/ckanext/justicehub_theme/templates/header.html
@@ -27,13 +27,11 @@
                 <li>
                     <a href="https://justicehub.in/covid-19/" target="_blank">
                         {{ _('Covid-19') }}
-                        <i class="fa fa-sm fa-external-link"></i>
                     </a>
                 </li>
                 <li>
                     <a href="https://github.com/justicehub-in" target="_blank">
                         {{ _('Open Source') }}
-                        <i class="fa fa-sm fa-external-link"></i>
                     </a>
                 </li>
             </ul>
@@ -45,13 +43,22 @@
           {% endblock %}
 
         {% else %}
-          {% block header_account_log_out_link %}
-          <li>
-              <a href="{{ h.url_for('/user/_logout') }}" title="{{ _('Log out') }}">
-                  <span class="text">{{ _('Log out') }}</span>
-              </a>
+          <li class="dropdown">
+            {% set name = c.userobj.fullname if c.userobj.fullname else c.userobj.name %}
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ name }}<b class="caret"></b></a>
+            <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
+                <li>
+                    {% link_for _('Dashboard'), named_route='dashboard' %}
+                </li>
+                <li>
+                    {% block header_account_log_out_link %}
+                        <a href="{{ h.url_for('/user/_logout') }}" title="{{ _('Log out') }}">
+                            <span class="text">{{ _('Log out') }}</span>
+                        </a>
+                    {% endblock %}
+                </li>
+            </ul>
           </li>
-          {% endblock %}
         {% endif %}
     </ul>
     </nav>
diff --git a/ckanext/justicehub_theme/templates/user/logout.html b/ckanext/justicehub_theme/templates/user/logout.html
new file mode 100644
index 0000000..5370d36
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/user/logout.html
@@ -0,0 +1,27 @@
+{% ckan_extends %}
+
+{% block pre_primary %}
+  <div class="row">
+      <div class="col col-md-3">
+      </div>
+      <div class="col col-md-9 login-heading">
+          <h1>{% block page_heading %}{{ _('LOGGED OUT') }}{% endblock %}</h1>
+      </div>
+  </div>
+{% endblock %}
+
+{% block primary_content %}
+  <section class="module">
+    <div class="module-content">
+      <div class="login-form">
+        <div class="form-group">
+          <p>{% trans %}You are now logged out.{% endtrans %}</p>
+        </div>
+      </div>
+    </div>
+  </section>
+{% endblock %}
+{% block secondary_content %}
+  <section class="login-sidebar">
+  </section>
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/user/logout_first.html b/ckanext/justicehub_theme/templates/user/logout_first.html
new file mode 100644
index 0000000..d862733
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/user/logout_first.html
@@ -0,0 +1,34 @@
+{% import 'macros/form.html' as form %}
+{% ckan_extends %}
+
+{% block form %}
+<div class="login-form">
+    <div class="form-group">
+        <span class="alert alert-danger">
+            {{ _("You're already logged in as {user}.").format(user=g.user) }}
+            <a href="{{ logout_url }}">{{ _('Logout') }}</a>?
+        </span>
+    </div>
+    {{ form.input('login', label=_('Username'), id='field-login', value="", error="", classes=["control-full"], attrs={"disabled": "disabled"}) }}
+    {{ form.input('password', label=_('Password'), id='field-password', type="password", value="", error="", classes=["control-full"], attrs={"disabled": "disabled"}) }}
+    <div class="form-group">
+        <label class="checkbox" for="field-remember">
+            <input id="field-remember" type="checkbox" name="remember" value="63072000" checked=true disabled="disabled">
+            {{ _('Remember me') }}
+        </label>
+    </div>
+    <div class="form-actions">
+      <button class="btn btn-primary disabled" type="submit" disabled>{{ _('LOG IN') }}</button>
+    </div>
+</div>
+{% endblock %}
+
+{% block secondary_content %}
+  <section class="module module-narrow module-shallow">
+    <h2 class="module-heading">{{ _("You're already logged in") }}</h2>
+    <div class="module-content">
+      <p>{{ _("You need to log out before you can log in with another account.") }}</p>
+      <p class="action"><a class="btn btn-default" href="{{ logout_url }}">{{ _("LOG OUT") }}</a></p>
+    </div>
+  </section>
+{% endblock %}

From 60584894a72106d27b41a9a9e32dc33454325f80 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 29 Jun 2020 14:44:35 +0530
Subject: [PATCH 115/127] update user templates

- profile
- edit profile
- fix dashboard link in header
---
 ckanext/justicehub_theme/public/common.css    |  2 +
 .../public/justicehub_theme.css               |  8 ++
 .../justicehub_theme/templates/header.html    |  4 +-
 .../justicehub_theme/templates/user/edit.html | 15 ++++
 .../templates/user/edit_base.html             | 13 +++
 .../templates/user/edit_user_form.html        | 84 ++++++++++++-------
 .../templates/user/logout.html                |  6 +-
 .../templates/user/read_base.html             | 15 ++++
 8 files changed, 114 insertions(+), 33 deletions(-)
 create mode 100644 ckanext/justicehub_theme/templates/user/edit.html
 create mode 100644 ckanext/justicehub_theme/templates/user/edit_base.html

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 333e46f..bbaefc1 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -23,6 +23,7 @@ body {
 .dataset-desc,
 .rsrc-list-side > li a,
 .dropdown-menu > li > a,
+.context-info .info,
 .footer-links .input-group-btn .btn {
     font-size: 16px;
 }
@@ -139,6 +140,7 @@ h1,
 
 /* ----------------------- colors ------------------------- */
 a,
+code,
 .count,
 .media-item,
 .res-title,
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 6192b44..88f9273 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -8,6 +8,14 @@
 .image-box img.media-image {
     margin:auto;
 }
+.context-info .image a {
+    width: 150px;
+    height: 150px;
+    margin-left: -50px;
+}
+.context-info .image img {
+    border-radius: 50%;
+}
 
 /* ------------------------ header ------------------------ */
 /* Hide top account bar */
diff --git a/ckanext/justicehub_theme/templates/header.html b/ckanext/justicehub_theme/templates/header.html
index d26c047..1a06836 100644
--- a/ckanext/justicehub_theme/templates/header.html
+++ b/ckanext/justicehub_theme/templates/header.html
@@ -48,7 +48,9 @@
             <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ name }}<b class="caret"></b></a>
             <ul class="dropdown-menu" role="menu" aria-labelledby="drop1">
                 <li>
-                    {% link_for _('Dashboard'), named_route='dashboard' %}
+                    <a href="{{ h.url_for('/dashboard') }}" title="{{ _('Dashboard') }}">
+                        <span class="text">{{ _('Dashboard') }}</span>
+                    </a>
                 </li>
                 <li>
                     {% block header_account_log_out_link %}
diff --git a/ckanext/justicehub_theme/templates/user/edit.html b/ckanext/justicehub_theme/templates/user/edit.html
new file mode 100644
index 0000000..6f1b008
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/user/edit.html
@@ -0,0 +1,15 @@
+{% ckan_extends %}
+
+{% block secondary_content %}
+  <section class="module module-narrow module-shallow">
+    <h2 class="module-heading"> {{ _('Account Info') }}</h2>
+    <div class="module-content">
+      <p>
+      {% trans %}
+        Your profile lets other CKAN users know about who you are and what you
+        do.
+      {% endtrans %}
+      </p>
+    </div>
+  </section>
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/user/edit_base.html b/ckanext/justicehub_theme/templates/user/edit_base.html
new file mode 100644
index 0000000..beeee4f
--- /dev/null
+++ b/ckanext/justicehub_theme/templates/user/edit_base.html
@@ -0,0 +1,13 @@
+{% ckan_extends %}
+
+{% block pre_primary %}
+<div class="col-xs-12 row top-section"></div>
+{% endblock %}
+
+{% block primary_content %}
+  <article class="module">
+    <div>
+      {% block primary_content_inner %}{% endblock %}
+    </div>
+  </article>
+{% endblock %}
diff --git a/ckanext/justicehub_theme/templates/user/edit_user_form.html b/ckanext/justicehub_theme/templates/user/edit_user_form.html
index 2a04e14..c91fdac 100644
--- a/ckanext/justicehub_theme/templates/user/edit_user_form.html
+++ b/ckanext/justicehub_theme/templates/user/edit_user_form.html
@@ -3,47 +3,69 @@
 <form id="user-edit-form" class="dataset-form" method="post" action="{{ action }}">
   {{ form.errors(error_summary) }}
 
-  <fieldset>
-    <legend>{{ _('Change details') }}</legend>
-    {{ form.input('name', label=_('Username'), id='field-username', value=data.name, error=errors.name, classes=['control-medium'], attrs={'readonly': '', 'class': 'form-control'}) }}
+  <div class="page-header">
+    <ul class="nav nav-tabs" data-module="justicehub_theme_tabs">
+        <li class="active">
+            <a href='#details' data-toggle="tab">
+                {{ _('DETAILS') }}
+            </a>
+        </li>
+        <li>
+            <a href='#password' data-toggle="tab">
+                {{ _('PASSWORD') }}
+            </a>
+        </li>
+        <div class="content_action">
+            {% link_for _('VIEW'), controller='user', action='read', id=data.name, class_='btn btn-default' %}
+            {% if h.check_access('user_delete', {'id': data.id})  %}
+                <a class="btn btn-danger"
+                   href="{% url_for 'user_delete', id=data.id %}"
+                   data-module="confirm-action"
+                   data-module-content="{{ _('Are you sure you want to delete this User?') }}">
+                    {% block delete_button_text %}{{ _('DELETE') }}{% endblock %}
+                </a>
+            {% endif %}
+        </div>
+    </ul>
+  </div>
 
-    {{ form.input('fullname', label=_('Full name'), id='field-fullname', value=data.fullname, error=errors.fullname, placeholder=_('eg. Joe Bloggs'), classes=['control-medium']) }}
+    <div class="tab-content">
+        <div class="tab-pane active" id="details">
 
-    {{ form.input('email', label=_('Email'), id='field-email', type='email', value=data.email, error=errors.email, placeholder=_('eg. joe@example.com'), classes=['control-medium'], is_required=true) }}
+        {{ form.input('old_password',
+                      type='password',
+                      label=_('Sysadmin Password') if is_sysadmin else _('Your Password'),
+                      id='field-password',
+                      value=data.oldpassword,
+                      error=errors.oldpassword,
+                      classes=['control-medium'],
+                      attrs={'autocomplete': 'off', 'class': 'form-control'}
+                      ) }}
+        {{ form.input('name', label=_('Username'), id='field-username', value=data.name, error=errors.name, classes=['control-medium'], attrs={'readonly': '', 'class': 'form-control'}) }}
 
-    {{ form.markdown('about', label=_('About'), id='field-about', value=data.about, error=errors.about, placeholder=_('A little information about yourself')) }}
+        {{ form.input('fullname', label=_('Full name'), id='field-fullname', value=data.fullname, error=errors.fullname, placeholder=_('eg. Joe Bloggs'), classes=['control-medium']) }}
 
-    {% if show_email_notifications %}
-      {% call form.checkbox('activity_streams_email_notifications', label=_('Subscribe to notification emails'), id='field-activity-streams-email-notifications', value=True, checked=g.userobj.activity_streams_email_notifications) %}
-      {% set helper_text = _("You will receive notification emails from {site_title}, e.g. when you have new activities on your dashboard."|string) %}
-      {{ form.info(helper_text.format(site_title=g.site_title), classes=['info-help-tight']) }}
-      {% endcall %}
-    {% endif %}
+        {{ form.input('email', label=_('Email'), id='field-email', type='email', value=data.email, error=errors.email, placeholder=_('eg. joe@example.com'), classes=['control-medium'], is_required=true) }}
 
-  </fieldset>
+        {{ form.markdown('about', label=_('About'), id='field-about', value=data.about, error=errors.about, placeholder=_('A little information about yourself')) }}
 
-  <fieldset>
-    <legend>{{ _('Change password') }}</legend>
-    {{ form.input('old_password',
-                  type='password',
-                  label=_('Sysadmin Password') if is_sysadmin else _('Old Password'),
-                  id='field-password',
-                  value=data.oldpassword,
-                  error=errors.oldpassword,
-                  classes=['control-medium'],
-                  attrs={'autocomplete': 'off', 'class': 'form-control'}
-                  ) }}
+        {% if show_email_notifications %}
+          {% call form.checkbox('activity_streams_email_notifications', label=_('Subscribe to notification emails'), id='field-activity-streams-email-notifications', value=True, checked=g.userobj.activity_streams_email_notifications) %}
+          {% set helper_text = _("You will receive notification emails from {site_title}, e.g. when you have new activities on your dashboard."|string) %}
+          {{ form.info(helper_text.format(site_title=g.site_title), classes=['info-help-tight']) }}
+          {% endcall %}
+        {% endif %}
+        </div>
+        <div class="tab-pane" id="password">
 
-    {{ form.input('password1', type='password', label=_('Password'), id='field-password', value=data.password1, error=errors.password1, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'} ) }}
+        {{ form.input('password1', type='password', label=_('Password'), id='field-password', value=data.password1, error=errors.password1, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'} ) }}
 
-    {{ form.input('password2', type='password', label=_('Confirm Password'), id='field-password-confirm', value=data.password2, error=errors.password2, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'}) }}
-  </fieldset>
+        {{ form.input('password2', type='password', label=_('Confirm Password'), id='field-password-confirm', value=data.password2, error=errors.password2, classes=['control-medium'], attrs={'autocomplete': 'off', 'class': 'form-control'}) }}
+        </div>
+    </div>
 
-  <div class="form-actions">
+  <div class="form-group form-actions">
     {% block delete_button %}
-      {% if h.check_access('user_delete', {'id': data.id})  %}
-        <a class="btn btn-danger pull-left" href="{% url_for 'user_delete', id=data.id %}" data-module="confirm-action" data-module-content="{{ _('Are you sure you want to delete this User?') }}">{% block delete_button_text %}{{ _('Delete') }}{% endblock %}</a>
-      {% endif %}
     {% endblock %}
     {% block generate_button %}
       {% if h.check_access('user_generate_apikey', {'id': data.id})  %}
diff --git a/ckanext/justicehub_theme/templates/user/logout.html b/ckanext/justicehub_theme/templates/user/logout.html
index 5370d36..059db1c 100644
--- a/ckanext/justicehub_theme/templates/user/logout.html
+++ b/ckanext/justicehub_theme/templates/user/logout.html
@@ -15,7 +15,11 @@ <h1>{% block page_heading %}{{ _('LOGGED OUT') }}{% endblock %}</h1>
     <div class="module-content">
       <div class="login-form">
         <div class="form-group">
-          <p>{% trans %}You are now logged out.{% endtrans %}</p>
+          <p>
+            {% trans %}You are now logged out.{% endtrans %}
+            {% link_for _('Log in'), named_route='user.login' %}
+            again?
+          </p>
         </div>
       </div>
     </div>
diff --git a/ckanext/justicehub_theme/templates/user/read_base.html b/ckanext/justicehub_theme/templates/user/read_base.html
index b9569a0..d3b6cd8 100644
--- a/ckanext/justicehub_theme/templates/user/read_base.html
+++ b/ckanext/justicehub_theme/templates/user/read_base.html
@@ -17,3 +17,18 @@
       </div>
   {% endif %}
 {% endblock %}
+
+{% block user_image %}
+    <div class="image image-box">{{ h.linked_gravatar(user.email_hash, 190) }}</div>
+{% endblock %}
+{% block user_heading %}
+<div class="image-box" style="margin-left: -50px;">
+    <h1 class="heading">{{ user.display_name }}</h1>
+</div>
+{% endblock %}
+{% block user_about %}
+<div class="image-box" style="margin-left: -50px;">
+    {{ super() }}
+</div>
+<hr style="margin-left: -40px;">
+{% endblock %}

From f87e888ee46daeb2d314b38d1a8c2b9c9655782e Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 29 Jun 2020 17:04:48 +0530
Subject: [PATCH 116/127] update dashboard activity dropdown

---
 ckanext/justicehub_theme/public/common.css         |  5 ++++-
 ckanext/justicehub_theme/public/form.css           |  2 ++
 .../justicehub_theme/public/justicehub_theme.css   |  8 ++++++--
 ckanext/justicehub_theme/public/search.css         |  5 +++++
 .../justicehub_theme/templates/user/dashboard.html | 14 ++++++++++++--
 .../templates/user/snippets/followee_dropdown.html |  4 ++--
 6 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index bbaefc1..7f72a11 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -237,7 +237,7 @@ body,
 .account-masthead,
 .nav-facet,
 .sidebar,
-.popover,
+.site-footer .popover,
 .dropdown-menu,
 [class^="btn btn-"],
 [class^="btn btn-"].disabled:hover,
@@ -278,6 +278,9 @@ h2.module-heading,
 .nav-facet .nav-item.active a,
 .composite-control-repeating .btn-danger,
 .masthead .navigation .nav-pills .dropdown-menu > li a:hover,
+.nav-pills li.active a,
+.nav-pills li.active a:hover,
+.nav-pills li a:hover,
 .dropdown-menu > li a:hover,
 .nav-tabs-plain li.active a:hover,
 .page-header .nav-tabs li a:hover,
diff --git a/ckanext/justicehub_theme/public/form.css b/ckanext/justicehub_theme/public/form.css
index 6d26b44..41eed45 100644
--- a/ckanext/justicehub_theme/public/form.css
+++ b/ckanext/justicehub_theme/public/form.css
@@ -49,6 +49,8 @@
 .btn-xs:focus,
 .btn-xs:focus,
 .bg-clear,
+.bg-clear.active,
+.bg-clear.active:hover,
 .bg-clear:active,
 .bg-clear:focus,
 .bg-clear:hover,
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 88f9273..e87dd6d 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -113,6 +113,10 @@
     padding: 20px 20px;
 }
 
+/* ----------------------- dashboard ----------------- */
+.popover-followee {
+    border-radius: 0;
+}
 /* ----------------------- pre-primary-blocks ----------------- */
 .morecontent span {
 	display: none;
@@ -321,13 +325,13 @@ aside .module [class^=module] {
 .subscribe-box .btn.btn-default {
     padding: 10px 25px;
 }
-.popover {
+.site-footer .popover {
     border-radius: 0;
     box-shadow: 5px 5px 1px #403644;
     max-width: 400px;
     width: 350px;
 }
-.popover .popover-content {
+.site-footer .popover .popover-content {
     display: flex;
     align-items: center;
 }
diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index 9497773..545eb7f 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -115,6 +115,11 @@
 .filters .module-footer {
     display: none;
 }
+.popover-followee .popover-header .input-group-addon {
+    border-radius: 0px;
+    border: 1px solid #f65940;
+    background-color: #f65940;
+}
 
 /* -------------------------------------- Mobile adjustments ----------------------------- */
 @media (min-width: 320px) and (orientation: portrait) {
diff --git a/ckanext/justicehub_theme/templates/user/dashboard.html b/ckanext/justicehub_theme/templates/user/dashboard.html
index 12130ac..9b6a0d8 100644
--- a/ckanext/justicehub_theme/templates/user/dashboard.html
+++ b/ckanext/justicehub_theme/templates/user/dashboard.html
@@ -20,6 +20,16 @@
   </header>
 {% endblock %}
 
-{% block page_heading %}
-  {{ _('MY FEED') }}
+{% block primary_content_inner %}
+<div data-module="dashboard">
+  {% snippet 'user/snippets/followee_dropdown.html', context=dashboard_activity_stream_context, followees=followee_list %}
+  <h2 class="page-heading">
+    {% block page_heading %}
+      {{ _('MY FEED') }}
+    {% endblock %}
+  </h2>
+  {% block activity_stream %}
+    {{ dashboard_activity_stream|safe }}
+  {% endblock %}
+</div>
 {% endblock %}
diff --git a/ckanext/justicehub_theme/templates/user/snippets/followee_dropdown.html b/ckanext/justicehub_theme/templates/user/snippets/followee_dropdown.html
index 6d59df3..36385cc 100644
--- a/ckanext/justicehub_theme/templates/user/snippets/followee_dropdown.html
+++ b/ckanext/justicehub_theme/templates/user/snippets/followee_dropdown.html
@@ -13,14 +13,14 @@
 <div id="followee-filter" class="pull-right">
   <div class="btn-group">
     <a href="#followee-popover" class="btn btn-default dropdown-toggle bg-clear" title="{{ _('Activity from:') }} {{ context.context }}">
-    <span>{{ _('Activity from:') }}</span> <strong>{{ context.context }}</strong> <span class="caret"></span>
+    <span>{{ _('Activity from:') }}</span> <strong>{{ context.context }}</strong>
     </a>
   </div>
   <form id="followee-popover" action="/dashboard" class="dropdown js-hide">
     <div class="popover-header">
       <div class="input-group">
-        <span class="input-group-addon"><i class="fa fa-search"></i></span>
         <input type="text" class="form-control" name="q" placeholder="{{ _('Search list...') }}" value="{{context.q}}" autocomplete="off">
+        <span class="input-group-addon"><i class="fa fa-search"></i></span>
       </div>
     </div>
     {% if followees %}

From ddc074f28f23e87d4278f1ef5772a700b207640d Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 29 Jun 2020 17:05:01 +0530
Subject: [PATCH 117/127] make org follow button not visible to org admins

---
 ckanext/justicehub_theme/lib/helpers.py       |  5 +++++
 ckanext/justicehub_theme/plugin.py            |  3 ++-
 .../templates/organization/read_base.html     | 20 ++++++++++---------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/ckanext/justicehub_theme/lib/helpers.py b/ckanext/justicehub_theme/lib/helpers.py
index f7ebd50..8d6ecc1 100644
--- a/ckanext/justicehub_theme/lib/helpers.py
+++ b/ckanext/justicehub_theme/lib/helpers.py
@@ -12,6 +12,11 @@
 
 cached_tables = {}
 
+def is_org_admin(username, org):
+    for user in org['users']:
+        if user['name'] == username and user['capacity'] == 'admin':
+            return True
+
 def issues_vars(dataset_id, request):
     extra_vars = issues_for_dataset(dataset_id, request.GET)
     return extra_vars
diff --git a/ckanext/justicehub_theme/plugin.py b/ckanext/justicehub_theme/plugin.py
index 68b5695..c7db29b 100644
--- a/ckanext/justicehub_theme/plugin.py
+++ b/ckanext/justicehub_theme/plugin.py
@@ -36,7 +36,8 @@ def get_helpers(self):
             'justicehub_theme_parse_json': helpers.parse_json,
             'justicehub_theme_get_assignee_user': helpers.get_assignee_user,
             'justicehub_theme_days_ago': helpers.days_ago,
-            'justicehub_theme_issue_vars': helpers.issues_vars
+            'justicehub_theme_issue_vars': helpers.issues_vars,
+            'justicehub_theme_is_org_admin': helpers.is_org_admin
         }
 
     #IActions
diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index ed3fa4d..6117634 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -40,18 +40,20 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
 
         <div class="row" style="margin-top: 60px;">
             {% block content_action %}
-            <div class="col col-sm-2 col-xs-6 content_action">
-                {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
+            {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
+                <div class="col col-sm-2 col-xs-6 content_action">
                     {% link_for _('EDIT'), controller='organization', action='edit', id=c.group_dict.name, class_='btn btn-default', named_route=group_type + '_edit'  %}
-                {% endif %}
-            </div>
+                </div>
+            {% endif %}
             {% endblock %}
 
-            {% block follow %}
-            <div class="col col-sm-2 col-xs-6 follow_button">
-              {{ h.follow_button('group', c.group_dict.id) }}
-            </div>
-            {% endblock %}
+            {% if not h.justicehub_theme_is_org_admin(c.userobj.name, c.group_dict) %}
+                {% block follow %}
+                <div class="col col-sm-2 col-xs-6 follow_button">
+                  {{ h.follow_button('group', c.group_dict.id) }}
+                </div>
+                {% endblock %}
+            {% endif %}
 
             <div class="col col-sm-2 col-sm-offset-2 col-xs-12 text-right" style="margin-top: 15px;">
                 <span>{{ _('Contact ') }}</span>

From 083df9848d2acfbf1c06c0b7a439fca2aa0cd48d Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 29 Jun 2020 17:38:56 +0530
Subject: [PATCH 118/127] remove custom library function: days_ago

reason: ckan already has a function called: time_ago_from_timestamp
---
 ckanext/justicehub_theme/lib/helpers.py       | 27 -------------------
 ckanext/justicehub_theme/plugin.py            |  1 -
 .../templates/package/read_base.html          |  2 +-
 .../templates/package/resource_read.html      |  2 +-
 .../package/snippets/resource_item.html       |  2 +-
 5 files changed, 3 insertions(+), 31 deletions(-)

diff --git a/ckanext/justicehub_theme/lib/helpers.py b/ckanext/justicehub_theme/lib/helpers.py
index 8d6ecc1..4e28eec 100644
--- a/ckanext/justicehub_theme/lib/helpers.py
+++ b/ckanext/justicehub_theme/lib/helpers.py
@@ -34,33 +34,6 @@ def get_assignee_user(user_id):
             .first()
     return user
 
-def days_ago(date):
-    '''
-    Calculates days elapsed for the given date.
-    '''
-    try:
-        date = parse_dates(date)
-    except:
-        return ''
-
-    diff = (datetime.today() - date).days
-
-    elapsed = '{0} Days ago'.format(diff)
-    if diff > 31:
-        months = int(diff/31.0)
-        if months > 1:
-            elapsed = '{0} Months ago'.format(months)
-        else:
-            elapsed = '{0} Month ago'.format(months)
-    if diff > 365:
-        years = int(diff/365.0)
-        if years > 1:
-            elapsed = '{0} Years ago'.format(years)
-        else:
-            elapsed = '{0} Year ago'.format(years)
-
-    return elapsed
-
 
 def parse_json(string):
     return json.loads(string)
diff --git a/ckanext/justicehub_theme/plugin.py b/ckanext/justicehub_theme/plugin.py
index c7db29b..e8d55cd 100644
--- a/ckanext/justicehub_theme/plugin.py
+++ b/ckanext/justicehub_theme/plugin.py
@@ -35,7 +35,6 @@ def get_helpers(self):
             'justicehub_theme_package_activity_stream': helpers.package_activity_stream,
             'justicehub_theme_parse_json': helpers.parse_json,
             'justicehub_theme_get_assignee_user': helpers.get_assignee_user,
-            'justicehub_theme_days_ago': helpers.days_ago,
             'justicehub_theme_issue_vars': helpers.issues_vars,
             'justicehub_theme_is_org_admin': helpers.is_org_admin
         }
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index d7c6462..a620823 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -77,7 +77,7 @@ <h1>{{h.dataset_display_name(pkg)}}
             </span>
             <span class="hidden-xs" style="float: left;">{{ _('|') }}</span>
             <span class="col-xs-5 col-sm-5">
-                <span>{{ _('Updated ') }}{{ h.justicehub_theme_days_ago(pkg.last_updated) }}</span>
+                <span>{{ _('Updated ') }}{{ h.time_ago_from_timestamp(pkg.last_updated) }}</span>
             </span>
         </div>
         <div class="col col-sm-5 col-sm-offset-1 col-xs-12 text-center">
diff --git a/ckanext/justicehub_theme/templates/package/resource_read.html b/ckanext/justicehub_theme/templates/package/resource_read.html
index ba08ec6..88304c1 100644
--- a/ckanext/justicehub_theme/templates/package/resource_read.html
+++ b/ckanext/justicehub_theme/templates/package/resource_read.html
@@ -13,7 +13,7 @@ <h1>{{ h.resource_display_name(res) | truncate(50) }}</h1>
 
         <div class="dataset-meta">
             {{ _('Updated') }}
-            {{ h.justicehub_theme_days_ago(res.last_modified) or h.justicehub_theme_days_ago(res.created) or _('unknown') }}
+            {{ h.time_ago_from_timestamp(res.last_modified) or h.time_ago_from_timestamp(res.created) or _('unknown') }}
         </div>
 
         <div class="dataset-meta">
diff --git a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
index fcc3fb5..6472dd1 100644
--- a/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
+++ b/ckanext/justicehub_theme/templates/package/snippets/resource_item.html
@@ -17,7 +17,7 @@
 
         <p class="res-meta">
                 {{ _('Updated:') }}
-                {{ h.justicehub_theme_days_ago(res.last_modified) or h.justicehub_theme_days_ago(res.Created) }}
+                {{ h.time_ago_from_timestamp(res.last_modified) or h.time_ago_from_timestamp(res.Created) }}
             {% if res.Created %}
             <br>
                 {{ _('Created:') }}

From 9f1d76c275fb7b32ca2e323634407a21cfa09c06 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 29 Jun 2020 18:04:08 +0530
Subject: [PATCH 119/127] Closes justicehub-in/Justice-Hub#83: protect
 maintainer email

only show email when a user is logged in.
---
 ckanext/justicehub_theme/templates/package/read_base.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index a620823..d943a14 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -29,7 +29,7 @@ <h1>{{h.dataset_display_name(pkg)}}
                 </h1>
                 <div class="dataset-meta">
                     <span>{{ _('Maintained by ') }}
-                        <a href="mailto:{{ pkg.maintainer_email }}">{{ pkg.maintainer }}</a>
+                        <span style="color: #f65940; font-weight: 600;">{{ pkg.maintainer }}</span>
                     </span>
                 </div>
                 <div class="dataset-meta">
@@ -82,9 +82,7 @@ <h1>{{h.dataset_display_name(pkg)}}
         </div>
         <div class="col col-sm-5 col-sm-offset-1 col-xs-12 text-center">
             <div class="col col-sm-5 col-xs-12">
-                <span>{{ _('Email ') }}
-                <a href="mailto:{{ pkg.maintainer_email }}">{{ pkg.maintainer }}</a>
-                </span>
+                <a href={% if c.userobj %}"mailto:{{ pkg.maintainer_email }}"{% else %}{{h.url_for('user.login', came_from=h.full_current_url())}}{% endif %}>Contact Maintainer</a>
             </div>
             <span class="hidden-xs" style="float: left;">{{ _('|') }}</span>
 

From f4013a09ef1b35e1935d7f00b55e0706f3535153 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 29 Jun 2020 18:15:38 +0530
Subject: [PATCH 120/127] fix external link

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

diff --git a/ckanext/justicehub_theme/templates/snippets/external_links.html b/ckanext/justicehub_theme/templates/snippets/external_links.html
index 7aeee4e..9caeb6a 100644
--- a/ckanext/justicehub_theme/templates/snippets/external_links.html
+++ b/ckanext/justicehub_theme/templates/snippets/external_links.html
@@ -7,7 +7,7 @@ <h1 class="page-heading">{{ _('EXTERNAL LINKS') }}</h1>
        <dl class="dl-horizontal links-list">
       {% set item = h.composite_get_as_dict(item) %}
       <dt>
-          <a href="{{ link }}">{{ item['title'] }}</a>
+          <a href="{{ item['link'] }}">{{ item['title'] }}</a>
       </dt>
       <dd>
           <p>{{ item['description'] }}</p>

From ae1917a0f7fcced511f235587f803ac86ae6c14c Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Mon, 29 Jun 2020 20:08:21 +0530
Subject: [PATCH 121/127] update metadata header display in dataste upload/edit

---
 ckanext/justicehub_theme/public/common.css     |  3 +++
 ckanext/justicehub_theme/public/dataset.css    | 18 +++++++++++++++---
 .../package/snippets/package_form.html         |  4 ++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 7f72a11..1a8629f 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -59,6 +59,7 @@ h1,
 .stages li,
 .nav-tabs > li >  a,
 .module-heading,
+.metadata-heading,
 .login-sidebar-heading,
 .footer-intro {
     font-size: 25px;
@@ -117,6 +118,7 @@ h1,
 .content_action a,
 .dataset-title,
 .module-heading,
+.metadata-heading,
 .popover .popover-content,
 .intro-box span:nth-child(2),
 .footer-links .input-group-btn .btn {
@@ -451,6 +453,7 @@ img.fa-certificate.fa-lg {
     }
     .intro-box span,
     .stages .highlight,
+    .metadata-heading,
     .nav-tabs li a {
         font-size: 18px;
     }
diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index cf0968c..d0ec9ea 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -149,11 +149,17 @@ h1+.dataset-meta {
     margin: 0;
 }
 .metadata-heading {
-    padding: 10px 0;
+    padding: 15px 0;
     width: 50%;
     display: inline-block;
     text-align: center;
-    margin-left: -30px;
+}
+.metadata-small-heading {
+    padding: 10px 0;
+    width: 270px;
+}
+.metadata-small-heading:hover {
+    background-color: #f65940;
 }
 
 /* --------------------- responsive ------------------------- */
@@ -162,7 +168,13 @@ h1+.dataset-meta {
         padding-right: 0;
     }
     .metadata-heading {
-        margin-left: 0;
+        padding: 20px 50px;
+        margin-left: 0px;
+        width: 100%;
+        text-align: left;
+    }
+    .metadata-small-heading {
+        padding: 10px 50px;
     }
     .additional-info .table {
         width: 100%;
diff --git a/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html b/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
index 5baeccc..aa31bdd 100644
--- a/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
+++ b/ckanext/justicehub_theme/templates/scheming/package/snippets/package_form.html
@@ -83,8 +83,8 @@
   {%- endfor -%}
   </div>
 
-  <div style="margin-top: 25px;">
-      <span class="metadata-heading">{{ _('METADATA') }}</span>
+  <div style="margin-top: 25px; margin-left: -30px; border-bottom: 2px solid #f65940;">
+      <span class={%if form_style == 'edit' %}"metadata-heading metadata-small-heading"{% else %}"metadata-heading"{% endif %}>{{ _('METADATA') }}</span>
   </div>
 
   <div class="row">

From 85d0a8c0a8998e1619854d87ae5c95b8b9f01f3d Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 30 Jun 2020 16:00:11 +0530
Subject: [PATCH 122/127] fix subscribe popover for mobile screen

---
 .../justicehub_theme/fanstatic/justicehub_theme.js | 14 ++++++++++++--
 ckanext/justicehub_theme/public/search.css         |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ckanext/justicehub_theme/fanstatic/justicehub_theme.js b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
index a0fb9dd..d572298 100644
--- a/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
+++ b/ckanext/justicehub_theme/fanstatic/justicehub_theme.js
@@ -1,3 +1,4 @@
+// Read More effect.
 // https://www.viralpatel.net/dynamically-shortened-text-show-more-link-jquery/
 $(document).ready(function() {
 	var showChar = 215;
@@ -33,8 +34,10 @@ $(document).ready(function() {
 });
 
 
+// tooltip enabled.
 $('[data-toggle="tooltip"]').tooltip();
 
+// counting animation for stats.
 // https://stackoverflow.com/a/23006629/3860168
 $('.stats-big').each(function () {
     var $this = $(this);
@@ -47,6 +50,7 @@ $('.stats-big').each(function () {
   });
 });
 
+// bootstrap nav-tabs.
 ckan.module('justicehub_theme_tabs', function ($) {
     return {
         initialize: function () {
@@ -74,6 +78,7 @@ ckan.module('justicehub_theme_tabs', function ($) {
     };
 });
 
+// subscribe to mailing.
 ckan.module('justicehub_theme_subscribe', function ($) {
     return {
         initialize: function () {
@@ -107,8 +112,13 @@ ckan.module('justicehub_theme_subscribe', function ($) {
                     }
 
                     console.log(msg);
-                    $('[data-toggle="popover"]').data('bs.popover').options.content=msg;
-                    $('[data-toggle="popover"]').popover('show');
+                    if ($(window).width() < 768) {
+                        $('[data-toggle="popover"][class*="visible"]').data('bs.popover').options.content=msg;
+                        $('[data-toggle="popover"][class*="visible"]').popover('show');
+                    } else {
+                        $('[data-toggle="popover"]').data('bs.popover').options.content=msg;
+                        $('[data-toggle="popover"]').popover('show');
+                    }
                 };
 
                 request.onerror = function() {
diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index 545eb7f..de9b8a9 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -164,7 +164,7 @@
         border-color: #f65940;
         padding: 0 5px;
     }
-    .footer-links .input-group-btn .fa {
+    .footer-links .input-group-btn button > .fa {
         text-align: center;
         font-size: 14px;
         width: 10px;

From 230e774137d015edd579aa5d700646939490cbdf Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 30 Jun 2020 16:00:23 +0530
Subject: [PATCH 123/127] disable horizontal scroll

---
 ckanext/justicehub_theme/public/justicehub_theme.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index e87dd6d..806c08f 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -82,7 +82,12 @@
 }
 
 /* -------------------- body layout ----------------------- */
-
+html, body {
+  overflow-x: hidden;
+}
+body {
+  position: relative
+}
 .container {
     width: 95%;
 }

From ffa3ddef0ea40ad5176be511ca29c44749e1fc86 Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Tue, 30 Jun 2020 16:39:14 +0530
Subject: [PATCH 124/127] adjust viewport and remove overflow limits from body

---
 ckanext/justicehub_theme/public/justicehub_theme.css | 6 ------
 ckanext/justicehub_theme/templates/base.html         | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 806c08f..e13584d 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -82,12 +82,6 @@
 }
 
 /* -------------------- body layout ----------------------- */
-html, body {
-  overflow-x: hidden;
-}
-body {
-  position: relative
-}
 .container {
     width: 95%;
 }
diff --git a/ckanext/justicehub_theme/templates/base.html b/ckanext/justicehub_theme/templates/base.html
index 69129d1..b111432 100644
--- a/ckanext/justicehub_theme/templates/base.html
+++ b/ckanext/justicehub_theme/templates/base.html
@@ -1,5 +1,9 @@
 {% ckan_extends %}
 
+{% block meta_viewport %}
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0">
+{% endblock %}
+
 {% block styles %}
   {{ super() }}
   <link rel="stylesheet" href="/justicehub_theme.css" />

From 6c63980cad8f3a2da794d21e16f3a089d59a356d Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Wed, 1 Jul 2020 20:50:14 +0530
Subject: [PATCH 125/127] adjust font size for mobile view

---
 ckanext/justicehub_theme/public/common.css    | 57 +++++++++++++++----
 ckanext/justicehub_theme/public/dataset.css   |  3 +-
 ckanext/justicehub_theme/public/issues.css    |  6 +-
 .../public/justicehub_theme.css               | 28 ++++++++-
 ckanext/justicehub_theme/public/partner.css   | 38 ++++++++-----
 ckanext/justicehub_theme/public/search.css    |  3 +
 .../templates/issues/dataset.html             |  4 +-
 .../templates/organization/jh_members.html    | 24 ++++----
 .../templates/organization/read_base.html     |  6 +-
 .../templates/organization/stats.html         |  6 +-
 10 files changed, 121 insertions(+), 54 deletions(-)

diff --git a/ckanext/justicehub_theme/public/common.css b/ckanext/justicehub_theme/public/common.css
index 1a8629f..45b765e 100644
--- a/ckanext/justicehub_theme/public/common.css
+++ b/ckanext/justicehub_theme/public/common.css
@@ -390,8 +390,8 @@ img.fa-check.fa-lg {
     height: 28px;
 }
 img.fa.fa-certificate {
-    width: 20px;
-    height: 25px;
+    width: 21px;
+    height: 27px;
 }
 img.fa-certificate.fa-lg {
     width: 22px;
@@ -431,32 +431,59 @@ img.fa-certificate.fa-lg {
 
 /* -------------------------------------- Mobile adjustments ----------------------------- */
 @media (min-width:320px) and (orientation: portrait) {
+    .count,
+    .pkg_tags,
+    .sort-box,
     .res-meta,
-    .dataset-meta {
+    .downloads,
+    .dataset-meta,
+    .input-group-addon,
+    .package-item-row,
+    .dataset-count-box,
+    .resource-item .description,
+    .footer-links .nav-item a {
+        font-size: 11px;
+    }
+    .dataset-desc {
         font-size: 12px;
     }
+    h3,
     .btn,
     .col2 p,
     .stats-box,
     .content_action a,
-    .dataset-desc,
-    .dataset-count-box,
+    .dataset-title,
+    .dataset-org,
+    .media-heading,
+    .nav-tabs li a,
+    .nav-pills li,
+    .dl-horizontal,
+    .dropdown-menu > li > a,
+    .toolbar .breadcrumb,
     .resource-item .heading,
     .table thead tr th.table-actions .btn,
     body {
         font-size: 14px;
     }
+    h1, h2,
     .landing-desc,
+    .page-heading,
+    .control-label,
+    #field-giant-search,
     .search-form .search-input.search-giant input,
+    .login-form .checkbox,
+    .footer-intro,
     .btn.bg-clear {
-        font-size: 16px;
+        font-size: 14px;
     }
     .intro-box span,
     .stages .highlight,
-    .metadata-heading,
-    .nav-tabs li a {
+    .metadata-heading {
         font-size: 18px;
     }
+    .stats-big {
+        font-size: 30px;
+    }
     .fa.fa-circle {
         font-size: 60px;
     }
@@ -470,10 +497,18 @@ img.fa-certificate.fa-lg {
     .subscribe-box {
         background-color: #403644;
     }
-    .footer-intro {
-        font-size: 18px;
-    }
     .page-header .nav-tabs {
         border-bottom: none;
     }
+    img.fa.fa-certificate {
+        width: 12px;
+        height: 16px;
+    }
+    img.fa.fa-check {
+        width: 13px;
+        height: 14px;
+    }
+    .stats-big {
+        text-align: center;
+    }
 }
diff --git a/ckanext/justicehub_theme/public/dataset.css b/ckanext/justicehub_theme/public/dataset.css
index d0ec9ea..ae8e289 100644
--- a/ckanext/justicehub_theme/public/dataset.css
+++ b/ckanext/justicehub_theme/public/dataset.css
@@ -182,6 +182,7 @@ h1+.dataset-meta {
     }
     .partner-links.social-links {
         margin-top: 5%;
+        float: right;
     }
     .links-list.dl-horizontal dt,
     .links-list.dl-horizontal dd {
@@ -208,7 +209,7 @@ h1+.dataset-meta {
         width:100%;
     }
     .org-box {
-        width: 200px;
+        width: 300px;
         height: 200px;
     }
 }
diff --git a/ckanext/justicehub_theme/public/issues.css b/ckanext/justicehub_theme/public/issues.css
index 907d5e3..831901d 100644
--- a/ckanext/justicehub_theme/public/issues.css
+++ b/ckanext/justicehub_theme/public/issues.css
@@ -1,16 +1,12 @@
 #issues-found,
 .issue-list-group {
-    padding-left: 15px;
+    padding-left: 10px;
     margin-left: 0;
     margin-top: 0;
 }
 .issues-home .gravatar {
     border-radius: 50%;
 }
-.issues-home .page-heading {
-    padding-bottom: 50px;
-    padding-left: 15px;
-}
 .issues-home .input-group {
     border-bottom: 1px solid #f65940;
 }
diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index e13584d..022eee4 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -182,6 +182,10 @@ a.morelink:visited {
     margin-bottom: 10px !important;
     margin-left: -30px;
 }
+h2.page-heading {
+    padding-bottom: 50px;
+    padding-left: 20px;
+}
 .module .page-header {
     margin: 0;
     padding-bottom: 0;
@@ -455,6 +459,12 @@ aside .module [class^=module] {
     .page-header .nav-tabs {
         margin-top: 50px;
     }
+    .page-heading {
+        padding-left: 45px;
+    }
+    h2.page-heading {
+        padding-left: 35px;
+    }
     .toolbar .breadcrumb,
     .toolbar .breadcrumb a {
         color: #403644;
@@ -467,20 +477,34 @@ aside .module [class^=module] {
     }
     .masthead .navigation .nav-pills > li {
         height: auto;
-        min-height: 50px;
+        min-height: 40px;
         display: block;
     }
+    .masthead .navigation .nav-pills > li.active {
+        border-bottom: 3px solid #f65940;
+        padding-top: 0;
+    }
+    .navigation .open {
+        border-bottom: 3px solid #f65940;
+        padding-top: 0;
+    }
     .navigation .dropdown:last-child .dropdown-menu {
         position: static;
     }
     .login-heading {
-        padding-left: 20px;
+        padding-left: 65px;
         margin-bottom: 20px;
         margin-left: -10px;
     }
     .login-sidebar {
         height: 100%;
     }
+    .btn-forgot {
+        margin-top: 15px;
+    }
+    .wrapper {
+        min-height: 400px;
+    }
     .container {
         width: 100%;
     }
diff --git a/ckanext/justicehub_theme/public/partner.css b/ckanext/justicehub_theme/public/partner.css
index c812e7a..5df5f80 100644
--- a/ckanext/justicehub_theme/public/partner.css
+++ b/ckanext/justicehub_theme/public/partner.css
@@ -38,12 +38,10 @@
 }
 
 /* ----------------------- members --------------------------- */
-.members-table > thead > tr > th {
-    border-bottom: 2px solid #f65940;
-    padding: 25px;
-}
 .members-table > tbody > tr > td {
-    padding: 35px;
+    border-top: None;
+    padding-top: 35px;
+    vertical-align: middle;
 }
 .member_media > img {
     width: 60px;
@@ -62,16 +60,6 @@
 }
 
 /*----------------- org-edit dataset ----------------------*/
-.partner-dataset-table > tbody > tr > td {
-    border-top:None;
-}
-.partner-dataset-table > thead tr th {
-    padding-bottom: 5%;
-}
-.partner-dataset-table > thead > tr > th {
-    border-bottom:None;
-    vertical-align:middle;
-}
 .btn-icon {
     border:None;
     padding: 0;
@@ -85,3 +73,23 @@
 .partner-dataset-table td.context {
     padding-left: 20px;
 }
+/* -------------------------------------- Mobile adjustments ----------------------------- */
+@media (min-width:320px) and (orientation: portrait) {
+    .media-item {
+        width: 40%;
+    }
+    .media-logo {
+        height: 80px;
+    }
+    .img-responsive {
+        max-width: 75%;
+    }
+    .member_media > img {
+        width: auto;
+        height: auto;
+    }
+    .members-table > thead > tr > th,
+    .members-table > tbody > tr > td {
+        padding: 10px;
+    }
+}
diff --git a/ckanext/justicehub_theme/public/search.css b/ckanext/justicehub_theme/public/search.css
index de9b8a9..1c63f33 100644
--- a/ckanext/justicehub_theme/public/search.css
+++ b/ckanext/justicehub_theme/public/search.css
@@ -123,6 +123,9 @@
 
 /* -------------------------------------- Mobile adjustments ----------------------------- */
 @media (min-width: 320px) and (orientation: portrait) {
+    #field-giant-search {
+        padding-left: 35px;
+    }
     .search-form .input-group-btn .btn,
     .search-form .input-group >:first-child,
     .search-form .input-group > select {
diff --git a/ckanext/justicehub_theme/templates/issues/dataset.html b/ckanext/justicehub_theme/templates/issues/dataset.html
index 4fae0cd..8e1f91d 100644
--- a/ckanext/justicehub_theme/templates/issues/dataset.html
+++ b/ckanext/justicehub_theme/templates/issues/dataset.html
@@ -37,7 +37,9 @@ <h2 class="page-heading">
        <!-- NOTE: disabled issue show for Alpha
        <a href="{{ h.url_for('issues_show', dataset_id=pkg.id, issue_number=issue.number) }}" {% if issue.visibility == 'hidden'%} class="issue-abuse"{% endif%}-->
        <div class="row">
-           <h2>{{ issue.title }}</h2>
+           <div class="col-sm-12">
+               <h2>{{ issue.title }}</h2>
+           </div>
        </div>
        <div class="row">
            <div class="col col-sm-8 col-xs-5">
diff --git a/ckanext/justicehub_theme/templates/organization/jh_members.html b/ckanext/justicehub_theme/templates/organization/jh_members.html
index 35809d9..9653e8f 100644
--- a/ckanext/justicehub_theme/templates/organization/jh_members.html
+++ b/ckanext/justicehub_theme/templates/organization/jh_members.html
@@ -12,15 +12,20 @@
 
 {% block primary_content_inner %}
     {% block package_description %}
-      <h1 class="page-heading">
-          {{ _('MEMBERS') }}
-      </h1>
+    <h2 class="page-heading">
+       <div class="col col-sm-6 col-xs-6">
+           {{ _('User') }}
+       </div>
+       <div class="col col-sm-6 col-xs-6">
+           {{ _('Role') }}
+       </div>
+    </h2>
     {% endblock %}
-    <div class="row page_primary_action">
     {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
+        <div class="row page_primary_action">
         {% link_for _('ADD MEMBER'), controller='organization', action='member_new', id=c.group_dict.id, class_='btn btn-primary pull-right', named_route=group_type + '_member_new' %}
+        </div>
     {% endif %}
-    </div>
 
 	{% block packages_list %}
         {% block member_list %}
@@ -28,15 +33,6 @@ <h1 class="page-heading">
         {% set members_count = ungettext('{count} member', '{count} members', count).format(count=count) %}
         
         <table class="table table-header table-hover members-table">
-            <thead>
-            <tr>
-                <th>{{ _('User') }}</th>
-                <th>{{ _('Role') }}</th>
-                {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
-                    <th></th>
-                {% endif %}
-            </tr>
-            </thead>
             <tbody>
             {% for user_id, user, role in c.members %}
                 <tr>
diff --git a/ckanext/justicehub_theme/templates/organization/read_base.html b/ckanext/justicehub_theme/templates/organization/read_base.html
index 6117634..7f1bab8 100644
--- a/ckanext/justicehub_theme/templates/organization/read_base.html
+++ b/ckanext/justicehub_theme/templates/organization/read_base.html
@@ -49,17 +49,19 @@ <h1 class="heading">{{ c.group_dict.title or c.group_dict.name }}
 
             {% if not h.justicehub_theme_is_org_admin(c.userobj.name, c.group_dict) %}
                 {% block follow %}
+                {% if c.userobj %}
                 <div class="col col-sm-2 col-xs-6 follow_button">
                   {{ h.follow_button('group', c.group_dict.id) }}
                 </div>
+                {% endif %}
                 {% endblock %}
             {% endif %}
 
-            <div class="col col-sm-2 col-sm-offset-2 col-xs-12 text-right" style="margin-top: 15px;">
+            <div class="col col-sm-2 col-sm-offset-2 col-xs-2 text-right" style="margin-top: 15px;">
                 <span>{{ _('Contact ') }}</span>
             </div>
                 <span class="hidden-xs pull-left" style="margin-top: 15px;">{{ _('|') }}</span>
-            <div class="partner-links social-links col-sm-3 col-xs-12" style="margin-top: 15px;">
+            <div class="partner-links social-links col-sm-3 col-xs-8" style="margin-top: 15px;">
                 <ul class="list-unstyled list-inline">
                     <li>
                     {% if c.group_dict.website %}
diff --git a/ckanext/justicehub_theme/templates/organization/stats.html b/ckanext/justicehub_theme/templates/organization/stats.html
index 6e52112..bc3db79 100644
--- a/ckanext/justicehub_theme/templates/organization/stats.html
+++ b/ckanext/justicehub_theme/templates/organization/stats.html
@@ -16,15 +16,15 @@ <h1 class="page-heading">
     </h1>
   {% endblock %}
 	<div class="row stats-box">
-        <div class="col-xs-6 col-sm-4">
+        <div class="col-xs-4 col-sm-4">
             <span class="primary-color stats-big">{{ c.group_dict.downloads }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
             <span>{{ _('DOWNLOADS') }}</span>
         </div>
-        <div class="col-xs-6 col-sm-4">
+        <div class="col-xs-3 col-xs-offset-1 col-sm-4">
             <span class="primary-color stats-big">{{ c.group_dict.visits }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
             <span>{{ _('VISITS') }}</span>
         </div>
-        <div class="col-xs-6 col-sm-4">
+        <div class="col-xs-4 col-sm-4">
             <span class="primary-color stats-big">{{ c.group_dict.num_followers }}{% if c.group_dict.downloads %}{{ _('+') }}{% endif %}</span>
             <span>{{ _('FOLLOWERS') }}</span>
         </div>

From e86683cd475506500740d4b48719b8760133f72e Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Thu, 2 Jul 2020 19:29:15 +0530
Subject: [PATCH 126/127] fix overflowing partner images

---
 ckanext/justicehub_theme/public/justicehub_theme.css | 2 ++
 ckanext/justicehub_theme/public/partner.css          | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/ckanext/justicehub_theme/public/justicehub_theme.css b/ckanext/justicehub_theme/public/justicehub_theme.css
index 022eee4..3623334 100644
--- a/ckanext/justicehub_theme/public/justicehub_theme.css
+++ b/ckanext/justicehub_theme/public/justicehub_theme.css
@@ -7,6 +7,8 @@
 }
 .image-box img.media-image {
     margin:auto;
+    max-width: 100%;
+    max-height: 100%;
 }
 .context-info .image a {
     width: 150px;
diff --git a/ckanext/justicehub_theme/public/partner.css b/ckanext/justicehub_theme/public/partner.css
index 5df5f80..d8f0e77 100644
--- a/ckanext/justicehub_theme/public/partner.css
+++ b/ckanext/justicehub_theme/public/partner.css
@@ -4,7 +4,8 @@
     border: none;
 }
 .media-item {
-    width:200px;
+    width:210px;
+    margin-left: 24px;
 }
 .count,
 .media-item .media-heading {

From c4fd0725cecdc94b776d591766800a87fb6cf3cb Mon Sep 17 00:00:00 2001
From: curioswati <swati@civicdatalab.in>
Date: Fri, 3 Jul 2020 15:00:20 +0530
Subject: [PATCH 127/127] rename NOTEs to FIXME for post alpha fixing.

---
 ckanext/justicehub_theme/logic/action/action.py               | 2 +-
 ckanext/justicehub_theme/public/resource.css                  | 2 +-
 ckanext/justicehub_theme/templates/issues/dataset.html        | 4 ++--
 ckanext/justicehub_theme/templates/package/read_base.html     | 2 +-
 .../templates/package/resource_edit_base.html                 | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ckanext/justicehub_theme/logic/action/action.py b/ckanext/justicehub_theme/logic/action/action.py
index 4d9b6b3..84adbdd 100644
--- a/ckanext/justicehub_theme/logic/action/action.py
+++ b/ckanext/justicehub_theme/logic/action/action.py
@@ -42,7 +42,7 @@ def get_package_owner_details(context, data_dict):
                                                include_extras=True
                                                )
 
-    # NOTE: commented becaues this validation causes solr to fail reindexing
+    # FIXME: commented becaues this validation causes solr to fail reindexing
     # group_plugin = lib_plugins.lookup_group_plugin(partner_dict['type'])
     # schema = logic.schema.default_show_group_schema()
     # partner, errors = lib_plugins.plugin_validate(
diff --git a/ckanext/justicehub_theme/public/resource.css b/ckanext/justicehub_theme/public/resource.css
index 860e863..4da7f13 100644
--- a/ckanext/justicehub_theme/public/resource.css
+++ b/ckanext/justicehub_theme/public/resource.css
@@ -24,7 +24,7 @@
     border-radius: 0;
     margin-top: 0;
 }
-/* NOTE: hiding for Alpha */
+/* FIXME: hiding for Alpha */
 .res-actions ul > li a[data-module=api-info] {
     display: none;
 }
diff --git a/ckanext/justicehub_theme/templates/issues/dataset.html b/ckanext/justicehub_theme/templates/issues/dataset.html
index 8e1f91d..8d2295a 100644
--- a/ckanext/justicehub_theme/templates/issues/dataset.html
+++ b/ckanext/justicehub_theme/templates/issues/dataset.html
@@ -7,7 +7,7 @@
 {% set issues = extra_vars.issues %}
 
 <section class="module issues-home">
-    <!-- NOTE: disabled for Alpha -->
+    <!-- FIXME: disabled for Alpha -->
     {#% snippet 'snippets/search_form.html',
                 type='issue', query=extra_vars.q,
                 fields=(('page', pagination.page), ('per_page', pagination.per_page), ('status', extra_vars.status), ('visibility', visibility)),
@@ -34,7 +34,7 @@ <h2 class="page-heading">
    <ul id="issue-list" class="issue-list-group list-group list-unstyled">
    {% for issue in issues %}
        <li>
-       <!-- NOTE: disabled issue show for Alpha
+       <!-- FIXME: disabled issue show for Alpha
        <a href="{{ h.url_for('issues_show', dataset_id=pkg.id, issue_number=issue.number) }}" {% if issue.visibility == 'hidden'%} class="issue-abuse"{% endif%}-->
        <div class="row">
            <div class="col-sm-12">
diff --git a/ckanext/justicehub_theme/templates/package/read_base.html b/ckanext/justicehub_theme/templates/package/read_base.html
index d943a14..070eef1 100644
--- a/ckanext/justicehub_theme/templates/package/read_base.html
+++ b/ckanext/justicehub_theme/templates/package/read_base.html
@@ -199,7 +199,7 @@ <h2>ACTIVITY</h2>
             </a>
             </li>
 
-            <!-- NOTE: need to figure out how to conditionally show, disabling for Alpha
+            <!-- FIXME: need to figure out how to conditionally show, disabling for Alpha
             <div class="issues-actions">
                 {{ h.nav_link(_('New Issue'), named_route='issues_new', dataset_id=pkg.name, class_='btn btn-success pull-right') }}
             </div-->
diff --git a/ckanext/justicehub_theme/templates/package/resource_edit_base.html b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
index 0faff2c..d1e69fb 100644
--- a/ckanext/justicehub_theme/templates/package/resource_edit_base.html
+++ b/ckanext/justicehub_theme/templates/package/resource_edit_base.html
@@ -23,7 +23,7 @@
 {% block content_primary_nav %}
   {{ h.build_nav_icon('resource_edit', _('EDIT RESOURCE'), id=pkg.name, resource_id=res.id) }}
   {% block inner_primary_nav %}{% endblock %}
-  <!--NOTE: Removing for Alpha -->
+  <!--FIXME: Removing for Alpha -->
   {#{ h.build_nav_icon('views', _('Views'), id=pkg.name, resource_id=res.id) }#}
 
   <div class="content_action">