Skip to content

Commit 3d0d55f

Browse files
wesleyboarwesleyboar
committed
Squashed merge of site/frontera/main of the following:
commit 8ca137498f4206b26f5e2a4df7ea98f41fce1b4b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Sep 1 12:11:54 2021 -0500 Squashed merge of main of the following: commit 8e4b58e3b2e7f3108a722d91350d477532fb8a11 Merge: 97f7df0 2aca7e6 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Wed Sep 1 12:10:40 2021 -0500 Merge pull request #278 from TACC/quick/support-plugins-unadulterated-by-bootstrap--for-main commit 2aca7e66d1e2dc8955ae99892bed076fe0e497ae Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 13:01:15 2021 -0500 Quick: Mark Bootstrap Link & Image as Depreacted commit 884194ec70f1bf0791697999959b0157d1d4df6d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 10:58:58 2021 -0500 Quick: More Comments commit 31e9da8205061055fa2b05b690818da063353d89 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:53:25 2021 -0500 Quick: Explain Try/Catch for Plugin Restoration commit 7c2f78a4e9f107037c372380d8885e931479a470 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:44:28 2021 -0500 Quick: Better Comments Restoring Generic Plugins commit 9d018e0fd70d6cfb6cbc3c20ba35ecea136cc19c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:35:14 2021 -0500 Quick: Fix Support for Unadulterated Link Plugin commit 9cf1e6700fff8557d04d38e2476fe3433d6722ae Merge: 7c617af 97f7df0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 07:54:50 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 97f7df069bf119ad51a1d85205a6ae0c63b71008 Merge: 08e09e7 afa0672 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 20:37:20 2021 -0500 Merge pull request #332 from TACC/task/GH-331-new-fullwidth-standard-templates commit afa06722fd357dee5eef6b37d096a96f16298387 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 20:33:44 2021 -0500 Quick: Update submod → main. Drop Frontera changes commit 735ec867b582b47a83a4f877e9ef1244027c8b9a Merge: b9f976d 08e09e7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:46:30 2021 -0500 Merge branch 'main' into task/GH-331-new-fullwidth-standard-templates commit 08e09e7a01d542c8198dfe1baeda12ad94f663b7 Merge: e80de90 15cafe8 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 17:44:40 2021 -0500 Merge pull request #333 from TACC/quick/update-submod-protx-secrets Quick: Update submod (ProTX secrets delta) commit 15cafe8a44061318609f5884f19457f9c523542a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:40:13 2021 -0500 Quick: Update submod (ProTX secrets delta) commit b9f976d5d68d6ef3b45225de98bd4f3a4d4ab810 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 15:10:01 2021 -0500 GH-331: Frontera: Remove now-superfluous comment commit 2be0bff7c9ac377b25dd07d91404779dbb132534 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 13:00:58 2021 -0500 GH-331: Frontera: Load via static, not staticfiles commit b54467cf82546b1a29074513be4efb3405c28b5e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f0e3f6c0bab6110938092d6e955794ec14 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d760b4e7494a13db3e95cbaba8f63c8020 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit 7c617af1aa88dd14b39e3764c0e42f8a8246b3e4 Merge: 0ddc50a e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 11:14:12 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 0ddc50a8e8dc66675172b9a0121f21b11b473c7f Merge: d662f24 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:20:09 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit d662f24607b58d07aa7d865d42ce5a8488829c82 Merge: 6bb1f9e 5b97b8f Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 17 17:30:22 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 6bb1f9ecc36fe5ea14a225ddb803f1f9777a3106 Merge: eda34fa 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:25:14 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit eda34faa49ddcefcbbd5ced6e8473040082e4a03 Merge: 11f735c d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:37:41 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 11f735c49efed900e13b737c817ee3546fae9522 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit fe181dcdf29fdf312e7af312ce9a1fecb5679a9e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit 78374510d25b0603d54e32e4a53d57b26a9c17a9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit 815c68f4f4073a50ac853c49286123b2daed8c1f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 520f44c13acf86bfe5fa9f77fa398ac7eb87cfe1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit af8a9c21d2cae1ec5642450ee475183f60f06973 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 14:51:32 2021 -0500 Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-styles of the following: (nothing, empty commit, I confirmed all merge conflicts were erroneous) commit db3aed1480da5d9653a62aed6741cfbdb08e9946 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 13:02:14 2021 -0500 Squashed merge of quick/support-plugins-unadulterated-by-bootstrap--for-main of the following: commit 2aca7e66d1e2dc8955ae99892bed076fe0e497ae Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 13:01:15 2021 -0500 Quick: Mark Bootstrap Link & Image as Depreacted commit 884194ec70f1bf0791697999959b0157d1d4df6d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 10:58:58 2021 -0500 Quick: More Comments commit 31e9da8205061055fa2b05b690818da063353d89 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:53:25 2021 -0500 Quick: Explain Try/Catch for Plugin Restoration commit 7c2f78a4e9f107037c372380d8885e931479a470 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:44:28 2021 -0500 Quick: Better Comments Restoring Generic Plugins commit 9d018e0fd70d6cfb6cbc3c20ba35ecea136cc19c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:35:14 2021 -0500 Quick: Fix Support for Unadulterated Link Plugin commit 9cf1e6700fff8557d04d38e2476fe3433d6722ae Merge: 7c617af 97f7df0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 07:54:50 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 97f7df069bf119ad51a1d85205a6ae0c63b71008 Merge: 08e09e7 afa0672 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 20:37:20 2021 -0500 Merge pull request #332 from TACC/task/GH-331-new-fullwidth-standard-templates commit afa06722fd357dee5eef6b37d096a96f16298387 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 20:33:44 2021 -0500 Quick: Update submod → main. Drop Frontera changes commit 735ec867b582b47a83a4f877e9ef1244027c8b9a Merge: b9f976d 08e09e7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:46:30 2021 -0500 Merge branch 'main' into task/GH-331-new-fullwidth-standard-templates commit 08e09e7a01d542c8198dfe1baeda12ad94f663b7 Merge: e80de90 15cafe8 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 17:44:40 2021 -0500 Merge pull request #333 from TACC/quick/update-submod-protx-secrets Quick: Update submod (ProTX secrets delta) commit 15cafe8a44061318609f5884f19457f9c523542a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:40:13 2021 -0500 Quick: Update submod (ProTX secrets delta) commit b9f976d5d68d6ef3b45225de98bd4f3a4d4ab810 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 15:10:01 2021 -0500 GH-331: Frontera: Remove now-superfluous comment commit 2be0bff7c9ac377b25dd07d91404779dbb132534 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 13:00:58 2021 -0500 GH-331: Frontera: Load via static, not staticfiles commit b54467cf82546b1a29074513be4efb3405c28b5e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f0e3f6c0bab6110938092d6e955794ec14 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d760b4e7494a13db3e95cbaba8f63c8020 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit 7c617af1aa88dd14b39e3764c0e42f8a8246b3e4 Merge: 0ddc50a e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 11:14:12 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 0ddc50a8e8dc66675172b9a0121f21b11b473c7f Merge: d662f24 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:20:09 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit d662f24607b58d07aa7d865d42ce5a8488829c82 Merge: 6bb1f9e 5b97b8f Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 17 17:30:22 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 6bb1f9ecc36fe5ea14a225ddb803f1f9777a3106 Merge: eda34fa 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:25:14 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit eda34faa49ddcefcbbd5ced6e8473040082e4a03 Merge: 11f735c d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:37:41 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 11f735c49efed900e13b737c817ee3546fae9522 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit fe181dcdf29fdf312e7af312ce9a1fecb5679a9e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit 78374510d25b0603d54e32e4a53d57b26a9c17a9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit 815c68f4f4073a50ac853c49286123b2daed8c1f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 520f44c13acf86bfe5fa9f77fa398ac7eb87cfe1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit a49f908ca44d470b4aad8b1c6370d44de31762aa Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 11:42:45 2021 -0500 Squashed merge of quick/support-plugins-unadulterated-by-bootstrap--for-main of the following: commit 884194ec70f1bf0791697999959b0157d1d4df6d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 10:58:58 2021 -0500 Quick: More Comments commit 31e9da8205061055fa2b05b690818da063353d89 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:53:25 2021 -0500 Quick: Explain Try/Catch for Plugin Restoration commit 7c2f78a4e9f107037c372380d8885e931479a470 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:44:28 2021 -0500 Quick: Better Comments Restoring Generic Plugins commit 9d018e0fd70d6cfb6cbc3c20ba35ecea136cc19c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 09:35:14 2021 -0500 Quick: Fix Support for Unadulterated Link Plugin commit 9cf1e6700fff8557d04d38e2476fe3433d6722ae Merge: 7c617af 97f7df0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 31 07:54:50 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 97f7df069bf119ad51a1d85205a6ae0c63b71008 Merge: 08e09e7 afa0672 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 20:37:20 2021 -0500 Merge pull request #332 from TACC/task/GH-331-new-fullwidth-standard-templates commit afa06722fd357dee5eef6b37d096a96f16298387 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 20:33:44 2021 -0500 Quick: Update submod → main. Drop Frontera changes commit 735ec867b582b47a83a4f877e9ef1244027c8b9a Merge: b9f976d 08e09e7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:46:30 2021 -0500 Merge branch 'main' into task/GH-331-new-fullwidth-standard-templates commit 08e09e7a01d542c8198dfe1baeda12ad94f663b7 Merge: e80de90 15cafe8 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Mon Aug 30 17:44:40 2021 -0500 Merge pull request #333 from TACC/quick/update-submod-protx-secrets Quick: Update submod (ProTX secrets delta) commit 15cafe8a44061318609f5884f19457f9c523542a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 17:40:13 2021 -0500 Quick: Update submod (ProTX secrets delta) commit b9f976d5d68d6ef3b45225de98bd4f3a4d4ab810 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 15:10:01 2021 -0500 GH-331: Frontera: Remove now-superfluous comment commit 2be0bff7c9ac377b25dd07d91404779dbb132534 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 13:00:58 2021 -0500 GH-331: Frontera: Load via static, not staticfiles commit b54467cf82546b1a29074513be4efb3405c28b5e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f0e3f6c0bab6110938092d6e955794ec14 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d760b4e7494a13db3e95cbaba8f63c8020 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit 7c617af1aa88dd14b39e3764c0e42f8a8246b3e4 Merge: 0ddc50a e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 11:14:12 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 0ddc50a8e8dc66675172b9a0121f21b11b473c7f Merge: d662f24 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:20:09 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit d662f24607b58d07aa7d865d42ce5a8488829c82 Merge: 6bb1f9e 5b97b8f Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 17 17:30:22 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 6bb1f9ecc36fe5ea14a225ddb803f1f9777a3106 Merge: eda34fa 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:25:14 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit eda34faa49ddcefcbbd5ced6e8473040082e4a03 Merge: 11f735c d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:37:41 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 11f735c49efed900e13b737c817ee3546fae9522 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit fe181dcdf29fdf312e7af312ce9a1fecb5679a9e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit 78374510d25b0603d54e32e4a53d57b26a9c17a9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit 815c68f4f4073a50ac853c49286123b2daed8c1f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 520f44c13acf86bfe5fa9f77fa398ac7eb87cfe1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit 217d0a553a0eed013eaa05f750e7a26cd30d8cb9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 13:02:07 2021 -0500 Quick: Update submodule to its latest commit 1edbb038c19cfa9e951b2eb8cfd8d54b7ede0153 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 12:17:21 2021 -0500 Squashed merge of task/GH-331-new-fullwidth-standard-templates of the following: commit b54467cf82546b1a29074513be4efb3405c28b5e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:49:39 2021 -0500 GH-331: Frontera: Cleanup Templates & Add Standard commit 0c4a38f0e3f6c0bab6110938092d6e955794ec14 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:41 2021 -0500 GH-331: Remove "Full Width" template cruft commit e60ba1d760b4e7494a13db3e95cbaba8f63c8020 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 11:38:07 2021 -0500 GH-331: Rename "Fullwidth" to "Full Width" commit d6ebf9b71fd6875032463a4880527ef3555a683f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 09:53:26 2021 -0500 Squashed merge of task/GH-83-callout-element of the following: commit 75a6ecebd1e9cc68626885f427422b060c67b3db Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 30 09:51:01 2021 -0500 GH-83: Fix: Ensure 0001 taccsite_callout migration See d01c8cf for details. commit fa185d0140f45607df01f73cf91f5e2f2fffcd79 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 15:04:29 2021 -0500 GH-83/GH-321: Show image on narrow windows commit 66eae8f47b8cee14b0a2bd5b8214c824b15a161c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:35:59 2021 -0500 GH-321: Fix figure size and note about its resize commit a7134e21c129ab8ce1cea9f229b393169275429f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:25:01 2021 -0500 GH-83: Quick: Update script comments & equality - Update comments for clarity and accuracy and scope. - Update equality that was not explicit enough. commit 1a57226619c01cebf5afb2b834976b3acff25485 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:08:18 2021 -0500 GH-83: Support Optional Image/Link in CSS Docblock The plugin may require a link and should require an image (GH-328)… But the styles (and template) work fine without either. commit 5059e02f5a4244ddc735ef8bbb541c0a7893858b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 10:07:26 2021 -0500 GH-83: Require all fields (can't require image) commit a07957ea33e5455d87faf8cc1df799a7f9a91abe Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 09:48:21 2021 -0500 GH-83: Add two relevant docs from PR #280 SEE: https://github.com/TACC/Core-CMS/pull/280/ SEE: https://github.com/TACC/Core-CMS/blob/579f5c6/taccsite_cms/contrib/_docs/ commit 7ffceebca8b873da46d417d0aa74e0fecad4b8a0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 09:29:14 2021 -0500 GH-321: Default to not resize image. Add warning. - Add helper to get a model name. - Simplify user instruction for fixing caveat. - Do not allow normal user to check resize field. - Hide field and caveat details in "Advanced settings". - Default resize field to false. commit 9767d455a00157fc1b8bc7ad1c9426301dfbbdcc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:56:56 2021 -0500 GH-321: Resize Callout image to parent height CAVEAT: The addition to 0001 migration was manual and is untested. commit acefadfbd1e74ff7d6479049856a6be949db0e74 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:10:57 2021 -0500 GH-83/GH-321: Add missing static template tag load commit d59c3f63b358868c4cbe0c2a76ed0c1dfe3aa0e2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:07:24 2021 -0500 GH-83: Squash migrations. Accept GH-321 as part of GH-83. commit df1060bdad9f680a1f2e76ace22e0b9e6897340c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:01:27 2021 -0500 GH-83: Add missing helper clean_for_abstract_link commit 51d3f1d9482a0ab6d147e76bbccf4e9593e78771 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:26:20 2021 -0500 GH-83: Support Hyperlink (requires 69f47cc) Requires new `x-article-link-active` mixin. The reason 0003 is added, not 0002, is cuz extending branch added 0002: - site/frontera/task/GH-83-callout-element--GH-321-resize-callout-image (there, the 0003 migration has 0002 as a dependency) (here, the 0003 migration has 0001 as a dependency) When a proper main-extending branch is made, this should still happen: - task/GH-83-callout-element--GH-321-resize-callout-image - task/GH-321-resize-callout-image (there, the 0003 migration will have ??? as a dependency) Good luck, Wes. commit ed0e74902e9d1b687e81b460b6b7b620ceb8ca05 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:24:45 2021 -0500 Quick: Add x-article-link-active mixin commit 1266e4e34f136b1e4ea4271327f2dc0d637978ea Merge: 54fc04a 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:18:48 2021 -0500 Merge branch 'main' into task/GH-83-callout-element commit 54fc04a706581eacc62b5c9d20dd80fb3ed7646d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 14:05:36 2021 -0500 GH-83: Quick: Remove temp snippet commit c24e0f9c0af615cecac4e48363c99427cedb3aff Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:30:29 2021 -0500 GH-83: Noop: Add markup whitespace for legibility commit dba3f4b8cfd6cdd38abb23bac453ee433a795818 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:03:37 2021 -0500 GH-83: Remove leftover templates commit a15e585587a49a4a2753e9ad6a073c40e83e209f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:50:15 2021 -0500 GH-83: Fix Callout Plugin, Update Styles to Match commit 4fa354cd6ca120c47638184ade411dbe4c25afce Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:09:41 2021 -0500 GH-83: Fix Callout Component after Plugin's tweaks commit c15d7667864ba8f879d35a4d6b02eb1d3ea52705 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:53:49 2021 -0500 GH-83: WIP: Callout Plugin commit c2c96ecbed4a45df1be98337d214bbb5b84a2ae0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:25 2021 -0500 GH-83: Temp: Callout Snippet (Frontera) commit 82b768ff9b6650f21f5d699666cd40ba6a327073 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:02 2021 -0500 GH-83: Callout Component commit 736a0be8c78c074b00bc74241ae8e509df7e3ecc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:21:46 2021 -0500 Quick: Update submodule to its site/frontera/main commit 52c8ef79304ab7769da4eb5a15d0bbb0ba40a670 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:10:03 2021 -0500 Squashed merge of task/GH-73-tacc-blockquote-plugin of the following: commit 425cdfbe31273e76ff9dc3674a2ec839b2d0a210 Merge: 3ad23ee e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:08:20 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 3ad23ee0eca8dcf42d2ae2959efeae9df4e5eb02 Merge: 20b00a8 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:21:53 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 20b00a8dc38fdde2ee364bd03e90d0e5b4465ab5 Merge: e2d4fc0 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:23:19 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit e2d4fc078093f70a99dc06a162872d28d856e6cd Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:53:46 2021 -0500 GH-73: Add Missing Plugin Helper This code was lost during re-creation: - of https://github.com/TACC/Core-CMS/pull/257 - as https://github.com/TACC/Core-CMS/pull/275. commit d2ee16101ecb7898a499262a1fc0c08818f0e088 Merge: 64c0894 374b78e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:50:53 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 64c089498958d96078bd7a8aa05cc41628bfd518 Merge: 89ce2c6 d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:38:32 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 89ce2c60e588840399079bdade22e41cf08e8e59 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 23 18:41:23 2021 -0500 Noop: Existing Plugins: Comments, New Lines (Cherry-picked from `task/GH-93…` or `dev` as 29e929ed "GH-93: Noop: Existing Plugins: Comments, New Lines".) commit a69c40c49817c6352f938ad8167d289c097f6405 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 30 15:28:52 2021 -0500 Quick: Couple DIRECTION class names and choices commit 4ea2e1c1810f06f3db3d17d7c2148b3c3bdc907a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 20:20:20 2021 -0500 Quick: Polish Existing Plugins (cherry-picked from GH-93, new message) From b510c757 "GH-93: Polish Existing Plugins" on `task/GH-93…` or `dev` branch commit e44356b867875afb98a663a997fb00d20204908a Merge: a7f46f6 053bcb2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 16:48:38 2021 -0500 Merge branch 'quick/clean-up-plugins-to-match-GH-93-plugins' into task/GH-73-tacc-blockquote-plugin commit a7f46f6709f9ee2f1756b6c3ffc9f7a57571515a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 16:42:55 2021 -0500 Quick: Submod: Merge main commit 053bcb28aa3dc71ae3ca403b9fcde0ed7992cffb Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jul 1 10:25:13 2021 -0500 Quick: Function doc improvements & additions commit 39e3d26985f9fcc95cb800c910d7230d4d936b62 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jul 1 10:18:46 2021 -0500 Quick: Clean Up PLugins to Match GH-93 Plugins commit b76fda0db85bbfb7b40ac05120f2b9d839c01ecb Merge: 3622661 a0104d4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 30 15:47:26 2021 -0500 Merge branch 'main' into dev commit 3622661cad36714d1969ab799c51b3422bf05bc0 Merge: 10aaf2f 66380a2 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Fri Jun 25 16:10:17 2021 -0500 Merge pull request #261 from TACC/quick/support-plugins-unadulterated-by-bootstrap commit 66380a23f227b69f56f89b8aff1c46a54b2d1931 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit a4f6b4d10dfb090687f57f6fcc8eacf758ff55a2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit cd7e3e123a33839a868c99b6b897110dd424986f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit df25f2b1ff0bb7f3d5eb07d769206f2e385eddfd Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 989c981f903583b08d154a8974741c63182188d3 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit 10aaf2f0a1ed43082c01e305a87980665577e6b3 Merge: 0b38c4a 9ce83d2 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Jun 22 12:21:27 2021 -0500 Merge pull request #258 from TACC/test/FP-1099-disabled-auto-search-reindex commit 0b38c4af7a95b95c3a9b9c80cf33579a4907062d Merge: 27b3dd3 0a82cd7 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:55:58 2021 -0500 Merge branch 'dev' of github.com:TACC/Core-CMS into dev commit 27b3dd3990f847ba3c8e30dd3a18c2ad034eee0c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:55:46 2021 -0500 Quick: Update taccsite_custom commit 0a82cd70c6eef78baba15403e300a7bf50191a1f Merge: f48ecd2 956e12d Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Jun 22 10:31:39 2021 -0500 Merge pull request #257 from TACC/task/GH-73-tacc-blockquote-plugin commit 956e12dce53209de38a72645b67b1de0c09254ee Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:13:00 2021 -0500 GH-73: Texascale: Noop: Comment text tweak commit 38317320c1563557e9dc1cf876869425e6ceef22 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 10:00:28 2021 -0500 GH-73: Cleanup constants & helpers & offset commit 2eee71a35ff48ac5e3f51fd3da908c407056bd9b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 09:09:55 2021 -0500 GH-73: Recreate migrations from zero commit cd45ab75e348cca784a52ded56fcaa1d6f490230 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jun 22 08:54:10 2021 -0500 GH-73: Texascale: Use 2400px / `--max-wide-…` commit a047df5e7e360b7f33235933c2bdfab86d90111e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 21:05:13 2021 -0500 GH-73: Move `offset-…` max-width to media query commit 10c57480dc100b7199559f295aa2392c79bfd7b3 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:51:09 2021 -0500 GH-73: Support quotes in blockquote via CSS commit d63e6ad113b2f5f52cd7fde4e92616931870bdb9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:40:10 2021 -0500 GH-73: Texascale: Deprecate Bootstrap blockquote commit 4a55986178777fe698226aa9e6b752cd35306e3b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 20:33:01 2021 -0500 GH-73: Rename c-offset-content model prop commit a7517d9c45efa915bc21081d7e87e1ed01f1fc59 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 18:42:05 2021 -0500 GH-73: Rename c-offset-content → o-offset-content - Texascale: - Have c-offset-content extend o-offset-content styles - Add comment for legacy support and deprecation of c-offset-content commit f972214da05f2d9e081db00e62296eeeaba5d857 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 16:52:28 2021 -0500 GH-73: Collapse "Adv. Settings" for Offset… plugin commit 9ce83d2977c1a253afe4b4cb9e571a79444585e2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 13:18:44 2021 -0500 FP-1099: Clarify Search feature value results Default Value (i.e. falsy): - Allow indexing for Portal CMS. - Disallow indexing for SAD CMS. commit 7ebecb1dc58152c21ed3241c242cc4c6a6dd09be Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 12:44:30 2021 -0500 FP-1099: Make Search a feature Allow search to be disabled for Portal. Allow indexing to be disabled for CMS. commit 98d419965d35ac45e94b685853e8c00ad64c016e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 21 10:59:22 2021 -0500 GH-73: Move sample markup for blockquote into css commit c1bb7c74c0fbff34508acc81b9bb1d3251c3ec23 Merge: 22232f0 f48ecd2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Sat Jun 19 15:17:59 2021 -0500 Merge branch 'main' into test/FP-1099-disabled-auto-search-reindex commit 22232f0a10b6dcd51aed684927a6e699357311fa Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Sat Jun 19 15:03:43 2021 -0500 Quick: Update taccsite_custom to latest commit 3419a002c303e15b01bc9c13310ed14680eebdde Merge: 444cfc1 f48ecd2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 18 21:41:57 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 580a7a5e306b88ee8cf3c8f368dcd830615fc434 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 18 14:19:53 2021 -0500 FP-1099: Test: Disable reindex on publish commit 444cfc15c77a1f7ce0852de7c5e3d543dad18d5d Merge: eaa0a01 5918cce Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 16:34:11 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit eaa0a01abd472ed131ddee52622fa1db4e511222 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 16:19:26 2021 -0500 GH-73: Update submodule to merge of main commit 4d5ee2b4f0756ebb73bb39626f91321e4e102203 Merge: f3dac48 fb7f601 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 15:02:29 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit f3dac48fb0f9d069d42841d986d636c0296e6590 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 09:58:18 2021 -0500 GH-73: Blockquote: fix markup bug, post-dash space commit 59db29512b8b8a9d0badea0fc6a69eaf876452bf Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Jun 17 09:26:34 2021 -0500 GH-73: Add offset plugin and offset to blockquote. - Add basic "Offset Content" plugin. - matches existing usage - lacks new feature (center alignment) - Add support for Blockquote plugin inside text. - Add support for offset option in Blockquote plugin. commit c73532e452171c48e72e03ca3531f9dbac33ff5b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 19:24:03 2021 -0500 GH-73: Finish blockquote plugin commit 6028f4aff5270cc47885bb615eb432f2e0c12cad Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 15:45:24 2021 -0500 GH-73: Finish first version of blockquote plugin commit 6ed391e90c286d29a03997d6df945a40f19ada75 Merge: d2c554d 828a5dd Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Jun 16 10:37:19 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit d2c554d153980d192eaa932df1a4c148faa88966 Merge: 6f9440d 2c50694 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jun 14 10:08:50 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 6f9440d86108a203d2a2fa99269b041e7a264bbe Merge: aac4f5e 3d4b47c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon May 10 12:12:52 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit aac4f5e197fffe5b5b741910343155bd3f93bf5e Merge: 1c34b4b 3deb6b4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Apr 22 10:06:57 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 1c34b4bd823dae176090060b5eb5d98cc882499e Merge: 49a8163 2781c7e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Apr 14 17:33:39 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 49a8163d84bbb11dd4a1ce2d6382617bcc84e937 Merge: 0260226 27958c4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:52:26 2021 -0500 Merge branch 'main' into task/GH-73-tacc-blockquote-plugin commit 0260226af608deb05adfc54413b5df10a0c01d9f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:16:08 2021 -0500 GH-73: Update blockquote based on GH-67 commit 0a9ae0cbb3fa42e86b3c9e488be2a470742e0250 Merge: 556024f 541a74d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Apr 13 15:10:00 2021 -0500 Merge branch 'task/GH-67-tacc-sample-plugin' into task/GH-73-tacc-blockquote-plugin commit 556024f1298e76578f8335e99e8732d2001417fb Merge: 4b5b5c7 b8be85c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 19:02:54 2021 -0500 Merge branch 'task/GH-67-tacc-sample-plugin' into task/GH-73-tacc-blockquote-plugin commit 4b5b5c74b5b6e1c0dc4f3f2c1cbfe4d64712cf97 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 19:02:42 2021 -0500 GH-73: Fix model desc typo commit 6d69a561007512b7397fe78d6f46914b7682cc04 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Apr 12 18:46:53 2021 -0500 GH-73: WIP Blockquote Plugin from Greet Plugin commit b96869201053ab8eb9523bc229117c3b6be5c5a1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:04:10 2021 -0500 Squashed merge of task/GH-88-system-specs of the following: commit b57e072b16b46a040a515b8501bb908f301ad491 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 10:43:42 2021 -0500 GH-88: Do not allow Bootstrap Picture commit fd5ed6195aa06c237687e4981f47b87063a2c3c0 Merge: 0bfb57f 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:25:11 2021 -0500 Merge branch 'main' into task/GH-88-system-specs commit 0bfb57fe35fa3d9966cb5ebc507bc9a23f59dcf6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 15:03:21 2021 -0500 GH-88: Noop: Cleanup commit a64592daf7448a1983aa27100c5d50fbd9a0abdb Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 12:58:00 2021 -0500 GH-88: Add missing taccsite helper and constant commit 3b179f79a9954e369ef04149e162ae8b12a0499c Merge: 52b408b 610a49a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 12:17:21 2021 -0500 Merge branch 'main' into task/GH-88-system-specs commit 52b408b3e1388bab087920aee9344e519bfed674 Merge: c2616c0 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:24:02 2021 -0500 Merge branch 'main' into task/GH-88-system-specs commit c2616c0de47fa78d3cba9c7dd047ce1e8b1971f4 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 15:26:23 2021 -0500 GH-88: Rename child plugin Sysmon to SystemMonitor This prepares for the rename that occurs in task/GH-89. commit 732b99c926cf4a7e6a5eeb82be90b03309a674b6 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:19:25 2021 -0500 GH-88: Fix incorrect var name (font-size→weight) commit 5f5eb56e6339464619266632b64e66319c5532ed Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 06:00:21 2021 -0500 GH-88: Document support for app stylesheets commit 2c28f4a403b3baccb35a59ebeab86d3eb711fa81 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 05:04:32 2021 -0500 GH-88: Set plugin font size and weight commit e5748a1afdb5866e45417388e544aabad46c2855 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 12 16:47:37 2021 -0500 GH-88: SystemSpecs: Fix Bug using Generic Image commit 3fb8a3056478a351432afae77347748fcf70ba3b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 12 16:13:13 2021 -0500 GH-88: SystemSpecs: Support Sysmon Image DataList For System Monitor, Image / Picture, and DataList: - Limit System Specs child plugins to these. - Style these in System Monitor layout. - Load System Monitor styles via new `app.*` stylesheet. commit 491c385d6ac019e80d5bbe9a635786a47ab88ecc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 05:01:52 2021 -0500 GH-88: Update submod (merge main) commit eba88c0b0ec81afb9415d4ec22208aa3d7864719 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 6 12:56:41 2021 -0500 GH-88: SystemSpecs: Fix Dup. Internal Link Opt Do not let "Internal Link" have duplicate options. commit 45f07cf9bac85f51a59cf85cca84b210aaead0df Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 6 00:10:23 2021 -0500 GH-88: SystemSpecs: Enable Link (Has Admin Bug) Enable the link by adding missing context variables. TODO: Prevent duplicate entires in "Internal Link". commit e5fa6c4658b3f673f484883f661891616b02c349 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 5 23:39:16 2021 -0500 GH-88: SystemSpecs: Integrate DataList - Add DataList plugin support. - Require description. - Edit "Resources Title" verbose name. - Update To Do list. - Rebuild migrations. - Rebuild specifications using table. commit 4e40d66ed81e27e4d6a4bbabf23c201c75767229 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 4 12:51:47 2021 -0500 GH-88: Initial SystemSpecs (see TODO.md) commit 0b102dfe83d31094f8330b4d40cf566bf4ef501a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 17:02:02 2021 -0500 Squashed merge of task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts of the following: commit 579f5c6a0f94b1ea8329d2bb3cbb93ff01beb0a8 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:25:31 2021 -0500 Docs: Corrections to "How to Extend Plugin" doc commit 3bdde39258aca0c15e0c735e749a9fd716141734 Merge: 266a9ad 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:18:22 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit 266a9adfcc42d6637471fd955a04498b8da7abf8 Merge: 647d394 a66033a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:09:17 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit 647d394e8d67f43184224649f2f038f67f1be788 Merge: dcf606c ac6d873 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 17:19:26 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit dcf606cfda2c76f894086764412a183913f7e7f4 Merge: 74b9a9c e0e420d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 17:04:52 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit 74b9a9c5029ed786e43de23319249696fc17f172 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 13 05:52:08 2021 -0500 GH-93: Avoid title color bug with upcoming PR #312 Ensure heading turns white. commit 1729430fce740e7d77a80f5294ebe31e99c64e13 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 13:43:29 2021 -0500 GH-142, GH-133: Article List Plugin Helpers This code was lost during re-creation: - of https://github.com/TACC/Core-CMS/pull/264 - as https://github.com/TACC/Core-CMS/pull/280. commit eea07689bc7aada961a9a02333a1ee8dadffb7aa Merge: 89b1136 374b78e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jul 30 12:46:27 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit 89b11363442836eda4799ebd4842cc2823969432 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jul 20 17:24:37 2021 -0500 GH-93: Frontera: Plugin-less style … — Real Fix commit 5bd64840bd0d19565238e678d44dfa8c0542bb6c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jul 20 17:23:30 2021 -0500 GH-93: Frontera: Plugin-less style … snippet — Fix commit f6b8f3aa00ce5918ed7f132ae6e80c69407d2e5a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jul 20 17:03:17 2021 -0500 GH-93: Frontera: Plugin-less style updates snippet commit b531503dd5e9c8a29c7327dc7713081dccec60d3 Merge: 2b66f11 302fe3b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Jul 20 16:58:15 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit 2b66f11f5f23da70f204a52ef1f1287e51f9b161 Merge: 2bdf7e7 d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:38:53 2021 -0500 Merge branch 'main' into task/GH-93-GH-142-GH-133-article-list-plugins-and-styles--no-reverts commit 2bdf7e70faa42580d96a737be5b8bf7666177f1f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 20:55:42 2021 -0500 GH-93, GH-142, GH-133: Article List Plugins+Styles commit b250ed412432853ba2231f7403e7393b42782f2a Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 16:58:18 2021 -0500 Squashed merge of quick/support-plugins-unadulterated-by-bootstrap--for-main of the following: commit 7c617af1aa88dd14b39e3764c0e42f8a8246b3e4 Merge: 0ddc50a e80de90 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Wed Aug 25 11:14:12 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 0ddc50a8e8dc66675172b9a0121f21b11b473c7f Merge: d662f24 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:20:09 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit d662f24607b58d07aa7d865d42ce5a8488829c82 Merge: 6bb1f9e 5b97b8f Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 17 17:30:22 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 6bb1f9ecc36fe5ea14a225ddb803f1f9777a3106 Merge: eda34fa 1d50a7b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 16 18:25:14 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit eda34faa49ddcefcbbd5ced6e8473040082e4a03 Merge: 11f735c d0a5151 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Jul 12 21:37:41 2021 -0500 Merge branch 'main' into quick/support-plugins-unadulterated-by-bootstrap--for-main commit 11f735c49efed900e13b737c817ee3546fae9522 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:59:59 2021 -0500 Quick: Improve import caveat comments commit fe181dcdf29fdf312e7af312ce9a1fecb5679a9e Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:56:21 2021 -0500 Quick: Support Unadulterated PicturePlugin commit 78374510d25b0603d54e32e4a53d57b26a9c17a9 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:52:13 2021 -0500 Quick: Tweak desc of bootstrap4_djangocms_link commit 815c68f4f4073a50ac853c49286123b2daed8c1f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:46:03 2021 -0500 Quick: Move Install Line of Unadulaterated Plugin commit 520f44c13acf86bfe5fa9f77fa398ac7eb87cfe1 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Jun 25 15:45:25 2021 -0500 Quick: Support Unadulterated LinkPlugin commit 4b97bad78afe02894bc51e2a026d709f3b616502 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Thu Aug 26 16:57:53 2021 -0500 Squashed merge of task/GH-83-callout-element of the following: commit fa185d0140f45607df01f73cf91f5e2f2fffcd79 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 15:04:29 2021 -0500 GH-83/GH-321: Show image on narrow windows commit 66eae8f47b8cee14b0a2bd5b8214c824b15a161c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:35:59 2021 -0500 GH-321: Fix figure size and note about its resize commit a7134e21c129ab8ce1cea9f229b393169275429f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:25:01 2021 -0500 GH-83: Quick: Update script comments & equality - Update comments for clarity and accuracy and scope. - Update equality that was not explicit enough. commit 1a57226619c01cebf5afb2b834976b3acff25485 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 13:08:18 2021 -0500 GH-83: Support Optional Image/Link in CSS Docblock The plugin may require a link and should require an image (GH-328)… But the styles (and template) work fine without either. commit 5059e02f5a4244ddc735ef8bbb541c0a7893858b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 10:07:26 2021 -0500 GH-83: Require all fields (can't require image) commit a07957ea33e5455d87faf8cc1df799a7f9a91abe Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 09:48:21 2021 -0500 GH-83: Add two relevant docs from PR #280 SEE: https://github.com/TACC/Core-CMS/pull/280/ SEE: https://github.com/TACC/Core-CMS/blob/579f5c6/taccsite_cms/contrib/_docs/ commit 7ffceebca8b873da46d417d0aa74e0fecad4b8a0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 09:29:14 2021 -0500 GH-321: Default to not resize image. Add warning. - Add helper to get a model name. - Simplify user instruction for fixing caveat. - Do not allow normal user to check resize field. - Hide field and caveat details in "Advanced settings". - Default resize field to false. commit 9767d455a00157fc1b8bc7ad1c9426301dfbbdcc Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:56:56 2021 -0500 GH-321: Resize Callout image to parent height CAVEAT: The addition to 0001 migration was manual and is untested. commit acefadfbd1e74ff7d6479049856a6be949db0e74 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:10:57 2021 -0500 GH-83/GH-321: Add missing static template tag load commit d59c3f63b358868c4cbe0c2a76ed0c1dfe3aa0e2 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:07:24 2021 -0500 GH-83: Squash migrations. Accept GH-321 as part of GH-83. commit df1060bdad9f680a1f2e76ace22e0b9e6897340c Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:01:27 2021 -0500 GH-83: Add missing helper clean_for_abstract_link commit 51d3f1d9482a0ab6d147e76bbccf4e9593e78771 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:26:20 2021 -0500 GH-83: Support Hyperlink (requires 69f47cc) Requires new `x-article-link-active` mixin. The reason 0003 is added, not 0002, is cuz extending branch added 0002: - site/frontera/task/GH-83-callout-element--GH-321-resize-callout-image (there, the 0003 migration has 0002 as a dependency) (here, the 0003 migration has 0001 as a dependency) When a proper main-extending branch is made, this should still happen: - task/GH-83-callout-element--GH-321-resize-callout-image - task/GH-321-resize-callout-image (there, the 0003 migration will have ??? as a dependency) Good luck, Wes. commit ed0e74902e9d1b687e81b460b6b7b620ceb8ca05 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 20:24:45 2021 -0500 Quick: Add x-article-link-active mixin commit 1266e4e34f136b1e4ea4271327f2dc0d637978ea Merge: 54fc04a 2689b8b Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 18:18:48 2021 -0500 Merge branch 'main' into task/GH-83-callout-element commit 54fc04a706581eacc62b5c9d20dd80fb3ed7646d Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 14:05:36 2021 -0500 GH-83: Quick: Remove temp snippet commit c24e0f9c0af615cecac4e48363c99427cedb3aff Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:30:29 2021 -0500 GH-83: Noop: Add markup whitespace for legibility commit dba3f4b8cfd6cdd38abb23bac453ee433a795818 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Mon Aug 23 13:03:37 2021 -0500 GH-83: Remove leftover templates commit a15e585587a49a4a2753e9ad6a073c40e83e209f Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:50:15 2021 -0500 GH-83: Fix Callout Plugin, Update Styles to Match commit 4fa354cd6ca120c47638184ade411dbe4c25afce Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 19:09:41 2021 -0500 GH-83: Fix Callout Component after Plugin's tweaks commit c15d7667864ba8f879d35a4d6b02eb1d3ea52705 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:53:49 2021 -0500 GH-83: WIP: Callout Plugin commit c2c96ecbed4a45df1be98337d214bbb5b84a2ae0 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:25 2021 -0500 GH-83: Temp: Callout Snippet (Frontera) commit 82b768ff9b6650f21f5d699666cd40ba6a327073 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Fri Aug 20 18:15:02 2021 -0500 GH-83: Callout Component commit e80de906635960698d9e3585aa217ff71e08e015 Merge: 2689b8b bbef103 Author: W. Bomar <62723358+tacc-wbomar@users.noreply.github.com> Date: Tue Aug 24 08:40:16 2021 -0500 Merge pull request #326 from TACC/hotfix/GH-75-data-list-field-desc-db-migration commit bbef103d71cfad0e2d4a36fc4fcbb71efa351aa8 Author: Wesley Bomar <wbomar@tacc.utexas.edu> Date: Tue Aug 24 08:15:54 2021 -0500 GH-75: Hotfix: Add missing (small) db migration
1 parent b50a8ad commit 3d0d55f

