Merge branch 'develop' into enh/enable-longer-password

common/translation_utils/translation_status.csv

@@ -190,7 +190,7 @@ articles,FE,translate,,has partial translation,,,
 %(counter)s of %(total)s questions,FE,translate,,has partial translation,,,
 Optional,FE,translate,,has partial translation,,,obsoleted if hints become custom
 Select one,FE,translate,,has partial translation,,,obsoleted if hints become custom
-Check all that apply,FE,translate,,has translation,,,obsoleted if hints become custom
+Check all that apply,FE,translate,,has partial translation,,,obsoleted if hints become custom
 Check if applies,FE,translate,,has partial translation,,,obsoleted if hints become custom; rephrase?
 Comments,FE,translate,,has partial translation,,,
 Please log in or create your account,FE,translate,,has partial translation,,,"rephrease ""please log in to comment"""
@@ -717,3 +717,4 @@ Enter your old 4-digit PIN or a longer password,,translate,,has partial translat
 Enter your new 4-digit PIN or a longer password,,translate,,has partial translation,,,
 Repeat your new 4-digit PIN or longer password,,translate,,has partial translation,,,
 Set Password,,not needed,,not needed,,Create 4 digit pin or a longer password,
+Farsi,,not needed,,not needed,,,

docker-compose.yml

@@ -30,6 +30,7 @@ services:
  SUPERSET_USERNAME: ''
  SUPERSET_PASSWORD: ''
  PUSH_NOTIFICATION: 'enable'
+ JQUERY: 'enable'
  command: python manage.py runserver 0.0.0.0:8000
  volumes:
  - ./:/app/

home/migrations/0051_auto_20230330_1105.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.14 on 2023-03-30 11:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('home', '0050_auto_20230213_1214'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='manifestsettings',
+ name='language',
+ field=models.CharField(choices=[('ar', 'Arabic'), ('bn', 'Bengali'), ('ny', 'Chichewa'), ('prs', 'Dari'), ('en', 'English'), ('fa', 'Farsi'), ('fr', 'French'), ('hi', 'Hindi'), ('id', 'Indonesian'), ('kaa', 'Karakalpak'), ('km', 'Khmer'), ('rw', 'Kinyarwanda'), ('rn', 'Kirundi'), ('ku', 'Kurdish'), ('mg', 'Malagasy'), ('ne', 'Nepali'), ('nr', 'Ndebele'), ('ps', 'Pashto'), ('pt', 'Portuguese'), ('qu', 'Quechua'), ('ru', 'Russian'), ('sn', 'Shona'), ('si', 'Sinhala'), ('es', 'Spanish'), ('sw', 'Swahili'), ('tg', 'Tajik'), ('ta', 'Tamil'), ('ti', 'Tigrinya'), ('tr', 'Turkish'), ('uk', 'Ukraine'), ('ur', 'Urdu'), ('uz', 'Uzbek'), ('zu', 'Zulu'), ('xy', 'Testing')], default='en', help_text='Choose language', max_length=3, verbose_name='Language'),
+ ),
+ ]

home/processors.py

@@ -13,3 +13,9 @@ def show_footers(request):
  if start_link:
  show_footers_ = False
  return {'show_footers': show_footers_}
+
+
+def jquery(request):
+ return {
+ 'jquery': settings.JQUERY,
+ }

home/translatable_strings.py

@@ -18,6 +18,7 @@
  '%(counter)s of %(total)s questions',
  'Optional',
  'Select one',
+ 'Check all that apply',
  'Check if applies',
  'Comments',
  'Please log in or create your account',

home/wagtail_hooks.py

@@ -85,7 +85,7 @@ def global_admin_css():
 def global_admin_js():
  return format_html(
  '<script src="{}"></script>',
- static("js/global/admin.js")
+ static("js/admin.js")
  )
 
 

iogt/settings/base.py

@@ -139,6 +139,7 @@
  'home.processors.show_footers',
  'messaging.processors.add_vapid_public_key',
  'notifications.processors.push_notification',
+ 'home.processors.jquery',
  ],
  },
  },
