Merge pull request #6492 from OCHA-DAP/dev

dev into prod

ckanext-hdx_org_group/ckanext/hdx_org_group/helpers/organization_helper.py

@@ -841,7 +841,7 @@ def hdx_generate_organization_stats(org_dict):
             ('Organisation Name', org_dict.get('title') or org_dict.get('name')),
             ('Overview', 'This spreadsheet contains the number of dataset downloads and page views of the organisation, tracked monthly.'),
             ('Contents', '1. Total and unique number of downloads by month. \n2. Total and unique number of page views by month.'),
-            ('Time Period', 'Includes monthly data for the current year and the preceding four years.'),
+            ('Time Period', 'Includes monthly data for the current year (January to December) as well as the previous four years.'),
             ('Update Frequency', 'The spreadsheet is refreshed automatically on the first day of each month.'),
             ('Data Source', 'The data comes from the analytics platform Mixpanel.'),
             ('Caveats', 'To ensure accuracy, we have excluded as much bot traffic as possible. \nThe data in this spreadsheet may differ from that on the organisation page stats dashboard as they cover different time periods.'),

ckanext-hdx_theme/ckanext/hdx_theme/helpers/ui_constants/landing_pages/hapi.py

@@ -10,6 +10,11 @@
     'BE_INSPIRED_CARD_BUTTON_POWER_BI': '''Learn more''',
     'BE_INSPIRED_CARD_BUTTON_LINK_POWER_BI': '''https://drive.google.com/file/d/1EQ4UAshvFvpqmoifdBH0mJxKck7xoSGN/view''',
 
+    'BE_INSPIRED_CARD_TITLE_POWER_QUERY': '''Power Query workflow''',
+    'BE_INSPIRED_CARD_TEXT_POWER_QUERY': '''A tutorial to demonstrate how to integrate HDX HAPI into Excel.''',
+    'BE_INSPIRED_CARD_BUTTON_POWER_QUERY': '''Learn more''',
+    'BE_INSPIRED_CARD_BUTTON_LINK_POWER_QUERY': '''https://drive.google.com/file/d/1KaUc2X9OOHgOP2q7toJ6XoewZy0ALsIW/view''',
+
     'BE_INSPIRED_CARD_TITLE_API': '''API Sandbox''',
     'BE_INSPIRED_CARD_TEXT_API': '''A sandbox environment to help construct queries and get a data response.''',
     'BE_INSPIRED_CARD_BUTTON_API': '''Learn more''',

ckanext-hdx_theme/ckanext/hdx_theme/templates/landing_pages/hapi.html

@@ -42,13 +42,16 @@
           {{ h.snippet('bem.blocks/paragraph.html', text=CONST.BE_INSPIRED_SECTION_DESCRIPTION, paragraph_classes=["paragraph__text_font-size-big"]) }}
         </div>
         <div class="row mt-4">
-          <div class="col-12 col-md-4 d-md-flex align-items-md-stretch">
+          <div class="col-12 col-md-6 col-lg-3 d-md-flex align-items-md-stretch">
             {{ h.snippet('bem.blocks/card.html', title=CONST.BE_INSPIRED_CARD_TITLE_POWER_BI, text=CONST.BE_INSPIRED_CARD_TEXT_POWER_BI, button=CONST.BE_INSPIRED_CARD_BUTTON_POWER_BI, link=CONST.BE_INSPIRED_CARD_BUTTON_LINK_POWER_BI, click_stopper_link_type='hapi tools', click_stopper_link_label=CONST.BE_INSPIRED_CARD_TITLE_POWER_BI, spacing_class="my-3") }}
           </div>
-          <div class="col-12 col-md-4 d-md-flex align-items-md-stretch">
+          <div class="col-12 col-md-6 col-lg-3 d-md-flex align-items-md-stretch">
+            {{ h.snippet('bem.blocks/card.html', title=CONST.BE_INSPIRED_CARD_TITLE_POWER_QUERY, text=CONST.BE_INSPIRED_CARD_TEXT_POWER_QUERY, button=CONST.BE_INSPIRED_CARD_BUTTON_POWER_QUERY, link=CONST.BE_INSPIRED_CARD_BUTTON_LINK_POWER_QUERY, click_stopper_link_type='hapi tools', click_stopper_link_label=CONST.BE_INSPIRED_CARD_TITLE_POWER_QUERY, spacing_class="my-3") }}
+          </div>
+          <div class="col-12 col-md-6 col-lg-3 d-md-flex align-items-md-stretch">
             {{ h.snippet('bem.blocks/card.html', title=CONST.BE_INSPIRED_CARD_TITLE_API, text=CONST.BE_INSPIRED_CARD_TEXT_API, button=CONST.BE_INSPIRED_CARD_BUTTON_API, link=CONST.BE_INSPIRED_CARD_BUTTON_LINK_API, click_stopper_link_type='hapi tools', click_stopper_link_label=CONST.BE_INSPIRED_CARD_TITLE_API, spacing_class="my-3") }}
           </div>
-          <div class="col-12 col-md-4 d-md-flex align-items-md-stretch">
+          <div class="col-12 col-md-6 col-lg-3 d-md-flex align-items-md-stretch">
             {{ h.snippet('bem.blocks/card.html', title=CONST.BE_INSPIRED_CARD_TITLE_VISUALIZATION, text=CONST.BE_INSPIRED_CARD_TEXT_VISUALIZATION, button=CONST.BE_INSPIRED_CARD_BUTTON_VISUALIZATION, link=CONST.BE_INSPIRED_CARD_BUTTON_LINK_VISUALIZATION, click_stopper_link_type='hapi tools', click_stopper_link_label=CONST.BE_INSPIRED_CARD_TITLE_VISUALIZATION, spacing_class="my-3") }}
           </div>
         </div>

ckanext-hdx_theme/ckanext/hdx_theme/version.py

@@ -1 +1 @@
-hdx_version = 'v1.85.5'
+hdx_version = 'v1.85.6'