Merge branch 'main' into feat/script-to-setup-cms

Author: wesleyboar

.github/pull_request_template.md

@@ -6,8 +6,8 @@
 
 <!--
 - [CMD-XYZ](https://tacc-main.atlassian.net/browse/CMD-XYZ)
-- requires https://github.com/TACC/Core-Styles/pull/5
-- required by https://github.com/TACC/Core-CMS-Resources/pull/117
+- requires https://github.com/TACC/Core-Styles/pull/123
+- required by https://github.com/TACC/Core-CMS-Custom/pull/123
 -->…
 
 ## Changes

README.md

@@ -13,6 +13,7 @@ The base CMS code for TACC WMA Workspace Portals & Websites
 - [Update Project](#update-project)
 - [Develop Project](#develop-project)
   - [Develop a Custom Project](#develop-a-custom-project)
+  - [Develop a Custom App/Plugin](#develop-a-custom-appplugin)
 - [Debug Project](#debug-project)
 - [Build & Deploy Project](#build--deploy-project)
 - [Contributing](#contributing)
@@ -23,6 +24,7 @@ The base CMS code for TACC WMA Workspace Portals & Websites
 - [Camino], a Docker container-based deployment scheme
 - [Core Portal], the base Portal code for TACC WMA CMS Websites
 - [Core Styles], the shared UI pattern code for TACC WMA CMS Websites
+- [Core CMS Template], a template for creating new TACC WMA CMS projects
 - [Core CMS Resources], the old solution for extensions of the [Core CMS] project
 - [Core CMS Custom], the new solution for extensions of the [Core CMS] project
 - [Core Portal Deployments], private repository that facilitates deployments of [Core Portal] images via [Camino] and Jenkins
@@ -153,6 +155,10 @@ Read [Develop Project] for developer instructions.
 
 To develop a new or existing custom CMS website for a client, read [Develop a Custom Project].
 
+### Develop a Custom App/Plugin
+
+To develop a new or existing Django CMS app or plugin for a client, read [Develop a Custom App/Plugin].
+
 ## Debug Project
 
 Read [Debug Project] for miscellaneous tips.
@@ -182,6 +188,7 @@ To contribute, first read [How to Contirbute][Contributing].
 [Core CMS]: https://github.com/TACC/Core-CMS
 [Core Styles]: https://github.com/TACC/Core-Styles
 [Core CMS Resources]: https://github.com/TACC/Core-CMS-Resources
+[Core CMS Template]: https://github.com/TACC/Core-CMS-Template
 [Core CMS Custom]: https://github.com/TACC/Core-CMS-Custom
 [Core Portal]: https://github.com/TACC/Core-Portal
 [Core Portal Deployments]: https://github.com/TACC/Core-Portal-Deployments
@@ -195,6 +202,7 @@ To contribute, first read [How to Contirbute][Contributing].
 [Django CMS User Guide]: https://tacc-main.atlassian.net/wiki/x/phdv
 
 [Develop a Custom Project]: ./docs/develop-custom-project.md
+[Develop a Custom App/Plugin]: ./docs/develop-custom-app.md
 [Develop Project]: ./docs/develop-project.md
 [Upgrade Project]: ./docs/upgrade-project.md
 [Debug Project]: ./docs/debug-project.md

docs/develop-custom-app.md

@@ -0,0 +1,27 @@
+# Develop a Custom App
+
+- [Create a **New** App](#create-a-new-app)
+- [**Extend** an Existing App](#extend-an-existing-app)
+
+## Create a New App
+
+Create a repository via the [TACC Django App].
+
+_A sample repository created this way is [wesleyboar/Core-CMS-Plugin-Sample](https://github.com/wesleyboar/Core-CMS-Plugin-Sample)._
+
+### Known Repos
+
+- [search for such repos by TACC](https://github.com/search?q=org%3ATACC%20archived%3Afalse%20%22Core-CMS-Plugin%22&type=repositories)
+- [search for such repos by others](https://github.com/search?q=-org%3ATACC+-user%3Acementhorses+archived%3Afalse+%22Core-CMS-Plugin%22&type=repositories)
+
+## Extend an Existing App
+
+[Fork an existing app repository.](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo)
+
+### Known Forks
+
+- [search for Django CMS apps forked by TACC](https://github.com/search?q=fork%3Aonly+org%3ATACC+djangocms&type=repositories)
+
+<!-- Link Aliases -->
+
+[TACC Django App]: https://github.com/TACC/Django-App

docs/develop-custom-project.md

@@ -2,19 +2,18 @@
 
 | You can do these actions | via this resource | (status) |
 | - | - | - |
-| **customize** templates, static assets, settings, custom apps, URLs, middleware | [Core-CMS-Custom](#via-core-cms-custom) | active |
-| **customize** templates, static assets, settings | [Core-CMS-Resources](#via-core-cms-resources) | deprecated |
-| **create** custom apps | [Django-App](https://github.com/TACC/Django-App) | active |
-| **create** forked apps e.g. [TACC/djangocms-forms](https://github.com/TACC/djangocms-forms) | ["Fork a repo"](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo) | evergreen |
+| **customize** static assets | [Core CMS Custom] | active |
+| **customize** templates, static assets, settings | [Core CMS Resources](#via-core-cms-resources) | deprecated |
+| **customize** templates, static assets, custom apps, URLs, middleware | [Core CMS Template] | active |
+| **create** or **customize** an app | [Develop a Custom App/Plugin](./develop-custom-app.md) | active |
 
-## via [Core CMS Custom]
-
-Work on the project **only** via [Core CMS Custom].
+## via [Core CMS Resources]
 
-> **Note**
-> You should **not** need to clone **nor** edit this [Core CMS] repository.
+> [!DANGER]
+> Deprecated solution.
 
-## via [Core CMS Resources]
+> [!TIP]
+> Use [Core CMS Custom] or [Core CMS Template] instead.
 
 ### Update Project
 
@@ -70,8 +69,8 @@ To commit changes to a custom project:
 
 [Core CMS]: https://github.com/TACC/Core-CMS
 [Core Styles]: https://github.com/TACC/Core-Styles
-[Core CMS Resources]: https://github.com/TACC/Core-CMS-Resources
 [Core CMS Custom]: https://github.com/TACC/Core-CMS-Custom
+[Core CMS Template]: https://github.com/TACC/Core-CMS-Template
 
 [restart server]: https://github.com/TACC/Core-CMS/wiki/How-to-Restart-the-CMS-Server
 [collect static files]: ./develop-project.md#collect-static-files

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "tacc-core-cms-backend"
-version = "4.29.0"
+version = "4.29.1"
 description = "DjangoCMS backend for the TACC ACI-WMA Core-CMS Codebase."
 authors = ["TACC-WMA <wma-portals@tacc.utexas.edu>"]
 

taccsite_cms/settings_custom.example.py

@@ -56,7 +56,7 @@
 ]
 
 # Generic TACC Portals.
-PORTAL_BRANDING = [ PORTAL_BRANDING_TACC, UTEXAS_BRANDING ]
+PORTAL_BRANDING = [ PORTAL_BRANDING_TACC, PORTAL_UTEXAS_BRANDING ]
 
 # Custom-Branded Portals (Non-NSF).
 # PORTAL_BRANDING = [ PORTAL_BRANDING_TACC, PORTAL_BRANDING_UTEXAS, CUSTOM_BRANDING ]

taccsite_cms/static/site_cms/css/README.md

@@ -10,11 +10,11 @@ See [repo `README.md` at "Static Files"](/README.md#static-files).
 
 - (Standard) Style TACC UI patterns in [Core Styles].
 - (Exception) Style CMS-specific UI in [Core CMS].
-- (Exception) Style project-specific UI in [Core CMS Resources].
+- (Exception) Style project-specific UI in [Core CMS Custom] or its own repo.
 
 
 <!-- Link Aliases -->
 
 [Core CMS]: https://github.com/TACC/Core-CMS
-[Core CMS Resources]: https://github.com/TACC/Core-CMS-Resources
+[Core CMS Custom]: https://github.com/TACC/Core-CMS-Custom
 [Core Styles]: https://github.com/TACC/Core-Styles

taccsite_cms/templates/analytics.html

@@ -5,7 +5,7 @@
     </script>
   {% else %}
     <!-- Global site tag (gtag.js) & Google Analytics Code for Site.  -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id={{ settings.GOOGLE_ANALYTICS_PROPERTY_ID }}"></script>
+    <script async nonce="CSP_NONCE" src="https://www.googletagmanager.com/gtag/js?id={{ settings.GOOGLE_ANALYTICS_PROPERTY_ID }}"></script>
 
     <!-- Analytics Code -->
     <script>