@@ -289,6 +290,7 @@
  ('ny', _('Chichewa')), # previously 'ch'
  ('prs', _('Dari')),
  ('en', _('English')),
+ ('fa', _('Farsi')),
  ('fr', _('French')),
  ('hi', _('Hindi')),
  ('id', _('Indonesian')),
@@ -535,5 +537,6 @@
 SUPERSET_PASSWORD = os.getenv('SUPERSET_PASSWORD')
 
 PUSH_NOTIFICATION = os.getenv('PUSH_NOTIFICATION', 'disable') == 'enable'
+JQUERY = os.getenv('JQUERY', 'enable') == 'enable'
 
 DATA_UPLOAD_MAX_NUMBER_FIELDS = int(os.getenv('DATA_UPLOAD_MAX_NUMBER_FIELDS', '') or '1000')

iogt/settings/production.py

@@ -41,7 +41,7 @@
  },
 }
 
-SITE_VERSION = '2.3.3'
+SITE_VERSION = '2.3.4'
 
 try:
  from .local import *

home/static/js/global/admin.js → iogt/static/js/admin.js

@@ -21,5 +21,31 @@ $(document).ready(function () {
  $('#id_page_permissions-ADD').parent().prepend('<h4 style="color: #FF0000; font-weight: bold; margin: 5px;">' +
  'Giving a Group the EDIT permission will also allow them to download data for Polls, Surveys, and Quizzes ' +
  'for the Pages they can access.</h4>')
-
 });
+
+function validateFileUpload(fileInput, file_size_threshold) {
+ if (!fileInput.files || !fileInput.files[0])
+ return true;
+ else {
+ var file = fileInput.files[0];
+ if (file.size >= file_size_threshold)
+ return confirm('The file you have uploaded exceeds ' + Math.round(file_size_threshold / 1024 / 1024) + 'mb. ' +
+ 'This will prohibit access to the file in a low bandwidth setting, may restrict feature phone access, or ' +
+ 'violate your mobile network operator agreements. To reduce file size, try resizing and compressing your ' +
+ 'file. Do you want to continue?');
+ }
+
+ return true;
+}
+
+function validateFreeBasicsFileUpload(fileInput, file_size_threshold) {
+ if (!fileInput.files || !fileInput.files[0])
+ return true;
+ else {
+ var file = fileInput.files[0];
+ if (file.size >= file_size_threshold)
+ alert(`File size exceeds facebook free basics limit (${file_size_threshold / 1024}KB).`);
+ }
+
+ return true;
+}

iogt/static/js/iogt-no-jquery.js

