From 6384a858ad80a5e6f4c02f38daed6a17e367fb25 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 15 Aug 2022 19:20:35 -0500 Subject: [PATCH 1/3] fix(django): implement djangocms-text-ckeditor#568 Implement the #568 fix from PR #590 until we update our ckeditor to v5. This will save H.P. (main CMS admin/designer) so many tiny bits of time. --- .../static/djangocms_text_ckeditor/css/cms.ckeditor.css | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 taccsite_cms/static/djangocms_text_ckeditor/css/cms.ckeditor.css diff --git a/taccsite_cms/static/djangocms_text_ckeditor/css/cms.ckeditor.css b/taccsite_cms/static/djangocms_text_ckeditor/css/cms.ckeditor.css new file mode 100644 index 000000000..2627d2ae3 --- /dev/null +++ b/taccsite_cms/static/djangocms_text_ckeditor/css/cms.ckeditor.css @@ -0,0 +1,6 @@ +/* IMPORTANT: Unnecessary if we use djangocms-text-ckeditor@5.0.0 */ + +@import url("https://raw.githubusercontent.com/django-cms/djangocms-text-ckeditor/3.10.0/djangocms_text_ckeditor/static/djangocms_text_ckeditor/css/cms.ckeditor.css"); + +/* https://github.com/django-cms/djangocms-text-ckeditor/pull/590 */ +textarea.cke_source { max-height: inherit; } From 9aecf533345ab9459b465e21ca2cf0dfaf481f6d Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 15 Aug 2022 20:10:16 -0500 Subject: [PATCH 2/3] fix(django): working remote url for remote css Fixes: https://github.com/TACC/Core-CMS/pull/540 --- .../static/djangocms_text_ckeditor/css/cms.ckeditor.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_cms/static/djangocms_text_ckeditor/css/cms.ckeditor.css b/taccsite_cms/static/djangocms_text_ckeditor/css/cms.ckeditor.css index 2627d2ae3..90eb198b8 100644 --- a/taccsite_cms/static/djangocms_text_ckeditor/css/cms.ckeditor.css +++ b/taccsite_cms/static/djangocms_text_ckeditor/css/cms.ckeditor.css @@ -1,6 +1,6 @@ /* IMPORTANT: Unnecessary if we use djangocms-text-ckeditor@5.0.0 */ -@import url("https://raw.githubusercontent.com/django-cms/djangocms-text-ckeditor/3.10.0/djangocms_text_ckeditor/static/djangocms_text_ckeditor/css/cms.ckeditor.css"); +@import url("https://combinatronics.com/django-cms/djangocms-text-ckeditor/3.10.0/djangocms_text_ckeditor/static/djangocms_text_ckeditor/css/cms.ckeditor.css"); /* https://github.com/django-cms/djangocms-text-ckeditor/pull/590 */ textarea.cke_source { max-height: inherit; } From 5dd8ba8b18d1d8404c93240da2bac881b19e9a69 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 15 Aug 2022 20:15:00 -0500 Subject: [PATCH 3/3] fix: delete unrelated file added during merge --- .../js/modules/renderEmailAddresses.js | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 taccsite_cms/static/site_cms/js/modules/renderEmailAddresses.js diff --git a/taccsite_cms/static/site_cms/js/modules/renderEmailAddresses.js b/taccsite_cms/static/site_cms/js/modules/renderEmailAddresses.js deleted file mode 100644 index 582b7e213..000000000 --- a/taccsite_cms/static/site_cms/js/modules/renderEmailAddresses.js +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Convert data-attribute-name to dataset.propName - * @param {string} attr - * @returns {string} - */ - function _dataAttrFromDatasetProp(attr) { - const datasetPropName = attr.replace(/-[a-z]/g, match => match.toUpperCase()); - - return datasetPropName; -} - -/** - * Update hyperlinks from `[data-email="…"]` to `href="mailto:…"` - * @param {string} [hostAttrName='data-host'] - Which attribute has host - * @param {string} [domainAttrName='data-domain'] - Which attribute has domain - * @param {HTMLElement} [scopeElement=document] - Element within which to search for link - * @return {boolean} -*/ -export default function renderEmailAddresses({ - hostAttrName = 'data-host', - domainAttrName = 'data-domain', - scopeElement = document -} = {}) { - const querySelector = '[' + hostAttrName + '][' + domainAttrName + ']'; - - scopeElement.querySelector(querySelector).addEventListener('click', event => { - event.preventDefault(); - - const linkEl = event.target; - const hostPropName = _dataAttrFromDatasetProp(hostAttrName); - const domainPropName = _dataAttrFromDatasetProp(domainAttrName); - - linkEl.href = 'mailto:' - + linkEl.dataset[hostPropName] - + '@' - + linkEl.dataset[domainPropName]; - }); -}