From 51036b324d913d51f7d9355a523c30274e2d8f60 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 21 Apr 2023 21:16:56 -0500 Subject: [PATCH 01/13] feat: rename example-cms to example_cms --- README.md | 2 +- {example-cms => example_cms}/__init__.py | 0 {example-cms => example_cms}/settings_custom.py | 4 ++-- .../static/example-cms/css/src/placeholder.css | 0 .../static/example-cms/img/org_logos/favicon.png | Bin .../static/example-cms/img/org_logos/nsf-white.png | Bin .../static/example-cms/img/org_logos/portal.png | Bin .../static/example-cms/img/org_logos/tacc-white.png | Bin .../example-cms/img/org_logos/utaustin-white.png | Bin 9 files changed, 3 insertions(+), 3 deletions(-) rename {example-cms => example_cms}/__init__.py (100%) rename {example-cms => example_cms}/settings_custom.py (94%) rename {example-cms => example_cms}/static/example-cms/css/src/placeholder.css (100%) rename {example-cms => example_cms}/static/example-cms/img/org_logos/favicon.png (100%) rename {example-cms => example_cms}/static/example-cms/img/org_logos/nsf-white.png (100%) rename {example-cms => example_cms}/static/example-cms/img/org_logos/portal.png (100%) rename {example-cms => example_cms}/static/example-cms/img/org_logos/tacc-white.png (100%) rename {example-cms => example_cms}/static/example-cms/img/org_logos/utaustin-white.png (100%) diff --git a/README.md b/README.md index c2d80587..b2089632 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ The project-specific CMS code for TACC WMA Workspace Websites. To add resources for a new project: -1. Clone `/example-cms`. +1. Clone `/example_cms`. 2. Read `/_readme-cms`. To build such a CMS project, use [TACC/Core-CMS](https://github.com/TACC/Core-CMS). diff --git a/example-cms/__init__.py b/example_cms/__init__.py similarity index 100% rename from example-cms/__init__.py rename to example_cms/__init__.py diff --git a/example-cms/settings_custom.py b/example_cms/settings_custom.py similarity index 94% rename from example-cms/settings_custom.py rename to example_cms/settings_custom.py index 324673dc..076daf39 100644 --- a/example-cms/settings_custom.py +++ b/example_cms/settings_custom.py @@ -30,7 +30,7 @@ # # _CUSTOM_BRANDING = [ # "example", -# "example-cms/img/org_logos/example-logo.png", +# "example_cms/img/org_logos/example-logo.png", # "", # "https://example.com", # "_blank", @@ -47,7 +47,7 @@ LOGO = [ "example", - "example-cms/img/org_logos/portal.png", + "example_cms/img/org_logos/portal.png", "", "/", "_self", diff --git a/example-cms/static/example-cms/css/src/placeholder.css b/example_cms/static/example-cms/css/src/placeholder.css similarity index 100% rename from example-cms/static/example-cms/css/src/placeholder.css rename to example_cms/static/example-cms/css/src/placeholder.css diff --git a/example-cms/static/example-cms/img/org_logos/favicon.png b/example_cms/static/example-cms/img/org_logos/favicon.png similarity index 100% rename from example-cms/static/example-cms/img/org_logos/favicon.png rename to example_cms/static/example-cms/img/org_logos/favicon.png diff --git a/example-cms/static/example-cms/img/org_logos/nsf-white.png b/example_cms/static/example-cms/img/org_logos/nsf-white.png similarity index 100% rename from example-cms/static/example-cms/img/org_logos/nsf-white.png rename to example_cms/static/example-cms/img/org_logos/nsf-white.png diff --git a/example-cms/static/example-cms/img/org_logos/portal.png b/example_cms/static/example-cms/img/org_logos/portal.png similarity index 100% rename from example-cms/static/example-cms/img/org_logos/portal.png rename to example_cms/static/example-cms/img/org_logos/portal.png diff --git a/example-cms/static/example-cms/img/org_logos/tacc-white.png b/example_cms/static/example-cms/img/org_logos/tacc-white.png similarity index 100% rename from example-cms/static/example-cms/img/org_logos/tacc-white.png rename to example_cms/static/example-cms/img/org_logos/tacc-white.png diff --git a/example-cms/static/example-cms/img/org_logos/utaustin-white.png b/example_cms/static/example-cms/img/org_logos/utaustin-white.png similarity index 100% rename from example-cms/static/example-cms/img/org_logos/utaustin-white.png rename to example_cms/static/example-cms/img/org_logos/utaustin-white.png From ce6c1a873b1fb7fca50e0c5d2808dddfb03d7faa Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 1 May 2023 15:41:35 -0500 Subject: [PATCH 02/13] =?UTF-8?q?feat:=20rename=20=E2=80=A6-cms=20to=20?= =?UTF-8?q?=E2=80=A6=5Fcms?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- {_readme-cms => _readme_cms}/README.md | 0 {_readme-cms => _readme_cms}/__init__.py.md | 0 {_readme-cms => _readme_cms}/_static/README.md | 4 ++-- .../_static/_readme_cms}/README.md | 0 .../_templates/README.md | 4 ++-- .../settings_custom.py.md | 0 {a2cps-cms => a2cps_cms}/__init__.py | 0 {a2cps-cms => a2cps_cms}/settings_custom.py | 4 ++-- .../css/src/_migrations/v1_v2/a2cps.css | 0 .../static/a2cps_cms}/css/src/migrate.v1_v2.css | 0 .../static/a2cps_cms}/img/org_logos/a2cps.png | Bin .../static/a2cps_cms}/img/org_logos/favicon.ico | Bin .../templates/assets_custom.html | 2 +- .../templates/fullwidth.html | 0 .../snippets/a2cps-consortium-map.html | 0 ...-245-markup-single-paragraph-whitespace.html | 0 .../snippets/iframe-report-consort.html | 0 .../snippets/iframe-report-weekly-dash.html | 0 .../snippets/study-timeline-table.html | 0 .../templates/snippets/twitter.html | 0 .../templates/standard.html | 0 {apcd-cms => apcd_cms}/README.md | 2 +- {apcd-cms => apcd_cms}/__init__.py | 0 {apcd-cms => apcd_cms}/settings_custom.py | 4 ++-- .../static/apcd_cms}/css/src/placeholder.css | 0 .../static/apcd_cms}/img/favicons/favicon.ico | Bin .../apcd_cms}/img/org_logos/apcd-black.png | Bin .../apcd_cms}/img/org_logos/apcd-white.png | Bin .../apcd_cms}/img/org_logos/tacc-white.png | Bin {brainmap-cms => brainmap_cms}/__init__.py | 0 .../settings_custom.py | 8 ++++---- .../brainmap_cms}/css/src/placeholder.css | 0 ...ap-logo--dark-text-trans-bkgd--icon-only.png | Bin ...p-logo--dark-text-white-bkgd--large-text.png | Bin ...p-logo--dark-text-white-bkgd--large-text.svg | 0 .../brainmap-logo--dark-text-white-bkgd.png | Bin .../brainmap-logo--dark-text-white-bkgd.svg | 0 ...-logo--light-text-trans-bkgd--large-text.png | Bin ...-logo--light-text-trans-bkgd--large-text.svg | 0 .../brainmap_cms}/img/org_logos/favicon.ico | Bin .../img/org_logos/sgci-logo-sans-text.svg | 0 .../brainmap_cms}/img/org_logos/sgci-logo.png | Bin .../img/org_logos/uthscsa-logo-white.png | Bin .../img/org_logos/uthscsa-logo.png | Bin {demdata-cms => demdata_cms}/__init__.py | 0 {demdata-cms => demdata_cms}/settings_custom.py | 16 ++++++++-------- .../static/demdata_cms}/css/src/placeholder.css | 0 .../demdata_cms}/img/favicons/Favicon_64x64.svg | 0 .../demdata_cms}/img/favicons/favicon.ico | Bin .../demdata_cms}/img/org_logos/Demo-Data.jpg | Bin .../demdata_cms}/img/org_logos/Demo-Data.png | Bin .../demdata_cms}/img/org_logos/Demo-Data.svg | 0 .../demdata_cms}/img/org_logos/tacc-white.png | Bin {ecep-cms => ecep_cms}/__init__.py | 0 {ecep-cms => ecep_cms}/settings_custom.py | 6 +++--- .../static/ecep_cms}/css/.postcssrc.yml | 2 +- .../static/ecep_cms}/css/src/_themes/ecep.json | 0 .../static/ecep_cms}/css/src/site.css | 0 .../img/org_logos/ecep-purple-has_words.svg | 0 .../org_logos/ecep-purple-no_words-padded.jpeg | Bin .../img/org_logos/ecep-purple-no_words.svg | 0 .../img/org_logos/ecep-white-has_words.svg | 0 .../img/org_logos/ecep-white-no_words.svg | 0 .../static/ecep_cms}/img/org_logos/favicon.ico | Bin .../snippets/page-members-css-old.html | 0 .../templates/snippets/page-members-css.html | 0 .../templates/snippets/page-members-js-old.html | 0 .../templates/snippets/page-members-js.html | 0 .../templates/snippets/site-css.html | 2 +- {ecep-cms => ecep_cms}/urls.py | 0 {epoc-cms => epoc_cms}/__init__.py | 0 {epoc-cms => epoc_cms}/settings_custom.py | 16 ++++++++-------- .../static/epoc_cms}/css/src/placeholder.css | 0 .../epoc_cms}/img/org_logos/epoc-color-logo.png | Bin .../epoc_cms}/img/org_logos/epoc-color-logo.svg | 0 .../img/org_logos/esnet-white-logo.png | Bin .../static/epoc_cms}/img/org_logos/favicon.png | Bin .../epoc_cms}/img/org_logos/nsf-white.png | Bin .../static/epoc_cms}/img/org_logos/portal.png | Bin .../epoc_cms}/img/org_logos/tacc-white.png | Bin .../epoc_cms}/img/org_logos/utaustin-white.png | Bin .../css/src/placeholder.css | 0 .../img/org_logos/favicon.png | Bin .../img/org_logos/nsf-white.png | Bin .../img/org_logos/portal.png | Bin .../img/org_logos/tacc-white.png | Bin .../img/org_logos/utaustin-white.png | Bin frontera-cms/templates/assets_custom.html | 3 --- {frontera-cms => frontera_cms}/__init__.py | 0 .../settings_custom.py | 6 +++--- .../css/src/_imports/settings/color.css | 0 .../css/src/_imports/trumps/s-home.css | 0 .../css/src/_migrations/v1_v2/frontera.css | 14 +++++++------- .../frontera_cms}/css/src/migrate.v1_v2.css | 0 .../static/frontera_cms}/css/src/site.css | 0 .../frontera_cms}/css/src/template.home.css | 0 .../fonts/archive/BentonSans-Bold.otf | Bin .../fonts/archive/BentonSans-Medium.otf | Bin .../fonts/archive/BentonSans-MediumItalic.otf | Bin .../fonts/archive/BentonSans-Regular.otf | Bin .../fonts/archive/icon-works-webfont.eot | Bin .../fonts/archive/icon-works-webfont.svg | 0 .../fonts/archive/icon-works-webfont.woff | Bin .../frontera_cms}/img/org_logos/favicon.ico | Bin .../img/org_logos/frontera-white-solo.png | Bin .../frontera_cms}/img/org_logos/tacc-white.md | 0 .../frontera_cms}/img/org_logos/tacc-white.png | Bin frontera_cms/templates/assets_custom.html | 3 +++ .../templates/fullwidth.html | 2 +- .../templates/home.html | 2 +- .../snippets/newsletter-body--july-2020.html | 0 .../snippets/newsletter-body--july-2021.html | 0 .../snippets/newsletter-body--march-2021.html | 0 .../newsletter-body--november-2020.html | 0 .../templates/snippets/newsletter-foot.html | 0 .../templates/snippets/newsletter-head.html | 0 .../templates/snippets/slide-show.html | 0 .../templates/standard.html | 0 {lccf-tacc => lccf_tacc}/__init__.py | 0 {lccf-tacc => lccf_tacc}/settings_custom.py | 0 .../static/lccf-tacc/img/org_logos/favicon.png | Bin .../lccf-tacc/img/org_logos/lccf-white.png | Bin {neuronex-cms => neuronex_cms}/__init__.py | 0 .../settings_custom.py | 4 ++-- .../neuronex_cms}/css/src/migrate.v1_v2.css | 0 .../neuronex_cms}/img/org_logos/favicon.ico | Bin .../neuronex_cms}/img/org_logos/logo.3dem.png | Bin .../templates/fullwidth.html | 2 +- {protx-cms => protx_cms}/__init__.py | 0 {protx-cms => protx_cms}/settings_custom.py | 4 ++-- .../static/protx_cms}/css/.postcssrc.yml | 0 .../static/protx_cms}/css/src/placeholder.css | 0 .../img/guides/account-request-form.png | Bin .../img/guides/account-request-site.png | Bin .../CClogo_Standard_White_Transparent.png | Bin .../img/org_logos/ProTx-logo-nobg.png | Bin .../img/org_logos/ProTx-logo-white-nobg.png | Bin .../org_logos/protx-logo-provided-cropped.png | Bin .../img/org_logos/protx-logo-provided.png | Bin .../img/org_logos/protx-logo-temp.png | Bin .../templates/getting_started.html | 4 ++-- .../__init__.py | 0 .../settings_custom.py | 4 ++-- .../sciviscolor_cms}/css/src/placeholder.css | 0 .../sciviscolor_cms}/img/org_logos/favicon.ico | Bin .../img/org_logos/sciviscolor-logo-white.png | Bin {tup-cms => tup_cms}/README.md | 0 {tup-cms => tup_cms}/__init__.py | 0 {tup-cms => tup_cms}/settings_custom.py | 2 +- .../static/tup_cms}/css/.postcssrc.yml | 0 .../static/tup_cms}/css/src/placeholder.css | 0 .../static/tup_cms}/img/org_logos/tacc-logo.svg | 0 {utrc-cms => utrc_cms}/__init__.py | 0 {utrc-cms => utrc_cms}/settings_custom.py | 4 ++-- .../css/src/_imports/trumps/s-focus-list.css | 0 .../css/src/_imports/trumps/s-home.css | 0 .../css/src/_imports/trumps/s-icon-list.css | 0 .../static/utrc_cms}/css/src/template.home.css | 0 .../static/utrc_cms}/img/org_logos/favicon.ico | Bin .../utrc_cms}/img/org_logos/tacc-white.png | Bin .../utrc-horizontal-logo-white-simple.svg | 0 {utrc-cms => utrc_cms}/templates/home.html | 2 +- 163 files changed, 64 insertions(+), 64 deletions(-) rename {_readme-cms => _readme_cms}/README.md (100%) rename {_readme-cms => _readme_cms}/__init__.py.md (100%) rename {_readme-cms => _readme_cms}/_static/README.md (84%) rename {_readme-cms/_static/_readme-cms => _readme_cms/_static/_readme_cms}/README.md (100%) rename {_readme-cms => _readme_cms}/_templates/README.md (90%) rename {_readme-cms => _readme_cms}/settings_custom.py.md (100%) rename {a2cps-cms => a2cps_cms}/__init__.py (100%) rename {a2cps-cms => a2cps_cms}/settings_custom.py (88%) rename {a2cps-cms/static/a2cps-cms => a2cps_cms/static/a2cps_cms}/css/src/_migrations/v1_v2/a2cps.css (100%) rename {a2cps-cms/static/a2cps-cms => a2cps_cms/static/a2cps_cms}/css/src/migrate.v1_v2.css (100%) rename {a2cps-cms/static/a2cps-cms => a2cps_cms/static/a2cps_cms}/img/org_logos/a2cps.png (100%) rename {a2cps-cms/static/a2cps-cms => a2cps_cms/static/a2cps_cms}/img/org_logos/favicon.ico (100%) rename {a2cps-cms => a2cps_cms}/templates/assets_custom.html (56%) rename {a2cps-cms => a2cps_cms}/templates/fullwidth.html (100%) rename {a2cps-cms => a2cps_cms}/templates/snippets/a2cps-consortium-map.html (100%) rename {a2cps-cms => a2cps_cms}/templates/snippets/gh-245-markup-single-paragraph-whitespace.html (100%) rename {a2cps-cms => a2cps_cms}/templates/snippets/iframe-report-consort.html (100%) rename {a2cps-cms => a2cps_cms}/templates/snippets/iframe-report-weekly-dash.html (100%) rename {a2cps-cms => a2cps_cms}/templates/snippets/study-timeline-table.html (100%) rename {a2cps-cms => a2cps_cms}/templates/snippets/twitter.html (100%) rename {a2cps-cms => a2cps_cms}/templates/standard.html (100%) rename {apcd-cms => apcd_cms}/README.md (81%) rename {apcd-cms => apcd_cms}/__init__.py (100%) rename {apcd-cms => apcd_cms}/settings_custom.py (90%) rename {apcd-cms/static/apcd-cms => apcd_cms/static/apcd_cms}/css/src/placeholder.css (100%) rename {apcd-cms/static/apcd-cms => apcd_cms/static/apcd_cms}/img/favicons/favicon.ico (100%) rename {apcd-cms/static/apcd-cms => apcd_cms/static/apcd_cms}/img/org_logos/apcd-black.png (100%) rename {apcd-cms/static/apcd-cms => apcd_cms/static/apcd_cms}/img/org_logos/apcd-white.png (100%) rename {apcd-cms/static/apcd-cms => apcd_cms/static/apcd_cms}/img/org_logos/tacc-white.png (100%) rename {brainmap-cms => brainmap_cms}/__init__.py (100%) rename {brainmap-cms => brainmap_cms}/settings_custom.py (87%) rename {brainmap-cms/static/brainmap-cms => brainmap_cms/static/brainmap_cms}/css/src/placeholder.css (100%) rename {brainmap-cms/static/brainmap-cms => brainmap_cms/static/brainmap_cms}/img/org_logos/brainmap-logo--dark-text-trans-bkgd--icon-only.png (100%) rename {brainmap-cms/static/brainmap-cms => brainmap_cms/static/brainmap_cms}/img/org_logos/brainmap-logo--dark-text-white-bkgd--large-text.png (100%) rename {brainmap-cms/static/brainmap-cms => brainmap_cms/static/brainmap_cms}/img/org_logos/brainmap-logo--dark-text-white-bkgd--large-text.svg (100%) rename {brainmap-cms/static/brainmap-cms => brainmap_cms/static/brainmap_cms}/img/org_logos/brainmap-logo--dark-text-white-bkgd.png (100%) rename {brainmap-cms/static/brainmap-cms => brainmap_cms/static/brainmap_cms}/img/org_logos/brainmap-logo--dark-text-white-bkgd.svg (100%) rename {brainmap-cms/static/brainmap-cms => brainmap_cms/static/brainmap_cms}/img/org_logos/brainmap-logo--light-text-trans-bkgd--large-text.png (100%) rename {brainmap-cms/static/brainmap-cms => brainmap_cms/static/brainmap_cms}/img/org_logos/brainmap-logo--light-text-trans-bkgd--large-text.svg (100%) rename {brainmap-cms/static/brainmap-cms => brainmap_cms/static/brainmap_cms}/img/org_logos/favicon.ico (100%) rename {brainmap-cms/static/brainmap-cms => brainmap_cms/static/brainmap_cms}/img/org_logos/sgci-logo-sans-text.svg (100%) rename {brainmap-cms/static/brainmap-cms => brainmap_cms/static/brainmap_cms}/img/org_logos/sgci-logo.png (100%) rename {brainmap-cms/static/brainmap-cms => brainmap_cms/static/brainmap_cms}/img/org_logos/uthscsa-logo-white.png (100%) rename {brainmap-cms/static/brainmap-cms => brainmap_cms/static/brainmap_cms}/img/org_logos/uthscsa-logo.png (100%) rename {demdata-cms => demdata_cms}/__init__.py (100%) rename {demdata-cms => demdata_cms}/settings_custom.py (89%) rename {demdata-cms/static/demdata-cms => demdata_cms/static/demdata_cms}/css/src/placeholder.css (100%) rename {demdata-cms/static/demdata-cms => demdata_cms/static/demdata_cms}/img/favicons/Favicon_64x64.svg (100%) rename {demdata-cms/static/demdata-cms => demdata_cms/static/demdata_cms}/img/favicons/favicon.ico (100%) rename {demdata-cms/static/demdata-cms => demdata_cms/static/demdata_cms}/img/org_logos/Demo-Data.jpg (100%) rename {demdata-cms/static/demdata-cms => demdata_cms/static/demdata_cms}/img/org_logos/Demo-Data.png (100%) rename {demdata-cms/static/demdata-cms => demdata_cms/static/demdata_cms}/img/org_logos/Demo-Data.svg (100%) rename {demdata-cms/static/demdata-cms => demdata_cms/static/demdata_cms}/img/org_logos/tacc-white.png (100%) rename {ecep-cms => ecep_cms}/__init__.py (100%) rename {ecep-cms => ecep_cms}/settings_custom.py (95%) rename {ecep-cms/static/ecep-cms => ecep_cms/static/ecep_cms}/css/.postcssrc.yml (62%) rename {ecep-cms/static/ecep-cms => ecep_cms/static/ecep_cms}/css/src/_themes/ecep.json (100%) rename {ecep-cms/static/ecep-cms => ecep_cms/static/ecep_cms}/css/src/site.css (100%) rename {ecep-cms/static/ecep-cms => ecep_cms/static/ecep_cms}/img/org_logos/ecep-purple-has_words.svg (100%) rename {ecep-cms/static/ecep-cms => ecep_cms/static/ecep_cms}/img/org_logos/ecep-purple-no_words-padded.jpeg (100%) rename {ecep-cms/static/ecep-cms => ecep_cms/static/ecep_cms}/img/org_logos/ecep-purple-no_words.svg (100%) rename {ecep-cms/static/ecep-cms => ecep_cms/static/ecep_cms}/img/org_logos/ecep-white-has_words.svg (100%) rename {ecep-cms/static/ecep-cms => ecep_cms/static/ecep_cms}/img/org_logos/ecep-white-no_words.svg (100%) rename {ecep-cms/static/ecep-cms => ecep_cms/static/ecep_cms}/img/org_logos/favicon.ico (100%) rename {ecep-cms => ecep_cms}/templates/snippets/page-members-css-old.html (100%) rename {ecep-cms => ecep_cms}/templates/snippets/page-members-css.html (100%) rename {ecep-cms => ecep_cms}/templates/snippets/page-members-js-old.html (100%) rename {ecep-cms => ecep_cms}/templates/snippets/page-members-js.html (100%) rename {ecep-cms => ecep_cms}/templates/snippets/site-css.html (64%) rename {ecep-cms => ecep_cms}/urls.py (100%) rename {epoc-cms => epoc_cms}/__init__.py (100%) rename {epoc-cms => epoc_cms}/settings_custom.py (89%) rename {epoc-cms/static/epoc-cms => epoc_cms/static/epoc_cms}/css/src/placeholder.css (100%) rename {epoc-cms/static/epoc-cms => epoc_cms/static/epoc_cms}/img/org_logos/epoc-color-logo.png (100%) rename {epoc-cms/static/epoc-cms => epoc_cms/static/epoc_cms}/img/org_logos/epoc-color-logo.svg (100%) rename {epoc-cms/static/epoc-cms => epoc_cms/static/epoc_cms}/img/org_logos/esnet-white-logo.png (100%) rename {epoc-cms/static/epoc-cms => epoc_cms/static/epoc_cms}/img/org_logos/favicon.png (100%) rename {epoc-cms/static/epoc-cms => epoc_cms/static/epoc_cms}/img/org_logos/nsf-white.png (100%) rename {epoc-cms/static/epoc-cms => epoc_cms/static/epoc_cms}/img/org_logos/portal.png (100%) rename {epoc-cms/static/epoc-cms => epoc_cms/static/epoc_cms}/img/org_logos/tacc-white.png (100%) rename {epoc-cms/static/epoc-cms => epoc_cms/static/epoc_cms}/img/org_logos/utaustin-white.png (100%) rename example_cms/static/{example-cms => example_cms}/css/src/placeholder.css (100%) rename example_cms/static/{example-cms => example_cms}/img/org_logos/favicon.png (100%) rename example_cms/static/{example-cms => example_cms}/img/org_logos/nsf-white.png (100%) rename example_cms/static/{example-cms => example_cms}/img/org_logos/portal.png (100%) rename example_cms/static/{example-cms => example_cms}/img/org_logos/tacc-white.png (100%) rename example_cms/static/{example-cms => example_cms}/img/org_logos/utaustin-white.png (100%) delete mode 100644 frontera-cms/templates/assets_custom.html rename {frontera-cms => frontera_cms}/__init__.py (100%) rename {frontera-cms => frontera_cms}/settings_custom.py (90%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/css/src/_imports/settings/color.css (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/css/src/_imports/trumps/s-home.css (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/css/src/_migrations/v1_v2/frontera.css (69%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/css/src/migrate.v1_v2.css (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/css/src/site.css (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/css/src/template.home.css (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/fonts/archive/BentonSans-Bold.otf (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/fonts/archive/BentonSans-Medium.otf (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/fonts/archive/BentonSans-MediumItalic.otf (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/fonts/archive/BentonSans-Regular.otf (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/fonts/archive/icon-works-webfont.eot (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/fonts/archive/icon-works-webfont.svg (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/fonts/archive/icon-works-webfont.woff (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/img/org_logos/favicon.ico (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/img/org_logos/frontera-white-solo.png (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/img/org_logos/tacc-white.md (100%) rename {frontera-cms/static/frontera-cms => frontera_cms/static/frontera_cms}/img/org_logos/tacc-white.png (100%) create mode 100644 frontera_cms/templates/assets_custom.html rename {frontera-cms => frontera_cms}/templates/fullwidth.html (88%) rename {frontera-cms => frontera_cms}/templates/home.html (90%) rename {frontera-cms => frontera_cms}/templates/snippets/newsletter-body--july-2020.html (100%) rename {frontera-cms => frontera_cms}/templates/snippets/newsletter-body--july-2021.html (100%) rename {frontera-cms => frontera_cms}/templates/snippets/newsletter-body--march-2021.html (100%) rename {frontera-cms => frontera_cms}/templates/snippets/newsletter-body--november-2020.html (100%) rename {frontera-cms => frontera_cms}/templates/snippets/newsletter-foot.html (100%) rename {frontera-cms => frontera_cms}/templates/snippets/newsletter-head.html (100%) rename {frontera-cms => frontera_cms}/templates/snippets/slide-show.html (100%) rename {frontera-cms => frontera_cms}/templates/standard.html (100%) rename {lccf-tacc => lccf_tacc}/__init__.py (100%) rename {lccf-tacc => lccf_tacc}/settings_custom.py (100%) rename {lccf-tacc => lccf_tacc}/static/lccf-tacc/img/org_logos/favicon.png (100%) rename {lccf-tacc => lccf_tacc}/static/lccf-tacc/img/org_logos/lccf-white.png (100%) rename {neuronex-cms => neuronex_cms}/__init__.py (100%) rename {neuronex-cms => neuronex_cms}/settings_custom.py (93%) rename {neuronex-cms/static/neuronex-cms => neuronex_cms/static/neuronex_cms}/css/src/migrate.v1_v2.css (100%) rename {neuronex-cms/static/neuronex-cms => neuronex_cms/static/neuronex_cms}/img/org_logos/favicon.ico (100%) rename {neuronex-cms/static/neuronex-cms => neuronex_cms/static/neuronex_cms}/img/org_logos/logo.3dem.png (100%) rename {neuronex-cms => neuronex_cms}/templates/fullwidth.html (86%) rename {protx-cms => protx_cms}/__init__.py (100%) rename {protx-cms => protx_cms}/settings_custom.py (93%) rename {protx-cms/static/protx-cms => protx_cms/static/protx_cms}/css/.postcssrc.yml (100%) rename {protx-cms/static/protx-cms => protx_cms/static/protx_cms}/css/src/placeholder.css (100%) rename {protx-cms/static/protx-cms => protx_cms/static/protx_cms}/img/guides/account-request-form.png (100%) rename {protx-cms/static/protx-cms => protx_cms/static/protx_cms}/img/guides/account-request-site.png (100%) rename {protx-cms/static/protx-cms => protx_cms/static/protx_cms}/img/org_logos/CClogo_Standard_White_Transparent.png (100%) rename {protx-cms/static/protx-cms => protx_cms/static/protx_cms}/img/org_logos/ProTx-logo-nobg.png (100%) rename {protx-cms/static/protx-cms => protx_cms/static/protx_cms}/img/org_logos/ProTx-logo-white-nobg.png (100%) rename {protx-cms/static/protx-cms => protx_cms/static/protx_cms}/img/org_logos/protx-logo-provided-cropped.png (100%) rename {protx-cms/static/protx-cms => protx_cms/static/protx_cms}/img/org_logos/protx-logo-provided.png (100%) rename {protx-cms/static/protx-cms => protx_cms/static/protx_cms}/img/org_logos/protx-logo-temp.png (100%) rename {protx-cms => protx_cms}/templates/getting_started.html (99%) rename {sciviscolor-cms => sciviscolor_cms}/__init__.py (100%) rename {sciviscolor-cms => sciviscolor_cms}/settings_custom.py (76%) rename {sciviscolor-cms/static/sciviscolor-cms => sciviscolor_cms/static/sciviscolor_cms}/css/src/placeholder.css (100%) rename {sciviscolor-cms/static/sciviscolor-cms => sciviscolor_cms/static/sciviscolor_cms}/img/org_logos/favicon.ico (100%) rename {sciviscolor-cms/static/sciviscolor-cms => sciviscolor_cms/static/sciviscolor_cms}/img/org_logos/sciviscolor-logo-white.png (100%) rename {tup-cms => tup_cms}/README.md (100%) rename {tup-cms => tup_cms}/__init__.py (100%) rename {tup-cms => tup_cms}/settings_custom.py (94%) rename {tup-cms/static/tup-cms => tup_cms/static/tup_cms}/css/.postcssrc.yml (100%) rename {tup-cms/static/tup-cms => tup_cms/static/tup_cms}/css/src/placeholder.css (100%) rename {tup-cms/static/tup-cms => tup_cms/static/tup_cms}/img/org_logos/tacc-logo.svg (100%) rename {utrc-cms => utrc_cms}/__init__.py (100%) rename {utrc-cms => utrc_cms}/settings_custom.py (86%) rename {utrc-cms/static/utrc-cms => utrc_cms/static/utrc_cms}/css/src/_imports/trumps/s-focus-list.css (100%) rename {utrc-cms/static/utrc-cms => utrc_cms/static/utrc_cms}/css/src/_imports/trumps/s-home.css (100%) rename {utrc-cms/static/utrc-cms => utrc_cms/static/utrc_cms}/css/src/_imports/trumps/s-icon-list.css (100%) rename {utrc-cms/static/utrc-cms => utrc_cms/static/utrc_cms}/css/src/template.home.css (100%) rename {utrc-cms/static/utrc-cms => utrc_cms/static/utrc_cms}/img/org_logos/favicon.ico (100%) rename {utrc-cms/static/utrc-cms => utrc_cms/static/utrc_cms}/img/org_logos/tacc-white.png (100%) rename {utrc-cms/static/utrc-cms => utrc_cms/static/utrc_cms}/img/org_logos/utrc-horizontal-logo-white-simple.svg (100%) rename {utrc-cms => utrc_cms}/templates/home.html (77%) diff --git a/README.md b/README.md index b2089632..3dc36708 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Please see the [Core CMS README]. - https://prod.a2cps.tacc.utexas.edu/ - https://prod.apcd.tacc.utexas.edu/ a.k.a. https://txapcd.org/
- code has moved to https://github.com/TACC/Core-CMS-Custom/blob/main/apcd-cms/ + code has moved to https://github.com/TACC/Core-CMS-Custom/blob/main/apcd_cms/ - https://portal.brainmap.org/ - https://democratizingdata.ai/ - https://prod.ecep.tacc.utexas.edu/ a.k.a. https://ecepalliance.org/ diff --git a/_readme-cms/README.md b/_readme_cms/README.md similarity index 100% rename from _readme-cms/README.md rename to _readme_cms/README.md diff --git a/_readme-cms/__init__.py.md b/_readme_cms/__init__.py.md similarity index 100% rename from _readme-cms/__init__.py.md rename to _readme_cms/__init__.py.md diff --git a/_readme-cms/_static/README.md b/_readme_cms/_static/README.md similarity index 84% rename from _readme-cms/_static/README.md rename to _readme_cms/_static/README.md index be683b84..472bf6aa 100644 --- a/_readme-cms/_static/README.md +++ b/_readme_cms/_static/README.md @@ -9,9 +9,9 @@ Otherwise, they will be unavailable to [Core CMS] loading this project. ## Directory Hierarchy -Where `name-of-project` is a CMS projects with custom static assets: +Where `name_of_project` is a CMS projects with custom static assets: -- `/name-of-project/static/name-of-project/...` +- `/name_of_project/static/name_of_project/...` The redundancy is intentional: diff --git a/_readme-cms/_static/_readme-cms/README.md b/_readme_cms/_static/_readme_cms/README.md similarity index 100% rename from _readme-cms/_static/_readme-cms/README.md rename to _readme_cms/_static/_readme_cms/README.md diff --git a/_readme-cms/_templates/README.md b/_readme_cms/_templates/README.md similarity index 90% rename from _readme-cms/_templates/README.md rename to _readme_cms/_templates/README.md index 70b33603..3925525a 100644 --- a/_readme-cms/_templates/README.md +++ b/_readme_cms/_templates/README.md @@ -13,9 +13,9 @@ This consistency lets us override templates in Django fashion. ## How to Write Template Path -Where `name-of-project` is a CMS projects with custom templates: +Where `name_of_project` is a CMS projects with custom templates: -- `/name-of-project/templates/___.html` +- `/name_of_project/templates/___.html` ### How to Overwrite Core Templates diff --git a/_readme-cms/settings_custom.py.md b/_readme_cms/settings_custom.py.md similarity index 100% rename from _readme-cms/settings_custom.py.md rename to _readme_cms/settings_custom.py.md diff --git a/a2cps-cms/__init__.py b/a2cps_cms/__init__.py similarity index 100% rename from a2cps-cms/__init__.py rename to a2cps_cms/__init__.py diff --git a/a2cps-cms/settings_custom.py b/a2cps_cms/settings_custom.py similarity index 88% rename from a2cps-cms/settings_custom.py rename to a2cps_cms/settings_custom.py index e3e25e0a..141fb133 100644 --- a/a2cps-cms/settings_custom.py +++ b/a2cps_cms/settings_custom.py @@ -23,7 +23,7 @@ LOGO = [ "a2cps", - "a2cps-cms/img/org_logos/a2cps.png", + "a2cps_cms/img/org_logos/a2cps.png", "", "/", "_self", @@ -33,5 +33,5 @@ ] FAVICON = { - "img_file_src": "a2cps-cms/img/org_logos/favicon.ico" + "img_file_src": "a2cps_cms/img/org_logos/favicon.ico" } diff --git a/a2cps-cms/static/a2cps-cms/css/src/_migrations/v1_v2/a2cps.css b/a2cps_cms/static/a2cps_cms/css/src/_migrations/v1_v2/a2cps.css similarity index 100% rename from a2cps-cms/static/a2cps-cms/css/src/_migrations/v1_v2/a2cps.css rename to a2cps_cms/static/a2cps_cms/css/src/_migrations/v1_v2/a2cps.css diff --git a/a2cps-cms/static/a2cps-cms/css/src/migrate.v1_v2.css b/a2cps_cms/static/a2cps_cms/css/src/migrate.v1_v2.css similarity index 100% rename from a2cps-cms/static/a2cps-cms/css/src/migrate.v1_v2.css rename to a2cps_cms/static/a2cps_cms/css/src/migrate.v1_v2.css diff --git a/a2cps-cms/static/a2cps-cms/img/org_logos/a2cps.png b/a2cps_cms/static/a2cps_cms/img/org_logos/a2cps.png similarity index 100% rename from a2cps-cms/static/a2cps-cms/img/org_logos/a2cps.png rename to a2cps_cms/static/a2cps_cms/img/org_logos/a2cps.png diff --git a/a2cps-cms/static/a2cps-cms/img/org_logos/favicon.ico b/a2cps_cms/static/a2cps_cms/img/org_logos/favicon.ico similarity index 100% rename from a2cps-cms/static/a2cps-cms/img/org_logos/favicon.ico rename to a2cps_cms/static/a2cps_cms/img/org_logos/favicon.ico diff --git a/a2cps-cms/templates/assets_custom.html b/a2cps_cms/templates/assets_custom.html similarity index 56% rename from a2cps-cms/templates/assets_custom.html rename to a2cps_cms/templates/assets_custom.html index 41b66bd2..1e6470a0 100644 --- a/a2cps-cms/templates/assets_custom.html +++ b/a2cps_cms/templates/assets_custom.html @@ -1,4 +1,4 @@ {% load static %} - + diff --git a/a2cps-cms/templates/fullwidth.html b/a2cps_cms/templates/fullwidth.html similarity index 100% rename from a2cps-cms/templates/fullwidth.html rename to a2cps_cms/templates/fullwidth.html diff --git a/a2cps-cms/templates/snippets/a2cps-consortium-map.html b/a2cps_cms/templates/snippets/a2cps-consortium-map.html similarity index 100% rename from a2cps-cms/templates/snippets/a2cps-consortium-map.html rename to a2cps_cms/templates/snippets/a2cps-consortium-map.html diff --git a/a2cps-cms/templates/snippets/gh-245-markup-single-paragraph-whitespace.html b/a2cps_cms/templates/snippets/gh-245-markup-single-paragraph-whitespace.html similarity index 100% rename from a2cps-cms/templates/snippets/gh-245-markup-single-paragraph-whitespace.html rename to a2cps_cms/templates/snippets/gh-245-markup-single-paragraph-whitespace.html diff --git a/a2cps-cms/templates/snippets/iframe-report-consort.html b/a2cps_cms/templates/snippets/iframe-report-consort.html similarity index 100% rename from a2cps-cms/templates/snippets/iframe-report-consort.html rename to a2cps_cms/templates/snippets/iframe-report-consort.html diff --git a/a2cps-cms/templates/snippets/iframe-report-weekly-dash.html b/a2cps_cms/templates/snippets/iframe-report-weekly-dash.html similarity index 100% rename from a2cps-cms/templates/snippets/iframe-report-weekly-dash.html rename to a2cps_cms/templates/snippets/iframe-report-weekly-dash.html diff --git a/a2cps-cms/templates/snippets/study-timeline-table.html b/a2cps_cms/templates/snippets/study-timeline-table.html similarity index 100% rename from a2cps-cms/templates/snippets/study-timeline-table.html rename to a2cps_cms/templates/snippets/study-timeline-table.html diff --git a/a2cps-cms/templates/snippets/twitter.html b/a2cps_cms/templates/snippets/twitter.html similarity index 100% rename from a2cps-cms/templates/snippets/twitter.html rename to a2cps_cms/templates/snippets/twitter.html diff --git a/a2cps-cms/templates/standard.html b/a2cps_cms/templates/standard.html similarity index 100% rename from a2cps-cms/templates/standard.html rename to a2cps_cms/templates/standard.html diff --git a/apcd-cms/README.md b/apcd_cms/README.md similarity index 81% rename from apcd-cms/README.md rename to apcd_cms/README.md index 9eed097c..8de068dc 100644 --- a/apcd-cms/README.md +++ b/apcd_cms/README.md @@ -1,3 +1,3 @@ ## APCD CMS -This codebase has moved to https://github.com/TACC/Core-CMS-Custom as `apcd-cms`. +This codebase has moved to https://github.com/TACC/Core-CMS-Custom as `apcd_cms`. diff --git a/apcd-cms/__init__.py b/apcd_cms/__init__.py similarity index 100% rename from apcd-cms/__init__.py rename to apcd_cms/__init__.py diff --git a/apcd-cms/settings_custom.py b/apcd_cms/settings_custom.py similarity index 90% rename from apcd-cms/settings_custom.py rename to apcd_cms/settings_custom.py index 13dd84b3..3750d4ff 100644 --- a/apcd-cms/settings_custom.py +++ b/apcd_cms/settings_custom.py @@ -23,7 +23,7 @@ LOGO = [ "tacc", - "apcd-cms/img/org_logos/apcd-white.png", + "apcd_cms/img/org_logos/apcd-white.png", "", "/", "_self", @@ -33,7 +33,7 @@ ] FAVICON = { - "img_file_src": "apcd-cms/img/favicons/favicon.ico" + "img_file_src": "apcd_cms/img/favicons/favicon.ico" } ######################## diff --git a/apcd-cms/static/apcd-cms/css/src/placeholder.css b/apcd_cms/static/apcd_cms/css/src/placeholder.css similarity index 100% rename from apcd-cms/static/apcd-cms/css/src/placeholder.css rename to apcd_cms/static/apcd_cms/css/src/placeholder.css diff --git a/apcd-cms/static/apcd-cms/img/favicons/favicon.ico b/apcd_cms/static/apcd_cms/img/favicons/favicon.ico similarity index 100% rename from apcd-cms/static/apcd-cms/img/favicons/favicon.ico rename to apcd_cms/static/apcd_cms/img/favicons/favicon.ico diff --git a/apcd-cms/static/apcd-cms/img/org_logos/apcd-black.png b/apcd_cms/static/apcd_cms/img/org_logos/apcd-black.png similarity index 100% rename from apcd-cms/static/apcd-cms/img/org_logos/apcd-black.png rename to apcd_cms/static/apcd_cms/img/org_logos/apcd-black.png diff --git a/apcd-cms/static/apcd-cms/img/org_logos/apcd-white.png b/apcd_cms/static/apcd_cms/img/org_logos/apcd-white.png similarity index 100% rename from apcd-cms/static/apcd-cms/img/org_logos/apcd-white.png rename to apcd_cms/static/apcd_cms/img/org_logos/apcd-white.png diff --git a/apcd-cms/static/apcd-cms/img/org_logos/tacc-white.png b/apcd_cms/static/apcd_cms/img/org_logos/tacc-white.png similarity index 100% rename from apcd-cms/static/apcd-cms/img/org_logos/tacc-white.png rename to apcd_cms/static/apcd_cms/img/org_logos/tacc-white.png diff --git a/brainmap-cms/__init__.py b/brainmap_cms/__init__.py similarity index 100% rename from brainmap-cms/__init__.py rename to brainmap_cms/__init__.py diff --git a/brainmap-cms/settings_custom.py b/brainmap_cms/settings_custom.py similarity index 87% rename from brainmap-cms/settings_custom.py rename to brainmap_cms/settings_custom.py index 436c8b2e..5ea4238b 100644 --- a/brainmap-cms/settings_custom.py +++ b/brainmap_cms/settings_custom.py @@ -25,7 +25,7 @@ _UTHSCSA_BRANDING = [ "uthscsa", - "brainmap-cms/img/org_logos/uthscsa-logo-white.png", + "brainmap_cms/img/org_logos/uthscsa-logo-white.png", "branding-logo--short", "https://www.uthscsa.edu/", "_blank", @@ -36,7 +36,7 @@ _SGCI_BRANDING = [ "sgci", - "brainmap-cms/img/org_logos/sgci-logo-sans-text.svg", + "brainmap_cms/img/org_logos/sgci-logo-sans-text.svg", "branding-logo--short", "https://sciencegateways.org/", "_blank", @@ -75,7 +75,7 @@ LOGO = [ "brainmap", - "brainmap-cms/img/org_logos/brainmap-logo--light-text-trans-bkgd--large-text.svg", + "brainmap_cms/img/org_logos/brainmap-logo--light-text-trans-bkgd--large-text.svg", "", "/", "_self", @@ -85,5 +85,5 @@ ] FAVICON = { - "img_file_src": "brainmap-cms/img/org_logos/brainmap-logo--dark-text-trans-bkgd--icon-only.png" + "img_file_src": "brainmap_cms/img/org_logos/brainmap-logo--dark-text-trans-bkgd--icon-only.png" } diff --git a/brainmap-cms/static/brainmap-cms/css/src/placeholder.css b/brainmap_cms/static/brainmap_cms/css/src/placeholder.css similarity index 100% rename from brainmap-cms/static/brainmap-cms/css/src/placeholder.css rename to brainmap_cms/static/brainmap_cms/css/src/placeholder.css diff --git a/brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--dark-text-trans-bkgd--icon-only.png b/brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--dark-text-trans-bkgd--icon-only.png similarity index 100% rename from brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--dark-text-trans-bkgd--icon-only.png rename to brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--dark-text-trans-bkgd--icon-only.png diff --git a/brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--dark-text-white-bkgd--large-text.png b/brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--dark-text-white-bkgd--large-text.png similarity index 100% rename from brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--dark-text-white-bkgd--large-text.png rename to brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--dark-text-white-bkgd--large-text.png diff --git a/brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--dark-text-white-bkgd--large-text.svg b/brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--dark-text-white-bkgd--large-text.svg similarity index 100% rename from brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--dark-text-white-bkgd--large-text.svg rename to brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--dark-text-white-bkgd--large-text.svg diff --git a/brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--dark-text-white-bkgd.png b/brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--dark-text-white-bkgd.png similarity index 100% rename from brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--dark-text-white-bkgd.png rename to brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--dark-text-white-bkgd.png diff --git a/brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--dark-text-white-bkgd.svg b/brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--dark-text-white-bkgd.svg similarity index 100% rename from brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--dark-text-white-bkgd.svg rename to brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--dark-text-white-bkgd.svg diff --git a/brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--light-text-trans-bkgd--large-text.png b/brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--light-text-trans-bkgd--large-text.png similarity index 100% rename from brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--light-text-trans-bkgd--large-text.png rename to brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--light-text-trans-bkgd--large-text.png diff --git a/brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--light-text-trans-bkgd--large-text.svg b/brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--light-text-trans-bkgd--large-text.svg similarity index 100% rename from brainmap-cms/static/brainmap-cms/img/org_logos/brainmap-logo--light-text-trans-bkgd--large-text.svg rename to brainmap_cms/static/brainmap_cms/img/org_logos/brainmap-logo--light-text-trans-bkgd--large-text.svg diff --git a/brainmap-cms/static/brainmap-cms/img/org_logos/favicon.ico b/brainmap_cms/static/brainmap_cms/img/org_logos/favicon.ico similarity index 100% rename from brainmap-cms/static/brainmap-cms/img/org_logos/favicon.ico rename to brainmap_cms/static/brainmap_cms/img/org_logos/favicon.ico diff --git a/brainmap-cms/static/brainmap-cms/img/org_logos/sgci-logo-sans-text.svg b/brainmap_cms/static/brainmap_cms/img/org_logos/sgci-logo-sans-text.svg similarity index 100% rename from brainmap-cms/static/brainmap-cms/img/org_logos/sgci-logo-sans-text.svg rename to brainmap_cms/static/brainmap_cms/img/org_logos/sgci-logo-sans-text.svg diff --git a/brainmap-cms/static/brainmap-cms/img/org_logos/sgci-logo.png b/brainmap_cms/static/brainmap_cms/img/org_logos/sgci-logo.png similarity index 100% rename from brainmap-cms/static/brainmap-cms/img/org_logos/sgci-logo.png rename to brainmap_cms/static/brainmap_cms/img/org_logos/sgci-logo.png diff --git a/brainmap-cms/static/brainmap-cms/img/org_logos/uthscsa-logo-white.png b/brainmap_cms/static/brainmap_cms/img/org_logos/uthscsa-logo-white.png similarity index 100% rename from brainmap-cms/static/brainmap-cms/img/org_logos/uthscsa-logo-white.png rename to brainmap_cms/static/brainmap_cms/img/org_logos/uthscsa-logo-white.png diff --git a/brainmap-cms/static/brainmap-cms/img/org_logos/uthscsa-logo.png b/brainmap_cms/static/brainmap_cms/img/org_logos/uthscsa-logo.png similarity index 100% rename from brainmap-cms/static/brainmap-cms/img/org_logos/uthscsa-logo.png rename to brainmap_cms/static/brainmap_cms/img/org_logos/uthscsa-logo.png diff --git a/demdata-cms/__init__.py b/demdata_cms/__init__.py similarity index 100% rename from demdata-cms/__init__.py rename to demdata_cms/__init__.py diff --git a/demdata-cms/settings_custom.py b/demdata_cms/settings_custom.py similarity index 89% rename from demdata-cms/settings_custom.py rename to demdata_cms/settings_custom.py index f30d8c01..fdf694a3 100644 --- a/demdata-cms/settings_custom.py +++ b/demdata_cms/settings_custom.py @@ -19,9 +19,9 @@ # WALKTHROUGH ######################## -# To change LDAP auth settings for a custom CMS Project (e.g. `epoc-cms`): +# To change LDAP auth settings for a custom CMS Project (e.g. `epoc_cms`): # 1. Copy the setting from `settings.py` -# 2. Assign the new value in `Core-CMS/taccsite_custom/epoc-cms/settings_custom.py`. +# 2. Assign the new value in `Core-CMS/taccsite_custom/epoc_cms/settings_custom.py`. AUTH_LDAP_SERVER_URI = "ldap://cluster.ldap.tacc.utexas.edu" # The same goes for other more commonly customized values like below. @@ -58,7 +58,7 @@ TACC_BRANDING = [ "tacc", - "epoc-cms/img/org_logos/tacc-white.png", + "epoc_cms/img/org_logos/tacc-white.png", "branding-tacc", "https://www.tacc.utexas.edu/", "_blank", @@ -69,7 +69,7 @@ UTEXAS_BRANDING = [ "utexas", - "epoc-cms/img/org_logos/utaustin-white.png", + "epoc_cms/img/org_logos/utaustin-white.png", "branding-utaustin", "https://www.utexas.edu/", "_blank", @@ -80,7 +80,7 @@ # NSF_BRANDING = [ # "nsf", -# "epoc-cms/img/org_logos/nsf-white.png", +# "epoc_cms/img/org_logos/nsf-white.png", # "branding-nsf", # "https://www.nsf.gov/", # "_blank", @@ -91,7 +91,7 @@ # CUSTOM_BRANDING = [ # "epoc", -# "epoc-cms/img/org_logos/esnet-white-logo.png", +# "epoc_cms/img/org_logos/esnet-white-logo.png", # "branding-logo--short", # "https://www.es.net/", # "_blank", @@ -109,7 +109,7 @@ LOGO = [ "demdata", - "demdata-cms/img/org_logos/Demo-Data.svg", + "demdata_cms/img/org_logos/Demo-Data.svg", "", "/", "_self", @@ -119,6 +119,6 @@ ] FAVICON = { - "img_file_src": "demdata-cms/img/favicons/Favicon_64x64.svg" + "img_file_src": "demdata_cms/img/favicons/Favicon_64x64.svg" } diff --git a/demdata-cms/static/demdata-cms/css/src/placeholder.css b/demdata_cms/static/demdata_cms/css/src/placeholder.css similarity index 100% rename from demdata-cms/static/demdata-cms/css/src/placeholder.css rename to demdata_cms/static/demdata_cms/css/src/placeholder.css diff --git a/demdata-cms/static/demdata-cms/img/favicons/Favicon_64x64.svg b/demdata_cms/static/demdata_cms/img/favicons/Favicon_64x64.svg similarity index 100% rename from demdata-cms/static/demdata-cms/img/favicons/Favicon_64x64.svg rename to demdata_cms/static/demdata_cms/img/favicons/Favicon_64x64.svg diff --git a/demdata-cms/static/demdata-cms/img/favicons/favicon.ico b/demdata_cms/static/demdata_cms/img/favicons/favicon.ico similarity index 100% rename from demdata-cms/static/demdata-cms/img/favicons/favicon.ico rename to demdata_cms/static/demdata_cms/img/favicons/favicon.ico diff --git a/demdata-cms/static/demdata-cms/img/org_logos/Demo-Data.jpg b/demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.jpg similarity index 100% rename from demdata-cms/static/demdata-cms/img/org_logos/Demo-Data.jpg rename to demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.jpg diff --git a/demdata-cms/static/demdata-cms/img/org_logos/Demo-Data.png b/demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.png similarity index 100% rename from demdata-cms/static/demdata-cms/img/org_logos/Demo-Data.png rename to demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.png diff --git a/demdata-cms/static/demdata-cms/img/org_logos/Demo-Data.svg b/demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.svg similarity index 100% rename from demdata-cms/static/demdata-cms/img/org_logos/Demo-Data.svg rename to demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.svg diff --git a/demdata-cms/static/demdata-cms/img/org_logos/tacc-white.png b/demdata_cms/static/demdata_cms/img/org_logos/tacc-white.png similarity index 100% rename from demdata-cms/static/demdata-cms/img/org_logos/tacc-white.png rename to demdata_cms/static/demdata_cms/img/org_logos/tacc-white.png diff --git a/ecep-cms/__init__.py b/ecep_cms/__init__.py similarity index 100% rename from ecep-cms/__init__.py rename to ecep_cms/__init__.py diff --git a/ecep-cms/settings_custom.py b/ecep_cms/settings_custom.py similarity index 95% rename from ecep-cms/settings_custom.py rename to ecep_cms/settings_custom.py index 4f8cb131..5e7bfa9c 100644 --- a/ecep-cms/settings_custom.py +++ b/ecep_cms/settings_custom.py @@ -65,7 +65,7 @@ LOGO = [ "ecep", - "ecep-cms/img/org_logos/ecep-white-no_words.svg", + "ecep_cms/img/org_logos/ecep-white-no_words.svg", "", "/", "_self", @@ -75,7 +75,7 @@ ] FAVICON = { - "img_file_src": "ecep-cms/img/org_logos/favicon.ico" + "img_file_src": "ecep_cms/img/org_logos/favicon.ico" } ######################## @@ -143,4 +143,4 @@ # CLIENT BUILD SETTINGS ######################## -ROOT_URLCONF = 'taccsite_custom.ecep-cms.urls' +ROOT_URLCONF = 'taccsite_custom.ecep_cms.urls' diff --git a/ecep-cms/static/ecep-cms/css/.postcssrc.yml b/ecep_cms/static/ecep_cms/css/.postcssrc.yml similarity index 62% rename from ecep-cms/static/ecep-cms/css/.postcssrc.yml rename to ecep_cms/static/ecep_cms/css/.postcssrc.yml index 2a9736f9..9f33c4d6 100644 --- a/ecep-cms/static/ecep-cms/css/.postcssrc.yml +++ b/ecep_cms/static/ecep_cms/css/.postcssrc.yml @@ -2,4 +2,4 @@ plugins: postcss-env-function: importFrom: - - 'taccsite_custom/ecep-cms/static/ecep-cms/css/src/_themes/ecep.json' + - 'taccsite_custom/ecep_cms/static/ecep_cms/css/src/_themes/ecep.json' diff --git a/ecep-cms/static/ecep-cms/css/src/_themes/ecep.json b/ecep_cms/static/ecep_cms/css/src/_themes/ecep.json similarity index 100% rename from ecep-cms/static/ecep-cms/css/src/_themes/ecep.json rename to ecep_cms/static/ecep_cms/css/src/_themes/ecep.json diff --git a/ecep-cms/static/ecep-cms/css/src/site.css b/ecep_cms/static/ecep_cms/css/src/site.css similarity index 100% rename from ecep-cms/static/ecep-cms/css/src/site.css rename to ecep_cms/static/ecep_cms/css/src/site.css diff --git a/ecep-cms/static/ecep-cms/img/org_logos/ecep-purple-has_words.svg b/ecep_cms/static/ecep_cms/img/org_logos/ecep-purple-has_words.svg similarity index 100% rename from ecep-cms/static/ecep-cms/img/org_logos/ecep-purple-has_words.svg rename to ecep_cms/static/ecep_cms/img/org_logos/ecep-purple-has_words.svg diff --git a/ecep-cms/static/ecep-cms/img/org_logos/ecep-purple-no_words-padded.jpeg b/ecep_cms/static/ecep_cms/img/org_logos/ecep-purple-no_words-padded.jpeg similarity index 100% rename from ecep-cms/static/ecep-cms/img/org_logos/ecep-purple-no_words-padded.jpeg rename to ecep_cms/static/ecep_cms/img/org_logos/ecep-purple-no_words-padded.jpeg diff --git a/ecep-cms/static/ecep-cms/img/org_logos/ecep-purple-no_words.svg b/ecep_cms/static/ecep_cms/img/org_logos/ecep-purple-no_words.svg similarity index 100% rename from ecep-cms/static/ecep-cms/img/org_logos/ecep-purple-no_words.svg rename to ecep_cms/static/ecep_cms/img/org_logos/ecep-purple-no_words.svg diff --git a/ecep-cms/static/ecep-cms/img/org_logos/ecep-white-has_words.svg b/ecep_cms/static/ecep_cms/img/org_logos/ecep-white-has_words.svg similarity index 100% rename from ecep-cms/static/ecep-cms/img/org_logos/ecep-white-has_words.svg rename to ecep_cms/static/ecep_cms/img/org_logos/ecep-white-has_words.svg diff --git a/ecep-cms/static/ecep-cms/img/org_logos/ecep-white-no_words.svg b/ecep_cms/static/ecep_cms/img/org_logos/ecep-white-no_words.svg similarity index 100% rename from ecep-cms/static/ecep-cms/img/org_logos/ecep-white-no_words.svg rename to ecep_cms/static/ecep_cms/img/org_logos/ecep-white-no_words.svg diff --git a/ecep-cms/static/ecep-cms/img/org_logos/favicon.ico b/ecep_cms/static/ecep_cms/img/org_logos/favicon.ico similarity index 100% rename from ecep-cms/static/ecep-cms/img/org_logos/favicon.ico rename to ecep_cms/static/ecep_cms/img/org_logos/favicon.ico diff --git a/ecep-cms/templates/snippets/page-members-css-old.html b/ecep_cms/templates/snippets/page-members-css-old.html similarity index 100% rename from ecep-cms/templates/snippets/page-members-css-old.html rename to ecep_cms/templates/snippets/page-members-css-old.html diff --git a/ecep-cms/templates/snippets/page-members-css.html b/ecep_cms/templates/snippets/page-members-css.html similarity index 100% rename from ecep-cms/templates/snippets/page-members-css.html rename to ecep_cms/templates/snippets/page-members-css.html diff --git a/ecep-cms/templates/snippets/page-members-js-old.html b/ecep_cms/templates/snippets/page-members-js-old.html similarity index 100% rename from ecep-cms/templates/snippets/page-members-js-old.html rename to ecep_cms/templates/snippets/page-members-js-old.html diff --git a/ecep-cms/templates/snippets/page-members-js.html b/ecep_cms/templates/snippets/page-members-js.html similarity index 100% rename from ecep-cms/templates/snippets/page-members-js.html rename to ecep_cms/templates/snippets/page-members-js.html diff --git a/ecep-cms/templates/snippets/site-css.html b/ecep_cms/templates/snippets/site-css.html similarity index 64% rename from ecep-cms/templates/snippets/site-css.html rename to ecep_cms/templates/snippets/site-css.html index 23b7111f..962cd892 100644 --- a/ecep-cms/templates/snippets/site-css.html +++ b/ecep_cms/templates/snippets/site-css.html @@ -1,4 +1,4 @@ {% load staticfiles %} {# TODO: FP-1487: Move this to a templates/*.html that extends a site_cms one #} - + diff --git a/ecep-cms/urls.py b/ecep_cms/urls.py similarity index 100% rename from ecep-cms/urls.py rename to ecep_cms/urls.py diff --git a/epoc-cms/__init__.py b/epoc_cms/__init__.py similarity index 100% rename from epoc-cms/__init__.py rename to epoc_cms/__init__.py diff --git a/epoc-cms/settings_custom.py b/epoc_cms/settings_custom.py similarity index 89% rename from epoc-cms/settings_custom.py rename to epoc_cms/settings_custom.py index bd702092..4a31a82d 100644 --- a/epoc-cms/settings_custom.py +++ b/epoc_cms/settings_custom.py @@ -23,9 +23,9 @@ # WALKTHROUGH ######################## -# To change LDAP auth settings for a custom CMS Project (e.g. `epoc-cms`): +# To change LDAP auth settings for a custom CMS Project (e.g. `epoc_cms`): # 1. Copy the setting from `settings.py` -# 2. Assign the new value in `Core-CMS/taccsite_custom/epoc-cms/settings_custom.py`. +# 2. Assign the new value in `Core-CMS/taccsite_custom/epoc_cms/settings_custom.py`. AUTH_LDAP_SERVER_URI = "ldap://cluster.ldap.tacc.utexas.edu" # The same goes for other more commonly customized values like below. @@ -68,7 +68,7 @@ TACC_BRANDING = [ "tacc", - "epoc-cms/img/org_logos/tacc-white.png", + "epoc_cms/img/org_logos/tacc-white.png", "branding-tacc", "https://www.tacc.utexas.edu/", "_blank", @@ -79,7 +79,7 @@ UTEXAS_BRANDING = [ "utexas", - "epoc-cms/img/org_logos/utaustin-white.png", + "epoc_cms/img/org_logos/utaustin-white.png", "branding-utaustin", "https://www.utexas.edu/", "_blank", @@ -90,7 +90,7 @@ NSF_BRANDING = [ "nsf", - "epoc-cms/img/org_logos/nsf-white.png", + "epoc_cms/img/org_logos/nsf-white.png", "branding-nsf", "https://www.nsf.gov/", "_blank", @@ -101,7 +101,7 @@ CUSTOM_BRANDING = [ "epoc", - "epoc-cms/img/org_logos/esnet-white-logo.png", + "epoc_cms/img/org_logos/esnet-white-logo.png", "branding-logo--short", "https://www.es.net/", "_blank", @@ -118,7 +118,7 @@ LOGO = [ "epoc", - "epoc-cms/img/org_logos/epoc-color-logo.png", + "epoc_cms/img/org_logos/epoc-color-logo.png", "", "/", "_self", @@ -128,5 +128,5 @@ ] FAVICON = { - "img_file_src": "epoc-cms/img/org_logos/favicon.ico" + "img_file_src": "epoc_cms/img/org_logos/favicon.ico" } diff --git a/epoc-cms/static/epoc-cms/css/src/placeholder.css b/epoc_cms/static/epoc_cms/css/src/placeholder.css similarity index 100% rename from epoc-cms/static/epoc-cms/css/src/placeholder.css rename to epoc_cms/static/epoc_cms/css/src/placeholder.css diff --git a/epoc-cms/static/epoc-cms/img/org_logos/epoc-color-logo.png b/epoc_cms/static/epoc_cms/img/org_logos/epoc-color-logo.png similarity index 100% rename from epoc-cms/static/epoc-cms/img/org_logos/epoc-color-logo.png rename to epoc_cms/static/epoc_cms/img/org_logos/epoc-color-logo.png diff --git a/epoc-cms/static/epoc-cms/img/org_logos/epoc-color-logo.svg b/epoc_cms/static/epoc_cms/img/org_logos/epoc-color-logo.svg similarity index 100% rename from epoc-cms/static/epoc-cms/img/org_logos/epoc-color-logo.svg rename to epoc_cms/static/epoc_cms/img/org_logos/epoc-color-logo.svg diff --git a/epoc-cms/static/epoc-cms/img/org_logos/esnet-white-logo.png b/epoc_cms/static/epoc_cms/img/org_logos/esnet-white-logo.png similarity index 100% rename from epoc-cms/static/epoc-cms/img/org_logos/esnet-white-logo.png rename to epoc_cms/static/epoc_cms/img/org_logos/esnet-white-logo.png diff --git a/epoc-cms/static/epoc-cms/img/org_logos/favicon.png b/epoc_cms/static/epoc_cms/img/org_logos/favicon.png similarity index 100% rename from epoc-cms/static/epoc-cms/img/org_logos/favicon.png rename to epoc_cms/static/epoc_cms/img/org_logos/favicon.png diff --git a/epoc-cms/static/epoc-cms/img/org_logos/nsf-white.png b/epoc_cms/static/epoc_cms/img/org_logos/nsf-white.png similarity index 100% rename from epoc-cms/static/epoc-cms/img/org_logos/nsf-white.png rename to epoc_cms/static/epoc_cms/img/org_logos/nsf-white.png diff --git a/epoc-cms/static/epoc-cms/img/org_logos/portal.png b/epoc_cms/static/epoc_cms/img/org_logos/portal.png similarity index 100% rename from epoc-cms/static/epoc-cms/img/org_logos/portal.png rename to epoc_cms/static/epoc_cms/img/org_logos/portal.png diff --git a/epoc-cms/static/epoc-cms/img/org_logos/tacc-white.png b/epoc_cms/static/epoc_cms/img/org_logos/tacc-white.png similarity index 100% rename from epoc-cms/static/epoc-cms/img/org_logos/tacc-white.png rename to epoc_cms/static/epoc_cms/img/org_logos/tacc-white.png diff --git a/epoc-cms/static/epoc-cms/img/org_logos/utaustin-white.png b/epoc_cms/static/epoc_cms/img/org_logos/utaustin-white.png similarity index 100% rename from epoc-cms/static/epoc-cms/img/org_logos/utaustin-white.png rename to epoc_cms/static/epoc_cms/img/org_logos/utaustin-white.png diff --git a/example_cms/static/example-cms/css/src/placeholder.css b/example_cms/static/example_cms/css/src/placeholder.css similarity index 100% rename from example_cms/static/example-cms/css/src/placeholder.css rename to example_cms/static/example_cms/css/src/placeholder.css diff --git a/example_cms/static/example-cms/img/org_logos/favicon.png b/example_cms/static/example_cms/img/org_logos/favicon.png similarity index 100% rename from example_cms/static/example-cms/img/org_logos/favicon.png rename to example_cms/static/example_cms/img/org_logos/favicon.png diff --git a/example_cms/static/example-cms/img/org_logos/nsf-white.png b/example_cms/static/example_cms/img/org_logos/nsf-white.png similarity index 100% rename from example_cms/static/example-cms/img/org_logos/nsf-white.png rename to example_cms/static/example_cms/img/org_logos/nsf-white.png diff --git a/example_cms/static/example-cms/img/org_logos/portal.png b/example_cms/static/example_cms/img/org_logos/portal.png similarity index 100% rename from example_cms/static/example-cms/img/org_logos/portal.png rename to example_cms/static/example_cms/img/org_logos/portal.png diff --git a/example_cms/static/example-cms/img/org_logos/tacc-white.png b/example_cms/static/example_cms/img/org_logos/tacc-white.png similarity index 100% rename from example_cms/static/example-cms/img/org_logos/tacc-white.png rename to example_cms/static/example_cms/img/org_logos/tacc-white.png diff --git a/example_cms/static/example-cms/img/org_logos/utaustin-white.png b/example_cms/static/example_cms/img/org_logos/utaustin-white.png similarity index 100% rename from example_cms/static/example-cms/img/org_logos/utaustin-white.png rename to example_cms/static/example_cms/img/org_logos/utaustin-white.png diff --git a/frontera-cms/templates/assets_custom.html b/frontera-cms/templates/assets_custom.html deleted file mode 100644 index f442c233..00000000 --- a/frontera-cms/templates/assets_custom.html +++ /dev/null @@ -1,3 +0,0 @@ -{% load static %} - - diff --git a/frontera-cms/__init__.py b/frontera_cms/__init__.py similarity index 100% rename from frontera-cms/__init__.py rename to frontera_cms/__init__.py diff --git a/frontera-cms/settings_custom.py b/frontera_cms/settings_custom.py similarity index 90% rename from frontera-cms/settings_custom.py rename to frontera_cms/settings_custom.py index 9d052346..db86bf93 100644 --- a/frontera-cms/settings_custom.py +++ b/frontera_cms/settings_custom.py @@ -38,7 +38,7 @@ _FRONTERA_TACC_BRANDING = [ "tacc", - "frontera-cms/img/org_logos/tacc-white.png", # TACC/Core-CMS#283 & #284 + "frontera_cms/img/org_logos/tacc-white.png", # TACC/Core-CMS#283 & #284 "branding-tacc", "https://www.tacc.utexas.edu/", "_blank", @@ -66,7 +66,7 @@ LOGO = [ "frontera", - "frontera-cms/img/org_logos/frontera-white-solo.png", + "frontera_cms/img/org_logos/frontera-white-solo.png", "", "/", "_self", @@ -76,5 +76,5 @@ ] FAVICON = { - "img_file_src": "frontera-cms/img/org_logos/favicon.ico" + "img_file_src": "frontera_cms/img/org_logos/favicon.ico" } diff --git a/frontera-cms/static/frontera-cms/css/src/_imports/settings/color.css b/frontera_cms/static/frontera_cms/css/src/_imports/settings/color.css similarity index 100% rename from frontera-cms/static/frontera-cms/css/src/_imports/settings/color.css rename to frontera_cms/static/frontera_cms/css/src/_imports/settings/color.css diff --git a/frontera-cms/static/frontera-cms/css/src/_imports/trumps/s-home.css b/frontera_cms/static/frontera_cms/css/src/_imports/trumps/s-home.css similarity index 100% rename from frontera-cms/static/frontera-cms/css/src/_imports/trumps/s-home.css rename to frontera_cms/static/frontera_cms/css/src/_imports/trumps/s-home.css diff --git a/frontera-cms/static/frontera-cms/css/src/_migrations/v1_v2/frontera.css b/frontera_cms/static/frontera_cms/css/src/_migrations/v1_v2/frontera.css similarity index 69% rename from frontera-cms/static/frontera-cms/css/src/_migrations/v1_v2/frontera.css rename to frontera_cms/static/frontera_cms/css/src/_migrations/v1_v2/frontera.css index 896e0d94..f3d8ec7d 100644 --- a/frontera-cms/static/frontera-cms/css/src/_migrations/v1_v2/frontera.css +++ b/frontera_cms/static/frontera_cms/css/src/_migrations/v1_v2/frontera.css @@ -12,17 +12,17 @@ SRC: https://bitbucket.org/taccaci/frontera/src/master/client/css/frontera.scss /* FAQ: Though CMS default font is `Benton Sans`, old content uses these */ @font-face { font-family: BentonSansBold; - src: url("/static/frontera-cms/fonts/archive/BentonSans-Bold.otf"); + src: url("/static/frontera_cms/fonts/archive/BentonSans-Bold.otf"); } @font-face { font-family: BentonSansMedium; - src: url("/static/frontera-cms/fonts/archive/BentonSans-Medium.otf"); + src: url("/static/frontera_cms/fonts/archive/BentonSans-Medium.otf"); } @font-face { font-family: BentonSansItalic; - src: url("/static/frontera-cms/fonts/archive/BentonSans-MediumItalic.otf"); + src: url("/static/frontera_cms/fonts/archive/BentonSans-MediumItalic.otf"); } /* … */ @@ -30,10 +30,10 @@ SRC: https://bitbucket.org/taccaci/frontera/src/master/client/css/frontera.scss /* HELP: Wesley assumes that old content uses these… but where? */ @font-face { font-family: 'icon-worksregular'; - src: url('/static/frontera-cms/fonts/archive/icon-works-webfont.eot'); - src: url('/static/frontera-cms/fonts/archive/icon-works-webfont.eot?#iefix') format('embedded-opentype'), - url('/static/frontera-cms/fonts/archive/icon-works-webfont.woff') format('woff'), - url('/static/frontera-cms/fonts/archive/icon-works-webfont.svg#icon-worksregular') format('svg'); + src: url('/static/frontera_cms/fonts/archive/icon-works-webfont.eot'); + src: url('/static/frontera_cms/fonts/archive/icon-works-webfont.eot?#iefix') format('embedded-opentype'), + url('/static/frontera_cms/fonts/archive/icon-works-webfont.woff') format('woff'), + url('/static/frontera_cms/fonts/archive/icon-works-webfont.svg#icon-worksregular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/frontera-cms/static/frontera-cms/css/src/migrate.v1_v2.css b/frontera_cms/static/frontera_cms/css/src/migrate.v1_v2.css similarity index 100% rename from frontera-cms/static/frontera-cms/css/src/migrate.v1_v2.css rename to frontera_cms/static/frontera_cms/css/src/migrate.v1_v2.css diff --git a/frontera-cms/static/frontera-cms/css/src/site.css b/frontera_cms/static/frontera_cms/css/src/site.css similarity index 100% rename from frontera-cms/static/frontera-cms/css/src/site.css rename to frontera_cms/static/frontera_cms/css/src/site.css diff --git a/frontera-cms/static/frontera-cms/css/src/template.home.css b/frontera_cms/static/frontera_cms/css/src/template.home.css similarity index 100% rename from frontera-cms/static/frontera-cms/css/src/template.home.css rename to frontera_cms/static/frontera_cms/css/src/template.home.css diff --git a/frontera-cms/static/frontera-cms/fonts/archive/BentonSans-Bold.otf b/frontera_cms/static/frontera_cms/fonts/archive/BentonSans-Bold.otf similarity index 100% rename from frontera-cms/static/frontera-cms/fonts/archive/BentonSans-Bold.otf rename to frontera_cms/static/frontera_cms/fonts/archive/BentonSans-Bold.otf diff --git a/frontera-cms/static/frontera-cms/fonts/archive/BentonSans-Medium.otf b/frontera_cms/static/frontera_cms/fonts/archive/BentonSans-Medium.otf similarity index 100% rename from frontera-cms/static/frontera-cms/fonts/archive/BentonSans-Medium.otf rename to frontera_cms/static/frontera_cms/fonts/archive/BentonSans-Medium.otf diff --git a/frontera-cms/static/frontera-cms/fonts/archive/BentonSans-MediumItalic.otf b/frontera_cms/static/frontera_cms/fonts/archive/BentonSans-MediumItalic.otf similarity index 100% rename from frontera-cms/static/frontera-cms/fonts/archive/BentonSans-MediumItalic.otf rename to frontera_cms/static/frontera_cms/fonts/archive/BentonSans-MediumItalic.otf diff --git a/frontera-cms/static/frontera-cms/fonts/archive/BentonSans-Regular.otf b/frontera_cms/static/frontera_cms/fonts/archive/BentonSans-Regular.otf similarity index 100% rename from frontera-cms/static/frontera-cms/fonts/archive/BentonSans-Regular.otf rename to frontera_cms/static/frontera_cms/fonts/archive/BentonSans-Regular.otf diff --git a/frontera-cms/static/frontera-cms/fonts/archive/icon-works-webfont.eot b/frontera_cms/static/frontera_cms/fonts/archive/icon-works-webfont.eot similarity index 100% rename from frontera-cms/static/frontera-cms/fonts/archive/icon-works-webfont.eot rename to frontera_cms/static/frontera_cms/fonts/archive/icon-works-webfont.eot diff --git a/frontera-cms/static/frontera-cms/fonts/archive/icon-works-webfont.svg b/frontera_cms/static/frontera_cms/fonts/archive/icon-works-webfont.svg similarity index 100% rename from frontera-cms/static/frontera-cms/fonts/archive/icon-works-webfont.svg rename to frontera_cms/static/frontera_cms/fonts/archive/icon-works-webfont.svg diff --git a/frontera-cms/static/frontera-cms/fonts/archive/icon-works-webfont.woff b/frontera_cms/static/frontera_cms/fonts/archive/icon-works-webfont.woff similarity index 100% rename from frontera-cms/static/frontera-cms/fonts/archive/icon-works-webfont.woff rename to frontera_cms/static/frontera_cms/fonts/archive/icon-works-webfont.woff diff --git a/frontera-cms/static/frontera-cms/img/org_logos/favicon.ico b/frontera_cms/static/frontera_cms/img/org_logos/favicon.ico similarity index 100% rename from frontera-cms/static/frontera-cms/img/org_logos/favicon.ico rename to frontera_cms/static/frontera_cms/img/org_logos/favicon.ico diff --git a/frontera-cms/static/frontera-cms/img/org_logos/frontera-white-solo.png b/frontera_cms/static/frontera_cms/img/org_logos/frontera-white-solo.png similarity index 100% rename from frontera-cms/static/frontera-cms/img/org_logos/frontera-white-solo.png rename to frontera_cms/static/frontera_cms/img/org_logos/frontera-white-solo.png diff --git a/frontera-cms/static/frontera-cms/img/org_logos/tacc-white.md b/frontera_cms/static/frontera_cms/img/org_logos/tacc-white.md similarity index 100% rename from frontera-cms/static/frontera-cms/img/org_logos/tacc-white.md rename to frontera_cms/static/frontera_cms/img/org_logos/tacc-white.md diff --git a/frontera-cms/static/frontera-cms/img/org_logos/tacc-white.png b/frontera_cms/static/frontera_cms/img/org_logos/tacc-white.png similarity index 100% rename from frontera-cms/static/frontera-cms/img/org_logos/tacc-white.png rename to frontera_cms/static/frontera_cms/img/org_logos/tacc-white.png diff --git a/frontera_cms/templates/assets_custom.html b/frontera_cms/templates/assets_custom.html new file mode 100644 index 00000000..a4196bfe --- /dev/null +++ b/frontera_cms/templates/assets_custom.html @@ -0,0 +1,3 @@ +{% load static %} + + diff --git a/frontera-cms/templates/fullwidth.html b/frontera_cms/templates/fullwidth.html similarity index 88% rename from frontera-cms/templates/fullwidth.html rename to frontera_cms/templates/fullwidth.html index 1fa0c518..2b6f613d 100644 --- a/frontera-cms/templates/fullwidth.html +++ b/frontera_cms/templates/fullwidth.html @@ -11,5 +11,5 @@ - Frontera was tested with this load order (so let it lie) - Frontera is being redesigned (which will obviate this stylesheet) --> - + {% endblock assets_custom %} diff --git a/frontera-cms/templates/home.html b/frontera_cms/templates/home.html similarity index 90% rename from frontera-cms/templates/home.html rename to frontera_cms/templates/home.html index 3910d395..71166b92 100644 --- a/frontera-cms/templates/home.html +++ b/frontera_cms/templates/home.html @@ -13,7 +13,7 @@ html { font-size: 62.5%; /* 1rem = 10px */ } - + {% endblock assets_custom %} {# FAQ: Common practice but unused, and template is unnecessary long-term #} diff --git a/frontera-cms/templates/snippets/newsletter-body--july-2020.html b/frontera_cms/templates/snippets/newsletter-body--july-2020.html similarity index 100% rename from frontera-cms/templates/snippets/newsletter-body--july-2020.html rename to frontera_cms/templates/snippets/newsletter-body--july-2020.html diff --git a/frontera-cms/templates/snippets/newsletter-body--july-2021.html b/frontera_cms/templates/snippets/newsletter-body--july-2021.html similarity index 100% rename from frontera-cms/templates/snippets/newsletter-body--july-2021.html rename to frontera_cms/templates/snippets/newsletter-body--july-2021.html diff --git a/frontera-cms/templates/snippets/newsletter-body--march-2021.html b/frontera_cms/templates/snippets/newsletter-body--march-2021.html similarity index 100% rename from frontera-cms/templates/snippets/newsletter-body--march-2021.html rename to frontera_cms/templates/snippets/newsletter-body--march-2021.html diff --git a/frontera-cms/templates/snippets/newsletter-body--november-2020.html b/frontera_cms/templates/snippets/newsletter-body--november-2020.html similarity index 100% rename from frontera-cms/templates/snippets/newsletter-body--november-2020.html rename to frontera_cms/templates/snippets/newsletter-body--november-2020.html diff --git a/frontera-cms/templates/snippets/newsletter-foot.html b/frontera_cms/templates/snippets/newsletter-foot.html similarity index 100% rename from frontera-cms/templates/snippets/newsletter-foot.html rename to frontera_cms/templates/snippets/newsletter-foot.html diff --git a/frontera-cms/templates/snippets/newsletter-head.html b/frontera_cms/templates/snippets/newsletter-head.html similarity index 100% rename from frontera-cms/templates/snippets/newsletter-head.html rename to frontera_cms/templates/snippets/newsletter-head.html diff --git a/frontera-cms/templates/snippets/slide-show.html b/frontera_cms/templates/snippets/slide-show.html similarity index 100% rename from frontera-cms/templates/snippets/slide-show.html rename to frontera_cms/templates/snippets/slide-show.html diff --git a/frontera-cms/templates/standard.html b/frontera_cms/templates/standard.html similarity index 100% rename from frontera-cms/templates/standard.html rename to frontera_cms/templates/standard.html diff --git a/lccf-tacc/__init__.py b/lccf_tacc/__init__.py similarity index 100% rename from lccf-tacc/__init__.py rename to lccf_tacc/__init__.py diff --git a/lccf-tacc/settings_custom.py b/lccf_tacc/settings_custom.py similarity index 100% rename from lccf-tacc/settings_custom.py rename to lccf_tacc/settings_custom.py diff --git a/lccf-tacc/static/lccf-tacc/img/org_logos/favicon.png b/lccf_tacc/static/lccf-tacc/img/org_logos/favicon.png similarity index 100% rename from lccf-tacc/static/lccf-tacc/img/org_logos/favicon.png rename to lccf_tacc/static/lccf-tacc/img/org_logos/favicon.png diff --git a/lccf-tacc/static/lccf-tacc/img/org_logos/lccf-white.png b/lccf_tacc/static/lccf-tacc/img/org_logos/lccf-white.png similarity index 100% rename from lccf-tacc/static/lccf-tacc/img/org_logos/lccf-white.png rename to lccf_tacc/static/lccf-tacc/img/org_logos/lccf-white.png diff --git a/neuronex-cms/__init__.py b/neuronex_cms/__init__.py similarity index 100% rename from neuronex-cms/__init__.py rename to neuronex_cms/__init__.py diff --git a/neuronex-cms/settings_custom.py b/neuronex_cms/settings_custom.py similarity index 93% rename from neuronex-cms/settings_custom.py rename to neuronex_cms/settings_custom.py index 0eb7dba6..dd796ee7 100644 --- a/neuronex-cms/settings_custom.py +++ b/neuronex_cms/settings_custom.py @@ -64,7 +64,7 @@ LOGO = [ "portal", - "neuronex-cms/img/org_logos/logo.3dem.png", + "neuronex_cms/img/org_logos/logo.3dem.png", "", "/", "_self", @@ -74,5 +74,5 @@ ] FAVICON = { - "img_file_src": "neuronex-cms/img/org_logos/favicon.ico" + "img_file_src": "neuronex_cms/img/org_logos/favicon.ico" } diff --git a/neuronex-cms/static/neuronex-cms/css/src/migrate.v1_v2.css b/neuronex_cms/static/neuronex_cms/css/src/migrate.v1_v2.css similarity index 100% rename from neuronex-cms/static/neuronex-cms/css/src/migrate.v1_v2.css rename to neuronex_cms/static/neuronex_cms/css/src/migrate.v1_v2.css diff --git a/neuronex-cms/static/neuronex-cms/img/org_logos/favicon.ico b/neuronex_cms/static/neuronex_cms/img/org_logos/favicon.ico similarity index 100% rename from neuronex-cms/static/neuronex-cms/img/org_logos/favicon.ico rename to neuronex_cms/static/neuronex_cms/img/org_logos/favicon.ico diff --git a/neuronex-cms/static/neuronex-cms/img/org_logos/logo.3dem.png b/neuronex_cms/static/neuronex_cms/img/org_logos/logo.3dem.png similarity index 100% rename from neuronex-cms/static/neuronex-cms/img/org_logos/logo.3dem.png rename to neuronex_cms/static/neuronex_cms/img/org_logos/logo.3dem.png diff --git a/neuronex-cms/templates/fullwidth.html b/neuronex_cms/templates/fullwidth.html similarity index 86% rename from neuronex-cms/templates/fullwidth.html rename to neuronex_cms/templates/fullwidth.html index c4ec6668..da666533 100644 --- a/neuronex-cms/templates/fullwidth.html +++ b/neuronex_cms/templates/fullwidth.html @@ -15,5 +15,5 @@ {{ block.super }} - + {% endblock assets_custom %} diff --git a/protx-cms/__init__.py b/protx_cms/__init__.py similarity index 100% rename from protx-cms/__init__.py rename to protx_cms/__init__.py diff --git a/protx-cms/settings_custom.py b/protx_cms/settings_custom.py similarity index 93% rename from protx-cms/settings_custom.py rename to protx_cms/settings_custom.py index fa5dc67f..e2de45c6 100644 --- a/protx-cms/settings_custom.py +++ b/protx_cms/settings_custom.py @@ -32,7 +32,7 @@ COOKS_BRANDING = [ "cooks", - "protx-cms/img/org_logos/CClogo_Standard_White_Transparent.png", + "protx_cms/img/org_logos/CClogo_Standard_White_Transparent.png", "branding-tacc", "https://cookchildrens.org", "_blank", @@ -71,7 +71,7 @@ LOGO = [ "protx", - "protx-cms/img/org_logos/ProTx-logo-nobg.png", + "protx_cms/img/org_logos/ProTx-logo-nobg.png", "", "/", "_self", diff --git a/protx-cms/static/protx-cms/css/.postcssrc.yml b/protx_cms/static/protx_cms/css/.postcssrc.yml similarity index 100% rename from protx-cms/static/protx-cms/css/.postcssrc.yml rename to protx_cms/static/protx_cms/css/.postcssrc.yml diff --git a/protx-cms/static/protx-cms/css/src/placeholder.css b/protx_cms/static/protx_cms/css/src/placeholder.css similarity index 100% rename from protx-cms/static/protx-cms/css/src/placeholder.css rename to protx_cms/static/protx_cms/css/src/placeholder.css diff --git a/protx-cms/static/protx-cms/img/guides/account-request-form.png b/protx_cms/static/protx_cms/img/guides/account-request-form.png similarity index 100% rename from protx-cms/static/protx-cms/img/guides/account-request-form.png rename to protx_cms/static/protx_cms/img/guides/account-request-form.png diff --git a/protx-cms/static/protx-cms/img/guides/account-request-site.png b/protx_cms/static/protx_cms/img/guides/account-request-site.png similarity index 100% rename from protx-cms/static/protx-cms/img/guides/account-request-site.png rename to protx_cms/static/protx_cms/img/guides/account-request-site.png diff --git a/protx-cms/static/protx-cms/img/org_logos/CClogo_Standard_White_Transparent.png b/protx_cms/static/protx_cms/img/org_logos/CClogo_Standard_White_Transparent.png similarity index 100% rename from protx-cms/static/protx-cms/img/org_logos/CClogo_Standard_White_Transparent.png rename to protx_cms/static/protx_cms/img/org_logos/CClogo_Standard_White_Transparent.png diff --git a/protx-cms/static/protx-cms/img/org_logos/ProTx-logo-nobg.png b/protx_cms/static/protx_cms/img/org_logos/ProTx-logo-nobg.png similarity index 100% rename from protx-cms/static/protx-cms/img/org_logos/ProTx-logo-nobg.png rename to protx_cms/static/protx_cms/img/org_logos/ProTx-logo-nobg.png diff --git a/protx-cms/static/protx-cms/img/org_logos/ProTx-logo-white-nobg.png b/protx_cms/static/protx_cms/img/org_logos/ProTx-logo-white-nobg.png similarity index 100% rename from protx-cms/static/protx-cms/img/org_logos/ProTx-logo-white-nobg.png rename to protx_cms/static/protx_cms/img/org_logos/ProTx-logo-white-nobg.png diff --git a/protx-cms/static/protx-cms/img/org_logos/protx-logo-provided-cropped.png b/protx_cms/static/protx_cms/img/org_logos/protx-logo-provided-cropped.png similarity index 100% rename from protx-cms/static/protx-cms/img/org_logos/protx-logo-provided-cropped.png rename to protx_cms/static/protx_cms/img/org_logos/protx-logo-provided-cropped.png diff --git a/protx-cms/static/protx-cms/img/org_logos/protx-logo-provided.png b/protx_cms/static/protx_cms/img/org_logos/protx-logo-provided.png similarity index 100% rename from protx-cms/static/protx-cms/img/org_logos/protx-logo-provided.png rename to protx_cms/static/protx_cms/img/org_logos/protx-logo-provided.png diff --git a/protx-cms/static/protx-cms/img/org_logos/protx-logo-temp.png b/protx_cms/static/protx_cms/img/org_logos/protx-logo-temp.png similarity index 100% rename from protx-cms/static/protx-cms/img/org_logos/protx-logo-temp.png rename to protx_cms/static/protx_cms/img/org_logos/protx-logo-temp.png diff --git a/protx-cms/templates/getting_started.html b/protx_cms/templates/getting_started.html similarity index 99% rename from protx-cms/templates/getting_started.html rename to protx_cms/templates/getting_started.html index 6fc412c2..8c8c4268 100644 --- a/protx-cms/templates/getting_started.html +++ b/protx_cms/templates/getting_started.html @@ -32,7 +32,7 @@

Creating an Account

Choosing institution from a form.

@@ -50,7 +50,7 @@

Creating an Account

A button to create a TACC account.

diff --git a/sciviscolor-cms/__init__.py b/sciviscolor_cms/__init__.py similarity index 100% rename from sciviscolor-cms/__init__.py rename to sciviscolor_cms/__init__.py diff --git a/sciviscolor-cms/settings_custom.py b/sciviscolor_cms/settings_custom.py similarity index 76% rename from sciviscolor-cms/settings_custom.py rename to sciviscolor_cms/settings_custom.py index 2255dee3..0e0c72bc 100644 --- a/sciviscolor-cms/settings_custom.py +++ b/sciviscolor_cms/settings_custom.py @@ -8,7 +8,7 @@ LOGO = [ "sciviscolor", - "sciviscolor-cms/img/org_logos/sciviscolor-logo-white.png", + "sciviscolor_cms/img/org_logos/sciviscolor-logo-white.png", "", "/", "_self", @@ -18,7 +18,7 @@ ] FAVICON = { - "img_file_src": "sciviscolor-cms/img/org_logos/favicon.ico" + "img_file_src": "sciviscolor_cms/img/org_logos/favicon.ico" } ######################## diff --git a/sciviscolor-cms/static/sciviscolor-cms/css/src/placeholder.css b/sciviscolor_cms/static/sciviscolor_cms/css/src/placeholder.css similarity index 100% rename from sciviscolor-cms/static/sciviscolor-cms/css/src/placeholder.css rename to sciviscolor_cms/static/sciviscolor_cms/css/src/placeholder.css diff --git a/sciviscolor-cms/static/sciviscolor-cms/img/org_logos/favicon.ico b/sciviscolor_cms/static/sciviscolor_cms/img/org_logos/favicon.ico similarity index 100% rename from sciviscolor-cms/static/sciviscolor-cms/img/org_logos/favicon.ico rename to sciviscolor_cms/static/sciviscolor_cms/img/org_logos/favicon.ico diff --git a/sciviscolor-cms/static/sciviscolor-cms/img/org_logos/sciviscolor-logo-white.png b/sciviscolor_cms/static/sciviscolor_cms/img/org_logos/sciviscolor-logo-white.png similarity index 100% rename from sciviscolor-cms/static/sciviscolor-cms/img/org_logos/sciviscolor-logo-white.png rename to sciviscolor_cms/static/sciviscolor_cms/img/org_logos/sciviscolor-logo-white.png diff --git a/tup-cms/README.md b/tup_cms/README.md similarity index 100% rename from tup-cms/README.md rename to tup_cms/README.md diff --git a/tup-cms/__init__.py b/tup_cms/__init__.py similarity index 100% rename from tup-cms/__init__.py rename to tup_cms/__init__.py diff --git a/tup-cms/settings_custom.py b/tup_cms/settings_custom.py similarity index 94% rename from tup-cms/settings_custom.py rename to tup_cms/settings_custom.py index 569c7b9b..2289a632 100644 --- a/tup-cms/settings_custom.py +++ b/tup_cms/settings_custom.py @@ -29,7 +29,7 @@ LOGO = [ "tup", - "tup-cms/img/org_logos/tacc-logo.svg", + "tup_cms/img/org_logos/tacc-logo.svg", "tup", "/", "_self", diff --git a/tup-cms/static/tup-cms/css/.postcssrc.yml b/tup_cms/static/tup_cms/css/.postcssrc.yml similarity index 100% rename from tup-cms/static/tup-cms/css/.postcssrc.yml rename to tup_cms/static/tup_cms/css/.postcssrc.yml diff --git a/tup-cms/static/tup-cms/css/src/placeholder.css b/tup_cms/static/tup_cms/css/src/placeholder.css similarity index 100% rename from tup-cms/static/tup-cms/css/src/placeholder.css rename to tup_cms/static/tup_cms/css/src/placeholder.css diff --git a/tup-cms/static/tup-cms/img/org_logos/tacc-logo.svg b/tup_cms/static/tup_cms/img/org_logos/tacc-logo.svg similarity index 100% rename from tup-cms/static/tup-cms/img/org_logos/tacc-logo.svg rename to tup_cms/static/tup_cms/img/org_logos/tacc-logo.svg diff --git a/utrc-cms/__init__.py b/utrc_cms/__init__.py similarity index 100% rename from utrc-cms/__init__.py rename to utrc_cms/__init__.py diff --git a/utrc-cms/settings_custom.py b/utrc_cms/settings_custom.py similarity index 86% rename from utrc-cms/settings_custom.py rename to utrc_cms/settings_custom.py index f676e9cd..89d28c61 100644 --- a/utrc-cms/settings_custom.py +++ b/utrc_cms/settings_custom.py @@ -26,7 +26,7 @@ LOGO = [ "portal", - "utrc-cms/img/org_logos/utrc-horizontal-logo-white-simple.svg", + "utrc_cms/img/org_logos/utrc-horizontal-logo-white-simple.svg", "", "/", "_self", @@ -36,5 +36,5 @@ ] FAVICON = { - "img_file_src": "utrc-cms/img/org_logos/favicon.ico" + "img_file_src": "utrc_cms/img/org_logos/favicon.ico" } diff --git a/utrc-cms/static/utrc-cms/css/src/_imports/trumps/s-focus-list.css b/utrc_cms/static/utrc_cms/css/src/_imports/trumps/s-focus-list.css similarity index 100% rename from utrc-cms/static/utrc-cms/css/src/_imports/trumps/s-focus-list.css rename to utrc_cms/static/utrc_cms/css/src/_imports/trumps/s-focus-list.css diff --git a/utrc-cms/static/utrc-cms/css/src/_imports/trumps/s-home.css b/utrc_cms/static/utrc_cms/css/src/_imports/trumps/s-home.css similarity index 100% rename from utrc-cms/static/utrc-cms/css/src/_imports/trumps/s-home.css rename to utrc_cms/static/utrc_cms/css/src/_imports/trumps/s-home.css diff --git a/utrc-cms/static/utrc-cms/css/src/_imports/trumps/s-icon-list.css b/utrc_cms/static/utrc_cms/css/src/_imports/trumps/s-icon-list.css similarity index 100% rename from utrc-cms/static/utrc-cms/css/src/_imports/trumps/s-icon-list.css rename to utrc_cms/static/utrc_cms/css/src/_imports/trumps/s-icon-list.css diff --git a/utrc-cms/static/utrc-cms/css/src/template.home.css b/utrc_cms/static/utrc_cms/css/src/template.home.css similarity index 100% rename from utrc-cms/static/utrc-cms/css/src/template.home.css rename to utrc_cms/static/utrc_cms/css/src/template.home.css diff --git a/utrc-cms/static/utrc-cms/img/org_logos/favicon.ico b/utrc_cms/static/utrc_cms/img/org_logos/favicon.ico similarity index 100% rename from utrc-cms/static/utrc-cms/img/org_logos/favicon.ico rename to utrc_cms/static/utrc_cms/img/org_logos/favicon.ico diff --git a/utrc-cms/static/utrc-cms/img/org_logos/tacc-white.png b/utrc_cms/static/utrc_cms/img/org_logos/tacc-white.png similarity index 100% rename from utrc-cms/static/utrc-cms/img/org_logos/tacc-white.png rename to utrc_cms/static/utrc_cms/img/org_logos/tacc-white.png diff --git a/utrc-cms/static/utrc-cms/img/org_logos/utrc-horizontal-logo-white-simple.svg b/utrc_cms/static/utrc_cms/img/org_logos/utrc-horizontal-logo-white-simple.svg similarity index 100% rename from utrc-cms/static/utrc-cms/img/org_logos/utrc-horizontal-logo-white-simple.svg rename to utrc_cms/static/utrc_cms/img/org_logos/utrc-horizontal-logo-white-simple.svg diff --git a/utrc-cms/templates/home.html b/utrc_cms/templates/home.html similarity index 77% rename from utrc-cms/templates/home.html rename to utrc_cms/templates/home.html index e5d3787b..e6ebf4c1 100644 --- a/utrc-cms/templates/home.html +++ b/utrc_cms/templates/home.html @@ -4,7 +4,7 @@ {% block assets_custom %} {{ block.super }} - + {% endblock assets_custom %} {% block page_type_class %}s-home{% endblock page_type_class %} From b5cd842a7b9e1f09b68f091a32a0334d11c124b1 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 1 May 2023 15:50:48 -0500 Subject: [PATCH 03/13] =?UTF-8?q?feat:=20rename=20=E2=80=A6-org=20to=20?= =?UTF-8?q?=E2=80=A6=5Forg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__init__.py | 0 .../settings_custom.py | 4 ++-- .../tapis_project_org}/css/src/placeholder.css | 0 .../tapis_project_org}/img/org_logos/favicon.png | Bin .../img/org_logos/hawaii-header-trimmed.png | Bin .../img/org_logos/tapis-logo-navbar.png | Bin .../image-map-frontera-secret-sauce-styles.html | 1 - .../snippets/image-map-whats-in-a-node-styles.html | 1 - {texascale-org => texascale_org}/__init__.py | 0 {texascale-org => texascale_org}/robots.md | 0 {texascale-org => texascale_org}/robots.txt | 0 {texascale-org => texascale_org}/settings_custom.py | 4 ++-- .../src/_imports/components/bootstrap.figure.css | 0 .../css/src/_imports/components/c-fellow.css | 0 .../css/src/_imports/components/c-image-map.css | 0 .../src/_imports/components/c-image-map.skin.css | 0 .../_imports/components/c-image-map.structure.css | 0 .../css/src/_imports/components/c-page.css | 0 .../css/src/_imports/components/c-page.twig.html | 0 .../css/src/_imports/components/c-ribbon.css | 0 .../components/deprecated/bootstrap.blockquote.css | 0 .../components/deprecated/c-offset-content.css | 0 .../css/src/_imports/components/wip.byline.css | 0 .../css/src/_imports/elements/headings.css | 0 .../css/src/_imports/elements/html-elements.css | 0 .../css/src/_imports/objects/o-offset-content.css | 0 .../css/src/_imports/settings/props.border.css | 0 .../css/src/_imports/settings/props.font.css | 0 .../css/src/_imports/settings/props.space.css | 0 .../css/src/_imports/trumps/s-article-page.css | 0 .../css/src/_imports/trumps/s-blockquote.css | 0 .../css/src/_imports/trumps/s-category-page.css | 0 .../css/src/_imports/trumps/s-drop-caps.css | 0 .../css/src/_imports/trumps/s-gallery.css | 0 .../_imports/trumps/s.gallery.advanced.twig.html | 0 .../css/src/_imports/trumps/s.gallery.twig.html | 0 .../css/src/_imports/trumps/u-border.css | 0 .../css/src/_imports/trumps/u-position-sticky.css | 0 .../css/src/_imports/trumps/u-swallow.css | 0 .../css/src/page.dispatches-frontera.css | 0 .../css/src/page.frontera-secret-sauce.css | 0 .../css/src/page.new-releases-and-remixes.css | 0 .../texascale_org}/css/src/page.whats-in-a-node.css | 0 .../static/texascale_org}/css/src/site.css | 0 .../texascale_org}/css/src/template.article.css | 0 .../css/src/template.article.image-map.css | 0 .../texascale_org}/css/src/template.category.css | 0 .../static/texascale_org}/img/org_logos/favicon.png | Bin .../img/org_logos/texascale-wordmark.png | Bin .../static/texascale_org}/js/activateFocusTarget.js | 0 .../templates/article.freeform.html | 0 .../templates/article.html | 2 +- .../templates/article.image-map.html | 4 ++-- .../templates/article.sidebar-right.html | 0 .../templates/article.visual.html | 0 .../templates/category.html | 2 +- .../templates/fullwidth.html | 2 +- .../templates/snippets/homepage-css.html | 0 .../image-map-frontera-secret-sauce-markup.html | 0 .../image-map-frontera-secret-sauce-styles.html | 1 + .../snippets/image-map-whats-in-a-node-markup.html | 0 .../snippets/image-map-whats-in-a-node-styles.html | 1 + .../templates/snippets/meet-fellows.html | 0 {texascale-org => texascale_org}/urls.py | 0 64 files changed, 11 insertions(+), 11 deletions(-) rename {tapis-project-org => tapis_project_org}/__init__.py (100%) rename {tapis-project-org => tapis_project_org}/settings_custom.py (92%) rename {tapis-project-org/static/tapis-project-org => tapis_project_org/static/tapis_project_org}/css/src/placeholder.css (100%) rename {tapis-project-org/static/tapis-project-org => tapis_project_org/static/tapis_project_org}/img/org_logos/favicon.png (100%) rename {tapis-project-org/static/tapis-project-org => tapis_project_org/static/tapis_project_org}/img/org_logos/hawaii-header-trimmed.png (100%) rename {tapis-project-org/static/tapis-project-org => tapis_project_org/static/tapis_project_org}/img/org_logos/tapis-logo-navbar.png (100%) delete mode 100644 texascale-org/templates/snippets/image-map-frontera-secret-sauce-styles.html delete mode 100644 texascale-org/templates/snippets/image-map-whats-in-a-node-styles.html rename {texascale-org => texascale_org}/__init__.py (100%) rename {texascale-org => texascale_org}/robots.md (100%) rename {texascale-org => texascale_org}/robots.txt (100%) rename {texascale-org => texascale_org}/settings_custom.py (95%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/components/bootstrap.figure.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/components/c-fellow.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/components/c-image-map.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/components/c-image-map.skin.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/components/c-image-map.structure.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/components/c-page.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/components/c-page.twig.html (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/components/c-ribbon.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/components/deprecated/bootstrap.blockquote.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/components/deprecated/c-offset-content.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/components/wip.byline.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/elements/headings.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/elements/html-elements.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/objects/o-offset-content.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/settings/props.border.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/settings/props.font.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/settings/props.space.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/trumps/s-article-page.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/trumps/s-blockquote.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/trumps/s-category-page.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/trumps/s-drop-caps.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/trumps/s-gallery.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/trumps/s.gallery.advanced.twig.html (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/trumps/s.gallery.twig.html (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/trumps/u-border.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/trumps/u-position-sticky.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/_imports/trumps/u-swallow.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/page.dispatches-frontera.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/page.frontera-secret-sauce.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/page.new-releases-and-remixes.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/page.whats-in-a-node.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/site.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/template.article.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/template.article.image-map.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/css/src/template.category.css (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/img/org_logos/favicon.png (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/img/org_logos/texascale-wordmark.png (100%) rename {texascale-org/static/texascale-org => texascale_org/static/texascale_org}/js/activateFocusTarget.js (100%) rename {texascale-org => texascale_org}/templates/article.freeform.html (100%) rename {texascale-org => texascale_org}/templates/article.html (91%) rename {texascale-org => texascale_org}/templates/article.image-map.html (90%) rename {texascale-org => texascale_org}/templates/article.sidebar-right.html (100%) rename {texascale-org => texascale_org}/templates/article.visual.html (100%) rename {texascale-org => texascale_org}/templates/category.html (87%) rename {texascale-org => texascale_org}/templates/fullwidth.html (86%) rename {texascale-org => texascale_org}/templates/snippets/homepage-css.html (100%) rename {texascale-org => texascale_org}/templates/snippets/image-map-frontera-secret-sauce-markup.html (100%) create mode 100644 texascale_org/templates/snippets/image-map-frontera-secret-sauce-styles.html rename {texascale-org => texascale_org}/templates/snippets/image-map-whats-in-a-node-markup.html (100%) create mode 100644 texascale_org/templates/snippets/image-map-whats-in-a-node-styles.html rename {texascale-org => texascale_org}/templates/snippets/meet-fellows.html (100%) rename {texascale-org => texascale_org}/urls.py (100%) diff --git a/tapis-project-org/__init__.py b/tapis_project_org/__init__.py similarity index 100% rename from tapis-project-org/__init__.py rename to tapis_project_org/__init__.py diff --git a/tapis-project-org/settings_custom.py b/tapis_project_org/settings_custom.py similarity index 92% rename from tapis-project-org/settings_custom.py rename to tapis_project_org/settings_custom.py index 2cc1e062..44009bc3 100644 --- a/tapis-project-org/settings_custom.py +++ b/tapis_project_org/settings_custom.py @@ -11,7 +11,7 @@ UHAWAII_BRANDING = [ "uhawaii", - "tapis-project-org/img/org_logos/hawaii-header-trimmed.png", + "tapis_project_org/img/org_logos/hawaii-header-trimmed.png", "branding-uhawaii", "https://www.hawaii.edu/", "_blank", @@ -61,7 +61,7 @@ LOGO = [ "tapis", - "tapis-project-org/img/org_logos/tapis-logo-navbar.png", + "tapis_project_org/img/org_logos/tapis-logo-navbar.png", "", "/", "_self", diff --git a/tapis-project-org/static/tapis-project-org/css/src/placeholder.css b/tapis_project_org/static/tapis_project_org/css/src/placeholder.css similarity index 100% rename from tapis-project-org/static/tapis-project-org/css/src/placeholder.css rename to tapis_project_org/static/tapis_project_org/css/src/placeholder.css diff --git a/tapis-project-org/static/tapis-project-org/img/org_logos/favicon.png b/tapis_project_org/static/tapis_project_org/img/org_logos/favicon.png similarity index 100% rename from tapis-project-org/static/tapis-project-org/img/org_logos/favicon.png rename to tapis_project_org/static/tapis_project_org/img/org_logos/favicon.png diff --git a/tapis-project-org/static/tapis-project-org/img/org_logos/hawaii-header-trimmed.png b/tapis_project_org/static/tapis_project_org/img/org_logos/hawaii-header-trimmed.png similarity index 100% rename from tapis-project-org/static/tapis-project-org/img/org_logos/hawaii-header-trimmed.png rename to tapis_project_org/static/tapis_project_org/img/org_logos/hawaii-header-trimmed.png diff --git a/tapis-project-org/static/tapis-project-org/img/org_logos/tapis-logo-navbar.png b/tapis_project_org/static/tapis_project_org/img/org_logos/tapis-logo-navbar.png similarity index 100% rename from tapis-project-org/static/tapis-project-org/img/org_logos/tapis-logo-navbar.png rename to tapis_project_org/static/tapis_project_org/img/org_logos/tapis-logo-navbar.png diff --git a/texascale-org/templates/snippets/image-map-frontera-secret-sauce-styles.html b/texascale-org/templates/snippets/image-map-frontera-secret-sauce-styles.html deleted file mode 100644 index 9c447f60..00000000 --- a/texascale-org/templates/snippets/image-map-frontera-secret-sauce-styles.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/texascale-org/templates/snippets/image-map-whats-in-a-node-styles.html b/texascale-org/templates/snippets/image-map-whats-in-a-node-styles.html deleted file mode 100644 index 3fb22cea..00000000 --- a/texascale-org/templates/snippets/image-map-whats-in-a-node-styles.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/texascale-org/__init__.py b/texascale_org/__init__.py similarity index 100% rename from texascale-org/__init__.py rename to texascale_org/__init__.py diff --git a/texascale-org/robots.md b/texascale_org/robots.md similarity index 100% rename from texascale-org/robots.md rename to texascale_org/robots.md diff --git a/texascale-org/robots.txt b/texascale_org/robots.txt similarity index 100% rename from texascale-org/robots.txt rename to texascale_org/robots.txt diff --git a/texascale-org/settings_custom.py b/texascale_org/settings_custom.py similarity index 95% rename from texascale-org/settings_custom.py rename to texascale_org/settings_custom.py index c7b03eda..b0506c02 100644 --- a/texascale-org/settings_custom.py +++ b/texascale_org/settings_custom.py @@ -22,7 +22,7 @@ LOGO = [ "texascale", - "texascale-org/img/org_logos/texascale-wordmark.png", + "texascale_org/img/org_logos/texascale-wordmark.png", "", "/", "_self", @@ -89,4 +89,4 @@ ######################## # TACC/Core-CMS-Resources#75: Load custom urls.py so we can add urlpatterns for taggit_autosuggest -ROOT_URLCONF = 'taccsite_custom.texascale-org.urls' +ROOT_URLCONF = 'taccsite_custom.texascale_org.urls' diff --git a/texascale-org/static/texascale-org/css/src/_imports/components/bootstrap.figure.css b/texascale_org/static/texascale_org/css/src/_imports/components/bootstrap.figure.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/components/bootstrap.figure.css rename to texascale_org/static/texascale_org/css/src/_imports/components/bootstrap.figure.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/components/c-fellow.css b/texascale_org/static/texascale_org/css/src/_imports/components/c-fellow.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/components/c-fellow.css rename to texascale_org/static/texascale_org/css/src/_imports/components/c-fellow.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/components/c-image-map.css b/texascale_org/static/texascale_org/css/src/_imports/components/c-image-map.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/components/c-image-map.css rename to texascale_org/static/texascale_org/css/src/_imports/components/c-image-map.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/components/c-image-map.skin.css b/texascale_org/static/texascale_org/css/src/_imports/components/c-image-map.skin.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/components/c-image-map.skin.css rename to texascale_org/static/texascale_org/css/src/_imports/components/c-image-map.skin.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/components/c-image-map.structure.css b/texascale_org/static/texascale_org/css/src/_imports/components/c-image-map.structure.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/components/c-image-map.structure.css rename to texascale_org/static/texascale_org/css/src/_imports/components/c-image-map.structure.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/components/c-page.css b/texascale_org/static/texascale_org/css/src/_imports/components/c-page.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/components/c-page.css rename to texascale_org/static/texascale_org/css/src/_imports/components/c-page.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/components/c-page.twig.html b/texascale_org/static/texascale_org/css/src/_imports/components/c-page.twig.html similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/components/c-page.twig.html rename to texascale_org/static/texascale_org/css/src/_imports/components/c-page.twig.html diff --git a/texascale-org/static/texascale-org/css/src/_imports/components/c-ribbon.css b/texascale_org/static/texascale_org/css/src/_imports/components/c-ribbon.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/components/c-ribbon.css rename to texascale_org/static/texascale_org/css/src/_imports/components/c-ribbon.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/components/deprecated/bootstrap.blockquote.css b/texascale_org/static/texascale_org/css/src/_imports/components/deprecated/bootstrap.blockquote.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/components/deprecated/bootstrap.blockquote.css rename to texascale_org/static/texascale_org/css/src/_imports/components/deprecated/bootstrap.blockquote.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/components/deprecated/c-offset-content.css b/texascale_org/static/texascale_org/css/src/_imports/components/deprecated/c-offset-content.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/components/deprecated/c-offset-content.css rename to texascale_org/static/texascale_org/css/src/_imports/components/deprecated/c-offset-content.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/components/wip.byline.css b/texascale_org/static/texascale_org/css/src/_imports/components/wip.byline.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/components/wip.byline.css rename to texascale_org/static/texascale_org/css/src/_imports/components/wip.byline.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/elements/headings.css b/texascale_org/static/texascale_org/css/src/_imports/elements/headings.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/elements/headings.css rename to texascale_org/static/texascale_org/css/src/_imports/elements/headings.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/elements/html-elements.css b/texascale_org/static/texascale_org/css/src/_imports/elements/html-elements.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/elements/html-elements.css rename to texascale_org/static/texascale_org/css/src/_imports/elements/html-elements.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/objects/o-offset-content.css b/texascale_org/static/texascale_org/css/src/_imports/objects/o-offset-content.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/objects/o-offset-content.css rename to texascale_org/static/texascale_org/css/src/_imports/objects/o-offset-content.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/settings/props.border.css b/texascale_org/static/texascale_org/css/src/_imports/settings/props.border.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/settings/props.border.css rename to texascale_org/static/texascale_org/css/src/_imports/settings/props.border.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/settings/props.font.css b/texascale_org/static/texascale_org/css/src/_imports/settings/props.font.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/settings/props.font.css rename to texascale_org/static/texascale_org/css/src/_imports/settings/props.font.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css b/texascale_org/static/texascale_org/css/src/_imports/settings/props.space.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/settings/props.space.css rename to texascale_org/static/texascale_org/css/src/_imports/settings/props.space.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/trumps/s-article-page.css b/texascale_org/static/texascale_org/css/src/_imports/trumps/s-article-page.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/trumps/s-article-page.css rename to texascale_org/static/texascale_org/css/src/_imports/trumps/s-article-page.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/trumps/s-blockquote.css b/texascale_org/static/texascale_org/css/src/_imports/trumps/s-blockquote.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/trumps/s-blockquote.css rename to texascale_org/static/texascale_org/css/src/_imports/trumps/s-blockquote.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/trumps/s-category-page.css b/texascale_org/static/texascale_org/css/src/_imports/trumps/s-category-page.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/trumps/s-category-page.css rename to texascale_org/static/texascale_org/css/src/_imports/trumps/s-category-page.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/trumps/s-drop-caps.css b/texascale_org/static/texascale_org/css/src/_imports/trumps/s-drop-caps.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/trumps/s-drop-caps.css rename to texascale_org/static/texascale_org/css/src/_imports/trumps/s-drop-caps.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/trumps/s-gallery.css b/texascale_org/static/texascale_org/css/src/_imports/trumps/s-gallery.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/trumps/s-gallery.css rename to texascale_org/static/texascale_org/css/src/_imports/trumps/s-gallery.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/trumps/s.gallery.advanced.twig.html b/texascale_org/static/texascale_org/css/src/_imports/trumps/s.gallery.advanced.twig.html similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/trumps/s.gallery.advanced.twig.html rename to texascale_org/static/texascale_org/css/src/_imports/trumps/s.gallery.advanced.twig.html diff --git a/texascale-org/static/texascale-org/css/src/_imports/trumps/s.gallery.twig.html b/texascale_org/static/texascale_org/css/src/_imports/trumps/s.gallery.twig.html similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/trumps/s.gallery.twig.html rename to texascale_org/static/texascale_org/css/src/_imports/trumps/s.gallery.twig.html diff --git a/texascale-org/static/texascale-org/css/src/_imports/trumps/u-border.css b/texascale_org/static/texascale_org/css/src/_imports/trumps/u-border.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/trumps/u-border.css rename to texascale_org/static/texascale_org/css/src/_imports/trumps/u-border.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/trumps/u-position-sticky.css b/texascale_org/static/texascale_org/css/src/_imports/trumps/u-position-sticky.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/trumps/u-position-sticky.css rename to texascale_org/static/texascale_org/css/src/_imports/trumps/u-position-sticky.css diff --git a/texascale-org/static/texascale-org/css/src/_imports/trumps/u-swallow.css b/texascale_org/static/texascale_org/css/src/_imports/trumps/u-swallow.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/_imports/trumps/u-swallow.css rename to texascale_org/static/texascale_org/css/src/_imports/trumps/u-swallow.css diff --git a/texascale-org/static/texascale-org/css/src/page.dispatches-frontera.css b/texascale_org/static/texascale_org/css/src/page.dispatches-frontera.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/page.dispatches-frontera.css rename to texascale_org/static/texascale_org/css/src/page.dispatches-frontera.css diff --git a/texascale-org/static/texascale-org/css/src/page.frontera-secret-sauce.css b/texascale_org/static/texascale_org/css/src/page.frontera-secret-sauce.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/page.frontera-secret-sauce.css rename to texascale_org/static/texascale_org/css/src/page.frontera-secret-sauce.css diff --git a/texascale-org/static/texascale-org/css/src/page.new-releases-and-remixes.css b/texascale_org/static/texascale_org/css/src/page.new-releases-and-remixes.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/page.new-releases-and-remixes.css rename to texascale_org/static/texascale_org/css/src/page.new-releases-and-remixes.css diff --git a/texascale-org/static/texascale-org/css/src/page.whats-in-a-node.css b/texascale_org/static/texascale_org/css/src/page.whats-in-a-node.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/page.whats-in-a-node.css rename to texascale_org/static/texascale_org/css/src/page.whats-in-a-node.css diff --git a/texascale-org/static/texascale-org/css/src/site.css b/texascale_org/static/texascale_org/css/src/site.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/site.css rename to texascale_org/static/texascale_org/css/src/site.css diff --git a/texascale-org/static/texascale-org/css/src/template.article.css b/texascale_org/static/texascale_org/css/src/template.article.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/template.article.css rename to texascale_org/static/texascale_org/css/src/template.article.css diff --git a/texascale-org/static/texascale-org/css/src/template.article.image-map.css b/texascale_org/static/texascale_org/css/src/template.article.image-map.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/template.article.image-map.css rename to texascale_org/static/texascale_org/css/src/template.article.image-map.css diff --git a/texascale-org/static/texascale-org/css/src/template.category.css b/texascale_org/static/texascale_org/css/src/template.category.css similarity index 100% rename from texascale-org/static/texascale-org/css/src/template.category.css rename to texascale_org/static/texascale_org/css/src/template.category.css diff --git a/texascale-org/static/texascale-org/img/org_logos/favicon.png b/texascale_org/static/texascale_org/img/org_logos/favicon.png similarity index 100% rename from texascale-org/static/texascale-org/img/org_logos/favicon.png rename to texascale_org/static/texascale_org/img/org_logos/favicon.png diff --git a/texascale-org/static/texascale-org/img/org_logos/texascale-wordmark.png b/texascale_org/static/texascale_org/img/org_logos/texascale-wordmark.png similarity index 100% rename from texascale-org/static/texascale-org/img/org_logos/texascale-wordmark.png rename to texascale_org/static/texascale_org/img/org_logos/texascale-wordmark.png diff --git a/texascale-org/static/texascale-org/js/activateFocusTarget.js b/texascale_org/static/texascale_org/js/activateFocusTarget.js similarity index 100% rename from texascale-org/static/texascale-org/js/activateFocusTarget.js rename to texascale_org/static/texascale_org/js/activateFocusTarget.js diff --git a/texascale-org/templates/article.freeform.html b/texascale_org/templates/article.freeform.html similarity index 100% rename from texascale-org/templates/article.freeform.html rename to texascale_org/templates/article.freeform.html diff --git a/texascale-org/templates/article.html b/texascale_org/templates/article.html similarity index 91% rename from texascale-org/templates/article.html rename to texascale_org/templates/article.html index 173f345f..70d7150e 100644 --- a/texascale-org/templates/article.html +++ b/texascale_org/templates/article.html @@ -4,7 +4,7 @@ {% block assets_custom %} {{ block.super }} - + {% endblock assets_custom %} {% block content %} diff --git a/texascale-org/templates/article.image-map.html b/texascale_org/templates/article.image-map.html similarity index 90% rename from texascale-org/templates/article.image-map.html rename to texascale_org/templates/article.image-map.html index 0b81b2ac..eb44cae0 100644 --- a/texascale-org/templates/article.image-map.html +++ b/texascale_org/templates/article.image-map.html @@ -4,7 +4,7 @@ {% block assets_custom %} {{ block.super }} - + {% endblock assets_custom %} {% block content %} @@ -36,5 +36,5 @@ {% block assets_custom_delayed %} {{ block.super }} - + {% endblock assets_custom_delayed %} diff --git a/texascale-org/templates/article.sidebar-right.html b/texascale_org/templates/article.sidebar-right.html similarity index 100% rename from texascale-org/templates/article.sidebar-right.html rename to texascale_org/templates/article.sidebar-right.html diff --git a/texascale-org/templates/article.visual.html b/texascale_org/templates/article.visual.html similarity index 100% rename from texascale-org/templates/article.visual.html rename to texascale_org/templates/article.visual.html diff --git a/texascale-org/templates/category.html b/texascale_org/templates/category.html similarity index 87% rename from texascale-org/templates/category.html rename to texascale_org/templates/category.html index b24b8019..39516005 100644 --- a/texascale-org/templates/category.html +++ b/texascale_org/templates/category.html @@ -4,7 +4,7 @@ {% block assets_custom %} {{ block.super }} - + {% endblock assets_custom %} {# Add class to the #} diff --git a/texascale-org/templates/fullwidth.html b/texascale_org/templates/fullwidth.html similarity index 86% rename from texascale-org/templates/fullwidth.html rename to texascale_org/templates/fullwidth.html index 74250fc7..5661fc0d 100644 --- a/texascale-org/templates/fullwidth.html +++ b/texascale_org/templates/fullwidth.html @@ -10,7 +10,7 @@ {% block assets_custom %} {{ block.super }} - + {% endblock assets_custom %} {% block content %} diff --git a/texascale-org/templates/snippets/homepage-css.html b/texascale_org/templates/snippets/homepage-css.html similarity index 100% rename from texascale-org/templates/snippets/homepage-css.html rename to texascale_org/templates/snippets/homepage-css.html diff --git a/texascale-org/templates/snippets/image-map-frontera-secret-sauce-markup.html b/texascale_org/templates/snippets/image-map-frontera-secret-sauce-markup.html similarity index 100% rename from texascale-org/templates/snippets/image-map-frontera-secret-sauce-markup.html rename to texascale_org/templates/snippets/image-map-frontera-secret-sauce-markup.html diff --git a/texascale_org/templates/snippets/image-map-frontera-secret-sauce-styles.html b/texascale_org/templates/snippets/image-map-frontera-secret-sauce-styles.html new file mode 100644 index 00000000..26092c78 --- /dev/null +++ b/texascale_org/templates/snippets/image-map-frontera-secret-sauce-styles.html @@ -0,0 +1 @@ + diff --git a/texascale-org/templates/snippets/image-map-whats-in-a-node-markup.html b/texascale_org/templates/snippets/image-map-whats-in-a-node-markup.html similarity index 100% rename from texascale-org/templates/snippets/image-map-whats-in-a-node-markup.html rename to texascale_org/templates/snippets/image-map-whats-in-a-node-markup.html diff --git a/texascale_org/templates/snippets/image-map-whats-in-a-node-styles.html b/texascale_org/templates/snippets/image-map-whats-in-a-node-styles.html new file mode 100644 index 00000000..a79f744b --- /dev/null +++ b/texascale_org/templates/snippets/image-map-whats-in-a-node-styles.html @@ -0,0 +1 @@ + diff --git a/texascale-org/templates/snippets/meet-fellows.html b/texascale_org/templates/snippets/meet-fellows.html similarity index 100% rename from texascale-org/templates/snippets/meet-fellows.html rename to texascale_org/templates/snippets/meet-fellows.html diff --git a/texascale-org/urls.py b/texascale_org/urls.py similarity index 100% rename from texascale-org/urls.py rename to texascale_org/urls.py From a7e44eff8e50184661d5079da7fd4e22096c6147 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 1 May 2023 15:54:28 -0500 Subject: [PATCH 04/13] feat!: rename paths to templates If deployed on relevant sites, site pages will be missing template. All pages need template re-assigned through CMS admin. --- a2cps_cms/settings_custom.py | 4 ++-- frontera_cms/settings_custom.py | 6 +++--- neuronex_cms/settings_custom.py | 2 +- protx_cms/settings_custom.py | 2 +- texascale_org/settings_custom.py | 14 +++++++------- utrc_cms/settings_custom.py | 2 +- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/a2cps_cms/settings_custom.py b/a2cps_cms/settings_custom.py index 141fb133..a811df0a 100644 --- a/a2cps_cms/settings_custom.py +++ b/a2cps_cms/settings_custom.py @@ -8,8 +8,8 @@ ######################## CMS_TEMPLATES = ( - ('a2cps-cms/templates/standard.html', 'Standard'), - ('a2cps-cms/templates/fullwidth.html', 'Full Width'), + ('a2cps_cms/templates/standard.html', 'Standard'), + ('a2cps_cms/templates/fullwidth.html', 'Full Width'), ('guide.html', 'Guide'), ('guides/getting_started.html', 'Guide: Getting Started'), ('guides/data_transfer.html', 'Guide: Data Transfer'), diff --git a/frontera_cms/settings_custom.py b/frontera_cms/settings_custom.py index db86bf93..33527443 100644 --- a/frontera_cms/settings_custom.py +++ b/frontera_cms/settings_custom.py @@ -10,9 +10,9 @@ ######################## CMS_TEMPLATES = ( - ('frontera-cms/templates/standard.html', 'Standard'), - ('frontera-cms/templates/fullwidth.html', 'Full Width'), - ('frontera-cms/templates/home.html', 'Homepage'), + ('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'), diff --git a/neuronex_cms/settings_custom.py b/neuronex_cms/settings_custom.py index dd796ee7..64d83fb3 100644 --- a/neuronex_cms/settings_custom.py +++ b/neuronex_cms/settings_custom.py @@ -10,7 +10,7 @@ ######################## CMS_TEMPLATES = ( - ('neuronex-cms/templates/fullwidth.html', 'Fullwidth'), + ('neuronex_cms/templates/fullwidth.html', 'Fullwidth'), ('home_portal.html', 'Standard Portal Homepage'), ('guide.html', 'Guide'), ('guides/getting_started.html', 'Guide: Getting Started'), diff --git a/protx_cms/settings_custom.py b/protx_cms/settings_custom.py index e2de45c6..a66da16c 100644 --- a/protx_cms/settings_custom.py +++ b/protx_cms/settings_custom.py @@ -14,7 +14,7 @@ ('fullwidth.html', 'Full Width'), ('guide.html', 'Guide'), - ('protx-cms/templates/getting_started.html', 'Guide: Getting Started'), + ('protx_cms/templates/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') diff --git a/texascale_org/settings_custom.py b/texascale_org/settings_custom.py index b0506c02..340765dd 100644 --- a/texascale_org/settings_custom.py +++ b/texascale_org/settings_custom.py @@ -7,13 +7,13 @@ ######################## CMS_TEMPLATES = ( - ('texascale-org/templates/fullwidth.html', 'Fullwidth'), - ('texascale-org/templates/category.html', 'Category'), - ('texascale-org/templates/article.html', 'Article'), - ('texascale-org/templates/article.freeform.html', 'Article (Free-Form)'), - ('texascale-org/templates/article.sidebar-right.html', 'Article (Right Sidebar)'), - ('texascale-org/templates/article.visual.html', 'Article (Full-Size Visual)'), - ('texascale-org/templates/article.image-map.html', 'Article (Image Map)'), + ('texascale_org/templates/fullwidth.html', 'Fullwidth'), + ('texascale_org/templates/category.html', 'Category'), + ('texascale_org/templates/article.html', 'Article'), + ('texascale_org/templates/article.freeform.html', 'Article (Free-Form)'), + ('texascale_org/templates/article.sidebar-right.html', 'Article (Right Sidebar)'), + ('texascale_org/templates/article.visual.html', 'Article (Full-Size Visual)'), + ('texascale_org/templates/article.image-map.html', 'Article (Image Map)'), ) ######################## diff --git a/utrc_cms/settings_custom.py b/utrc_cms/settings_custom.py index 89d28c61..de2ef02a 100644 --- a/utrc_cms/settings_custom.py +++ b/utrc_cms/settings_custom.py @@ -11,7 +11,7 @@ ('standard.html', 'Standard'), ('fullwidth.html', 'Full Width'), - ('utrc-cms/templates/home.html', 'Home'), + ('utrc_cms/templates/home.html', 'Home'), ('guide.html', 'Guide'), ('guides/getting_started.html', 'Guide: Getting Started'), From f3356ee327129a4008a6477adf79882e5fd9c491 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 1 May 2023 17:23:24 -0500 Subject: [PATCH 05/13] fix: django 3.0 staticfiles deprecated, use static https://docs.djangoproject.com/en/4.2/internals/deprecation/#deprecation-removed-in-3-0 --- ecep_cms/templates/snippets/site-css.html | 2 +- neuronex_cms/templates/fullwidth.html | 2 +- protx_cms/templates/getting_started.html | 2 +- texascale_org/templates/article.html | 2 +- texascale_org/templates/article.image-map.html | 2 +- texascale_org/templates/category.html | 2 +- texascale_org/templates/fullwidth.html | 2 +- utrc_cms/templates/home.html | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ecep_cms/templates/snippets/site-css.html b/ecep_cms/templates/snippets/site-css.html index 962cd892..2e42f6f3 100644 --- a/ecep_cms/templates/snippets/site-css.html +++ b/ecep_cms/templates/snippets/site-css.html @@ -1,4 +1,4 @@ -{% load staticfiles %} +{% load static %} {# TODO: FP-1487: Move this to a templates/*.html that extends a site_cms one #} diff --git a/neuronex_cms/templates/fullwidth.html b/neuronex_cms/templates/fullwidth.html index da666533..3807d294 100644 --- a/neuronex_cms/templates/fullwidth.html +++ b/neuronex_cms/templates/fullwidth.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load cms_tags staticfiles %} +{% load cms_tags static %} {% block title %}{% page_attribute "page_title" %}{% endblock title %} diff --git a/protx_cms/templates/getting_started.html b/protx_cms/templates/getting_started.html index 8c8c4268..2cd53393 100644 --- a/protx_cms/templates/getting_started.html +++ b/protx_cms/templates/getting_started.html @@ -1,5 +1,5 @@ {% extends "guide.html" %} -{% load cms_tags staticfiles tacc_uri_shortcuts %} +{% load cms_tags static tacc_uri_shortcuts %} {% block guide %} {% site_uri as site_uri %} diff --git a/texascale_org/templates/article.html b/texascale_org/templates/article.html index 70d7150e..988f0110 100644 --- a/texascale_org/templates/article.html +++ b/texascale_org/templates/article.html @@ -1,5 +1,5 @@ {% extends "./fullwidth.html" %} -{% load cms_tags staticfiles %} +{% load cms_tags static %} {% block assets_custom %} {{ block.super }} diff --git a/texascale_org/templates/article.image-map.html b/texascale_org/templates/article.image-map.html index eb44cae0..cd071ed3 100644 --- a/texascale_org/templates/article.image-map.html +++ b/texascale_org/templates/article.image-map.html @@ -1,5 +1,5 @@ {% extends "./article.html" %} -{% load cms_tags staticfiles %} +{% load cms_tags static %} {% block assets_custom %} {{ block.super }} diff --git a/texascale_org/templates/category.html b/texascale_org/templates/category.html index 39516005..98d45987 100644 --- a/texascale_org/templates/category.html +++ b/texascale_org/templates/category.html @@ -1,5 +1,5 @@ {% extends "./fullwidth.html" %} -{% load cms_tags staticfiles %} +{% load cms_tags static %} {% block assets_custom %} {{ block.super }} diff --git a/texascale_org/templates/fullwidth.html b/texascale_org/templates/fullwidth.html index 5661fc0d..f2d9ca54 100644 --- a/texascale_org/templates/fullwidth.html +++ b/texascale_org/templates/fullwidth.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{% load cms_tags staticfiles %} +{% load cms_tags static %} {% block title %}{% page_attribute "page_title" %}{% endblock title %} diff --git a/utrc_cms/templates/home.html b/utrc_cms/templates/home.html index e6ebf4c1..6f930ee3 100644 --- a/utrc_cms/templates/home.html +++ b/utrc_cms/templates/home.html @@ -1,5 +1,5 @@ {% extends "fullwidth.html" %} -{% load cms_tags staticfiles %} +{% load cms_tags static %} {% block assets_custom %} {{ block.super }} From 043869dde87ebdbb8125b9e27d2f6eba1e9afef4 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 23 May 2023 17:38:09 -0500 Subject: [PATCH 06/13] fix(brainmap-cms): move template to _ dir --- {brainmap-cms => brainmap_cms}/templates/snippets/site-css.html | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {brainmap-cms => brainmap_cms}/templates/snippets/site-css.html (100%) diff --git a/brainmap-cms/templates/snippets/site-css.html b/brainmap_cms/templates/snippets/site-css.html similarity index 100% rename from brainmap-cms/templates/snippets/site-css.html rename to brainmap_cms/templates/snippets/site-css.html From cb19e7d03ec295096796994d677d4afae8356840 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 24 May 2023 15:42:50 -0500 Subject: [PATCH 07/13] fix(lccf_cms): rename static subdir to lccf_cms --- .../img/org_logos/favicon.png | Bin .../img/org_logos/lccf-white.png | Bin 2 files changed, 0 insertions(+), 0 deletions(-) rename lccf_tacc/static/{lccf-tacc => lccf_tacc}/img/org_logos/favicon.png (100%) rename lccf_tacc/static/{lccf-tacc => lccf_tacc}/img/org_logos/lccf-white.png (100%) diff --git a/lccf_tacc/static/lccf-tacc/img/org_logos/favicon.png b/lccf_tacc/static/lccf_tacc/img/org_logos/favicon.png similarity index 100% rename from lccf_tacc/static/lccf-tacc/img/org_logos/favicon.png rename to lccf_tacc/static/lccf_tacc/img/org_logos/favicon.png diff --git a/lccf_tacc/static/lccf-tacc/img/org_logos/lccf-white.png b/lccf_tacc/static/lccf_tacc/img/org_logos/lccf-white.png similarity index 100% rename from lccf_tacc/static/lccf-tacc/img/org_logos/lccf-white.png rename to lccf_tacc/static/lccf_tacc/img/org_logos/lccf-white.png From aae497ea0bf96f9f5390a2812600e4db231c7d53 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 24 May 2023 15:47:19 -0500 Subject: [PATCH 08/13] fix(brainmap_cms): missing - to _ renames in code --- brainmap_cms/settings_custom.py | 2 +- brainmap_cms/templates/snippets/site-css.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/brainmap_cms/settings_custom.py b/brainmap_cms/settings_custom.py index 10d0ccb8..79b1c4e5 100644 --- a/brainmap_cms/settings_custom.py +++ b/brainmap_cms/settings_custom.py @@ -75,7 +75,7 @@ LOGO = [ "brainmap", - "brainmap-cms/img/org_logos/brainmap-logo--light-text-trans-bkgd--icon-only.png", + "brainmap_cms/img/org_logos/brainmap-logo--light-text-trans-bkgd--icon-only.png", "", "/", "_self", diff --git a/brainmap_cms/templates/snippets/site-css.html b/brainmap_cms/templates/snippets/site-css.html index 66f645b1..856564b3 100644 --- a/brainmap_cms/templates/snippets/site-css.html +++ b/brainmap_cms/templates/snippets/site-css.html @@ -1,4 +1,4 @@ {% load staticfiles %} {# TODO: FP-1652: Move to template that extends core_cms one #} - + From 19661d88de151b7ea83dd1fc88e5749ee8e5a898 Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Thu, 22 Jun 2023 17:06:27 -0500 Subject: [PATCH 09/13] feat(demdata_cms): delete a.k.a. migrate to core-cms-custom (#173) --- demdata_cms/__init__.py | 0 demdata_cms/settings_custom.py | 124 ------------------ .../demdata_cms/css/src/placeholder.css | 1 - .../img/favicons/Favicon_64x64.svg | 8 -- .../demdata_cms/img/favicons/favicon.ico | Bin 34494 -> 0 bytes .../demdata_cms/img/org_logos/Demo-Data.jpg | Bin 69240 -> 0 bytes .../demdata_cms/img/org_logos/Demo-Data.png | Bin 14792 -> 0 bytes .../demdata_cms/img/org_logos/Demo-Data.svg | 1 - .../demdata_cms/img/org_logos/tacc-white.png | Bin 16695 -> 0 bytes 9 files changed, 134 deletions(-) delete mode 100755 demdata_cms/__init__.py delete mode 100644 demdata_cms/settings_custom.py delete mode 100644 demdata_cms/static/demdata_cms/css/src/placeholder.css delete mode 100644 demdata_cms/static/demdata_cms/img/favicons/Favicon_64x64.svg delete mode 100644 demdata_cms/static/demdata_cms/img/favicons/favicon.ico delete mode 100644 demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.jpg delete mode 100644 demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.png delete mode 100644 demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.svg delete mode 100644 demdata_cms/static/demdata_cms/img/org_logos/tacc-white.png diff --git a/demdata_cms/__init__.py b/demdata_cms/__init__.py deleted file mode 100755 index e69de29b..00000000 diff --git a/demdata_cms/settings_custom.py b/demdata_cms/settings_custom.py deleted file mode 100644 index fdf694a3..00000000 --- a/demdata_cms/settings_custom.py +++ /dev/null @@ -1,124 +0,0 @@ -# CUSTOM SETTINGS VALUES. -# TACC WMA CMS SITE: -# *.DEMOCTRATIZING-SITE.TACC.UTEXAS.EDU -# https://democratizingdata.ai/ - -''' -A `settings_custom.py` file can override default values in `settings.py`. -The file is loaded after default settings but before settings assignment is complete, so we can override settings in: -- _either_ `settings_custom.py` (usually set in custom sites) -- _or_ in `settings_local.py` (usually used in a local dev environment) -To override a setting: -1. Copy/Paste the default settings. -2. Set the new/custom values. -If a setting override is for a custom CMS Project, the change is made in the `settings_custom.py` file of that project's directory and (if not a secret) can be committed. -Unless modifying default behavior for the CMS Core (and thus all custom Projects) (which probably means that setting should be in the `settings.py` file), the `settings_custom.py` file that should be modified is the one in the appropriate CMS Project directory. -''' - -######################## -# WALKTHROUGH -######################## - -# To change LDAP auth settings for a custom CMS Project (e.g. `epoc_cms`): -# 1. Copy the setting from `settings.py` -# 2. Assign the new value in `Core-CMS/taccsite_custom/epoc_cms/settings_custom.py`. -AUTH_LDAP_SERVER_URI = "ldap://cluster.ldap.tacc.utexas.edu" - -# The same goes for other more commonly customized values like below. - -######################## -# TACC: PORTAL -######################## - -# Does this CMS site have a portal (default value: True)? -INCLUDES_CORE_PORTAL = False -INCLUDES_PORTAL_NAV = False -INCLUDES_SEARCH_BAR = False - -######################## -# DJANGO CMS SETTINGS -######################## - -CMS_TEMPLATES = ( - ('standard.html', 'Standard'), - ('fullwidth.html', 'Full Width'), - ('guide.html', 'Guide'), - ('guides/getting_started.tam.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') -) - -######################## -# TACC: BRANDING -######################## - -# LOOK INTO THIS SOLUTION. -# from taccsite_cms.settings import TACC_BRANDING, UTEXAS_BRANDING, NSF_BRANDING - -TACC_BRANDING = [ - "tacc", - "epoc_cms/img/org_logos/tacc-white.png", - "branding-tacc", - "https://www.tacc.utexas.edu/", - "_blank", - "TACC Logo", - "anonymous", - "True" -] - -UTEXAS_BRANDING = [ - "utexas", - "epoc_cms/img/org_logos/utaustin-white.png", - "branding-utaustin", - "https://www.utexas.edu/", - "_blank", - "University of Texas at Austin Logo", - "anonymous", - "True" -] - -# NSF_BRANDING = [ -# "nsf", -# "epoc_cms/img/org_logos/nsf-white.png", -# "branding-nsf", -# "https://www.nsf.gov/", -# "_blank", -# "NSF Logo", -# "anonymous", -# "True" -# ] - -# CUSTOM_BRANDING = [ -# "epoc", -# "epoc_cms/img/org_logos/esnet-white-logo.png", -# "branding-logo--short", -# "https://www.es.net/", -# "_blank", -# "ESnet Logo", -# "anonymous", -# "True", -# ] - -# BRANDING = [ TACC_BRANDING, UTEXAS_BRANDING, CUSTOM_BRANDING ] -BRANDING = [ TACC_BRANDING, UTEXAS_BRANDING ] - -######################## -# TACC: LOGOS -######################## - -LOGO = [ - "demdata", - "demdata_cms/img/org_logos/Demo-Data.svg", - "", - "/", - "_self", - "Democratizing Data Logo", - "anonymous", - "True" -] - -FAVICON = { - "img_file_src": "demdata_cms/img/favicons/Favicon_64x64.svg" -} - diff --git a/demdata_cms/static/demdata_cms/css/src/placeholder.css b/demdata_cms/static/demdata_cms/css/src/placeholder.css deleted file mode 100644 index 46e7b292..00000000 --- a/demdata_cms/static/demdata_cms/css/src/placeholder.css +++ /dev/null @@ -1 +0,0 @@ -/* FAQ: The CSS build process crashes without at least one project stylesheet */ diff --git a/demdata_cms/static/demdata_cms/img/favicons/Favicon_64x64.svg b/demdata_cms/static/demdata_cms/img/favicons/Favicon_64x64.svg deleted file mode 100644 index db0ba21f..00000000 --- a/demdata_cms/static/demdata_cms/img/favicons/Favicon_64x64.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/demdata_cms/static/demdata_cms/img/favicons/favicon.ico b/demdata_cms/static/demdata_cms/img/favicons/favicon.ico deleted file mode 100644 index 533966ed9f6346e9428e7b34ca693b5dab0a6966..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 34494 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 W4Dx@^7z1z5SmxsaPGA3z5%^ys-eMU5 diff --git a/demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.jpg b/demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.jpg deleted file mode 100644 index f8a93bd519432b853065bff3e59b5a79c5b17d3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 69240 zcmeFacc2r+_Bft_x;0Fb7yDHIdkTmGiT1s z?2Ly#JhVyH$7aUOvL^7fHnqxRhrXAc?}=yfnOr<0wyMV}WH5?5TfUdoo<2>j;I|1t zAO3sji=H7I!zOtMw;6YsK!Hrw)9OeFndUw+Sz5?TgavI4g(Iz9SIe4Z-DO>5N|}tJ zbE4B{_5)fn+=R8}08lM`?AiSRs0BQ0+pM0})?@j9D%F=3r95EM1EAFmo1;PcDv;(& zd9jwi6Ql=3Q?+z+r&?M941)BaTAFL5&#%KY(ihg!Oj=+7OpRxeNi((dOCWu1vA}|K zivy&m7ZYp=q~8bWv-v_g0n&RwdO(_`axz(`p0)fuOUFT40n$AsKY@YtIGL@6^wkizKj|D@2Korjckl6@cGu7Q0WYxDM+n3k)qkww%;1@e~s9Itqy#gPp~moVg*nY z39Kw3a6sJxlgKABLTf_!BMtwTXdQT{B^!1P68#q(lnt0PR@Ud80kW3w-;#Cee~PT- z;(I|!(^0)Sx|6b6&kGL!x?%Sq4a)1k$Ne<-yIvU#!vvcve7F)zrUf zaMSRnQBCqDRTJDap~=+bXd;@zO_w!sO+r(l>GGz(H_d3ewdtOw`Av(P9%)+H^nBCn zO>3GyYWlosYtxTSdz)LDdo~YfKBIYbGt>+>BhB_^fAb~HTywU$+I&^>P0e>T-`D)l z=H<=LH^14uu6a}Qcg?$6WG$z(3~U+E($)gEU@h*JNK33mYMI({eaozt`&yQ^Jk|1Q z%i5MrE!$dt?bM}H|4yx)+B#j($=WHu@Vys+~VonP*}uJe}8ySsGhGO){-F8VIkF5xc8E|a_5 z&}D9yWnKQ=WlfjOU3PWt+I4VOdDrn>-Ce1!`L5Hu-re<|T~~E|uj`hsd%B&{ZFo0T zH*>d0H=)~=-DY)rsM~Yh-s|>tw|(9FbRX5dy}P?R)4kGtX7>f%pX&Zj_buJ`_2}DU zOpozB{5_IAuIO=BkEK0c?(s>FpH4aDl#!K=&rkWaXTP53 z^~8E!+_TX0rk;y>{=4T#J%8%etJmmW7xs$u%J;gd*Wz9;_WHEfo>TjuI`&ljROZxa zr_Mfg`Kj-ny1jSz-lKXWy)W%u?LDjaW4+($y{%98KBN0!eW*TD`^@gMvd{WHyZZL; ztL*FUo9=r<--r6X-uIh+UHgshXX?lFyQ<&){a)<1xqnOlv-)HG>HdH3zo7ri{kIJ0 zGGNRAd_Z!*i~&mqtRArQw0@^)P9sk%pEmonXHVNSuw~%rf%rgv;LL%K4*X!?-qX)G z9XXvn{kqeap8nqHzYH2W=)ytlpz8-M8?~IP@Wk-jhp!s`ZR=^RNGsoZSL;iyJ4Xx~VI5HzF@MDB5&K4t z85tOP<;Z0tH=fnwEcmS0S+}3{!dW}d9)7m-?90!7`0S5Ibsq(fijTT;)T^U@89ion zaP&2!pB(+om_cLkG1V~-kNM=BUgu0aCwtC)=e&PzmviBBQ|Hb-_uccF&(oe4KX3MV z@5r0wI(b4qSH9-_&gUD>7tX)${Pk@;+mNDeJ8r?a&ErRor^e48ziC42gv%!UW5TA1BPLQ4@0<9=g=byJT)6PUuaR?+B=S#W zJE}k>^a=DAtR0(z{oB}Lv>2~9t~T{E1x)vtJ~fXtbLNN5J1ttvWXr#;ovn83E!Oq; z890qE#&_EEwkfuk>^<#1`#ttA9OpSC$5YN`r_Fhr^Ap!7m*9HREpy}U+uR#HV?0^U z)7~y#k9W5BD?&+JPQ2>t@0;X%$hX^%`e*t#1kMQ*0xyug$&1OwlHx@G?||K z!sR0_zvA-Gryx`2Pi>kSo%+JGv!-1&ZOh**e|zwX9#^EUc>7AlmA78`^WTGif9k3; zuKL?mo3FN9{qXctr%Th; z*1S7=+*!DD(_N0cR@{B|-8bL8|DO0g>t>^~m(3YA=ejw+%w^`jckhMwE}eJAyczTM z{v+{^59eFvFTZc}eY5WGa)0suuNIICUVQ+5VDZ8s3ui1mut-?6=|SSbmlo?6FMep) zLo*+4ez@@P)_-37&v%y?m#kRYwsiiofy-w6OZKnAzrKCsvPV96)c)uTkHL>EeSFm8 zbDrq`#P!RYmRFYVd@}yzrWN58YgXD;zVOrqPd)MU*ryjgGvb-q&z|<|%;$PMchz%; zR#jK+`nUM+ZO?PhZ+>CY3maYxz4-o1-j`OtY=8N+SIn=x_$u=1s@KN9_RQ<;udjRq ze&fkEb#E?zOZ(OnZ)@LvVzqAd@^|#_ta#V(?o(^Vt$FUfiSIqX*0}bS_wo1NT<2Q1 z=7YcoAFjW6{iY9@55M_{|LBL0iy!aX@V8Goe{%iCJ{xC!I_%T?K0EibWt()Hp8eeT z`CDK3zSyvt-u&H{xi9x`x$3K4U(Nb@_}7cSQGN5wR`b?(zrE<&E#HaX?b|l}`@Y}L z*?!LU$9G(~com+m8emL~w4L=S3Y0=M`pI_MJ+4bq}^zMDXT)$`Vo(F%0e|>dt zaPQaqO8dL+zw5xc2c9};KlsU^^r1tCKKHFZ9OntSu@sYuvSaB?8Y)vFq#Ub&WaB25 zLFAQU^Q}>qO9PVR5(S9jVG*CiS<=oe!7~X4a~@i6MBp*x0lmm zn$1(KuZsc+Zl+LfBt!_UYGJwR%l#KhVOqxo=s;BEZK4gqXQJvJk8 z5D4fEkU|BiRBZsFEmslpRJl#aoz)<6gpLu+W~78zkNRqKsc5Eve_@%3658e(}i%?kM(5TX(~5griFQN$BU{tu8Wc$zyoA_pbX+#l8Hbeo^c{+)Jhs?b@Ogm z-8hDBk7cAZm7kDEQydE=MV1=}9m_ptpf%8ZBG0oO&;gNpH$nLP@wrC|_(ZMywDXhz zY^>bIG^SxACm7jurp-v@sWv{tWpd-7TBqO>#}jGf9#6Z@+i%$z2W-C`lh~TP{h16u zq2U1VV_Ilc>BlNs&v8<8LZ~f~oI4KsEl!7)9xY-4i|mA&t7uc!{`D&r?OIK{O53K; zwJQ`Ih%_L7L&KS260yqfXy_U=A`SEoK)*!?ZjAvl`W=B2FyZV7`x`p`cp)7Xs05$; zjeKiDKVH0tt)iig*4iJDl5%XVCypO^q$?hEZ4KzdI6!DMSJGZeF!}fdl~z}8UWcq> zTph)$DXtC?XKPC&6JX6Tq{CS!!#ZraHjl}24DWE}$?)o?J^?Z$Aq|3feW{3z;1Cqy zOo$IbaRf0!dM}a-SmH&-VyIFULkTxJ3r+;lcvHL!kt>k;gCYRF_Lz{-XO)o)5N{0` zJYEEaSfyr=5#xf)RnX9SY3zbk5-U=}9L^9)Ef znrx`ooQhh>JXK3VjhdrDGEM^^6saL0DaJx3DUd*owO7PR^Mub^D>v54IcG#k`04~Z zW`=(Q1c+$r%?D^vHL9gSs6tu2oZaFSaidA=_H&%iLaL({Qo&$KZ=E2}t`rX0Qn<-g zjE2y7Q~>R^5In5{7I*kD33Y9AHO;${Cao(O&N~yD@{#hxe;XXq%DO$-h=5b&^ruv= zgred|Hca9-2>;`2Lxvr}%s^v_BN@hO02q7yjfgsfW}Z5MMS|jnao6CE5{&8qs4=Mo zdB)UnMA1YVC@QZB0K6o198t_y)1D^|e)2g(DiU%fj}ioV00H#nfRm%Fgn~9^iViiS zW-3}S5_A^As=DUuU?+pE6FecpG1NbmI?_2ha#*PMU1PZH_J>stKVES9P*Wrri8H~n z0yozcmyD{)MJ9xEv>J_vRRPZ7L#u%lgB_{$|5JiTDrx-vjU777Ha?OjE0Lf!8S$Y( zDoCoSpjN2cZkiAo3tx;TP_fP-NSxdTv9b>|ou|_zP)>j&YyDQm7a|qVdsNyK6(Yo_ zO2bh>4Ob`lKUn|qoY&t_RgJ^L1%A<^LCj{j0D7mVP7t_cqaJtx6m>cf#6=5r3o+L{ zaRUi;Vq_QrmWUu`I;K@A`Ecl1w*;R4=+jXthcoS-dO~oCkxC=WtF#4hi%Urh;UkEL z`(*&ZIK+dXUc}->SOjx6dWszwI%32TR|(PAygK1U?T85mP8f|KW(^W9p&7)YKxhtC zBi0hac`*xu=a3YFk%%pW2qi3q*i(qaVU-4l4jL&UMig;|kxI$vMO*f}rs#IHdKui1%^I9ewd^qM&&NTX5CtVBX3 zlq*>rNCZdIoF$G>DKzJ`Xc5|kR=idMVN$5ZYZZ|gj>Cu4!Smj_X1jCFz$&Q(Fw8e@WU2N4}^lsLBzfoY?n~b;Zqihi|Elz$xmm8FXKT~CM$!m7F3(EN(c*~2HdLk#xxj`!>uK*f|mddoz8gM4LiePjiPL;P> zHF^~;8>d8!WX8oHDz}kJxk@E9TPJ9Yac)ydQ!u7d?g*lVjAG86=kz{fLF2)^FmF_t zJR#1YGit-0TnX|RC=>*MpMP<_m;sxs&V>7)MGZu0|7Md70jkofQtJXO*Y#V zfoj}eG7~uILdl>x1UytZXfU%#5ZGGUoJs|wDCIFrcu*OS>da+D$V)K1S(6G$@tDsH z(P2wDj#w;#aGk?MJW;f`0%3VP#aRM@2vtrKmM9%j6B&~wk)Z;FsJ4h2s!T{ZOW7NB zm-9)BCKJuYird)N_30ge?#u`^zts#U-6KW&aSY*v{En-b)SRU2M zt%X#~REFhNRVv1#a>y#raAqHh;+7JZ#*8N1gT$?v8OK9`c%5LzXLaMTT*6kdk$47A zNEHWzmoiB==1SvQZ?cr|lx!%R^7{zbX3wQmiGa=K=XeSWhHNy=8!BPJ2K;%vLaFNn zZ3RxSV2sVC&Is8`jJ6|+jHePW+wFKpiKQ%dKPOU^G-GFwERx75?P)HXu1Fqx371@n zylB@dB!#bJb{JE+I>Bh7l5n`_yb)8Pj!-zCt*GOUc(~xlbeKb;3;G0{aws#!ln=5x zAWg~TM{`cQx1_3?e9l0o%q1;4XAG~{leR|W;1qKerP1kfD#F!R)va+tCWXC9@GhH1 zp)v;iu7E-ruZA#JOrdgBBNbOxqtf~5luL!E1!FAaM!lMVG2wJOIc=Ro)X!t?5Ued4 z1+6<7)-lFx#a)2)4u4*9>oR(su_Smb0a!FvlO7*#2>VrW4~xigqn7hz5xK?)$2}?& zlu1H~IzcbyLLw$C?R7J#Jz&mysWPfh;U%wN!}0-#+FKQkv49655SNKi`0RvJ3+$LA ziHK-cr@{#$%~-OEXo;wj);d8}5d#w!689+*gwMs;tN}jhqj(!^%BX#U(q6806Q#?M zP8Ab=Omxzziq7w~xqK;=-_MlYwt%+amlzLXGBoBXeyz)+CJ`ZEHG2z6lO;f+L|SQ0 z2a;xA%COhANWjbcJftg6+Rdbrq-{Z?GD4GCK4?%fCQ@q))j8Cdxnj_& z3|EvXDj4J=1#`v<{!k(>DT4|!%9BMtWF+Z0Uk!$Q48xk$woqJTqh_5UR5HZEq`VqN zNRCut4SyK+l;eJtB@vF13184ohl^;^t8$0J@_fn*CT9^h&wGMFUxa1So*?Cm6yky> z$oeC4KI2g(f|R=~dR1wPikTY(eU@yDDl(E^RS+o1kRw%VYhb<~?G;S+UD!nOM z))rX{M9^5i6c>yf?H9{@$XcRP`HCnwQCg|27OdVty~&IfRaC8k3=<}m8o(DL=2dbl z6J+!*jVTl_u+Fm9E~ITN%jgIp%d;gyA66H!7-ojKP&FP4m<^eb292d{@;bqi04HM_ z0@8+2D`!ujSjH@Iv7YBn2hx?Q90Bg=_!tS_Ww|FR zPMyuENk{4g6EU4Vf=l*96?5>JBAm3iot2EDoQxz~kVczM=5!ucM$V=X${Q7p!IWQ4 zWNkQ+60$yx*5yj+sQ_;C*?EtTtP>1rLpES}K|xE~d37+PvBjNfMA`g`#W{ znO4}NlD0$(c$zk7l_`O-vtFC7Ae2?Hgcj0eENM<MNu+WatgcBBt;X2I)@HQ z7njOZF`-A0oHba|NoFp`P!*rvf#s@+sw8>&yse@%>4Ww>XHl`yXeqBss5Opwq~Nk> zeUg9`k_BBpnrjd&=vWw!R-#2BXh`Zc_F~2-hx7(r5egx+)0is-W2gqU#Y*|2G3fMw zMFXp;nj;-$I%y$tQDa$QwH9H{P;pcnUC*6MYb(j5JrCzp6@Ap{qASX(Kjg~O8dX(_ zdR(wvqc95ILf!-`qI#dl;6N1$zrUO(Y)WU5^yfo_k`Dz{E{3i*St&P$Bd%md6|6>J zMpUVa#VF@0nbo+&m|Uu$I$mWnd015IAkJ0544QyHUUl32ntU-CmU|?v)suqUL6eqK zr|Sgy0*IS+LdIE0z`8(GRJg^ct`L%FcTum$qj?jnqVgVUi5ctVZH!H`y~ zg`zPCg5;Xo3^Nr~*?7d_Z^Yd(D2m|TMvRSeUJ&mFOehyHqg={@dc!uX#DS2Fa~P3~ z9V=z*wSd`(lxqKZjflo$LSVNMb^6Vy*KaD9qLy-wwwB>oy~(vi{lAi_7RtGdh$0MX z2wUO-!c1fuWk+EChrh=Y>;MeGV426uftdi97L-f`g5U(=brMJnG9is=xD}~2%-eD1 z?={y6A|>1cCNEYDNrC18fLbvATVOAOfz|?%&^YGJH~PV-13w zlK|@gW}LvwUeaVSsZ0qvYzjCD*OUoN4&Oh}CaY6mZ;@aoVsr7m3?|=(0WqnRk(PRH|qok4fqFDBI;vSr97r~o8n>0n!wZcgr))vU5=%+K9U#N za5|EW3N{rhXzfYS9!!h6gqY11auTI0W@_>U&Bu+XH(;ta8JLL)16C2O2{>*tqF61& zFqs2{D~@xKG8ZvbGEr;E?6eXZp9?dSwgg=?Rc%JX$i*pNpb|`kfg?fHp2oV3i?x}! zG80IZxO$Uq$%xsKU{Z`ZpoX*VYN^7B3c05mxA{_er$3EhC-6@fxgseTC&FU(7DJw5RR71;1 z3783jnQC@sgb_V%P(vj|i$DQy*x-S4P>556?RgI?PmxYC5>)w9n2q7Badnvtu?EP4 z=+Y^gP3w$}K`P0m2%cwItr1qGtXauoHj)^j%mgtdSOg(aouEZwwVYDHd7Y$9@(Q&- zPbpF%UkJ~o(gkzUz-seiMl0E=#w;Kcil?z)Oym>BoSw-ivV5MG`(r}IqRyKOv8q|= z(-kB_2>bIkI%Bn&v;iN^m$GiuVZ#hoW7JlXm&z8qm^?g;20cPt&t%fDUL6Tn)VV~3 zQ`?6zT7gT@WF{LoL?D|!WFRSsE5uw*ST0m5grABwx*nZi zSs&)JxHO7zP61(A$>z)AMY~`Fe3}zkfrfaaRw<+kHWJpUU6NCwG&rbADXrHM5}g&4 z3|c892&>W2utOO(qx3!n&G@W%%C}`qEZS$t&0Z1lCm+AqNsq6R`?YPqClj;3VOs! zidYs71oDKLq>SdEKb+N@Lx1Y0&f%X0{xfiOf+wiFEWs6zI|d_Mu@VBoL{ujjV)6`| zguqmWO;!yQ>$b{ajV~bT_*hPp1z)=$@^}TR6O=<92yttZPzg;J>;*^%W+R9jWR@_H zsiHJlJ%rdnW(fnC`m_g%NC~M}!w0B<5P(8l4b(b80IG+9&#!?ZmO6fhE`oO$f)K|M zd>8?l;2mTZ!jR!;)c~qw1gJ1ltGZ4wTaLlnc;05V>*N62(%yDG<{+3T`i6CRsJ)4$}#hf+@x9c2>akZ@v&}&?W>P9`wx}=BK|G@}V5}oR22L#SKO^fphZ5lI&j?%()u4)1APS%s7&)rz zk`ZLWNKIFDf^~(JFkl5R0!nIDP*a$Jf$Ube>XCzQNQ06PgcMPE0?HaR2Hp@dM0Mqg zh9G>fJSLVDl1^z4=)>8@22Jv)W%Gp$8*y0_a(OZr&C()M$=GlWnM^T>q(>KXXw1+w8!@)a2Z2tJcR7oq9+NA@aI~OG%fT1X7EJ50 zgp}5}h795yWW^wVNm69!a#~42T4jt+T6`8|p71$+Nr=#=V7@V?s(l`ZJQXS=^Q_vPFR5ILoWAUc_`r;U2y>bgYE;T?MNSAxE=RLVHREBUOD5(6wvRFE37 z#jFD4w4;ny%4P5{lA_}Zms?KhXv$_*X>nIv!bK*L&E%`JBU%aSDusN}UMV^-3r?gP zt0G3!5@F+ZSe0Rw{)8kYbcHBbLkl^js?VOHeMP*?#H}VSne>{JaC+|(QjpZMy1Y6VtjiE%ZHZKhPFPb?rlPRtM6;IwV_ibZkxb(!>q_P%JD~~43zE4S zNVC2OW+J#?2GvD)h9faOOcba<#?IFXl7y>hLNFWeA_5$f*9BZONf|H?6w5$HdBHAa zqCvN>T5xb`FkYq5q(&vd5Xl=;@pLjHCgm8XMboHSg{m`kg4sAs#zG+oF($0QMfp@p z;ISQ1C+M?EOr^3HY3ET^jY_LeiUv@#uFQb&KN3uO%n1w=18G48RxsUlg7TmySB^7G zP;w+p@~Bmk;9Sh1tTG|8VkpNX2kR@k9HpWy6>#Btw_3~^%SpMaqV&Z@bw$iaD6kn| zQi^I%OkXE>SX5y~9)%EFwivSuT1Jh70$#0Z92T&Eq=;3NmZ-8}*k%!RP-?QQMh=*I2_2rTA(FsUIOb>Hgy$6qlCxhgc`w;CvLWgOwwoIY?(}! z`?!HTCYrq9=A#0s4Q_GT$05>Pqqe5?{M zJ0p<86EO2WZ_b)5Hf8~pcmOeS$^dPqxO6sUWqBsclaWY;_2YU12i`27_ZA!}yP4Gl z^M=OdAYCU2=vQza(u%xpmOU4>#6^xk0I>CAi9y zuIMX8$mwacLRSLLg7!;xLk_Cwloq=_uXV6qUC~+ckro1c&>9VsU=y=8JW`GI!y{wl zv4I_=!by2Fl!gLD8>EdCj`U@pJ>X*Ua&@IlM*kblc2sJ;$$w}Ke^Rp@m0BnG$C|B; zn=s@QpgK+kFBIi9<0%MQb1dzWVj#eBX4GsB?At}bK37y1uM@OIGJHA*w&z@UI08mt zEAIhuu^!C!EM-zjMT?~9^Q*nn4KA|?Mu~tV?uh5fKw?g4; z%v0iy1a2zuYPA*Y5a_f9tEEy&gQZDbEUq?0;S`w9nze{gm4Uog0SrA31LFZ>rxzwH zY)HhCdb#Km9GPOVn8xZ&);a>Ql&4~Hh^S4=z=k}PAfW&gb*qEkl01dQG2RmJ=e-(HcgUP2?NZ7amZsY7CptrQWdB@ zn61?gK5(klo)n>q7Ot{MDy@c#lqTXg`B}Lb_QQlrmxRGGd~FNQ;1;R4mM$pm*{mP5 zhGA(>yb&yUDhA0I!`v}@32fY|X)NIiu(bh8PBL=FBNrKE6cW)wOrB-!nQR4efW;-3 z=+3BJRgsl~axtjoECNNl9E~PxJyIy^ChUHv87pHpB1BvHAg3410h>b}3JLLWCgiVZ zCDb7XLxN~1WwQ{j0H08)owVDQ^}4FQw9=QA*M`@+34KIkQIv(tM@&v* zij+IEm|61L^LaUK6$)t{^>_@aYDgspRf3upln#Hx!J4Bbf0?MbSbbHV3v&?+ttPz5 z1mVy*6y9u(&4IoORwiMEln>*e1DIVR%J_4FLn*mY@HJIMFX9SV!Yx|7v2;(AasgVf z1;M_Hh6joSyGdF}3RkP5R?J1fXzGfH;aFCgGt*$dCsFpA#A+%{Xl);R!1z&x*@RnM}+)(S1=JZDAXojnq+-Yk#+g(`e;C%H3#&C zScQf27L7Mpo0SwCVI|;J#S}uJ8bX{5#-Rp5no1N^tbt8POi}I^_@ol-dB8jaPRgkS*WSXpiDzdjeMQBu@~ z${HmwR37Ck3r0rc@$4Qpn_BB@4L`1Og0^Y{Yz%c8JzB6yrJ-V`gtvm1UGAzGd=>`* zn~B)u0Wh_(5J|I^P=Y$Sz(Cd;rweD*s5}7H zm(r?2PyjoSCBBjg=|mIH>B|*o5TSkUptsC5f~5c#w`Q4qp8c=1Z5|@wy zridg{P6v-<$hh6&S8%>yECCjqX)lIZq=3CBCV>+)R`imJW4%#%wXsA{^lJ_7g6JaC zX&=}$qHI-5lu`%W2>9eT=uH&!2}ubZ-<=x$>;!pr8UA7EpC|xB1*GzhAAjteP2&*F zZ;#phCnvdT$E;3xHmPex)Xq-g#tDT&f@#-jO**wfp@VgpS*ZlyG3ZPxBMj@ofgB9gDD+3@p8)@Nb#$N& zm>$aj@-arEVN`mmjnU|JZ5ljlnUZ>C>t)c_^??~f9E>D4rLjc<~ z(ux0&bO-d`kv6hYqR294DU<$_hrGts4{Ww4j`36%C97a4eUyURV2v7X)2KAcHcAy! zw?*{|jhbfEtd3^KLBGR2#t=9Pc9=ACOiM>3sb#ga5{@d`D5YA}reSq#8%zV4(u|(g zD`Wa7Ab*5<2lNwB&-~Z6&|v-q_$R6c-1O48+vRsA+aU9s@?#{9*jxwAbU3Vc*r2V6 z95~@v=}=G;U+t8hkIf#Rd!zsy!2FL+@zsyhwo`QNr1FFu1&pL7U~t6tNZv7)kDcOc z0Ccd8Blh}d6bkv%yIn>W_)!GO>J# zl30WTPT^0T6>X3`9`BFo({XUzm1QPCM?`ld zU`j_>@D?rs#`tIv7!Kus5kuSQEDe(_*k7C z#s+X^yMfsu@1(dL+|p6p4tXcQJtEAbk~&_oHMUN8+`U#%lj(o%vX4{UU%GAoOSiz5 zjy%Bq{?%_Aeg3b0d&DRX|2-UfAN8Vt`Q#H`L2}{&{RHFo;Sn7dIEiHvwd;D0_x*MM zj#Aw5xj-5JrQ`oUJD~o4qIPsdJh{g`jM$<39YySr_uHZL#G_;*_jnl|39(Kr_i-IA z+iCaZDJfqNJyND-^b>+?bR2Y&@?$(5N9FKcGrmH!aor3~WTFY-cuK#4=|BlAVYCAV zm;%j8ho>JNaL*K>@aFW zZXNESs@q^A7u<3MZrFm3Ua|E%^Zbq5_}_Uw)~5d*dMBjvS0yJD%O7R_C9Xe`%n9@V z64wdE@<*9}iR+IfbHe<;#C1Zk{88p#;`$@WoG|}n;_7kil1{LoJ$_^fT)}y0gAA+x z?*?lB%Yljo<6+P$T@sRt;Z z)EAVuG`Dna?$opQDLuLZsOF{`8(sVM>(+n7NTmuHfO@IZ&LW~&>58jvfBe1oyAM)> zyE^;~o4@k0HEVYc95veP`}@_m+EqqaRuU;FfnnQc>=i|Ow!xNYQJAO85-oFyOK z__~?c%YS~#qgPeT&n3~oud~w6FQw8;PWP@a3|bv(zvQWnD>uG!>pZ92RypguSMFFg zbDj4gbk~keTc5po-)F;LMV4+pB)j*emzRB0%u>pC(z`!zetUebcu2P2GUkxXefhz=?;UnXcFX$@ z|MJAV8u+%Ia{&03gV7)W-!kdly_=sMpVRc1wm>yaF?H(Q&kdV)^ZSQnouByi&E3!? zV^15p>Zvj1>Z&vPt(tkTd}iT5?}P1YcgL=n^z(H0SH0g^Yj|dW8V z`NHOXBTG{+I3zn`$f}v&K0UL2cgyCv6Jzm-KlGgU)^P3j<6o>+H-9_r%8&PN*?Z^G z;XQk8yME(mUm1Jv-9GNS56`-3_|uvp2M)<@`}OZX{rt|(&wiP(c+V)%#Ff=gcfPxE zt>1P?_P3pb-dXGY`qJm;2s4+)uHG{h@G);K_F|;^QH}4%YJ6WL44wVa=}%3W zwrgb91Nk$FZKGa!ZSR(ECSCL8)aafAn#<|)~vJe=kB=W)TQD~$JTT9{P^`H>mDz;?tZqo zd)~^&%NwW9UR>I^5qja~l|Rq^Mfvr*ZmaW)?tSZ5>5j^)3!gjazHHFsQPG<=e6{1W z$FKVPgO^;hQr?q4UwTORPBh)R!u?o&RSJ@cd6&!>|5e}{+q`~To{3+2$Kv&0KD%aDV9Rjz^K|>8;zP)f zH+=BiM_=?k?^8k|s(U{!%1=LU&~sJxh8v|#*Y58(d;7J0_PlV{j?uloc)r+W5_6`3 z4&AtK^5oN1U*5m&BJzpzC#=|8NqxHUN#W5wk8f#T`@(Y>?%w|NZhN1 zcJk~`bs6H`y&uo{X2Z}@IXz{=%=70yv2=5aT(WP<+poP*{B>_>`7>ib{(Ae45vMpuJN@wpe-O|xgP2VXxeu=M`cZ8wA#x2d-1`0Ky__UhLo^Y6GFy7t#s z#EUNWZ$h{`N=auls4}24TZ19`+%`J^u>ym!)&7Cq;p2UBKzrJG169>4Nhh*8!tF|9l zII`!{Q;UX7f*a~#DU(A&+S`TJCpD7#IG;U+;vFSd+|RO z&dW@A=cfaYtTP;vtpngcT>ADit}UO>xaOTbUrw99d(0a3oCjXHU{m4A)x)M#6xD;2AHUi0O1FXV}@`%d{+`)3oM-~Hmu z?W-sDp7y=cJz?YJot7<}|IoA-g{c>Pb;&&|=0~JGV^6R1@0v00GiZ6&i>LK2zA*FE zhkuy1?aF&DS-GOuq#ns3^Ps)UcWim)yN~X_e&R~S!@qnvaTH)_+H7|B^Qn1Xec1Pq z?3bzQ4orUas;9H!$VtnG%)4f1`kn8FYq!1ga{J!s=Tiswn6`h)Ro}e*_LaYso=+_c z9+(D%x_{L&ap9fm?VaD;{i1Kt-u4|^o||ab4_GBpQwR5ceahmW(_hV>@~`TS{RgRe zU<}%R-@TVCFAtsM#E3((YcARUqVDp7d-u)`Ud)k#cLzgh0D6@K3MeVio!p> z|Gqlw`{a;I)T1Wfm!13IdtV98J@#cUjC=awn{R*4_S2%33&vi)%dj#%w9~-{HgCCc zUC?JYmUpE_XU8Moiv!}O1>zxuDgWx$5JW=yoa^za?e4t{0ut)<fs$dAADukoSxU3%O77N-#o;%t~!63deOqi?)ca?aLkuaoVxq7 zDd$}G%1!UKFWmI@TN@@r?Ga(atG6%N_|{|RqPwR--O1DGwHLq}FY#VI;+)mHfc+cy zJ(T$5s@1vM<~{SOE;r|E!)oW8ugCwoIyX<4{L;H~w%Vjc_sPlUo>+46mDYV=V4OMr zkZkM0&n<@a+n-^_E_=jMe&C`d_w0Rfu(066g~{dCt6%$~UFg2=+O1vQ81S;re)Wc7 zE8DxiKKXX*!L!$mc+_N-2E9D6SIP38{><5TEJ!_-o_mqwt(neGE}!9DnauAy?SU$| z_0ctFQTNK?2sz%i5emKk^LT8yf6cB_o)YHI7+YKxp0mVt$3Erm`zK8qwQlgMZ=UnP zgzn?=zkdC~xZ7^p7va|per5ZLLAx#;{ryw%M{oF0d|NT8oiHpOcQzXpX4$y6ZhNJF zJNxDbE6y7wZM;+dv}yO0c|E07Pu;j|@D_dwx@APj_UPP=x}Ois)^pI{%@^M}ef-wS z{m_C-|G8-6C9Bq4+9~_SXMMI!%gw&t^XjLtZcDpMc|#lb(KSmpWM|Gg{qx~NKcGK9 z=ci|5bIfEs;Y|o5YJo4-X z?=JrC`^Eg?VBec>B`#bzb!JMQi__hw!a*iHzWJmm#eP1=X&wsN|))cJ7*5D4SMeEA1~g2{!rNkAz6>T zPhDBOp?y~No!R>zes}MCYaWbzcfj(jZdCJ}PifyvZ`wv&vgE@{%`Yz+G5X;z?*8e% zCrsnc@SQ%`@YomIo38nEFZb~9EmLRydgs*#MmFtOSbgMR@S8)jyUUZ_Yd!NMWusPo zwEf$mub+DVGu*}t?6>tR47RgFtMUu4h|CM5i0It%?LE@hE`EwxQ&4RA>?vR7v9G>{ z-}&3iV@l6AtrGjJ{cg<%Yv+!iP+8S~{+_QVE}^yi-aZ{&b^fOtmTq36y8B-r^1%l` zI?aC0){lCUcc+?$UpeaY?IW(wmG&!!1b$gNK6FSX|9RS5&p=!I^kcW}+BNs%DVFu0 z?xk;6`Cr^|WBGRS_50z)>%9+YAOE)WDjRv^{_PmoV3L0K`pAZS^zGW!3pZY{LiuE+&r3hd;G@gA3*XDCzF{{Ep8ITGKI@Ll+u5tTUpHva z2kF?DOP9Z~n0>Lw>;=~OeuE5|c)S@^W4C{=-{pK}`z1I&Z+U{fZ0QBMtI2!trE{<0 zw}fVQe(1c>#vA9{iW!8>=Wkqc*vf;YmNADMNR+;rc4uRosOc=ubAl#g9g%m-Dm zF$-S)$D$iYPM;%8S#;*I53U*e39_TT%L@FBJ>h}=w@+IAe41(d=*|N+ z_eBc?C%Cj|At7k6AcdCTP~0^HiaW)7`1U^I-0|&w?>={p{FAI_j6Bas)?D)^b1o)) z62_Gb$GRA)D--5_1|0RHU+f<{)+O5bOLsN4(Z9NNE?w^7ww7mur#EwrknyQ!QShy0 z6=8I4u2?mCdeuyrt(bq1(#kyGrj>Xi*bRqE4@zy+>IjY|CbN_Z3e@sIbtnf7Tnimp zYn3G(Uue)p4GTd&t$zo2=y|@M{N`^;o?s#P@F9`Rdh5jc_<7Cy!y}#F^y8PDs$%`g zR2QeFtc7tr<-OSsrJ&pyKB1%+#+#Oo zNlw19)zNGlS{0|(Unl;KX94B0TEV+qyoSO*B`Tr!G|wzrdc}Q#NC(0_%5rw5m%I8O|5})tc~vT{&-Mg87wrJc-*0UGthOH4EXnDO_yfrm{T#~S=;Q--!nVm{w`JExW)amus~vB zSa~9ztu+R1=@6LF8QRtP$(cVsuR8wo*hh#j|HW6$yehsHh2%yLG}y69;`uo4H7vd5 z+Gbc?v`*?UkVGVfUXHSAs54j*FWh}6=f-BU6sGQW6m6^IjNiql7hj`G|B9+`H*$m_Aef49EJ^8KzB`xoD9y7c^bKk7B4M|FI;cf2&o(*KjGxlb!?9Wp$x= zGO<0FP#%+&gqSoRkn*qy3x3@ionVX+kECt{_O+92y4q+SCOnFb*wgXW0SS?uJG!Y1 z|ENp*ux;|ZC7tip$&2{K!n%t>)y5!i7RYK1g)%`>l%%Y0wtQxH=NltTvCl1k5{<9n z0loK2RW;GMLSO@-@s_@-q7bojw8QJsxqfL~)D}rT&+-H(U|9U8q zS1(!jst*DP`wM8#+U~iuEV{E<4ORIRxRnnNgRSWupRe)9i!3ff_pSkB0PmF$2} zFmD#))`I3u&5KqVz{|D1)qiVHV>hXQ*VRfp-|sVfp&CqJy-o2x_3Z~Oi1*8I$)b3= z&vQU>nj+_^IewRA7=fIl;b2OQ-Zu&YGUh~Tx|tv7rj!IHD9Nx#+l_)LR8rC?&X5a~`8T!#?fEycJViP6&F5 zwYZpyLnCKs;uLq)&m?~S3;>VX8#w_tQ*<2VAo^JDjYzLBe@P|L*WfGEcf;9#&m~wT zX4kj(1`~=+Gm^;?G>6`^eLyzUz)WDA-UnyJ zD&WPo3#F0^PjdLUm%e$o`R_ldn$wp8Q%ZUj$Eh~X-e_+>S+kw7-q|r$0y5aIK#&PP zQ{v-WFztwh@rXR%8I0P%fmU3|hFX;c(>3yWkkt?Hkl+?1dFhS6YN)fMc$A?ub7o3t zS}8kW2_kgPMhpHB&X`S)nUZ?wHf~EN!?ffFHz)^jESdQ`yi%yyW*2-!?AJDDvK@)M z6zFj=bwh4JD+0L#9MuT(*lEI;;;>HB1h*k5;T*Bz(A+xT%vnk!O*4>$#s=q6V%S6U zO91^n|5W{|r8EmPGcSrUnLecnvN|z9>;x~&Y{_t+zP z`J}c@0rjL9H&H258Wxj5jnNCu(slnwoOGyC>iIyXliN@j5%v*Pc?TSrBP@M8^$Lv^ zNR<|`o;}R`jkRvYrxTW`meRR3adl&mL^utllvA{!C9+k zxxC(1R56sj{6+96!Q@uu&Z+Ba!XXbKb-$`C=2}p7u2BXEJ}~y%RaEO1SBof{Sj_G)yYHzF+2!>hCwO zC>UQ^52}URtK0azC9^J{dRXX{CWNO1S^CH}ZrXPY)!2L%{@>}E2jTP@9&0OhuLLg6 zQV;fCjlPuPHq5XOAvIi|to#cQ@vgk+_zO@99Jt8sIO!y8FL1!nEvz+oT!`hjj)Ybn zM;4r3MY{zmPZvD6XtTUqo|L1=1{}6q-YCrq-;w;h3lKJIE?i63$3eg`0Gr*>M^t=Gt{U1fI*xh+p@_ zHh2dsGi1>ipleR$Yw{$&N)NY~bVAx&D4nF641bKoF+v#v)eZ7U8%{sf)>OL zajsLp4*ECzct<3XLda5?Yb{YC~(baBDEt@4yyd*6Y$mBrmQ#lY#FtH!7j5;=eE zWQc40BhAHZ+?s~7IGOXDO3*@2vo^oJgCrQTIx>rLH5YTyo{Q|2_c+mwYgnE>BdkF< zNQJAlEo{@sTv(e{wbVv5Pmyk&A$_Fx%%Y1|Ipy0)G<{-RAv0vzk^8jWpW{lbh{mbI zGs|>Dg+^UUXp)^%WtKd2ymSjtGgg}nUw>2vD)-ONZPa|(IKHrrgC@uLW|Y_^`uNzG z1iLs9d0ghD{yK9G4pkfz8I-#$t%(P5P0N|c-+o(+=RO%r#q#IPD^~u;dCht?6BrEp zHtF#yHgS6L0$0jDkKcFQ0y{;+Xd)KxT`h{8>UdiwnvtZ%&g(>&{+6n@OGUN93>v4= zVtx&{=gUS!4Io&=!gRU?-i=bzWlH}UB62GwDu*xSq{&yo%O)e$tum6 z9h4504{r|n{1%=X*5a+|%tdLhKN@^yUnuw{ULUATrOqIPoA=3$vT)OwuxR`p_y^Ec zZ;HT;@L&q}_g*C^l}4lfY+YZqFb8BV0wgDc)b*6QNu1zDDH1$Vy0rft*FNA7XfBG=h@Wsfd9sOl{F4l#j!8xbWB-}{xy0FFy8HJJTLOspt ziRM!q`dVCUva09_Srw$}=?i&E_!kg3u-Ut8r+6l>OB~xg$_Hwyft5)f z6pjn0CRlG;G0VIUOS%je5`D4+QAD6TQDaifgx3^j&EA9IPl#}&`Eb~Qg~h~0v|83_ zW#G@>C6mqMsZemgrN5=Ia<5h?2Csa*;}7naJRccSJ8EEB1oEF!PY6~X5L->`j^S8l z>**MYD!U2E&Z+cvP5s8ni6-Nofn5GRvlGo>;4K*W(lV{WPMgFqP?0nZp<8TRdzs9A2I)G}|-Pf?N) zloG}FqTg%hEDwV5n$VU2iWtVL;*ji1kO^oNK&0i;WtgvG+|%*8e1W$2x?A%sme^nfT zlEpam=)`9!a1TepqGJ8xw+ZQ6n~`rzDoEa*_$lFTMc3RJYn4Nf70^t$p=w5Z-i|^Iy}wWeA02w|otl{HPtS>=>*7g`QZ!+>Ul9ANXPB+% zk-hlw#PpVf;0ac&K{1ViWHahFJYCdi*Ib$H=D;#6nBy?ejZ+Bi?@1#hG zc{BXNh<7U@JGNH-r_mS7255LbaW z3BcSjhuB#4vV6APs#UHLAliv7`Gl=29Mugl^GTW3W?^?mgRPICRDo4)7DaT4q3MQj zQ_U}Wbf24E;$y!9j4WqGH+tqx<8nBnD7I|q%*01Nh;&%6?zxeScn$Zb_?=Az($Ti= zkdWTHU$`^Tox1X86pM6zr2DVbt#J`oBOa;lCyb?KtWB$5xp!S??Lfh0?cFb}%f7;R z3W7ho4Veb!os{tqo7UN24JuB!DTj^n9p<4VerfL`df!Yh^?CnuyYlTXK#s=q*5g5f zbk*~YJART#4rm!GsEfEl=g(aa`eVX$;=tA027EU8z`QuuZ7pe zGhRR7ogh;@l!UX_?1pZ$W8#t6?QVt<;}U-2$x)fy^mCHwUF_)rR$H5pxA)48i}U$J z)@@9^V|oD0$f-nkJN36;OLmR68P9e(*Pf^v`BtnMd--Qi&?<0vg2q-Zzl#(EyLE>j!Q-Zb_Q{r&~x-cv8HjRKuv4F~fQw4Y2Mr+$%ry}i(Y z8UG-cc4~FXUjVqqMiichd_Qb*og>;K>na5C8?^EbqWknq`~Q2-d#17Bt03#-PO8P< z+Wfjbu}t?wg4Qt7@rSdrmhqmCgBcG@1;5f8;%bB)?(S0T{3bhR zt%B+L=hC|H!q~6wiB!U?O*?3W^wH@_Nj+y_y=%$1UEPZW5T2E2^_S@_rCc6|T;9xM z)F8Xr$7dA?-5-fhGDC?Inc`$D+PT|~8{a`mYXgNnc4pnA$aLaA$sXN=!(BD5|koE4TS1?m!JV&zb z;2}8OppA(Jg%;ER4!;lTQXNo?wKkB@pcp+J-^POlq#QZs^vd}8{5mJ4B(Fpvz=w$9 zvxMPz=Y^BWM&%KYMFk$Nk*DoIk9eJAonNdP64YM1I?EMTKCWs#K^xT{@ zKZLtM%^t`^!q`S=o6A1)J6F#R#}uvenfSt($MZVUi6xd_c6nuGB20!B5}YIN1b2VU zNpZbbnd%oG_WtD5>$LU0kVsq=%0}Q9#>aH5Wih$14uUfzF^xu zXJ9sQIn<=CIGWE>cKou}tb}!o)LNyR_$C@X?gUrR<-8t?*AZH^S`{HG*OJFAu(>}D z+GnrzuDng_PMRA*pWd#F07aJ&G<}q zA;dF`I-=kcN7H{tZjW$V(lOoN@3cWjJ7OJkIz^#A##Ma3S~;o?D?2v!k&RSxzX$yP z0!Rw(?3q)?2Hxz+G!DcoyA}cS`Xe_S+eLH|Ryw%KWqE`7^kv_Clad*rgNpj?`!=+tn2}Cyt?f-Fn@;ZgEPdQJZR} zZklGfLpH}?>(!5nMmtB+@CEXDnx&2oVY*u}T*GRwXRSfGsIlX@I!DsYe!UE&Pq0V{ zN`F(rzhr!rdRVYz{Xkci+XJ}MkKNc_8?UCuFeD>H#tqI*P062Sk!ecQDQ5Hr}s-(d`k-ar>?@$GoO#X-`i`-=%@tMEa9=K zs$50Ou=j0PBx1kIY}_>9C=TRo+9)6*qt-lE*MUstp*u-=4i?|K z>YZ>c>&fwR&PWhPCMLQ;NwVQy~Cw}ZY?=u8uARbA{d!u^N(wt;KIbI4_%V#PeHPL z2THMCr9tA?SwWUhaF*o0{`u)b)4iKl&~kc4D^T`L;YL29&7lAjlIDny7&FP@C zvp>tH3=`MNlDj?@`l3{3Gs2DS; zZKR$7;b2tl@`9}L^AxF}epe&D0|3OGHYv_2FhqqtbC@GnZT~m@QB|@5C>an)HjJNz zpQYivK8qHB*h!2uGCehG7N2jVS!f2=LmX7j3~H+)98|{9$jV?&ZRn9i*YmVZE~OVG zP9{^W&9E6DXGM_Q;6MMURpEsq}vv9qMh`abDSY6%lra|_s`-&iHcSm zr6h=7ETXlNnKdKyQZwEWVOcuDU-Y}|d^n2e=u8nUKXj2Q0Rb|ql@19UJZQ^-yI z)(e`tvx~?=ZH{esHUD4g)S{XNZ=6JUrntq2^~HRIDB`3s^mp(8RNQs0$9Q6OPa~T5 zTElH(CrefRFQ89~!Y*)a{A^Zx@sHD< z!PH(N1g`%IWt=nH9!II(c$eL4@PQGYz8N~IT(Asinx>XVY;E-Fn^cpsnIj$3T>zRu}X3-?q{7a4t8 zG@H>+#q|AQf5HGU*Lq`zR%46f=&O2YSu8EHws}w1*oN01$(DtgjNlMo?uwuSJh9|p zpU?IgzW?Boi+(OCc<@@GO9R05eEaOE&~p>3*L0WJ2RK9!BEl`4+;7KAQk-WSImK^K z(FETV-oJh9Go-4Re!sDW6(^H&LO`_Qo$eMlH_s_4g6oit2a(Eu0a7nRRRI6fyL|_) z)QD7L@~5=~&tr=#l(}NKQX)Hh3+>oF!%MB!|AnbA;;)G({yS3NfJ6J{f@4F99Af=( zY+;(}hCJ>moHnfy(z`5J4BJ}4OE(jK+FlWGZ1D)ZOkw7M^%I-%Jmd9(C*~fAO>w(x z?daNPoV#kbtH9*+F$(GSK-f~T-byJDE)OY#WoioMLT084rN>wH$I$P5>2|Tfh7oki zOACb!A5+t>O5@nLEh2+zKQlSCt7N^B@z?7A7Cg$_zqr0)^sUfOAW3yQK`8Md$MC~E z*zNXoJ-?w0G$7OWBg&Z;7`Ee82*a0qn0WK&Ijj_oBj|1T`S zbKkvC@bE{}u%LTv2Qx}MBUx8EWfnea^pj^;KP7v*7NjD2UqY%R#yK%ULO1YA2Q89+qT`hiaCX^OSQ%c|}U302y->(?H6m_ydyzdrUD>`_pwrS;xht1zRYjH6{gWW#Sd! zXvO$`uL<3hnpXBR?P8dE!qy6ZTlYl+QK+J{#sF*YVmSNb*Gicl$EHWaQ45qUd*Hle@W1T{6#b~?-Fsi}oUCs2ajE_MN%lIO=` zhS9eIzI**;Jgw|M=AJ72mhopD>NIJy5v!l@r2m+l=)IU)54Ay1Efoj>>HPbo;uN;> zNGXR^xMCi#@(qWoZYRE%IdNT>zakY1a=?UVlCwH$Nh`$9)2e;w?=^HFndS4y5I%na zNl(dDC`Frn{AmU*mXe^91=KDH3W}15N>WfrKoo@EQ6zf^2)NKz$H&HhSQLeTiZbgp zVg#+i^;0y-^qBNCh5O~nN;uUX9X$BT05g9izBm!<*oNfhE4sMu)prpIv-F9#Xpf7! zma?=mh6U=GR(iL5`zjRdV6L;4l&XA)k{mQuRO73+D`I#p_M|67#!-uFE0!p16iPvs zXH&WID;yzT$Ddi7$*uvr%*yCNlV#P)B>~6#D0kL}8CnDCpb4PzB!;Pn4SZ8#=orgO zZb!FLsrQd<0OtH?{a){0-$3FL-W7&FSchbnCvp zboPS6FTxCSH&vnN7^NMWb&$jpE@`7}ai7&x(VYr}W-d=rYJ~<_G^acDDd1sA0&-zl zOhz)&H4lcz=U{HE5_+CJrldM-rd(d>jhV&e-7FG{#;5#M=8SMoUGEE$I5c_sE)|!< z=fNm{q{>OvHw0wT;1w%}x4EFI`A~~-yKU-4w8^|F->_=H&A7@_2OP)vhC2H(Png;p)40G25};Aef|+!k&4*NfdGqg6m#T&X?e82sQXdB2xl+a zb=YjP>rP~hqmxWy{bhidva18^d;6CbMqf3xY$4OW;agavcEH8k?3NrWo-vwkCbry7 zDr2~C6cdkvwgey1M)opwpU2X}1uv*-mnu9q!WieXqArjHssL4$Us=}?N|opw7XX`K z#D_g{sh(^D9=&NRU5@#4FG2DN%T3dZ<5;}p*qYhDp7)QxJp6k5(Cl$H0AST9d3VeQ zx`8$moGH6K&;;P=oWBbZbXh!Rn3c0Mb9exHb)TcKF3pb^c$Dc_iXnCyl}C{w4gYvp zH5gmF*Ou2=$D}Ia4$dMqcKX#N1L_RmS)!VT+Vri8b=FX0D^e!?0^nVlsdB{=HdfKR z%v$o``*XbVJmnoD%|9yDOX}{YNY)CLHyZs$b!cF7DD~V(1rBXY8?C~kJ~I4_AO!1f z`79>7R=&3f_T>c6ZAwrZR{&vybZS~g&ZK-}AIV>k(@jL_%ww1MVjYqqhc#>fCUT?1 z#fo~RqESDGCgH&FbW{k9$j0xcLIXG5vKmpHWV

u)W`3z{*dj!a@hiR~1&8145_c zc0BWnVz#tD9w1z+EXkK;L)7LIe|sh2M*uXmYnK1?d(xiJD_jLs<6V7<-E{ zO5^pNrlpB*{6@A{0*4>MCyUOxAYKGD#}*)lg;a0MQbnHWW)|zz_HDAhF9x#s zr5Z)(M>EMI?#76F-VSyg-#>9zKIH!C@Pn^g#V_@bc6PvD9%2t)81H=qZ(FJ#7MOXI zma*4c{{`^4RsE`mPxgOq*3;bHUFS0OoI$}oNJ=F#ZWR_fL+Exzvz z{o3bl=Up!foB;greHL#Y0GJGYZ;`OTu`L_0yR`SUsnWUPW|v^3;jUKL+YmHt0J0R( zHHo*+8U**vIvrT)7+0_dg-7dfm=ak{IlD`y9^GY-A$6%h6+ZN9lN5Dpp!KM;V`f z7whsD5TP}kSTa)4*YqRV9?k&}DT=O~UTxAH4{z1ez zu##QkqU3*>ymg@<)!T!vOWYmIJkBk2j zP|f`-G5xa#czu6ZFBb;(<>piaX6VDXu65Jeg<%JmW6q$ltoM_7;&jQzr<9BU+2qsYW;bF*k#AwtlpPpJ!T;9oO>2l&lOT z=SF4DL~)sG$GtMwC{epr*{HcR*Ok*?&!2E!>GfG&CpuS`{V42?MKmQcRV9|{o4P>C zTa2;-XM!$b@a|D=K50%w&a&-}ncQN))X0L-Y0qRm_gI~0S>8vmED17T0;XnQ;5MJe zZ&C@OnIcWpci^kgE4#Mya0sk>JKji?7})WBk{7)zaiK+in%CUZ1D)3^t{l$Y(P|nf zMJ8%Gjfp1mG)+JzbURqdEEhhV^A$Uj()9`R%sX(v>$~4%tKO1Jb2u^`7z*Jc-l%98)m4 z>cQzEmF}2Xa@%*WR6ARv#V%y2nUL3H?uqaA_jmrB5w0d{nPHNX56xUFf;Dqxw@*V_ zga%NI*Z#j3f6V24ZYi;IQ$|KN?A{og)E(yB$pJlCT9N#9&-_A_9xnZHJzjJje`mG3 z7g?R=vn7p;&Z-_%>mlz;TuNr)ZnESxq2;n$Nk)N#SOQ{MMZ;?vD7x!7_bRJO_j>2! z0}enK<2uixvLWs)8JW|Yc4V`U1;a$Poaqv6hmSc#WU(_3VX$5_YKy(jV46G%Yz;wd z=ewzNy*Tn2KQc__u_p~wQ`cPn_!~I&xmVq&>_hIGFR3_-jaE4uL+r2Pve^CHw-{+E zlZ|4^FvfZ>$cBTA9l8-T>#lV4%kE2XA=99Obzc8SoM8 z4#$q;>*}R}Okl0z%jxyfLw(8hCmvpARJy)`{Kl1;X!1O!X)5#I%|3KHTIHq@7?m@v z``A~)NPfSDH_onZLlH_Y64M34olYjYx!dcy>a%wRoy*I6WQH8aenE+x>abm%zT%9! z$%~`yk;cQj7pnid`l8Z7%@dZa%D*-eBGqR3NoS$yKgj^30XO)(??SCRIJQZ5-XcbXX=B(A*l^V{RGv^e zn;m|Ar^u}mFg<&gT9>0IA2l;C73w;d5lBx=OiNj{y<8E9`Jc(1ZFizVFKzM8VxaN`5){`M6100%{ zbApLlbv?~q8ab~@#2+y%$@w>tEkH?x{W*%Ooo$B9Fg3V{~#y)*}2b)I6 zj1)k%FjpYfM`qve?~^YBL%B5FQ#I&QdW8dcwD88Ddk%du%KaC>=AwDp;|PF!!FzT7 z#qV9dkmvgRK8zxV7c}^}oG>Y|u<@8ic^`i*xh617Y-Ll{@xZ)yYS$6&oWa%7F2$s} z`cC5YhYkgVC+(*;dExzE`A}(}l8zS9^d%~(h@98#Ei=SM!rduvfp_?t+~;U$&cjl) z^mrp2F%!jKT+k}kJvYDUz+)&QH+~l_ojvLmLFLA~k?T2_8EaaGSrnQS!ILjpJ^a>R zc&F>FPYk{H-P#+9cj`N9e2T5YZ|ZQ~h~^eHq~gpnZ*5qac|qQIJT$7=xdRlgEk*w*4Kt1|?m7n^voA`{f(pZg^B^D6+!xSa8>?NPfU66>}_zZwj0|2i= ziZI_E7;rn;WqL*((TJ({DEjY|Rv3SPE9BNT+a{BVnu`9>)lzSb?j(e^c1z3RsCY(z zzng=;?mVxrWGpR*HgGB#I+~Q3PkjKrXCjrCrNI44Oi9sA!fr+u!`cn=8VJKsp-Im` zR1daS04$Aj5O|li7j!12_NT(gmT9!=EKI`i=|!LD{(P)cxY&tDs{b;`XCBWJ`-gEr z;QDS8gO;zUrg(5J!)964onS8iY6Tsau#RH_Ox1p9#6`RzGLD;~^|}-U8RZ%4HFgNL#UJ6Fk3 z_AItp^jQowLVjh&-F2nP4<{oJD*p6y0@S$}llf)x43;z><`~?snikuqTCY`Z;=I*& zlyFAI%KBIh=ivOsSNDgipYH#v0B);2P>? zk|fXZc42(lGP8n}vpjq8>Sm5I&D>IgUe&G}8pRyt9@T>ubXZQ+7;0PAVeN2g-PE5! zj~`36oblJ4DPT?8rq-IaW8hn7=(!V(UzSp?=UTXFT}tvm2UG3_#V#V=u{uGwe3^b( zE0@*&2lng&w&I9_j+F(7_ zZhYrmb6$GF;dGr?SCc~XB|TC6#T<#WgFy;&`5Z28M~EAS;~zn~mxzZG2_uQ3a<-wG zi@Jf&YEw)N6B&r4cYjEm4y6QDl5mL$a|@-y{unO(-pN2hngYt=_)0)n4=4~w4teAU z00VSDeuFo{7L*M6+ z>=yvaXf1|eUtDI|OFcV7Cs7D~0^BouR@|c`4Fr$j&ScNXJh!r%n=^)rn3>jCXe!R{ zQ##e{@*+l>#cTqemL0kn))WrOXikDu06e40&e&M1NXk9iNling=WtnTM8cprONfcC zbi1X2Ymjp8T%|{~(2JSGwW##0flsGvk474NIZW#P%EviO`V)`h?$)U`2L;#b+-0oD zyZ&|L74gV~7XhnpNXBK+h%oyV}i2Yt0;XtV5phFskPYe^g^C4n(x`W z`^vi4&VUSUTT|Gmm*P>hcEYi5x5bPJ;aQ>UNB7=s8LCHS3uM=S{5+1!G1F7nH#h?;+!uRM z8Ut1R2$tz7#n}%a@oU?xc=w=|0dkv7AL&%idfKG>QdsW#*=Z-VDd+7pt9x|bA^zv5 zp@2s1A`vi6)mY;{HPsrriPoD5!n7p6Ss*JF8Vl46^H#z6e*w2UIgb~LpmNlUnYcr5 z0Lo5z=EV#=ha6BT^%xYRlG}Csh<&HK1(9f!d@VUGLI|b*Jg&8vg&IjE_pl0E za`O5Ma27G`#HfGwjOPC?JE}}28FB2B)m>><>^sS|?DM&4@OAZ4@^o=!y?mBo8d6Sm z74}Ctp}GRTmafV8$P+W9pD&%1&+>tl?qA{Y-^Zhf8f|5u)A&?Oqy|LMl}0N7XqEaz zQs>vMVRBG89t1NeVbZ84-V-8qY-tZ47hb5e)ElqQeKqDkS9vWyJ*sS#-Va&Q|_4t9E9sE=i!aR zm$i?_!~NY2K{%b%q6%A$Z!$U66ikvbnN-X^gsKH9J8$K1IJqnq6`AgzE;dGkh(@~8 zifku7E@`7J0#hIe^GYX9HBb0Gp=z$B;!5bm@4jPF+FZZ~Z!@_aIJufz%(EHS*5+Xu zf2v$6BMbpizW+DCNtu%&Ghtl9S5Rlj9Q!Yg>E>aqXBmGMhBIIap-R@4Up0M!!#0rH zwnR)bP{8l??O$2#_6=jz$$tXVfyu&#_KBF195aR8xCw&}-M0%B6HW7G^Y|^tx_B?c zdlEimx3k#s5v5wkrM}8Sp%PaQFD67io(+Ai_Y@h~&k=Iox-?A?UA2{%c0bz3q8G~z z-bc6%FCe;v({}i>)#NA(>KF`7O*1?|4k@DoXM?T540@IQYd_dedDJ|M9gO>jIH=TW zi$Ocofp;b+XThdFwbb|J8%@m|q;A7xrqm2hV&!?C7#p&8dO|41t%Ou|?S7p zXt>UEwvAh)&dM@q-PcF%D5SYo#(Y#RWTrN}vLN)!j;NZyzZBJiY{x7uMi%LgVmAiS zLwxP1_;k|^J7oDO2*NTrAf|PVhD4`J=je&~mZW{Un z=>p#QFFx;=vTiBGaFLOXy8~0tcLqDOGb*0%I|o;3X$JoV_=0FUimJ%VEg;*+Z5Zd? zQeB%az46k@>4au!i4#+W2|fEgLF?|}Amn-;srX35OrL`7qB&B$8S$r~p4*RBjs{qz zQFC-hnyPY>+LpyV<-}jr80Tnq1M06_Zbb3AW7PKdohUuUL@us%+5(!+CEJbWy7v)d z1*Xz*X_x*Dw1|3(>N8X6KlpF?9o11=@HbF&=vfK=I_m=2B z^)SCyaXtasKYX`K^XPSiYuylE2WKgRh!D6x~qK8T-d;m*#Oo-X<#g~?n57$;(FGFz}~FS zjlYuzIH~&BHytm->&eh+bvCA4`nO14+ znIpNhD4Dnn^VsmvDJ8*^v6mUq@da_v@Ej`%BmeYGM{N0c1tssj8DUk@u&XB5=~aIL z^Q+dmmB?|3Xt@+USW>B{$fn>M(r4lyqBE0b^Qx4uM$OcM>w^}Bh2@2d+nL<{52=No zW4&zVil&L4c>Dz@td*w5m2UeR)DK-oyQOQf!c_G53uT?*3{`mZxelC*by~h2C6m;; z4FUYxnL)NIh?*b4>Kr=bHT#aVLR>++)?+eY^iDAz`WRU?=##kjeW|T zHEHY(l_gbWP0^CJDR$JgtOt$2iESn0Oo(CU~`aqIuN38qerHpchs~ILfUbaeBghOTcY)%il)%Bv0Yql605OVIdBI~-)Ti4->p!YaSh`lB1MD499 z?fR>8u+z0>iA2B%e4H@0Lb>}&87(Y!U}kD|qkruM|91$=JbCY8)HHm5Xq-rbv7P6v zZ`O8(Rh+jkTA#2`eiNz8mfVxD@sF4|VVOsv3@Zd&s=;YhVofq&Z zmi1gLIZ;Xpa~@hy87<9DK+v`|qTbO@q<^zJ-Z5+Rq)lSW_wsFjL0-1+H8Q&zsjLBJTI1LNHUB*mA}io`ssc#>fKbDbhHuB;=m4E#1^rF zzurrFJqMys&Fs1!)dMQyknu-_hIeXnIa>)652)Wz)Oeq)GWes$Q=L1ftvuKoygWjd zuX6g{RH&e`zAE+RPa8U<s;|dvly;-08GvZS|Xy440(xIs>;plDeCI(Y0zdL_Ke6%YP&rAlwDAx!9y3!|oeJ5lWrsgoyKA z-$ehqFE2@3q4EAN+BEt0IqKq;LuZ2_Y&}rrY`}0~PF+~+__5oXOU_17ohsr2LC>nS zo?(*b{|!nudErPwkJjz$&FcTG5P^fB$CFsp-Q>`&e6uGJ<>+$z#1L-3IB(XE{bL*- zmhp6nrp6sSsVMjr!-KR(3pz-0;!hkiY*)MG<_mO^5)J|Y5q|+rfq6iyaU`X7g#yNb zHZDiO_H;=_S&F$7)~WbYO=E+T8x%Ta^i75ztZ<`_n*>#!8BK%tGz{cD*2&os2g zJJOdDt`qGMsS7fEHV3aE)4ohS^h1coM{C0BBVHxOS3*~%UE16@eYJhhc0bQjva?H# zDYe@SJ2T(=AVnUCx%NGgs&N0j&zJwFIm&~A7Fe=z@#`{VrJQE`Wx${{-%N3>j<-4{ z)rml-a;U~OM$3DiXBHwPkoEQzU^eyZkr_axX|V4e>8%3u}vsH31JyDV=CB3RO2yq}Vw9w}GhH_Mb#)? zd$If`ihj!Y6TA%FtTdI7-)FK!wy{4{j888pEaCtS&&eC^#w1TTIL{^&=JWg-p?U>3 zb28M@P4s28GYU#l3j*Lc+XsIRi#6~Cmrd?O8Y!;=?YVH@v3Or~|v)Eg9G?%GyFIB6_$r=gm@7J}Eu zo?WN%fgA+X@puS@Rj0+$7zB5 zK{Gux{x{~tPFbgf4udM9Ei+rqK1!p5e+a$pQfZ!2UT5% zC1Iax7XY~b1ZsAW?%&>-*@q$|-SJ!BXph${{%JU&Jz0Hs^|%Qy769mW{lEH>0neHD zSk9{1f2GxV9j^s<3{CwaPK#aN7(uAm^>@sI%ySXKla6n*Q0XN~ZLXHS3#DJ-hr#*`Cm4&Ox_9 zZ_=&p?;P6?x$~;{A5#UtL zL055y@6rJ5*oBq86*??2Xi`Juh|)HPv;XWQ3C{{C@@e45Q?s_sXW|Ls->**@?4l|W z_fusoW^cUOAPwc62wk&(W_EMi|PklDif0*=7Gqbd^yxRSX}MtFH5vE zg#sw~KSfeHD=VnUl^#x~zJLIA*^wV-C6(6y0;rho8!dE3&|@r$7Ias($bObNCsN0! zlClf3_M`>fPQ3i~uy220S&GXne5KWpe51^`tmPsdo{L{iWWWV(pcj*oK6Z@r`0!7w zxKEeN;6TL=oGIL4f`jA1VW*Scf0I1lk4?p_l$$yhCcUV>g@J$%Z=)w8Yk#vpO z2CqH*weqk1``-tHz`Zx2*zdBfXqMTIpK+@#zpn`F7u22GQat=6OyS6m>gaw&HysQM zEV&sCHQ9triM_Z8hK6`Gf*8%l$|MZOUPpz<*zh;2dHw~M(k)SJ20HA=85B)}H}Y~+ z#<6KNh_SS5q#-)Re0gZ+?CLMTEO84L+kb*pW+{>L=K2qSG;$cyk=SvCL$|4ADYS;% zv~bmA?KrrxsIpt>30)z}-~<2hlm0(f|37dlCq&VH!T%t3vF?y zxVw8>+(L1O7MBn_IJ8J{cL-24Sa1(goCFBPo#GUCmwtKPbG|wAKF|A}IcMg3zI!Ig z>?X52o89}~y|3$k{rF88Vw;$SYt{}p_&Mz_M3o49e6VIr~|aTV!hbeR%)-a zExCCHyPTP-;=3KxWxk)M(*aovIoH~%PBATunZ_OD@Y&1r{MLHX zOI>Jce3GzlEZ`*lw%Z+FB*KNFnI!_4G=q}p@Vq=+U8;?b1bfa3pG2*=5SBAx_qDDG z10)2Z^0~;A1PaYf$;7#4Y7^})BvsSa*Vg5#AWS4E{NNJgCkO*dAgaV*tPUokl-&;V zbihry)1HZiAbURQ)w?AYzFINcMOc;RCh2Vox-J@L#`ul~Iflfn>oJbUm2(Nkg}2_2C-f8 zR&&<~qEwORx_{hfx`r+9OwQp`U#QD#$@!tIZf94g$HJ)SIrrz5;uSNqYH4d7J#zwu zCLBxtq^>*Ot2`?&bGTlZ|HZH#=@LZO2nsdL_UQuew_HX5jHBZ`hxgiu4dYPg#K-+~ z?~{Ai*^|4o&f{Cky{pBoRJZ`!lw{EakAvFu&X(PoUv>b@$HXy30ENTSO(kw4#8FtB z#8_rvh|d66vvz{T48;$rvF}!+$%<_xvQhC-ni&$$vT2LWGD$m!G;Oku``YP_9}f?y z`ZxiW62a|2cD;UbvUc%p^0>yW4u$Dql69jtB)V#JjSPL~ULL`1z(Et|h=Ry7V5MHJ zyoKzL3{Q>ZawZRil{PfE%xp2+4Q9(_S6)n3UH?D&BEg=!@D-vZ_^!zdEn@b6G~UG2 zRx18w)0Cw7wSP?Y;8vx(QVcxl10HruL%5J`2!7M} z8Ye>3ZGEsJ(1t{wEDZ~AFZ5d}V)4O(AZfn8JA)uJibxa9Lnr$$;68KNW5`rm8|*OGX9r=#H_3<=Is03p)a2^^hh#-Kp@8(Vu~|u z2cM^_r}Q#YV2jkt7deK&JpC#Y5FSq+3Mx9L)tp3g<64RKf}pPs1DE`lZ2j36yo(>l!QXIHbcCmXOs};Sb zdMkYodl-CJm@FmqS)^_Vojq)#HV^nh&e^-2tu}XHKQ6)c>#jrDe*H#1+VP!W!N02P zOx`>$qG~jv?Z>F=4nI~J^p`L374z1q0L=irI6O733_+Yg2r24&k8 z{k#!$x~i_1q@ZQ8p6LlOlkxVk`eaOW{VaFhAtmEI=v>SZhOa%bd~-snhbxP@p9zAKMf`;IeZry>%WD6^&Z=;dNaRVBIEvHh$M=d_4t z#}X4gd&91K$_FpS`6qk%LBf6v^w)?e_i0h+!{fL@7Ay_)n>4StgVS@nbE*vv^4OdG zq)67)!*rCxeOM4(Q{?1ab7qe}f`e;{*Gqm;vk{RYU8mL46I|98EpAKio+`ufYtkE; zUU;6}K0&rg$%>wEjk9Ty0a-k|bSRGv7(U z3SqYMnFc^g*{W5|tla$<#yO@7E6E~>?1d&PFD@Rtrw}rVD=-&W1O+C4yrkqKf6nLx zB!0(Axx@4GK7YI{>GDAo_`PCLUQXP^RdIoy@+~v zYWg%J*2K3Y0k}@xNC)J6B}YAc0~aBn)}pzY4@@@H1}QFx-+TL0j;ZBs(rl2F%I2?= z!(|2VwD|~ncs)_Pk3Spn?YlUTQGR4h95#NEy%!($A)o(}sw68qf1xl#h!I~b(*1>w z_%S~CDX-((#eRuz4iH8SDssq7_MQ>E!7r=?ot$%7k1JL=o|`P+w!qy$6nQ+2KWV!$SIYzEXtole4s zUM>Qs9rT}|VMK4S1MMENqLrrX+uBe3XOXd&0vSSj0_0=XRM@lNtkJIx;l+v2xlj>=lUwT5{rcUlfQxGG=?HgrZa zs9l1Y1_xv1uKA_B-rYPw_0{UB^(k=WkB`L6!Gsuk@Y(R4=v&4*yaoCNK`x~wBijl- z!G^d*)3%GQwNtvfu(0-0D;d??4}Sx@|@9kWyG^r047rv+B!_$RmwR)sm0QGT;)=}aIZt;LyRN^|Q8Og>@9 zaplam_Xef~!m;@#4q^MBH(Qa1wDwcgKjeEP>KV9O=?JKSx8N9^(N4;wM7o$gt0F5V3d-ZgaOKr*I=tZY; z*~xD}>qH_s9+`%BTKa+L$x)v-FX0Z)Nxvf>3^vaG3p_hs9ubN{X+|Eq!QEYj9f-%4J@MFZ|YKU#{|VnA`bDX+48 zHB$b`sq@p-C)67=@klZ(0xtKBH;zdr8=Jkkxrz5$E1Uo4sX`!WZ-PkqGm9)kpi>S&Ej zLyJB@AMe%Ye`>yetmPN?J1Wz|H?%=*dYbIL9`Z3uTRxzU(=$>vafOKt2%2%Rx7JoS zwfz0X$XjffvV3n}TUD_7^;my+%xG4mXu3ryBVDmV|I<{NKjL1v>)(vOpeOA8B2lgo zw7d|w-p@0feU~;n;;#by2d>la2d`@=-U6V~g(%2!b4YNp&Uv$zCh}=}d?C#)UL*Nw zSUsLAu`;-=^xQ-ax9EP<7jJ}IawvwBP;Q8OaWFy348JCL-~Ox zTFpKX*c7?w94<1g@c8dSE|YSj7XR-{Y^^FSQ&%Cy556Aq7ehAK*oLghWs4^Lip@WJ z4Qwy2MC^u(>P368nGK(MJ4YNRa@UNa!Yp#+nqys72opXP(T10sk(2hl*S4POE>uk| z;$oucoytHC9!G*IIjnyPF?kuU%y27q5@b$-^$F2A2T*0!yw*|m5D+2T_J!ehD4Qg3 zh<^Z+)syA&;Am|_v%eCC{Q5HW=a=7-o*s%@m3WO@M2BoCJQe-0wE9TFw|pTb9#=xl zs9zP>wCMvLEZlYdeWlyg1j<}`H=3BtG7FHOtc>frRN!fXOTf=x5&O5(p9rORzS`+M<19y+Y4m0r7%cUFrn4XcYNlo$n6P9mK+Fg`8 z4Q?r8&nTm~-|_e?SUH<;wOmJhLhb7ZFnVwBU*&d>wdto-Wpq>`@=9T`0jNEhUbLRS~yT!rpgGb;&kAgh{RoJQrZFe9^*(McdE{6?G_FUpcsPQ4(P z)dj}3ZSc;0s6trD*)=}%wN{JWhVZk5(veTpoZ7tl(E;KuhitDkj5hixOCx=mduIoa zoE}K$OmD02v7DsBXCV43+4GARj(rBvyIR%7^H8-hcXn?%Qm1m;wHJWa8uqbv$DpNJ zsi+MpyavDf@Yee1#~aP^c#FuT?yLZ#?l#tGD&GhGd_Wmrxo_J!y!w)-(vdJqc zlfM`ya=)5gQ)leA)fSbS=@TxzJD%^}b$xf;@oJ{mxbQGP4%k|}|Cr(mUGPHsqcJIH z6=DbV0x%$;k~U%kRatck^YWZz#f_nGkDt8x7~rg*mX&mI=tZ>ov^Gg4GiC0gNq4(b z@=%jRRC0R&ffQwNj(Tfl)8E7rqnX%^kepjk>Ra?VRh#wJzA^nd^QrAsIC?rSq09uY zkP#PWI5Gso^kII*CMl{dV*-U!jb12S9->Jnh&KFU zR9u}cDHb~Tz5gqQ7R}`Dn#|S+66$=?4xGz&q*Y^tnzeW)L3paK9{2wy)4S5qv$nj&r|e569?6$>7JJ#c#F-rF_M7EJa~{ zMu@chs2=4+B7Gr|Q_r!S&@kHcpSV{Qyg=`17fH_o>u2`~4_h7wf?2eGc!N$cj-s~-O7UXTk#%2hGgR}hCFVbFJp45vcoZQ>vKULYhz;LIXy6D zWRhzpQMi+Vux6Ts(k|bUZ}nufiZ9gLk-cxw=<~Cx_bx{Q*SlIn?%--{F7qnoW;)?C zW|HYde7u;6J{P&_>i9p!@M*?Q)diUWbL;NgIP(4FSnKD-Qe1^JObwO{mw0a7^)FWC zPFr$~`b@H_Xb{QRTH^o;L5T0QOcKj44ZXPPGNz?G4c05A_^vLKCucWn0RUCzd1dFh zDmddIg1*EmUKeBTKP;d7&{WNPDlMW=^}N-XUP}Lf&B@a7uItr zUfqHEXeJ#CUTEc$G{c|fpZUKqkutn|cfe>Sv8Ph*y(17n&Nw=V{S2Tn5~6c3+oDn` zXjF9A8Rn8SGjb4td1}^smN`{DTE2)-kThm2PpbyiHpWtv`!Ys?VTN%?VZALLC5<=D zJT;EE+?ejI^m`BPRGStB;(-}~x-oOP^F{4D`+)a-h*5k1hcskRyzCdfA=BsP3ab)! zt0GV*b8qrVSZf*oBwN&zdvEizfYpBG8}nfIV4tj@mh$R9yfcOmJDu?$@RP_DZ5z?S zXPfFc0g7iGc)?K?d68Tjx#_mp+VetA@8_2P70%<4V=q}>UbYHobcUL&E5eV=KE*dU0XzF0@ab0@@5OizF^$MO>y=Tw6> zCArAWzn*~DU39IFZsQDU6AWCmstqyG>M^~%s&-t@*%V1ay^%@lPbwRH8GEgm&CJu= zaXp`g8Hi4j6&)WJy!38z7{vK9d?2t>p}NELT_?A;41r)FSkYkPP_NEJ>%87n2M~-4 zn$%A1W8`+J=xTsv=)2)0zANEW#}$`!HM98k;uldRIN-|l7FX29R-vS+Mt(1AClC@b zt1s&RJRAWmzUt@yXyG7}%9p@RFBeJfgrIzr;O7;AY_& zM!<=;=U;~DxHSyoH-g;PDeOsW>dPGlimqv`PDt`e3jKSIHWA!f0`309cikaYKN%Ni z2{t?Oln(tL&u{PqGlW&r)O9&h+(gn3qaQA2%c{>p_!6@`S2Zm&>ZG5tynHKu)PvI2 z+Q1&h`2Xrr{-4IV_dot|58`O}6LJi2(mkanzONU=Y(4kBs<=Kq(OC$PF8HeT?y;F) z3>q@4nf5zvhiQEBtJ=g9T`?0=B2@gf)2?H&i84lo&C`sw6w?To{OjXI>Uo|Y^j4U! zL@v8<6erlCJPrgLHVZ$5Bv)J7dJyf6x{JXC*_AkPwA!a@atDCoRvYdbZr`*OYTnko z&YSuK%PxOh0Ma;41vwr10sTcB$*#-b#QJI+ubDIS_4U$=Uc8BY2XluGHmdQu+v-`r zGVO0h+NSGNYMg4w0$IZ`>;5_2gE0}RO%?0wvXd+u!>}SxHtsW)Z&Wqqvsq6xdA27e zkRsMP3Hr2C{>_n}Pg30y*{O@Oz-!z!*e7XWtrl^_w!E1m4ayg%OHMXe%V%ontN(1N zYu{8SjqR5#XCj>bX(@|;j#CKlEFrFdlkn0`AW%=FmAQO5`ze4dOq=12x(u<(pVDwt zLJ6xhW1bQtFkWVY<~S;DLlEtTBHZVk@bzB5)`NB%PI6IUDgiEeV>g`fqStBxSGgt-X3Xk`jQW+Fd|w-Kguf0GD;)vfR7InM7PT@m9Z8`(fBx zw$tVkox(CC5npe|pj~sZ@vhE%+QF59BMA@r(sRC>$My0v9y)vVFYQsF_}=oOP=@Gr zx!obTHaJ9n%xL#^HvLACj1u)Sb#m~9V&bruo>u}>VltoC&;osC9XB)tj4F6;y(GB{ z!C6SHfz6~;*9&Ba*%<_ws+r15MnPDZVf&Rpu-ilRv&m!4k zxN%HQrS08DXzKU~v~0fCJLweA`#XS3pm|J)W+Z9Fg;s1Znmj+cA-UAhJCZ}!dHW>; zF|UQn3Cu#4eT%`zuttE>V6c%_MCF=>;4D~tgk_FdxO1Gz68xH=L5hGs)4OkIfymw7 zj|a9(al>0}Z*WWMIlkdNY-{2iRS4KQR1@Qazvy$>B088g%(So`R9nbU9U?tVa#+}y zjP;Mdy5Q2>_OKn_OtR%{^5F|+B9+UQj4(m%`E%Xfb`)DBW=XESNxGjXOZ5OV{a>Ybffjg>N+7F3Wc6{@~q z-BzfUL*u;3Vm2!SHMGmzw?_x&fqh}^Yva9{C}{zm#tXsMY;`RO@Nki#BOUJ&A^Jkng|{K56IENKcg8MI*?SH%C1Wpw- z=0PgJxPKF%Gq-~X6u2orNj@YKaFTAAQCd#=yBVhOJ@wE%V`9qu#e)_#VzGWZa5$}Isqz#mMi(6cngmpR|kTwJCXrZ@4f#~9ra%{+-JS|Fe6$@ z-TnGMVlwzAS5#ekd1bqE>fp0C>Eal*5lI3V6%y=Bc)QXFRRX6J}9e=C{RhyuPw^fayIa`ATNA3)Aqni zpBa1{%8?0aTzYXFYqWf@(^$6RZuLhr&C#;U@w5wR$O&{nt!1k;$VuKnElLJO~iaDSt9%divHYCSPE@Vids7x_*fS%9xS-H z+P9^iU+FIJFg-a%%epx3o61_}J-;I8->DflF!({-tVAWfMw_f1UDV!XRvI|l=kqi+ ztG21W#@v6}y{RE)r*AunVGo60nZ2;4)CYE9M@jI;3Y%1WQ*1K>-X?iPCY!rC{RRUj zkqf^r1s6LemBy#=p#>|ZBu2F^csm8H4(J$!00Z_}pl1o(OH*Jo9dASdU%Yi^GM)LC6A3RjN}jP_n@$RA>`cTY*c|0lKi2-n*-&-$d(ctX*_Q(j!MN}K?DnP{ z_Ne#{>zrukL$|5w<79`ytP-SlfwlMqnQY_N|JftnZp}a->-;9j8Fij{lPQ!a?g8h%+F0KgSDqCS7WUu-sOM;H ziTh|mcDK%x?e(=$l!LvJbgQ6fL})a;W^dJOYtx_}3rWe{_$sn0m~Q!RHfoKNT2VoVj2Xj_ z!A8*E-91qY({H3!2Jdee2h*s*f?3EkH}ib<%FAKWR{QLC^J4?U!{gjsCe2)S9-!6P zEX3dzWS2#Et87e86!G)F7!Lk_SVeZZ)q%Bqt*g|t;ZEdiSdmH5z>06(rNCqntIP%$ zAo4>DNBLybCQpemOpH8Kf|rq>dqMCTHd-G^=V__njKiM-VyS$BlJzc9IMo363W2$^ z?v<-w$2UM4GP(1nzZfX?zNF)3yP@2?rp3-ZNk*H=!SS_M#=i^ZQ#-jlJqH@O*!DlL0enBaAj?Ut!Szotg(KVyUpxAy-x!we7?4^W*n=l zI^(Y4RGGmWZHYbR1XNM>>KXJq&!DToKLQU=pnX}3n6^{Cl(=K|s2H$uA zBnbi?fuXPGr8k zERCky!iMCFj6!XKrsJLmvfWmWMG-L%gIGT_V_{`OPC~Gjr;K%sICqURe0-+Os-_%f zT#%3Y^apa2(_KMh)2cY1Hun(Ed2qPnr8k+XJ){yLmz-5{rCBOPHi?u=YJM?hl+W2D zP4m6g`hQ+KSOa?({v4IHt}7RNY(+k&cY=!S50A!&D?RS;=cSl_?Q!+O{$e;*ZN%)> zj(C6~Zrj7H9{49rg?P8ZF>vqeu zV3I!z__oMdo>KK>7?3U*mgiw*$*4$Y@ee1y$=&q7B`^GqR-3W<+m`&^|AhJ5+zo!0 zv!OODAa-Ahv0ryE`C3U#rbWFLjB{C`Uz}$lem|%x=J)0sK)c3LTi#?uO$up&wCrqs z6$9Kb^LzpH9D2W?M(XvuyTYQs^ft;ja&q1aJp7V|#<)T+-oZ1}%$H%=N21bdU<~}I zNTozMgsT6YO0g#N_ZkiI)8MCnbhx+hRxs4tRQ;ggMx*3}cBoKt^h-I5Me(jTqz%yJ zeOKF*h|*!unPsK|wC)W{&?E-sg{J^l1YRY02?ags><3re7)iyM^(vqMeMRSMI-&9L zlL8v@RdlIO-jA44Rt#xt@F_r%5gYtTnom@go}fUh>-6QrYl=kC7Ice(zMZEQR6M@J zZdrWZ!(+0>wM7-5c*0g{!m{|{)&-SZ(u!DWjK1D{HLDa9@q#r`_DQ58_uH^Nt9RS9 zFGw$>abRnotvF*PQD7WR!=Bq{a_gGzYUkiB&bOsar|X7SWbazSy$0X%6XIb0@8u!? zSKrPHsY;fMgLiVU8@8^ll^3-(z3p^z-`c3T=-NzPaxE;9>6!FqKS|1p{lZp&uhevl z%e%aG2ATL~fDPMMBcgS}#%M7gv5d|dn<2J}eN%fS3IE|oxI4pG z$bRZqn*gOlD&L_5A|(O$F;-Gmy*Pz*N$umfZxIjw`C58*d)0=JFdV$cEcaq5EXYx^ zSFJV`zjyG`3GW}`A5>()5=qlja7sQH2cUX*TkvK!eeVO%4eB-WK?`iQ1$bH zk1$(3r7hF*nj<9L(Gs*UH*IByPVkvPTKR{ai|%H4Lp#@%F?9aMJx#t}y&7wbKNLoHl*tVpvm7ivqdW3Gg|VO6>_&-4wmCam z*T8jrFW(}wnBl!5$WkG5o3C``qzkSIX+_;E7Oo+4mU?CpMxhF8ym~TiUstbRBpU)t9QyrpFRr zr}reZvDvLalPWN&LyUFev4QZ6%~{Sk17u17SpcWr8Je=9qG^*Eu#v}PtfQ}R_> zlbmg^Vwx}_N)1=MQNE8C=y}I*9vxB$c3pc0vs#h?L+W;kMck(O=*YAD z0>$@^BAx=9m2-SSbF#Z>r;G6uT!!Z{RFVJ{$&Fnw+UN3KywU#jY`phOt0mZ(cKMij zbKba|ytgJB%g}-_qHbhmx$VKCr$8SqYgYk&UNTSc7xzeAdCg&3+fQ8Q!#e=4+sd*M zzrMpqGlcx988USX<2frM$3Y!Tl|h$^`=p)wW_QjG2Y)^Mo;+QDlQ373GIyC6!;+Bu0A9eUzAchEmebXtgOBcS%u^Ht&(PXxkVm zw;d{1DW`~>NuQbKu4UIP0#|hD9CVq|uZYU2rw+3UNiv!+`U^mYUX^(@r4wwuY_KLz zfl{a7huC9lZbjS6(~4`q!@$5=02XE4%3D~&=lz?kj~>Vg!nWn++LRm|8r7EXq;x2js~P``K~Qsc9L4(s1LLU}B|wrFlq49_?eG|x8nu(99P^Q}%2!smXM&IpEmBd3qrC<#v#if%b_vjT_99f&h3 zB&g7h>cYnqmk4FPV$>Pdh7SkKdW?Vnrd2aUCU19aj1+ybqpL)h{=D83Yn@_8j5Lwv z#GMpYIT0H%nB2azBbUgSd#8V8jdP7LdT9H6)pXPJT0CI2Rt}?d9RuB-9Ey?u#W-;o z;o9i?_Ru-^gE0-WTSTCv#8-E1b9LRM`_l|`yUov{UAaNg?A?JOxARU@OhrFy$txpe z1oGyUk2pzlXO<$Z(ZipoLOyV(#p|a{;O{51ypp@74I3xpRr{67n}p3!jzru|lOLT= zaeZqdKFIq^%WVjy%$B(s78o(cbALKn#?RY}IQ?AnhJ5<#B}?qQ)62{NTe(AHd=VWo zMIFM$dc9cIO-@ZZeOE2Z`Fi;ww656uBBJ|Dt?Z>G}uJ2W>z1wl~WB6r0VHqLxzK#*Y_k{U5soYrQcr?bL(lyzmUD3{!CnCsH%5T5Pl z_uFfHdhz_~%=ORC@%Cnj>FePlin<*u;~Q$WtV`#mk!ILIcFc)RON-c2gxmSqx!aYy zTSrpD!(R;3<$Isd-oY#r0(G6bLXpX#I{QRxQnYQ4>F!nU)7^zui9@(f8SA-neb0fvez~xWr4D(oI1q|d&w;XJ&CUh6NDItJ z47=l>YnA)i99zCJhJxBj2wz{Uk*u!`4ztQvp3h5YR~kpQp_T9Y(s_rfGy4x@&SGGv z`A>}jvO~%Doa@)?%O)`U$arcjWE*w)(sr~cFUJ{*H=0HAWLmo!VGYDH`Y*opQTMOpWkj##)kdw z(;E}De=*2faxz&V4WKb7qUf_fo9#9xxy3RD#y_Xt4=HK<`2m=|rEXi}B)^C*zjhy} z9pQ&kAj**1&7}QV*44`NvvXK;lv6WuKoS9y>+d=rtE*`e90iQyPLp}l)$=D>yZ>VJ z6MnSl<<=>j3MgokbI1fY>t z#Oa){-cEb-(~x=;GmF>gVSBe!5Z0$K1_yuLlvX%^?xgiQvsKmKk|ZXe_NCu6>3noa z=lhiDkw8%Lc0UBk;``*i!!L}dz_t_$$$OnoB^HG)0VFnM-yt@2uH;EKOi^y9rAy{6Kt0yXaQ?Sv zQPX9iS|>tcW?>%IBMxuXzDO`vJ4bD?$mBfj{OX31K{Gr^FWZ;a4muszjp{bL>+NUP z2wAtu{rk%t|LuSmU;6j)30};Cy#8_YwCpyDc@t?3p;m zgIAj^8on_pCuw!F!k*IT^1+y`PlCRA0>0gRs_~NO@*RrQX zr^cGIQEUx%f5%fLZ@1`3D77!#5^zgT)a`0fgtXIcb-5vdzU-f$>)h(?IxbzrKG^F|C4JKe9`z46co&28pi4v_!4^`*>xZbg^D`!Nw#OjLRn9vMrNzEL_g6&_z;%?ELg zgk)K6qs)%(O>+1gX67Rt(DZ8|9`%U~$8Sm376_4s^-K_~Z?QJ;3zBRTU6cI1xpF}0 zn7l2x;io+VQ`CBa2+`zz>vIH=h{_u#yUD>Vj#*w1yfJ24u}m&nL%lnd(}-Cs4z&0r zGO@gQQbg$^F)3QhXHFuhf+=u z^i{m2!iq3QE}?gzYNysnQLdrvb%H}`c2t6KA} zK_Wom*z`ci=U|9T+0(%t{migS)hUImbCO7cnTxNRKmScPMf7In21`wL<2nv=>g}22 zhLu0n0{d~|O_?0&oU+W21}=(bXobflXw>uSgy4!NPD5fz0Z52A5;dOHv@mx#p#F>D z?y)!ir|%fDHK})!)hb5JWKA{UcQ0hEoGt(p(Qs?FF3nLYfQ;^Ix4Q`3-`*o<+V20% z9ujm% zRmm)7(U@V=%getQoh*O?O~e;V64AK!^M^yddXu)n93))7YCmfB7L9G( zy?;FJeW{CT)vKC~1#qNXrVsTQ*qPzNm%YcA%inc)S~Ja; z+h(;6$cZH$^ttJXZ8>Vq_2vXG3CrAWXc`Va*5{~tL!;wG4dAa|n?%;sgR@L}={!;! z>GStSTDbnq_ifI@T{@&21xm)acTT!ld)T}e9vUkqIp-?X8d(f?E@+p21!CV|VEhue zFT$xl>_50zgy~=Si)>xpQ3u`jzvq9s(6ICy$~7b0F=Xi4?X17m+(;M@VCB!_40n(* z#Vwwq|BHcXGB$Wm*ffMC4c{FBgCcHDCtL$aTe5rvAr0Rrp+}(Ct5ezEd8QQ5Cm3p8 z(%+{#!L-pmNL^WWgnK+jye6|OgoFb8c%mOUdSc+FYHM+ZV{{AlI8&y+m!PjTbn>sTmMXXfd>=gT)f}WaQ$EDC`GIp-Q1zhp<%zAV8h_G3Y(d%k0)F*ik^3 z*jkc~S%aIZzHD4PtXov8gu${yxirMbM0+TJ|9clNvAzvs8Ku(u+lic#lq^h{UW%YvL<3e5l_IcX@Tjfg|hG(Pp~B zJb-Lo(~z&k&(Eed?ySW;<@=XZ1=OppE8SAc8`yo!=mVW@HHvE{9TF)bWnv+9vA3LI z$;RK*0wKpEvy}<>FV-;le*71;y@1ndv;!sM!U?+EmwJz~^s((%4B_VH;)n(Qwunx8 z6xoZ%Ja-EVt&zcV^1U*$0@`OuiCfCnPk@MLHteOP{_`Bjb~nRi*XxGk1%@sHH@Zssj1HT3a8taEv|G!D&Jjd%wW?AKrMA> zVwZw+s`vJ^8xUwthM|3(>ykNS_7VM8bkF%WwKsPgk7JBZOygd_k)gWe`Bv{#AWbY0 zld!%owX|!LGlw+#1q+2ED=f-6A^VhJEAAZK-;E@rE7U{yRXI&e%Tg%Q)efdyV3y}7 zfn$@6`BuOxeFd@};@$?xmQsJU`z!Q*ppXA%I!?eoaf_-_ce#J}>Y1tcC09)+8VOj2 zs=wu&K>P!K+17O7-}caH-{u3|gb~{l8CPdYbuZqTUi)|a4|WUJbq>ZrPWS|kYtHL@=0-0uc+!2J zibmROU(Kr9ipS?ek_Bk$AAglL(bmy=7U_q3y3MQh39qxWY3rjFVvghIRtxp}es6oB zm0TR4F}~w#Z#Gk|z6;Bpgio8b(DxWP#3lwFd*q|=4tJN@Es5XVg11s*OrQ{O-TWL* zfR|YS&yy$9d#4ND=eDM^&8AVR&8ph5xRvPcB>ZFi_@4039+r8_?ugp~x_TE29ZGi= zY>53nG0%U^f5#edGnI9wM~d}-f*|1+n^RgmGH@+ucnArg*8xkca8=X|GZayLA+)65 z1jQ4Tv6(HGe%_&1^-ybJ^(B7R*_sfq;)x6VT4wQNON@eS=R;dSHo3#Nc?zq6`N!Qf z;xtWRRs9#I9Jy8v4Wh=2eWDI~XSD>2_Z!_osYhQkKVxxTw0JdcpJoVsP1^Rqs8Y-y zz?q0-GQJW=hdYvoRdwUL=s7jTY(g9o4#-Mf<26P;ik?KcscX_;#}NsgL3bQScfZ}e zSo=+B>MHnk?D)AlLzzQyG#jv)FS_1GUs?N@kh*qSAE5XQ??f)ls#yg{CD}6al&3n% znr6cfC>nj1uyv{C&;eyJYW<-nM5(Wk)tIl(qB7@TBr?md+5D*rNQM0L7BqY|DJr-4 zIHIfxw8+4|uHDrm6FTtX8bjrT;U3)jD z>=v`UC%pVt?z1xEok|(1=RJYnrJ^;GI>ph!=BN9DcWUsA|;oR?%Zr6t3ashLF(fT^E9BjO?jxpB4+mue~TuZau5OW!+O zm10&in*=r*jrAf7aDQuqk5dNZ4AO-kCz>bR-jjvzvFG}j#N=Vx)c?y+Gt}V*dH%Cfl`)P#$0fHr5 zN~mF^e5#s?m*bqdwaI*|#zZ}qe!1KJB$oATDi`iWb#!@?yN^H?SC_7(nq6F*eNLt5 zimRaii0=JgjLN?lA6gDg)<>t<#mxU>-S5iXJ)+3zmUe&p|97ZcM2~aSXosIk^njU@ zacVYfT%Sn2aMMBT;c@;_Vt3)ea&9;WtzmQAKjni5&aF&B-Q{M6!lQBCTkN>sTyy$D z2E>4yyx2Lh)XheyRDA@`9uKWH8F|cY!c<}nFaOK}v|H%ON~~S>!w!DPLipKTQn0yQ z2ZQ5>cfwB_9PQ@Uh&5p?cP|}3dJ!`m`^Tqzgb56t^H$Mk?FUI%;8C4z*3N9sWHBV_Urn>celyWy6WEq<{HGg?Dg%l0MAzS67S9WA^UCqi zs=ieR|JpMwLbM#{h+Q6btG*o_NXz%WHoo(u01AAuP>uQ(G@ie?d+?3n$Bko)2FFf!J>Em|MoOEZY~XAdujX zthE}UUSfiG*Pk}}e492oaRS$8j?vZU5?+r0QoJI3j+<&MLa9uZdZPHZXaOsi9lh-W z<*0rAo+WdOgKTYxY9f0VSr#QG!9pLJo=P)*_$c}xeVG?O{4S!&nJFPdIU$LUT+l(F zYB$wt&v%?QY7gi-hS#s{TjIP*Z`9^&Yt!gYvHTFt-uSgg$~l6V)-F2p)1pC#F^DpN z=AfR~PJIWCo5ciq6Y8hm+*w`KC8EtgDfz}|bPVSt&r_te_A2~0B zu|A(|Iv9<4A5{Ndl^f%!UR!R3gLQhA{Dr;JLUVz;5IGV`U0x0bn2kE?0CfX9#_@Rt&=JYDJ z36*seuXNH3C)zTXv`^{rqDfrqxN`QwqhIhEHCJZtyk>&_u5tdptuEo&G(|o;>~TxY60i?)~n~{flN>Tb>V*O{@_PUJi;cSr z;es##VMr^`Z~{^&MOC6qtG=;~`21lUHVA%)AmGNLVeg>5bV@lnW;VYsJMutk9M@0AKS&O&d0tN1StZ!0e?Io87GMwP0U@)jbjvGW-yEUR?6*idhg zD(FNNuGQ{acqOju9}ALapvcM#t0iIYgG`r;)tQ?Gy4XZc^$<%|h2(Y`d}MDtQl zmY3Wf+T~5_#x3*ZYs2})Vz3oBs058<^q2}2u`uf|tt~J&We3geY=Awd&56-g6&-Q4{-IBq3Blalh9w~j!P`1D0gbDaP% z8sEwG^#5t^yn>qC);^AhjeDaMDWV_&MG*u9L69oAMLi!;556pT-dkRQuo142!97mv%;VTBw{Vm|M8>#fqT(Z1(}01d1#MEfc4602fn zFOk)II``d;$TFru?H=T}RH;m8t3a&SI#$ZS@>H4ZVB`=!aNk71To=V&0M zCkpS&Q01K}P17O|6?H@>i%d&iOEE8HC3x@>wh%>mvR3ry*}<`fE1Aks)g{B0{%Cz@ zrhJt@>Kw2|0OL@#b@RK%u*y<{xPrl>It=n9jcX!H<7}?aRKwR-B0alS>SX0b5=pkM z!hP(#1!L0LcDcya1e3A#YG>yc^~nG`4EC)ZE@lpzei|8ZAF&zunyP}0nLTTIgfzU5 z{U$PU63kT5Axs8J2l~)ZjmZu;I`box$a3=87cbP^J-U7}+2D=USQR+=)KhXWk>bkZ zVw=JIUerc!9jBcd9K~HEaJxU6j~-B$0w}dDa$UE)_vvxqk;*(- z_>yE^Zg#F_5K5~bk*t!sM&FwjB(fOYaEpOY{*fdYSjB2U|PkwrZ%^%wX6vWgh zEN#H3fM83KGxV7-F2`-?!XU_c=_YtT!|F!If zuj;*O7X>m$sG!8sRe+UoU$%sBC4N>e!K0zp+p?Tt)KlE;O23*RFOFD0uKrZX!#{K8 zV)SUH>fO)#{^oO_ht5L^%{5mZezvgmTHSX!D66z6!^Xh5417FMs+{MRO z<#$BLiWie4 zIRBln(L<}t;8Lw;K3mLMnX35I8w!CQH#6?!uv;P>xuU{<;Ei zwNxJkflOQlL3-TjrHFX#z;t*|Umbi=oe=PXe{c=CeNq^p5a{b;%3Ke$ri9lSk%d=f z?1PVN-Zxl48uQz5U+?l8ywCNSt$151^2qn~vf6`gW8S9X$HJCjA z0HIFb%u0%w<$SBkIn5|`OR(?n9sf__^?$roi<~g5*c}gaYaAQ7-u0%HRPq|7l<+I& zxz^)7iva3QIh|V?wyxM`>UA%aq8$VXitn0Klcuz0YT4sNBL`;PCI%-c6FyTlTmuv6 zytN+?x0*^?q$glnPi}G%7X`}f4gXrg>x?3p!vhD8MV&U>c&^!m?T(oc>00-=`5NQY<51`*5JpLp% z&3V1pneWly+nWfFJQZMoC}S|wYF*bpgk9EfG&CZypk%=Sv7Vcq4wn+I0sGn-W;n|P zz$7o@S-xMuYFi!GgqIrc&k)0_gow=64qWh5+xqQhFKTj&0kD0fNF*YtXjLGS zsGV4gI_)lvG07vY;p!CZzbjAL=@`d(9_G2a9bY#si?=VO{bciDZJ3{7l|jrAf7!IK ze#znPSmIm9d{KSfTI($4K9Aqfn=zf3kOoywmuDVPpH-vn(ROVlzj`V@f7*D0lu8uC zq@hkn%gTeWgSo0a40#Wc;^4B!W0chfH~xc?ArC7Z3i_;dkEgT;$ZXQtLOFH}5@Zgm z_5L$asfP8Aip^T8Dku(f=l{6S0c^I36u`{#J&Zh4T8q;6L6=iURlQe_QtquD!m9UJ zG}&!CxYtCb`(kpIZaEg39BCJS$#dpqxZb+#%ki20{J`zLd)vCB1!*hmkpMiq?R^N^67;|L&-!^7X6~Wb0L#Jr` z_0G~lOzUhvDJ15bv~w%#zQ0piSRkxaL_F%`6`$rmEwkY{@1#p|KtJCSWQ{NCTI!0x zRGD&5{$zW2Ep;_rux^fQaS~)5(^|a)Z1Q_6B$mVa6KDp9WU~j|Lg#oy1QUh(uFW|k zdS|+RB%z(h{~SOHYhBScOR|WxQHYLU)uAkiAT?#s2jkhp@vr3iQS#*b_V)MZSGB>% z8t6aTdh_lA zX%a_j%}nJE&xv=Id zt7wtZxe<~|d_-LO#v9&09QeZ^^myCoH2Dl|`F^%onhK{A@X7KOX1k0G%I3ET?CQ9B z!V}8_i|);aQbJeuivH8(>__lC7t^KrYw381b;7$DW!{TwmBpl09ju$hsw=;n$7v5Xe$vG)>ndrbU90}*tl{Ra3+|)yLv=+ zNH2hD;uaB*?U&s9E8h0NVG#^?xyAc}_3fDQWtFHf!*?Bcw6eET!8yWNzH$QXGQK6i zdYAinbW}0J-c$q+UlHx;WtIEz3eB6mA%lyDHDy!npu#pM?hQy2PoX9b(nl;zOlTC22C}4c%zW0kOt1L zqFxxPNK6a6sK~Ya2Dr{|*xu1%pe>QDY9?I@-Um8m-CJS5tRB~8uS&4z zhR{WL4n_ zu@6As8oGO^d=}qyo+O?KP?@{uB6ZoRs>UmLB*V#a#xA3K5)H~5u^nuP@8==_17Vu{&N>*(0XpXt}RE;ixL7<@9uatX$;`8$YB0Zf-F1#Omjd?kV=; z2MPysvSFcb&jKaB;qKj`K}|Luo>J7fUq<}XN5O7X$9_HkTEm!|9e3^+&cUH+bTY(* zxQ^r(WYtoB461Y5loh2(KzY7&+>=D;t4EMnuv@OkUlQ1Fzh;XD7N*C-^jvybkmqF? zXyJcDp8I%mVzux71M*BE{KG@!&Tkur!S>-M{rEoo!iOg3I;pEWr_OW1+nCG6!l4WU zb;#x3w1ZBy?b?zzf;I42WzsFhwKLPoM2J8!;mw2wJ;YBK~ diff --git a/demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.png b/demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.png deleted file mode 100644 index 44941b75c660e6239c211f65e4a8157bbff2b4d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14792 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 b)VJ;)aMWHo(Oql)lM{IvW$AKB!@&Onz#oPk diff --git a/demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.svg b/demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.svg deleted file mode 100644 index 4095b473..00000000 --- a/demdata_cms/static/demdata_cms/img/org_logos/Demo-Data.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/demdata_cms/static/demdata_cms/img/org_logos/tacc-white.png b/demdata_cms/static/demdata_cms/img/org_logos/tacc-white.png deleted file mode 100644 index 9c3d593237d07ceda89a014417c5e062cdc940b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16695 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 J;FZy*{{tb-JemLi From 9c7e24eebe5a477e9de207b9857171c61718e307 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 13 Jul 2023 13:46:31 -0500 Subject: [PATCH 10/13] chore: remove migrated projects These projects have been migrated to: https://github.com/TACC/Core-CMS-Custom/ Or, in the case of tup_cms, are in their own repo: https://github.com/TACC/tup-ui --- apcd_cms/__init__.py | 0 apcd_cms/static/apcd_cms/css/src/placeholder.css | 1 - tapis_project_org/__init__.py | 0 .../tapis_project_org/img/org_logos/favicon.png | Bin 3033 -> 0 bytes tup_cms/__init__.py | 0 tup_cms/static/tup_cms/css/src/placeholder.css | 1 - 6 files changed, 2 deletions(-) delete mode 100755 apcd_cms/__init__.py delete mode 100644 apcd_cms/static/apcd_cms/css/src/placeholder.css delete mode 100755 tapis_project_org/__init__.py delete mode 100644 tapis_project_org/static/tapis_project_org/img/org_logos/favicon.png delete mode 100755 tup_cms/__init__.py delete mode 100644 tup_cms/static/tup_cms/css/src/placeholder.css diff --git a/apcd_cms/__init__.py b/apcd_cms/__init__.py deleted file mode 100755 index e69de29b..00000000 diff --git a/apcd_cms/static/apcd_cms/css/src/placeholder.css b/apcd_cms/static/apcd_cms/css/src/placeholder.css deleted file mode 100644 index 46e7b292..00000000 --- a/apcd_cms/static/apcd_cms/css/src/placeholder.css +++ /dev/null @@ -1 +0,0 @@ -/* FAQ: The CSS build process crashes without at least one project stylesheet */ diff --git a/tapis_project_org/__init__.py b/tapis_project_org/__init__.py deleted file mode 100755 index e69de29b..00000000 diff --git a/tapis_project_org/static/tapis_project_org/img/org_logos/favicon.png b/tapis_project_org/static/tapis_project_org/img/org_logos/favicon.png deleted file mode 100644 index 68e03ed6c452b785be305cef1d2506f8a86f9bfb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3033 zcmV;~3nui5P)004R>004l5008;`004mK004C`008P>0026e000+ooVrmw00006 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 Date: Tue, 18 Jul 2023 14:38:19 -0500 Subject: [PATCH 11/13] docs: change dash to underscore --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3dc36708..b0f2e94b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ The project-specific CMS code for TACC WMA Workspace Websites. To add resources for a new project: 1. Clone `/example_cms`. -2. Read `/_readme-cms`. +2. Read `/_readme_cms`. To build such a CMS project, use [TACC/Core-CMS](https://github.com/TACC/Core-CMS). From 57d0cb6418c7b46d97031de6a93ebc82a6308ca2 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 18 Jul 2023 14:49:46 -0500 Subject: [PATCH 12/13] docs: add warning about deploy, require migration --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index b0f2e94b..a199dcc7 100644 --- a/README.md +++ b/README.md @@ -9,11 +9,14 @@ To add resources for a new project: To build such a CMS project, use [TACC/Core-CMS](https://github.com/TACC/Core-CMS). +> **Warning** +> Do **not** deploy these websites via this repository with [TACC/Core-CMS#v3.12.0](https://github.com/TACC/Core-CMS/releases/tag/v3.12.0) or greater. **Instead**, migrate them to [Core CMS Custom].[^1] ## Related Repositories - [Camino], a Docker container-based deployment scheme - [Core CMS], the base CMS code for TACC WMA CMS Websites +- [Core CMS Custom], the custom CMS code (new solution) for TACC WMA CMS Websites ## Intended Usage @@ -49,5 +52,8 @@ Please see the [Core CMS README]. [Core CMS]: https://github.com/TACC/Core-CMS [Core Styles]: https://github.com/TACC/Core-Styles +[Core CMS Custom]: https://github.com/TACC/Core-CMS-Custom [Core CMS README]: https://github.com/TACC/Core-CMS/blob/main/README.md [Camino]: https://github.com/TACC/Camino + +[^1]: [Websites with custom templates will experience a major problem.](https://github.com/TACC/Core-CMS-Resources/pull/176#issuecomment-1603194690) Even though not all websites have such templates **and** there is a [tested solution](https://github.com/TACC/Core-CMS-Resources/pull/176#issuecomment-1603215969), website development benefits so much from migration, that every opportunity is taken to encourage it. From 2d60d3a61746b8f1bdb3e37456773113532e4fae Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 18 Jul 2023 14:55:03 -0500 Subject: [PATCH 13/13] docs: note migrated sites (premature, but soon) --- README.md | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index a199dcc7..76907c73 100644 --- a/README.md +++ b/README.md @@ -30,19 +30,23 @@ Please see the [Core CMS README]. ## Websites Maintained -- https://prod.a2cps.tacc.utexas.edu/ +- https://prod.a2cps.tacc.utexas.edu/ a.k.a. https://a2cps.org/
+ code has moved to https://github.com/TACC/Core-CMS-Custom/blob/main/a2cps_cms/ - https://prod.apcd.tacc.utexas.edu/ a.k.a. https://txapcd.org/
code has moved to https://github.com/TACC/Core-CMS-Custom/blob/main/apcd_cms/ - https://portal.brainmap.org/ -- https://democratizingdata.ai/ -- https://prod.ecep.tacc.utexas.edu/ a.k.a. https://ecepalliance.org/ +- https://democratizingdata.ai/
+ code has moved to https://github.com/TACC/Core-CMS-Custom/blob/main/apcd_cms/ +- https://prod.ecep.tacc.utexas.edu/ a.k.a. https://ecepalliance.org/
+ code has moved to https://github.com/TACC/Core-CMS-Custom/blob/main/ecep_cms/ - https://prod.epoc.tacc.utexas.edu/ - https://frontera-portal.tacc.utexas.edu/ - https://lccf.tacc.utexas.edu/ - https://3dem.org/ - https://prod.protx.tacc.utexas.edu/ - https://prod.sciviscolor.tacc.utexas.edu/ -- https://tapis-project.org/ +- https://tapis-project.org/
+ code has moved to https://github.com/TACC/Core-CMS-Custom/blob/main/tapisproject_cms/ - https://texascale.org/ - https://dev.tup.tacc.utexas.edu/
code has moved to https://github.com/TACC/tup-ui/blob/main/apps/tup-cms/