@@ -0,0 +1,200 @@
+const ready = (callback) => {
+ if (document.readyState != "loading") callback();
+ else document.addEventListener("DOMContentLoaded", callback);
+};
+
+const init = (event) => {
+ const show = (el) => el.style.display = 'block';
+ const hide = (el) => el.style.display = 'none';
+
+ const externalLinkOverlay = document.querySelector('#external-link-overlay');
+ externalLinkOverlay.addEventListener('click', (event) => hide(event.target));
+
+ const submitWhenOffline = gettext('You cannot submit when offline');
+
+ const readContent = document.querySelectorAll('.complete');
+ const commentLikeHolders = document.querySelectorAll('.like-holder');
+ const replyLinks = document.querySelectorAll('.reply-link');
+ const offlineAppBtns = document.querySelectorAll('.offline-app-btn');
+ const chatbotBtns = document.querySelectorAll('.chatbot-btn');
+ const questionnaireSubmitBtns = document.querySelectorAll('.questionnaire-submit-btn');
+ const externalLinks = document.querySelectorAll('a[href*="/external-link/?next="]');
+ const elementsToToggle = [
+ '.download-app-btn',
+ '.login-create-account-btn',
+ '.change-digital-pin',
+ '.comments__form',
+ '.logout-btn',
+ '.progress-holder',
+ '.report-comment',
+ '.search-form-holder',
+ ].flatMap(
+ (selector) => Array.from(document.querySelectorAll(selector))
+ );
+ console.log(elementsToToggle);
+
+ const blockExternalLinks = (event) => {
+ event.preventDefault();
+ show(externalLinkOverlay);
+ };
+
+ // for JS enabled devices hide double menu
+ const hideFooterMenu = () => {
+ hide(document.querySelector('.footer-head'));
+ };
+
+ const disableForOfflineAccess = (event) => {
+ elementsToToggle.forEach(hide);
+ replyLinks.forEach(hide)
+ readContent.forEach((el) => el.classList.remove('complete'));
+ commentLikeHolders.forEach((el) => el.setAttribute('style', 'display:none !important'));
+ offlineAppBtns.forEach(show);
+ chatbotBtns.forEach((btn) => {
+ btn.style['pointer-events'] = 'none';
+ btn.style.background = '#808080';
+ });
+ questionnaireSubmitBtns.forEach((btn) => {
+ btn.style['pointer-events'] = 'none';
+ const span = btn.querySelector('span');
+ span.innerHTML = `${span.innerHTML} (${submitWhenOffline})`;
+ });
+ externalLinks.forEach((link) => {
+ link.addEventListener('click', blockExternalLinks);
+ });
+ };
+
+ const enableForOnlineAccess = (event) => {
+ elementsToToggle.forEach(show);
+ readContent.forEach((el) => el.classList.add('complete'));
+ commentLikeHolders.forEach((el) => el.setAttribute('style', 'display:inline-block !important'));
+ replyLinks.forEach((el) => el.setAttribute('style', 'display:inline-block'));
+ offlineAppBtns.forEach(hide);
+ chatbotBtns.forEach((btn) => {
+ btn.style['pointer-events'] = 'all';
+ btn.style.background = '#F7F7F9';
+ });
+ questionnaireSubmitBtns.forEach((btn) => {
+ btn.style['pointer-events'] = 'all';
+ const span = btn.querySelector('span');
+ span.innerHTML = span.innerHTML.split(`(${submitWhenOffline})`)[0];
+ });
+ externalLinks.forEach((link) => {
+ show(link);
+ link.removeEventListener('click', blockExternalLinks);
+ });
+ };
+
+ window.addEventListener('offline', disableForOfflineAccess);
+ window.addEventListener('online', enableForOnlineAccess);
+
+ window.navigator.onLine ? enableForOnlineAccess() : disableForOfflineAccess();
+ hideFooterMenu();
+
+};
+
+const download = pageId => {
+ fetch(`/page-tree/${pageId}/`)
+ .then(resp => resp.json())
+ .then(urls => {
+ caches.open('iogt')
+ .then(cache => {
+ cache.addAll(urls);
+ });
+ });
+};
+
+const getItem = (key, defaultValue) => {
+ return JSON.parse(localStorage.getItem(key, defaultValue));
+};
+
+const setItem = (key, value) => {
+ localStorage.setItem(key, JSON.stringify(value));
+};
+
+const registerPushNotification = registration => {
+ if (!registration.showNotification) {
+ return;
+ }
+ if (Notification.permission === 'denied') {
+ return;
+ }
+ if (!'PushManager' in window) {
+ return;
+ }
+ subscribe(registration);
+};
+
+const urlB64ToUint8Array = base64String => {
+ const padding = '='.repeat((4 - base64String.length % 4) % 4);
+ const base64 = (base64String + padding)
+ .replace(/\-/g, '+')
+ .replace(/_/g, '/');
+
+ const rawData = window.atob(base64);
+ const outputArray = new Uint8Array(rawData.length);
+ const outputData = outputArray.map((output, index) => rawData.charCodeAt(index));
+
+ return outputData;
+};
+
+const subscribe = registration => {
+ registration.pushManager.getSubscription()
+ .then(subscription => {
+ if (subscription) {
+ sendSubscriptionToServer(subscription, 'subscribe');
+ return;
+ }
+ const vapidKeyMeta = document.querySelector('meta[name="vapid-key"]');
+ const vapidKey = vapidKeyMeta.content;
+ const options = {
+ userVisibleOnly: true,
+ // if key exists, create applicationServerKey property
+ ...(vapidKey && {applicationServerKey: urlB64ToUint8Array(vapidKey)})
+ };
+
+ registration.pushManager.subscribe(options)
+ .then(subscription => {
+ sendSubscriptionToServer(subscription, 'subscribe');
+ })
+ .catch(error => {
+ console.log("Error during subscribe()", error);
+ });
+ })
+ .catch(error => {
+ console.log("Error during getSubscription()", error);
+ });
+};
+
+const sendSubscriptionToServer = (subscription, statusType) => {
+ const browser = navigator.userAgent.match(/(firefox|msie|chrome|safari|trident)/ig)[0].toLowerCase();
+ const data = {
+ status_type: statusType,
+ subscription: subscription.toJSON(),
+ browser: browser,
+ };
+
+ fetch('/webpush/subscribe/', {
+ method: 'POST',
+ body: JSON.stringify(data),
+ headers: {
+ 'content-type': 'application/json'
+ },
+ credentials: "include"
+ }).then(resp => {
+ setItem('isPushNotificationRegistered', statusType === 'subscribe');
+ });
+};
+
+
+const unSubscribePushNotifications = () => {
+ const isPushNotificationRegistered = getItem('isPushNotificationRegistered', false);
+ if (isPushNotificationRegistered && isAuthenticated && 'serviceWorker' in navigator) {
+ navigator.serviceWorker.ready.then(registration => {
+ registration.pushManager.getSubscription().then(subscription => {
+ subscription && sendSubscriptionToServer(subscription, 'unsubscribe');
+ });
+ });
+ }
+};
+
+ready(init);