11 files changed

Lines changed: 120 additions & 96 deletions

File tree

‎taccsite_cms/contrib/bootstrap4_djangocms_link/cms_plugins.py‎

Lines changed: 37 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,48 @@
1-
# Reregister unregistered LinkPlugin without uninstalling Bootstrap4's
2-
# FAQ: A Bootstrap link is undesirable but may be used by migrated legacy sites
3-
# TODO: Drop try/except & load non-standard plugin set for migrated legacy sites
4-
# FAQ: If we can import both plugins, then re-register LinkPlugin
5-
# (because Bootstrap4Link unregistered LinkPlugin)
1+
# To support generic Link plugin without uninstalling Bootstrap4's
2+
# FAQ: Bootstrap Link plugin has features not desirable within TACC plugins
3+
# FAQ: We must not break sites that already use Bootstrap Link plugin
64
try:
5+
# CAVEAT: Solution must be more than that for `bootstrap4_djangocms_picture`
6+
# SEE: https://github.com/django-cms/djangocms-bootstrap4/pull/138
7+
import copy
8+
9+
from django.utils.translation import gettext_lazy as _
10+
711
from cms.plugin_pool import plugin_pool
12+
813
from djangocms_link.cms_plugins import LinkPlugin
914
from djangocms_bootstrap4.contrib.bootstrap4_link.cms_plugins import Bootstrap4LinkPlugin
1015

