From 8068ca04fb8d56f5440d14866f6374ffb8f110b0 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 26 Sep 2023 15:34:48 -0500 Subject: [PATCH 01/14] feat(taccsite_custom): texascale social media link --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index c0d3ac587..49be9df1a 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit c0d3ac58779777e104e7e0817aab32732d28f51f +Subproject commit 49be9df1a126010a9b9581d11014433ff23a8195 From 9ee925e4c2a9461ab8d8faf1f4fda7bba1b77cd6 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 26 Sep 2023 17:30:31 -0500 Subject: [PATCH 02/14] feat(taccsite_custom): texascale social platforms --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 49be9df1a..ceb61af80 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 49be9df1a126010a9b9581d11014433ff23a8195 +Subproject commit ceb61af800abdbfb0440c037d5b6efae693cefb1 From 01b7679187aca71c49c9ff1f18b93a30893323b7 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 27 Sep 2023 15:49:13 -0500 Subject: [PATCH 03/14] feat(taccsite_custom): texascale, share links --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index ceb61af80..d8da8a91c 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit ceb61af800abdbfb0440c037d5b6efae693cefb1 +Subproject commit d8da8a91cc8b0945fe3625d15c8adb8e15fcb699 From 9bd4d1f83f819761be8d3db0c51116a647bdc61d Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 28 Sep 2023 12:55:04 -0500 Subject: [PATCH 04/14] fix!: social media logo svgs fill viewport Breaking Change: Any existing use of these will show them Npx larger.* * E.g. TACC footer. --- .../static/site_cms/img/org_logos/facebook.svg | 10 +++++++++- .../static/site_cms/img/org_logos/instagram.svg | 8 +++++++- .../static/site_cms/img/org_logos/linkedin.svg | 8 +++++++- taccsite_cms/static/site_cms/img/org_logos/twitter.svg | 8 +++++++- taccsite_cms/static/site_cms/img/org_logos/youtube.svg | 8 +++++++- 5 files changed, 37 insertions(+), 5 deletions(-) diff --git a/taccsite_cms/static/site_cms/img/org_logos/facebook.svg b/taccsite_cms/static/site_cms/img/org_logos/facebook.svg index 315cbe7a8..342952d50 100644 --- a/taccsite_cms/static/site_cms/img/org_logos/facebook.svg +++ b/taccsite_cms/static/site_cms/img/org_logos/facebook.svg @@ -1 +1,9 @@ - + + + + + + + + + diff --git a/taccsite_cms/static/site_cms/img/org_logos/instagram.svg b/taccsite_cms/static/site_cms/img/org_logos/instagram.svg index b78fee986..f5e544c27 100644 --- a/taccsite_cms/static/site_cms/img/org_logos/instagram.svg +++ b/taccsite_cms/static/site_cms/img/org_logos/instagram.svg @@ -1 +1,7 @@ - + + + + + + + diff --git a/taccsite_cms/static/site_cms/img/org_logos/linkedin.svg b/taccsite_cms/static/site_cms/img/org_logos/linkedin.svg index 1c4440fcd..80cf2e639 100644 --- a/taccsite_cms/static/site_cms/img/org_logos/linkedin.svg +++ b/taccsite_cms/static/site_cms/img/org_logos/linkedin.svg @@ -1 +1,7 @@ - + + + + + + + diff --git a/taccsite_cms/static/site_cms/img/org_logos/twitter.svg b/taccsite_cms/static/site_cms/img/org_logos/twitter.svg index 55a16d49c..67e22c79c 100644 --- a/taccsite_cms/static/site_cms/img/org_logos/twitter.svg +++ b/taccsite_cms/static/site_cms/img/org_logos/twitter.svg @@ -1 +1,7 @@ - + + + + + + + diff --git a/taccsite_cms/static/site_cms/img/org_logos/youtube.svg b/taccsite_cms/static/site_cms/img/org_logos/youtube.svg index d28ca67ff..9ad4333d7 100644 --- a/taccsite_cms/static/site_cms/img/org_logos/youtube.svg +++ b/taccsite_cms/static/site_cms/img/org_logos/youtube.svg @@ -1 +1,7 @@ - + + + + + + + From adb4629d9322832fbe97448aafbe1d8028469c72 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 28 Sep 2023 12:55:53 -0500 Subject: [PATCH 05/14] feat: add text before social media icons And allow text after. And allow removing either text. --- taccsite_cms/templates/share_on_social.html | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/taccsite_cms/templates/share_on_social.html b/taccsite_cms/templates/share_on_social.html index 0cf1570b4..2db41b3e2 100644 --- a/taccsite_cms/templates/share_on_social.html +++ b/taccsite_cms/templates/share_on_social.html @@ -3,6 +3,9 @@ {% with request.scheme|add:"://"|add:request.get_host|add:request.path as url %} {% with settings.TACC_SOCIAL_SHARE_PLATFORMS as platforms %} {% endwith %} From 3a8c9d7b930049e3ccef3cb466f524c96d5524a9 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 28 Sep 2023 12:56:30 -0500 Subject: [PATCH 06/14] feat(texascale): new social media share links css --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index d8da8a91c..0417101a4 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit d8da8a91cc8b0945fe3625d15c8adb8e15fcb699 +Subproject commit 0417101a4f02c579a137b7da1799426174a56ce4 From 1b04834c3af4ca205a355f22f42de2e675c583f3 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 28 Sep 2023 13:17:43 -0500 Subject: [PATCH 07/14] fix: social media logo svg lost ids --- taccsite_cms/static/site_cms/img/org_logos/facebook.svg | 2 +- taccsite_cms/static/site_cms/img/org_logos/instagram.svg | 2 +- taccsite_cms/static/site_cms/img/org_logos/linkedin.svg | 2 +- taccsite_cms/static/site_cms/img/org_logos/twitter.svg | 2 +- taccsite_cms/static/site_cms/img/org_logos/youtube.svg | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/taccsite_cms/static/site_cms/img/org_logos/facebook.svg b/taccsite_cms/static/site_cms/img/org_logos/facebook.svg index 342952d50..9624023ab 100644 --- a/taccsite_cms/static/site_cms/img/org_logos/facebook.svg +++ b/taccsite_cms/static/site_cms/img/org_logos/facebook.svg @@ -1,6 +1,6 @@ - + diff --git a/taccsite_cms/static/site_cms/img/org_logos/instagram.svg b/taccsite_cms/static/site_cms/img/org_logos/instagram.svg index f5e544c27..02d1969fc 100644 --- a/taccsite_cms/static/site_cms/img/org_logos/instagram.svg +++ b/taccsite_cms/static/site_cms/img/org_logos/instagram.svg @@ -1,6 +1,6 @@ - + diff --git a/taccsite_cms/static/site_cms/img/org_logos/linkedin.svg b/taccsite_cms/static/site_cms/img/org_logos/linkedin.svg index 80cf2e639..6b026862d 100644 --- a/taccsite_cms/static/site_cms/img/org_logos/linkedin.svg +++ b/taccsite_cms/static/site_cms/img/org_logos/linkedin.svg @@ -1,6 +1,6 @@ - + diff --git a/taccsite_cms/static/site_cms/img/org_logos/twitter.svg b/taccsite_cms/static/site_cms/img/org_logos/twitter.svg index 67e22c79c..9f641a496 100644 --- a/taccsite_cms/static/site_cms/img/org_logos/twitter.svg +++ b/taccsite_cms/static/site_cms/img/org_logos/twitter.svg @@ -1,6 +1,6 @@ - + diff --git a/taccsite_cms/static/site_cms/img/org_logos/youtube.svg b/taccsite_cms/static/site_cms/img/org_logos/youtube.svg index 9ad4333d7..9755ba547 100644 --- a/taccsite_cms/static/site_cms/img/org_logos/youtube.svg +++ b/taccsite_cms/static/site_cms/img/org_logos/youtube.svg @@ -1,6 +1,6 @@ - + From 9f623771a8f3b76b80ef49304d8cf3832a2bf8da Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 28 Sep 2023 13:37:18 -0500 Subject: [PATCH 08/14] fix: facebook icon mask not well-supported --- taccsite_cms/static/site_cms/img/org_logos/facebook.svg | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/taccsite_cms/static/site_cms/img/org_logos/facebook.svg b/taccsite_cms/static/site_cms/img/org_logos/facebook.svg index 9624023ab..547d6e01e 100644 --- a/taccsite_cms/static/site_cms/img/org_logos/facebook.svg +++ b/taccsite_cms/static/site_cms/img/org_logos/facebook.svg @@ -1,9 +1,5 @@ - - - - - + From 55a4515e18ad1a6f3a41ca08395d81559671b36e Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 3 Oct 2023 18:06:23 -0500 Subject: [PATCH 09/14] chore(taccsite_custom): pull relevant branch --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 0417101a4..863c00025 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 0417101a4f02c579a137b7da1799426174a56ce4 +Subproject commit 863c000252e18d3931d4e17526c32e6cbd8ed298 From 659c12abeec93bba7d523685329901888d838b76 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 3 Oct 2023 18:41:26 -0500 Subject: [PATCH 10/14] feat: share via email --- taccsite_cms/settings.py | 2 +- taccsite_cms/static/site_cms/img/org_logos/email.svg | 11 +++++++++++ taccsite_cms/templates/share_on_social.html | 7 +++++++ taccsite_custom | 2 +- 4 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 taccsite_cms/static/site_cms/img/org_logos/email.svg diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py index 5040c0948..c5ce5737f 100644 --- a/taccsite_cms/settings.py +++ b/taccsite_cms/settings.py @@ -279,7 +279,7 @@ def gettext(s): return s # TODO: Enable ONLY after TUP-590 TACC_SOCIAL_SHARE_PLATFORMS = [] -# TACC_SOCIAL_SHARE_PLATFORMS = ['facebook', 'linkedin'] +# TACC_SOCIAL_SHARE_PLATFORMS = ['facebook', 'linkedin', 'email'] ######################## # TACC: CORE STYLES diff --git a/taccsite_cms/static/site_cms/img/org_logos/email.svg b/taccsite_cms/static/site_cms/img/org_logos/email.svg new file mode 100644 index 000000000..91eb6540d --- /dev/null +++ b/taccsite_cms/static/site_cms/img/org_logos/email.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/taccsite_cms/templates/share_on_social.html b/taccsite_cms/templates/share_on_social.html index 2db41b3e2..46d4915d4 100644 --- a/taccsite_cms/templates/share_on_social.html +++ b/taccsite_cms/templates/share_on_social.html @@ -23,6 +23,13 @@ {% endif %} + {% if 'email' in platforms %} + + {% endif %} {% block text_after %} {% endblock text_after %} {% endif %} diff --git a/taccsite_custom b/taccsite_custom index 863c00025..0041cf0d4 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 863c000252e18d3931d4e17526c32e6cbd8ed298 +Subproject commit 0041cf0d47f143796f10c658ce0785066a05c0e2 From 544d45064054fc61a7f452e1d1d8b2b7a7d3ba85 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 3 Oct 2023 20:56:17 -0500 Subject: [PATCH 11/14] feat(texascale): use re_path not url --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 0041cf0d4..be0801fe2 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 0041cf0d47f143796f10c658ce0785066a05c0e2 +Subproject commit be0801fe2e626fc24e4e7640da9585cd0610c3b3 From e405f432d969c3b46d08f4e725be760cf7030b37 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 3 Oct 2023 22:04:34 -0500 Subject: [PATCH 12/14] fix(texascale): bad import path for re_path --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index be0801fe2..4b72ac20f 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit be0801fe2e626fc24e4e7640da9585cd0610c3b3 +Subproject commit 4b72ac20f34bba8f89b44c240b1eaab605881de8 From 9e4726eb7f8e1eb094b0258c8d9125f096966375 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 4 Oct 2023 14:16:15 -0500 Subject: [PATCH 13/14] fix: change "share this" punctuation --- taccsite_cms/templates/share_on_social.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_cms/templates/share_on_social.html b/taccsite_cms/templates/share_on_social.html index 46d4915d4..5d93e4ce0 100644 --- a/taccsite_cms/templates/share_on_social.html +++ b/taccsite_cms/templates/share_on_social.html @@ -4,7 +4,7 @@ {% with settings.TACC_SOCIAL_SHARE_PLATFORMS as platforms %} share this — + share this: {% endblock text_before %} {% if platforms|length == 0 %} From f52708f33848f921f1f2f43ed6949d81b6bfd750 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 4 Oct 2023 17:07:09 -0500 Subject: [PATCH 14/14] fix(taccsite_custom): merge Core-CMS-Resources#193 --- taccsite_custom | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_custom b/taccsite_custom index 4b72ac20f..dccffe58e 160000 --- a/taccsite_custom +++ b/taccsite_custom @@ -1 +1 @@ -Subproject commit 4b72ac20f34bba8f89b44c240b1eaab605881de8 +Subproject commit dccffe58ebc1da950378f182f2e1f07311b7be2d