iogt/static/js/iogt.js

@@ -1,30 +1,3 @@
-function validateFileUpload(fileInput, file_size_threshold) {
- if (!fileInput.files || !fileInput.files[0])
- return true;
- else {
- var file = fileInput.files[0];
- if (file.size >= file_size_threshold)
- return confirm('The file you have uploaded exceeds ' + Math.round(file_size_threshold / 1024 / 1024) + 'mb. ' +
- 'This will prohibit access to the file in a low bandwidth setting, may restrict feature phone access, or ' +
- 'violate your mobile network operator agreements. To reduce file size, try resizing and compressing your ' +
- 'file. Do you want to continue?');
- }
-
- return true;
-}
-
-function validateFreeBasicsFileUpload(fileInput, file_size_threshold) {
- if (!fileInput.files || !fileInput.files[0])
- return true;
- else {
- var file = fileInput.files[0];
- if (file.size >= file_size_threshold)
- alert(`File size exceeds facebook free basics limit (${file_size_threshold / 1024}KB).`);
- }
-
- return true;
-}
-
 $(document).ready(() => {
  const externalLinkOverlay = $('#external-link-overlay')
 

iogt/templates/base.html

@@ -94,9 +94,13 @@
  {% endif %}
 </script>
 <script src="{% url 'javascript-catalog' %}"></script>
-<script src="{% static 'js/jquery-3.6.0.min.js' %}"></script>
-<script src="{% static 'js/iogt.js' %}"></script>
 <script src="{% static 'js/sw-init.js' %}"></script>
+{% if jquery %}
+ <script src="{% static 'js/jquery-3.6.0.min.js' %}"></script>
+ <script src="{% static 'js/iogt.js' %}"></script>
+{% else %}
+ <script src="{% static 'js/iogt-no-jquery.js' %}"></script>
+{% endif %}
 <noscript>
  <style type="text/css">
  #hideOnNonJSDevice, .hideOnNonJSDevice {

iogt/templates/wagtaildocs/documents/edit.html

@@ -3,7 +3,6 @@
 
 
 {% block extra_js %}
- <script type="text/javascript" src="{% static 'js/iogt.js' %}"></script>
  <script type="text/javascript">
  $(document).ready(function () {
  $('input[type=submit]').click(function () {

iogt/templates/wagtailimages/images/edit.html

@@ -3,7 +3,6 @@
 
 {% block extra_js %}
  {{ block.super }}
- <script type="text/javascript" src="{% static 'js/iogt.js' %}"></script>
  <script type="text/javascript">
  $(document).ready(function () {
  $('input[type=submit]').click(function () {