11-
# Restore original fields
12-
# SEE: https://github.com/django-cms/djangocms-bootstrap4/blob/2.0.0/djangocms_bootstrap4/contrib/bootstrap4_link/cms_plugins.py#L26-L42
13-
# SEE: https://github.com/django-cms/djangocms-link/blob/3.0.0/djangocms_link/cms_plugins.py#L20-L23
14-
LinkPlugin.fieldsets[0][1]['fields'] = (
15-
'name',
16-
('external_link', 'internal_link'),
16+
# To unlink Bootstrap's plugin fieldsets from Generic's
17+
# SEE: https://github.com/django-cms/djangocms-bootstrap4/blob/2.0.0/djangocms_bootstrap4/contrib/bootstrap4_link/cms_plugins.py#L44
18+
Bootstrap4LinkPlugin.fieldsets = copy.deepcopy(Bootstrap4LinkPlugin.fieldsets)
19+
20+
# To restore generic Link plugin fieldsets to state before Bootstrap's
21+
# SEE: https://github.com/django-cms/djangocms-link/blob/3.0.0/djangocms_link/cms_plugins.py#L19-L24
22+
# SEE: https://github.com/django-cms/djangocms-bootstrap4/blob/2.0.0/djangocms_bootstrap4/contrib/bootstrap4_link/cms_plugins.py#L38-L42
23+
LinkPlugin.fieldsets[0] = (
24+
None, {
25+
'fields': (
26+
'name',
27+
('external_link', 'internal_link'),
28+
)
29+
}
1730
)
1831

19-
# SEE: https://github.com/django-cms/djangocms-link/issues/163
32+
# To signal to users that plugin is not desirable
33+
Bootstrap4LinkPlugin.name = _('⚠️ Link / Button')
34+
Bootstrap4LinkPlugin.fieldsets.insert(0, (
35+
None, {
36+
'description': _('⚠️ This plugin is <strong>deprecated</strong>. Please use "Generic" > "Link" plugin instead.<br /><small>If the "Generic" > "Link" plugin is inadequate, please inform the CMS development team.</small>'),
37+
'fields': ()
38+
}
39+
))
40+
41+
# To re-register generic Link plugin
42+
# SEE: https://github.com/django-cms/djangocms-bootstrap4/blob/master/djangocms_bootstrap4/contrib/bootstrap4_link/cms_plugins.py#L81
2043
plugin_pool.register_plugin(LinkPlugin)
44+
45+
# To avoid server crash if Boostrap plugin is not registered
2146
# CAVEAT: If import statement fails for reason other than Bootstrap presence,
2247
# then that failure, and the failure of this plugin, is silent
2348
except ImportError:

‎taccsite_cms/contrib/bootstrap4_djangocms_picture/cms_plugins.py‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,28 @@
1-
# Reregister unregistered PicturePlugin without uninstalling Bootstrap4's
2-
# FAQ: A Bootstrap picture has superfluous options that are not always desirable
3-
# FAQ: If we can import both plugins, then re-register PicturePlugin
4-
# (because Bootstrap4Picture unregistered PicturePlugin)
1+
# To support generic Image plugin without uninstalling Bootstrap's
2+
# FAQ: Bootstrap Image plugin has features not desirable in TACC plugins
3+
# FAQ: We must not break sites that already use Bootstrap Image plugin
54
try:
5+
from django.utils.translation import gettext_lazy as _
6+
67
from cms.plugin_pool import plugin_pool
8+
79
from djangocms_picture.cms_plugins import PicturePlugin
810
from djangocms_bootstrap4.contrib.bootstrap4_picture.cms_plugins import Bootstrap4PicturePlugin
911

12+
# To signal to users that plugin is not desirable
13+
Bootstrap4PicturePlugin.name = _('⚠️ Picture / Image')
14+
Bootstrap4PicturePlugin.fieldsets.insert(0, (
15+
None, {
16+
'description': _('⚠️ This plugin is <strong>deprecated</strong>. Please use "Generic" > "Image" plugin instead.<br /><small>If the "Generic" > "Image" plugin is inadequate, please inform the CMS development team.</small>'),
17+
'fields': ()
18+
}
19+
))
20+
21+
# To re-register generic Picture plugin
1022
# SEE: https://github.com/django-cms/djangocms-bootstrap4/blob/master/djangocms_bootstrap4/contrib/bootstrap4_picture/cms_plugins.py#L54
1123
plugin_pool.register_plugin(PicturePlugin)
24+
25+
# To avoid server crash if Boostrap plugin is not registered
1226
# CAVEAT: If import statement fails for reason other than Bootstrap presence,
1327
# then that failure, and the failure of this plugin, is silent
1428
except ImportError:

‎taccsite_cms/contrib/taccsite_callout/migrations/0001_initial.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
class Migration(migrations.Migration):
1111

12-
replaces = [('taccsite_callout', '0001_initial'), ('taccsite_callout', '0003_auto_20210823_1902')]
12+
initial = True
1313

1414
dependencies = [
1515
('filer', '0012_file_mime_type'),

‎taccsite_cms/contrib/taccsite_data_list/migrations/0002_auto_20210824_0803.py‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# Generated by Django 2.2.16 on 2021-08-24 13:03
2+
3+
from django.db import migrations, models
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('taccsite_data_list', '0001_initial'),
10+
]
11+
12+
operations = [
13+
migrations.AlterField(
14+
model_name='taccsitedatalistitem',
15+
name='key',
16+
field=models.CharField(blank=True, help_text='A label for the data value.', max_length=50, verbose_name='Label'),
17+
),
18+
]

‎taccsite_cms/contrib/taccsite_system_specs/cms_plugins.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ def get_render_template(self, context, instance, placeholder):
2828
child_classes = [
2929
'TaccsiteSystemMonitorPlugin',
3030
'PicturePlugin',
31-
'Bootstrap4PicturePlugin',
3231
'TaccsiteDataListPlugin',
3332
]
3433

@@ -105,11 +104,9 @@ def render(self, context, instance, placeholder):
105104

106105
# To identify child plugins
107106
for plugin_instance in instance.child_plugin_instances:
108-
print(type(plugin_instance).__name__)
109107
if (type(plugin_instance).__name__ == 'TaccsiteSystemMonitor'):
110108
context.update({ 'sysmon_plugin': plugin_instance })
111-
if (type(plugin_instance).__name__ == 'Picture' or
112-
type(plugin_instance).__name__ == 'Bootstrap4Picture'):
109+
if (type(plugin_instance).__name__ == 'Picture'):
113110
context.update({ 'image_plugin': plugin_instance })
114111
if (type(plugin_instance).__name__ == 'TaccsiteDataList'):
115112
context.update({ 'data_plugin': plugin_instance })

‎taccsite_cms/default_secrets.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
# For standard pages (has Container and Breadcrumbs)
6565
('standard.html', 'Standard'),
6666
# For content that spans full window width (no Container nor Breadcrumbs)
67-
('fullwidth.html', 'Fullwidth'),
67+
('fullwidth.html', 'Full Width'),
6868

6969
# Any project that needs per-project styles must have a custom template
7070
# FAQ: This is a tedious solution until a cleaner solution is devised

‎taccsite_cms/settings.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,13 +245,13 @@ def getsecrets():
245245
# FAQ: The djangocms_bootstrap4 library can serve as an example
246246
'taccsite_cms.contrib.taccsite_callout',
247247
'taccsite_cms.contrib.taccsite_sample',
248-
'taccsite_cms.contrib.taccsite_static_article_list',
249-
'taccsite_cms.contrib.taccsite_static_article_preview',
250248
'taccsite_cms.contrib.taccsite_blockquote',
251249
'taccsite_cms.contrib.taccsite_offset',
252250
'taccsite_cms.contrib.taccsite_system_monitor',
253251
'taccsite_cms.contrib.taccsite_system_specs',
254252
'taccsite_cms.contrib.taccsite_data_list',
253+
'taccsite_cms.contrib.taccsite_static_article_list',
254+
'taccsite_cms.contrib.taccsite_static_article_preview',
255255
]
256256

