Merge branch 'main' into task/GH-73-tacc-blockquote-plugin--after-FP-…

…1194

.gitignore

@@ -9,4 +9,3 @@ __pycache__
 # Node & NPM
 ## built Static files
 build
-!build/README.md

a2cps-cms/settings_custom.py

@@ -31,3 +31,11 @@
     "anonymous",
     "True"
 ]
+
+########################
+# FAVICON
+########################
+
+FAVICON = {
+    "img_file_src": "a2cps-cms/img/org_logos/favicon.ico"
+}

brainmap-cms/settings_custom.py

@@ -0,0 +1,93 @@
+# CUSTOM SETTINGS VALUES.
+# TACC WMA CMS SITE:
+# *.BRAINMAP.TACC.UTEXAS.EDU
+
+########################
+# DJANGO CMS SETTINGS
+########################
+
+CMS_TEMPLATES = (
+    ('standard.html', 'Standard'),
+    ('fullwidth.html', 'Full Width'),
+
+    ('home_portal.html', 'Standard Portal Homepage'),
+
+    ('guide.html', 'Guide'),
+    ('guides/getting_started.html', 'Guide: Getting Started'),
+    ('guides/data_transfer.html', 'Guide: Data Transfer'),
+    ('guides/data_transfer.globus.html', 'Guide: Globus Data Transfer'),
+    ('guides/portal_technology.html', 'Guide: Portal Technology Stack'),
+)
+
+########################
+# BRANDING
+########################
+
+_UTHSCSA_BRANDING = [
+    "uthscsa",
+    "brainmap-cms/img/org_logos/uthscsa-logo-white.png",
+    "branding-logo--tall",
+    "https://www.uthscsa.edu/",
+    "_blank",
+    "UTHSC-SA Logo",
+    "anonymous",
+    "True",
+]
+
+_SGCI_BRANDING = [
+    "sgci",
+    "brainmap-cms/img/org_logos/sgci-logo-sans-text.svg",
+    "branding-logo--tall",
+    "https://sciencegateways.org/",
+    "_blank",
+    "SGCI Logo",
+    "anonymous",
+    "True",
+]
+
+_TACC_BRANDING = [
+    "tacc",
+    "site_cms/img/org_logos/tacc-white.png",
+    "branding-tacc",
+    "https://www.tacc.utexas.edu/",
+    "_blank",
+    "TACC Logo",
+    "anonymous",
+    "True"
+]
+
+_UTEXAS_BRANDING = [
+    "utexas",
+    "site_cms/img/org_logos/utaustin-white.png",
+    "branding-utaustin",
+    "https://www.utexas.edu/",
+    "_blank",
+    "University of Texas at Austin Logo",
+    "anonymous",
+    "True"
+]
+
+BRANDING = [ _SGCI_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING, _UTHSCSA_BRANDING ]
+
+########################
+# LOGOS
+########################
+
+LOGO = [
+    "brainmap",
+    "brainmap-cms/img/org_logos/brainmap-logo.png",
+    "",
+    "https://brainmap.org",
+    "_self",
+    "BrainMap Logo",
+    "anonymous",
+    "True"
+]
+
+########################
+# FAVICON
+########################
+
+FAVICON = {
+    "img_file_src": "brainmap-cms/img/org_logos/favicon.ico"
+}

brainmap-cms/static/brainmap-cms/css/src/placeholder.css

@@ -0,0 +1,3 @@
+/* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */
+
+/* FAQ: The CSS build process crashes without at least one project stylesheet */

ecep-cms/README.md

