Merge branch 'task/GH-101-header-redesign' into task/GH-101-header-re…

…design--mobile-nav-layout-2

.dockerignore

@@ -1,6 +1,8 @@
 # Version Control
 .git
 
+**settings_local.py
+
 # Python
 *.pyc
 *.pyo

.gitignore

@@ -29,6 +29,8 @@ repo_name.var
 settings.json
 taccsite_cms/secrets.py
 *.custom.yml
+*settings_custom*.py
+*settings_local*.py
 
 # Makefile var
 cms_name.var

Dockerfile

@@ -25,4 +25,4 @@ WORKDIR /code
 RUN pip3 install --no-cache-dir -r requirements.txt
 
 # build assets
-RUN npm ci && npm run settings && npm run build
+RUN npm ci && npm run build

README.md

@@ -14,7 +14,7 @@ The TACC CORE-CMS can be run using Docker and Docker Compose, both locally and i
     CUSTOM_ASSET_DIR=example-cms
     ```
 
-    \* Where `example-cms` is the project to be run. _See [(Optional) Custom Resources per CMS Project](#optional-custom-resources-per-cms-project). Refer to `.env.sample` for other settings._
+    \* Where `example-cms` is the project to be run. _See [(Optional) Custom Resources per CMS Project](#optional-custom-resources-per-cms-project)._
 1. Initialize / Update submodules.
     1. `git submodule init`\
         _(Adds `cms-site-resources` repo as submodule at `taccsite_custom/`. Only necessary once per `CORE-cms` repo clone.)_

conf/css/.postcssrc.yml

@@ -13,6 +13,7 @@ plugins:
   postcss-preset-env:
     # SEE: https://github.com/csstools/postcss-preset-env#features
     stage: false
+    # SEE: https://github.com/csstools/postcss-preset-env/blob/master/src/lib/plugins-by-id.js#L35
     features:
       custom-media-queries: true
       media-query-ranges: true

package.json

@@ -4,10 +4,10 @@
     "license": "MIT",
     "description": "The core CMS codebase for all new and updated TACC CMS sites.",
     "scripts": {
+        "prebuild": "python3 taccsite_cms/settings_to_json.py",
         "build": "npm run build:css",
-        "build:css": "npm run settings && node postcss.js",
-        "watch": "npm-watch",
-        "settings": "python3 taccsite_cms/settings_to_json.py"
+        "build:css": "node postcss.js",
+        "watch": "npm-watch"
     },
     "// scripts": {
         "prebuild": "Export Django settings to JSON (for Node to use)",

taccsite_cms/contrib/bootstrap4_djangocms_link/cms_plugins.py

@@ -6,7 +6,7 @@
     # SEE: https://github.com/django-cms/djangocms-bootstrap4/pull/138
     import copy
 
-    from django.utils.translation import gettext_lazy as _
+    from django.utils.translation import gettext as _
 
     from cms.plugin_pool import plugin_pool
 

taccsite_cms/contrib/bootstrap4_djangocms_picture/cms_plugins.py

@@ -2,7 +2,7 @@
 # FAQ: Bootstrap Image plugin has features not desirable in TACC plugins
 # FAQ: We must not break sites that already use Bootstrap Image plugin
 try:
-    from django.utils.translation import gettext_lazy as _
+    from django.utils.translation import gettext as _
 
     from cms.plugin_pool import plugin_pool
 

taccsite_cms/contrib/taccsite_data_list/cms_plugins.py

@@ -1,6 +1,6 @@
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 
 from taccsite_cms.contrib.constants import TEXT_FOR_NESTED_PLUGIN_CONTENT_SWAP
 from taccsite_cms.contrib.helpers import concat_classnames

taccsite_cms/contrib/taccsite_data_list/models.py

@@ -1,7 +1,7 @@
 from cms.models.pluginmodel import CMSPlugin
 
 from django.db import models
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 
 from djangocms_attributes_field import fields
 

taccsite_cms/contrib/taccsite_sample/cms_plugins.py

@@ -1,7 +1,7 @@
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool
 from cms.models.pluginmodel import CMSPlugin
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 from django.utils.encoding import force_text
 
 from .models import TaccsiteSample

taccsite_cms/contrib/taccsite_system_monitor/cms_plugins.py

@@ -1,6 +1,6 @@
 from cms.plugin_base import CMSPluginBase
 from cms.plugin_pool import plugin_pool
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 
 from taccsite_cms.contrib.helpers import concat_classnames
 

taccsite_cms/contrib/taccsite_system_monitor/models.py

@@ -1,5 +1,5 @@
 from cms.models.pluginmodel import CMSPlugin
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext as _
 
 from django.db import models