257257
# Convert list of paths to list of dotted module names

‎taccsite_cms/static/site_cms/css/src/_imports/trumps/s-system-specs.css‎

Lines changed: 38 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,8 @@ System Specifications
33
44
Styles for System Specifications content which assumes external code:
55
6-
- custom properties
7-
(for `--global-...`)
86
- `c-data-list`
97
(for "Data List")
10-
- `s-sysmon`
11-
(for "System Monitor")
128
139
Styleguide Trumps.Scopes.SystemSpecs
1410
*/
@@ -27,77 +23,63 @@ Styleguide Trumps.Scopes.SystemSpecs
2723

2824
/* Layout */
2925

30-
.s-system-specs {
31-
--row-gap: 32px;
32-
33-
display: grid;
34-
}
35-
.s-system-specs > figure { grid-area: figure; }
36-
.s-system-specs > div { grid-area: specs; }
37-
.s-system-specs > aside { grid-area: other; }
38-
39-
@media only screen and (--medium-and-below) {
26+
@media only screen and (--narrow-and-above) {
4027
.s-system-specs {
41-
--row-gap: 32px;
42-
43-
grid-template-areas:
44-
'figure'
45-
'specs'
46-
'other';
47-
row-gap: var(--row-gap);
28+
display: flow-root;
29+
}
30+
.s-system-specs > * {
31+
display: inline-block;
32+
}
33+
.s-system-specs > figure {
34+
float: left;
4835
}
4936
}
50-
@media only screen and (--medium-and-above) {
51-
.s-system-specs {
52-
--row-gap: 32px;
5337

54-
grid-template-columns: var(--col-width--wide) var(--col-width--thin);
55-
grid-template-rows: auto 1fr;
56-
gap: var(--row-gap) var(--col-gap);
57-
}
38+
39+
40+
/* Spacing */
41+
42+
.s-system-specs {
43+
--row-height: 32px;
5844
}
5945

60-
@media only screen and (--medium-to-wide) {
61-
.s-system-specs {
62-
--col-width--wide: 46%;
63-
--col-width--thin: 48%;
64-
--col-gap: 6%;
65-
--col-pad: 20px;
66-
67-
grid-template-areas:
68-
'figure specs'
69-
'other other';
70-
}
46+
.s-system-specs > aside {
47+
margin-top: var(--row-height);
7148
}
72-
@media only screen and (--wide-and-above) {
73-
.s-system-specs {
74-
--col-width--thin: 42%;
75-
--col-width--wide: 48%;
76-
--col-gap: 10%;
77-
--col-pad: 40px;
7849

79-
grid-template-areas:
80-
'figure specs'
81-
'figure other';
50+
@media only screen and (--medium-and-below) {
51+
.s-system-specs > figure {
52+
margin-bottom: var(--row-height);
8253
}
8354
}
8455

8556

8657

87-
/* Spacing */
58+
/* Sizes */
8859

8960
@media only screen and (--medium-and-above) {
90-
.s-system-specs,
91-
.s-system-specs > div { padding-inline: var(--col-pad); }
92-
.s-system-specs > aside { padding-right: var(--col-pad); }
93-
}
94-
@media only screen and (--wide-and-above) {
95-
.s-system-specs > aside { padding-left: var(--col-pad); }
61+
.s-system-specs {
62+
--col-width--thin: 42%;
63+
--col-width--wide: 48%;
64+
--col-gutter: 10%;
65+
--col-padding: 40px;
66+
67+
padding-inline: var(--col-padding);
68+
}
69+
.s-system-specs > div,
70+
.s-system-specs > aside {
71+
width: var(--col-width--thin);
72+
padding-inline: var(--col-padding);
73+
}
74+
.s-system-specs > figure {
75+
width: var(--col-width--wide);
76+
margin-right: var(--col-gutter);
77+
}
9678
}
9779

9880

9981

100-
/* Figure */
82+
/* Position */
10183

10284
.s-system-specs > figure > img {
10385
width: 100%;

‎taccsite_cms/static/site_cms/css/src/site.css‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,10 @@
2828
/* COMPONENTS */
2929
/* GH-302: HELP: How should all of these become individually built files? */
3030
/* GH-302: FAQ: Individually built stylesheets could be loaded explicitely. */
31+
@import url("_imports/components/c-callout.css");
3132
@import url("_imports/components/c-article-list.css");
3233
@import url("_imports/components/c-article-preview.css");
3334
@import url("_imports/components/c-date.css");
34-
@import url("_imports/components/c-callout.css");
3535
@import url("_imports/components/c-data-list.css");
3636
@import url("_imports/components/c-footer.css");
3737
@import url("_imports/components/c-see-all-link.css");
@@ -43,6 +43,7 @@
4343
/* TRUMPS */
4444
@import url("_imports/trumps/s-article-list.css");
4545
@import url("_imports/trumps/s-breadcrumbs.css");
46+
@import url("_imports/trumps/s-article-list.css");
4647
@import url("_imports/trumps/s-footer.css");
4748
@import url("_imports/trumps/s-blockquote.css");
4849
@import url("_imports/trumps/u-empty.css");

‎taccsite_cms/templates/fullwidth.html‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,7 @@
33

44
{% block title %}{% page_attribute "page_title" %}{% endblock title %}
55

6-
{% block assets_custom %}
7-
{{ block.super }}
8-
9-
<script>
10-
console.info('Core `fullwidth.html` loads no custom assets');
11-
</script>
12-
{% endblock assets_custom %}
13-
6+
{# To remove container and breadcrumbs #}
147
{% block content %}
158
{% placeholder "content" %}
169
{% endblock content %}
17-
18-
{% block assets_custom_delayed %}
19-
<script>
20-
console.info('Core `fullwidth.html` loads no (delayed) custom assets');
21-
</script>
22-
{% endblock assets_custom_delayed %}

0 commit comments

Comments
 (0)