@@ -0,0 +1,18 @@
+# TACC Example CMS
+
+All custom resources (assets, templates, configuration) specific to this project __must__ be placed in this directory. Failure to do so will make them unavailable to [Core CMS].
+
+## Configuration
+
+### `__init__.py`
+
+Treat directory as an app so that it can overwrite other apps. See `INSTALLED_APPS` in [`/taccsite_cms/settings.py`](/taccsite_cms/settings.py).
+
+### `settings_custom.py`
+
+Store custom configuration for this project. See [project `README.md` at "Code Configuration"](/README.md#code-configuration).
+
+
+<!-- Link Aliases -->
+
+[Core CMS]: https://github.com/TACC/Core-CMS

ecep-cms/settings_custom.py

@@ -0,0 +1,86 @@
+# CUSTOM SETTINGS VALUES.
+# TACC WMA CMS SITE:
+# *.ECEP.TACC.UTEXAS.EDU
+
+# FAQ: Some _VARIABLES are duplicated from settings.py (but prefixed with "_")
+#      because current infrastructure lacks ability to reference default values
+
+########################
+# DJANGO CMS SETTINGS
+########################
+
+CMS_TEMPLATES = (
+    ('ecep-cms/templates/standard.html', 'Standard'),
+    ('ecep-cms/templates/fullwidth.html', 'Full Width'),
+    ('guide.html', 'Guide'),
+    ('guides/getting_started.html', 'Guide: Getting Started'),
+    ('guides/data_transfer.html', 'Guide: Data Transfer'),
+    ('guides/data_transfer.globus.html', 'Guide: Globus Data Transfer'),
+    ('guides/portal_technology.html', 'Guide: Portal Technology Stack')
+)
+
+########################
+# THEME
+########################
+
+# THEME = 'has-dark-logo'
+
+########################
+# BRANDING
+########################
+
+_NSF_BRANDING = [
+    "nsf",
+    "site_cms/img/org_logos/nsf-white.png",
+    "branding-nsf",
+    "https://www.nsf.gov/",
+    "_blank",
+    "NSF Logo",
+    "anonymous",
+    "True"
+]
+
+_TACC_BRANDING = [
+    "tacc",
+    "site_cms/img/org_logos/tacc-white.png",
+    "branding-tacc",
+    "https://www.tacc.utexas.edu/",
+    "_blank",
+    "TACC Logo",
+    "anonymous",
+    "True"
+]
+
+_UTEXAS_BRANDING = [
+    "utexas",
+    "site_cms/img/org_logos/utaustin-white.png",
+    "branding-utaustin",
+    "https://www.utexas.edu/",
+    "_blank",
+    "University of Texas at Austin Logo",
+    "anonymous",
+    "True"
+]
+
+BRANDING = [_NSF_BRANDING, _TACC_BRANDING, _UTEXAS_BRANDING]
+
+########################
+# LOGOS
+########################
+
+LOGO = [
+    "ecep",
+    "ecep-cms/img/org_logos/ECEP_logo_PurpleNoText.jpeg",
+    "",
+    "/",
+    "_self",
+    "ECEP Logo",
+    "anonymous",
+    "True"
+]
+
+########################
+# PORTAL
+########################
+
+INCLUDES_CORE_PORTAL = True

ecep-cms/static/README.md

@@ -0,0 +1,20 @@
+# TACC CMS Per-Site Resources - Example - Static Files
+
+All static files specific to this CMS project __must__ be placed here _within_ a directory whose name matches _the parent directory of this directory_. Failure to do so will make them unavailable via [Core CMS][core-cms-repo].
+
+See [Core `static/README.md`](/taccsite_cms/static/README.md).
+
+
+[core-cms-repo]: https://gitlab.tacc.utexas.edu/wma-cms/cms-site-template
+
+
+## Clarification
+
+Where `cms-project-a` and `cms-project-b` are unique CMS projects with custom resources:
+
+- `cms-site-resources:/cms-project-a/static/cms-project-a/…`
+- `cms-site-resources:/cms-project-b/static/cms-project-b/…`
+
+The redundancy is intentional. The high-level instance isolates per-project resources. The low-level instance [namespaces the custom static files and templates][djangocms-custom-resources].
+
+[djangocms-custom-resources]: https://docs.djangoproject.com/en/2.2/intro/tutorial06/#customize-your-app-s-look-and-feel

ecep-cms/static/ecep-cms/README.md

@@ -0,0 +1,5 @@
+# TACC CMS Per-Site Resources - Example - Static Files (Namespaced)
+
+The directory structure here __should__ mirror that of `/taccsite_cms/static/site_cms` in the [Core CMS][core-cms-repo]. This simplifies the effort of developing and maintaining multiple custom websites.
+
+[core-cms-repo]: https://gitlab.tacc.utexas.edu/wma-cms/cms-site-template

utrc-cms/static/utrc-cms/css/src/migrate.v1_v2.css → ecep-cms/static/ecep-cms/css/src/migrate.v1_v2.css

@@ -1,4 +1,3 @@
 /* DO NOT ADD STYLES HERE; ONLY IMPORT OTHER STYLESHEETS */
 
 @import url("../../../../../_shared/static/css/src/migrate.v1_v2.css");
-@import url("./_migrations/v1_v2/bootstrap.3.3.7.css");

ecep-cms/templates/README.md

@@ -0,0 +1,23 @@
+# TACC CMS Per-Site Resources - Example - Templates
+
+All templates specific to this CMS project __must__ be placed in this directory. Failure to do so will make them unavailable via [Core CMS][core-cms-repo].
+
+[core-cms-repo]: https://gitlab.tacc.utexas.edu/wma-cms/cms-site-template
+
+## Page Templates
+
+Projects may make templates available as page templates for CMS editors, via this directory, _similar_ to the Core. See [Core `templates/README.md` at "Page Templates"](/taccsite_cms/templates/README.md#Page%20Templates).
+
+### Template Path
+
+To register or load (extend, include, etc) project-specific templates, you must use the path `__PROJECT__/templates/__TEMPLATE__.html`.
+
+### Overwrite Core Templates
+
+To overwrite Core templates, you may create a template of the same name template here, but must register it with the project-specific template path.
+
+> __Important__: A project can __not__ overwrite the Core CMS `base.html`.
+
+## Overwrite Apps or Plugins
+
+Projects may overwrite apps/plugins, via this directory, just like the Core. See [Core `templates/README.md` at "Overwrite Plugins"](/taccsite_cms/templates/README.md#Overwrite%20or%20Plugins).

ecep-cms/templates/assets_custom.html

@@ -0,0 +1,3 @@
+{% load static %}
+
+<link rel="stylesheet" href="{% static 'ecep-cms/css/build/site.css' %}">

example-cms/README.md

@@ -1,15 +1,18 @@
-# TACC CMS Per-Site Resources - Example
+# TACC Example CMS
 
-All custom resources (assets, templates, configuration) specific to this project __must__ be placed in this directory. Failure to do so will make them unavailable via [Core CMS][core-cms-repo].
-
-[core-cms-repo]: https://gitlab.tacc.utexas.edu/wma-cms/cms-site-template
+All custom resources (assets, templates, configuration) specific to this project __must__ be placed in this directory. Failure to do so will make them unavailable to [Core CMS].
 
 ## Configuration
 
 ### `__init__.py`
 
 Treat directory as an app so that it can overwrite other apps. See `INSTALLED_APPS` in [`/taccsite_cms/settings.py`](/taccsite_cms/settings.py).
 
-### `secrets.py`
+### `settings_custom.py`
+
+Store custom configuration for this project. See [project `README.md` at "Code Configuration"](/README.md#code-configuration).
+
+
+<!-- Link Aliases -->
 
-Store custom configuration for this project. See [project `README.md` at "Custom Configuration"](/README.md#Custom%20Configuration).
+[Core CMS]: https://github.com/TACC/Core-CMS

example-cms/settings_custom.py

@@ -65,4 +65,5 @@
 # PORTAL
 ########################
 
-INCLUDES_CORE_PORTAL = False
+# Should a user be able to see link to Portal? (default value: True)
+# INCLUDES_CORE_PORTAL = False # True to show login link, False to hide login link

frontera-cms/settings_custom.py

@@ -10,9 +10,10 @@
 ########################
 
 CMS_TEMPLATES = (
-    ('frontera-cms/templates/fullwidth.html', 'Fullwidth'),
-    ('fullwidth.html', 'DEPRECATED Fullwidth'),
+    ('frontera-cms/templates/standard.html', 'Standard'),
+    ('frontera-cms/templates/fullwidth.html', 'Full Width'),
     ('frontera-cms/templates/home.html', 'Homepage'),
+
     ('guide.html', 'Guide'),
     ('guides/getting_started.html', 'Guide: Getting Started'),
     ('guides/data_transfer.html', 'Guide: Data Transfer'),
@@ -73,3 +74,11 @@
     "anonymous",
     "True"
 ]
+
+########################
+# FAVICON
+########################
+
+FAVICON = {
+    "img_file_src": "frontera-cms/img/org_logos/favicon.ico"
+}

frontera-cms/static/frontera-cms/css/src/_imports/trumps/s-home.css

@@ -63,12 +63,12 @@
 
 /* To style the overlay */
 .s-home__banner .o-section__banner-overlay {
-  @extend .x-overlay--curtain;
+  @extend %x-overlay--curtain;
 }
-.s-home__banner .o-section--style-dark .o-section__banner-overlay {
+.s-home__banner.o-section--style-dark .o-section__banner-overlay {
   --color-bkgd-rgb: var(--global-color-primary--x-dark-rgb);
 }
-.s-home__banner .o-section--style-light .o-section__banner-overlay {
+.s-home__banner.o-section--style-light .o-section__banner-overlay {
   --color-bkgd-rgb: var(--global-color-primary--x-light-rgb);
 }
 

frontera-cms/templates/assets_custom.html

@@ -0,0 +1,3 @@
+{% load static %}
+
+<link rel="stylesheet" href="{% static 'frontera-cms/css/build/site.css' %}">