From f0111e8ebebbd5071a4fb2839b3c88f6c6212d55 Mon Sep 17 00:00:00 2001 From: Garrett Edmonds <43251554+edmondsgarrett@users.noreply.github.com> Date: Wed, 13 Mar 2024 16:10:18 -0500 Subject: [PATCH] task/WP-149: Upgrade APCD CMS to Django 4.2 (#277) * Update Core-CMS image to v4.5.0 (grab Django 4.2+ update) * Admin registrations table apps.py misconfigured * Fix app name in config for admin registrations listing * Update local dev postgres version * Update app config names so Django can find them - prepend 'apps.' to each * Update admin registrations listing namespace * Update static load in custom template * Add app config for login app * Convert to psycopg from psycopg2 for db connections * Rename taccsite_custom/apcd-cms to taccsite_custom/apcd_cms to match Core-CMS v3.12+ requirements --------- Co-authored-by: Garrett Edmonds --- apcd-cms/Dockerfile | 4 +- apcd-cms/docker-compose.dev.yml | 2 +- apcd-cms/src/apps/admin_exception/apps.py | 2 +- apcd-cms/src/apps/admin_extension/apps.py | 2 +- apcd-cms/src/apps/admin_regis_table/apps.py | 4 +- apcd-cms/src/apps/admin_regis_table/urls.py | 2 +- apcd-cms/src/apps/admin_regis_table/views.py | 2 +- apcd-cms/src/apps/admin_submissions/apps.py | 2 +- apcd-cms/src/apps/apcd_login/apps.py | 5 ++ apcd-cms/src/apps/exception/apps.py | 2 +- apcd-cms/src/apps/extension/apps.py | 2 +- apcd-cms/src/apps/registrations/apps.py | 2 +- apcd-cms/src/apps/registrations/urls.py | 2 +- apcd-cms/src/apps/submissions/apps.py | 2 +- .../apps/submitter_renewals_listing/apps.py | 2 +- apcd-cms/src/apps/utils/apcd_database.py | 67 +++++++++--------- apcd-cms/src/apps/view_users/apps.py | 2 +- apcd-cms/src/taccsite_cms/urls_custom.py | 2 +- .../css/modal--conflicts-with-core.css | 0 .../static/apcd-cms/css/modal.css | 0 .../static/apcd-cms/css/site.cms.css | 0 .../css/table--conflicts-with-core.css | 0 .../static/apcd-cms/css/table.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 .../templates/assets_custom.html | 2 +- ...up-175-css-alerts-messages-ui-pattern.html | 0 29 files changed, 59 insertions(+), 51 deletions(-) create mode 100644 apcd-cms/src/apps/apcd_login/apps.py rename apcd-cms/src/taccsite_custom/{apcd-cms => apcd_cms}/static/apcd-cms/css/modal--conflicts-with-core.css (100%) rename apcd-cms/src/taccsite_custom/{apcd-cms => apcd_cms}/static/apcd-cms/css/modal.css (100%) rename apcd-cms/src/taccsite_custom/{apcd-cms => apcd_cms}/static/apcd-cms/css/site.cms.css (100%) rename apcd-cms/src/taccsite_custom/{apcd-cms => apcd_cms}/static/apcd-cms/css/table--conflicts-with-core.css (100%) rename apcd-cms/src/taccsite_custom/{apcd-cms => apcd_cms}/static/apcd-cms/css/table.css (100%) rename apcd-cms/src/taccsite_custom/{apcd-cms => apcd_cms}/static/apcd-cms/img/favicons/favicon.ico (100%) rename apcd-cms/src/taccsite_custom/{apcd-cms => apcd_cms}/static/apcd-cms/img/org_logos/apcd-black.png (100%) rename apcd-cms/src/taccsite_custom/{apcd-cms => apcd_cms}/static/apcd-cms/img/org_logos/apcd-white.png (100%) rename apcd-cms/src/taccsite_custom/{apcd-cms => apcd_cms}/static/apcd-cms/img/org_logos/tacc-white.png (100%) rename apcd-cms/src/taccsite_custom/{apcd-cms => apcd_cms}/templates/assets_custom.html (96%) rename apcd-cms/src/taccsite_custom/{apcd-cms => apcd_cms}/templates/snippets/tup-175-css-alerts-messages-ui-pattern.html (100%) diff --git a/apcd-cms/Dockerfile b/apcd-cms/Dockerfile index bfaf254f..6cbbfc8d 100644 --- a/apcd-cms/Dockerfile +++ b/apcd-cms/Dockerfile @@ -1,5 +1,5 @@ -# TACC/Core-CMS#v3.11.6 -FROM taccwma/core-cms:c5bea4c +# TACC/Core-CMS#v4.5.0 +FROM taccwma/core-cms:5473db7 WORKDIR /code diff --git a/apcd-cms/docker-compose.dev.yml b/apcd-cms/docker-compose.dev.yml index 2aeb7843..3cb36cef 100644 --- a/apcd-cms/docker-compose.dev.yml +++ b/apcd-cms/docker-compose.dev.yml @@ -19,7 +19,7 @@ services: - core_cms_net postgres: - image: postgres:11.5 + image: postgres:14.9 environment: - POSTGRES_PASSWORD=taccforever - POSTGRES_USER=postgresadmin diff --git a/apcd-cms/src/apps/admin_exception/apps.py b/apcd-cms/src/apps/admin_exception/apps.py index afe130f2..26785aa0 100644 --- a/apcd-cms/src/apps/admin_exception/apps.py +++ b/apcd-cms/src/apps/admin_exception/apps.py @@ -1,4 +1,4 @@ from django.apps import AppConfig class AdminExceptionConfig(AppConfig): - name = 'admin_exception' \ No newline at end of file + name = 'apps.admin_exception' \ No newline at end of file diff --git a/apcd-cms/src/apps/admin_extension/apps.py b/apcd-cms/src/apps/admin_extension/apps.py index 5a4661b0..eaf367a2 100644 --- a/apcd-cms/src/apps/admin_extension/apps.py +++ b/apcd-cms/src/apps/admin_extension/apps.py @@ -1,4 +1,4 @@ from django.apps import AppConfig class AdminExtensionConfig(AppConfig): - name = 'admin_extension' \ No newline at end of file + name = 'apps.admin_extension' \ No newline at end of file diff --git a/apcd-cms/src/apps/admin_regis_table/apps.py b/apcd-cms/src/apps/admin_regis_table/apps.py index 672181cf..edfbea77 100644 --- a/apcd-cms/src/apps/admin_regis_table/apps.py +++ b/apcd-cms/src/apps/admin_regis_table/apps.py @@ -1,5 +1,5 @@ from django.apps import AppConfig -class CustomExampleConfig(AppConfig): - name = 'custom_example' +class AdminRegConfig(AppConfig): + name = 'apps.admin_regis_table' diff --git a/apcd-cms/src/apps/admin_regis_table/urls.py b/apcd-cms/src/apps/admin_regis_table/urls.py index 3e844572..cb42e9ba 100644 --- a/apcd-cms/src/apps/admin_regis_table/urls.py +++ b/apcd-cms/src/apps/admin_regis_table/urls.py @@ -1,7 +1,7 @@ from django.urls import path from apps.admin_regis_table.views import RegistrationsTable -app_name = 'administration' +app_name = 'admin_regis_table' urlpatterns = [ path('list-registration-requests/', RegistrationsTable.as_view(), name='admin_regis_table'), path(r'list-registration-requests/?status=(?P)/', RegistrationsTable.as_view(), name='admin_regis_table'), diff --git a/apcd-cms/src/apps/admin_regis_table/views.py b/apcd-cms/src/apps/admin_regis_table/views.py index d649206e..24f940c8 100644 --- a/apcd-cms/src/apps/admin_regis_table/views.py +++ b/apcd-cms/src/apps/admin_regis_table/views.py @@ -126,5 +126,5 @@ def getDate(row): context['query_str'] = queryStr context.update(paginator(self.request, registration_table_entries)) - context['pagination_url_namespaces'] = 'administration:admin_regis_table' + context['pagination_url_namespaces'] = 'admin_regis_table:admin_regis_table' return context diff --git a/apcd-cms/src/apps/admin_submissions/apps.py b/apcd-cms/src/apps/admin_submissions/apps.py index 88d87ec1..8041fb85 100644 --- a/apcd-cms/src/apps/admin_submissions/apps.py +++ b/apcd-cms/src/apps/admin_submissions/apps.py @@ -1,4 +1,4 @@ from django.apps import AppConfig class SubmissionConfig(AppConfig): - name = 'admin_submissions' + name = 'apps.admin_submissions' diff --git a/apcd-cms/src/apps/apcd_login/apps.py b/apcd-cms/src/apps/apcd_login/apps.py new file mode 100644 index 00000000..5b9041a6 --- /dev/null +++ b/apcd-cms/src/apps/apcd_login/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class APCDLoginConfig(AppConfig): + name = 'apps.apcd_login' diff --git a/apcd-cms/src/apps/exception/apps.py b/apcd-cms/src/apps/exception/apps.py index 57e406c0..6f658ac3 100644 --- a/apcd-cms/src/apps/exception/apps.py +++ b/apcd-cms/src/apps/exception/apps.py @@ -1,4 +1,4 @@ from django.apps import AppConfig class ExceptionFormConfig(AppConfig): - name = 'exception' + name = 'apps.exception' diff --git a/apcd-cms/src/apps/extension/apps.py b/apcd-cms/src/apps/extension/apps.py index 472e19af..969e0835 100644 --- a/apcd-cms/src/apps/extension/apps.py +++ b/apcd-cms/src/apps/extension/apps.py @@ -1,4 +1,4 @@ from django.apps import AppConfig class ExtensionFormConfig(AppConfig): - name = 'extension' + name = 'apps.extension' diff --git a/apcd-cms/src/apps/registrations/apps.py b/apcd-cms/src/apps/registrations/apps.py index b45cd192..7bd39945 100644 --- a/apcd-cms/src/apps/registrations/apps.py +++ b/apcd-cms/src/apps/registrations/apps.py @@ -1,4 +1,4 @@ from django.apps import AppConfig class SubmissionFormConfig(AppConfig): - name = 'register' + name = 'apps.registrations' diff --git a/apcd-cms/src/apps/registrations/urls.py b/apcd-cms/src/apps/registrations/urls.py index 88b64747..8d2d7b1d 100644 --- a/apcd-cms/src/apps/registrations/urls.py +++ b/apcd-cms/src/apps/registrations/urls.py @@ -1,7 +1,7 @@ from django.urls import path from apps.registrations.views import SubmissionFormView -app_name = 'register' +app_name = 'registrations' urlpatterns = [ path('request-to-submit/', SubmissionFormView.as_view(), name='register_table') ] diff --git a/apcd-cms/src/apps/submissions/apps.py b/apcd-cms/src/apps/submissions/apps.py index a011a444..d03e9dcf 100644 --- a/apcd-cms/src/apps/submissions/apps.py +++ b/apcd-cms/src/apps/submissions/apps.py @@ -1,4 +1,4 @@ from django.apps import AppConfig class SubmissionConfig(AppConfig): - name = 'submissions' + name = 'apps.submissions' diff --git a/apcd-cms/src/apps/submitter_renewals_listing/apps.py b/apcd-cms/src/apps/submitter_renewals_listing/apps.py index 78aafdff..2656ac7a 100644 --- a/apcd-cms/src/apps/submitter_renewals_listing/apps.py +++ b/apcd-cms/src/apps/submitter_renewals_listing/apps.py @@ -2,4 +2,4 @@ class SubmitterRenewalsListingConfig(AppConfig): - name = 'submitter_renewals_listing' + name = 'apps.submitter_renewals_listing' diff --git a/apcd-cms/src/apps/utils/apcd_database.py b/apcd-cms/src/apps/utils/apcd_database.py index 7e413951..9d07c6f0 100644 --- a/apcd-cms/src/apps/utils/apcd_database.py +++ b/apcd-cms/src/apps/utils/apcd_database.py @@ -1,5 +1,5 @@ from django.conf import settings -import psycopg2 +import psycopg from datetime import datetime, date import re import logging @@ -13,7 +13,7 @@ def get_users(): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -57,7 +57,7 @@ def update_user(form): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -114,7 +114,7 @@ def get_user_role(user): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -146,7 +146,7 @@ def get_registrations(reg_id=None, submitter_code=None): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -172,7 +172,10 @@ def get_registrations(reg_id=None, submitter_code=None): {f"WHERE registration_id = {str(reg_id)}" if reg_id is not None else ''} {f"LEFT JOIN registration_submitters on registrations.registration_id = registration_submitters.registration_id LEFT JOIN submitters ON registration_submitters.submitter_id = submitters.submitter_id WHERE submitter_code = ANY(%s) ORDER BY registrations.registration_id" if submitter_code is not None else ''}""" cur = conn.cursor() - cur.execute(query, (submitter_code,)) + if submitter_code: + cur.execute(query, (submitter_code,)) + else: + cur.execute(query) return cur.fetchall() except Exception as error: @@ -189,7 +192,7 @@ def create_registration(form, renewal=False): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -246,7 +249,7 @@ def update_registration(form, reg_id): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -298,7 +301,7 @@ def get_registration_entities(reg_id=None, submitter_code=None): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -386,7 +389,7 @@ def create_registration_entity(form, reg_id, iteration, from_update_reg=None, ol file_dc ) VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)""" - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -439,7 +442,7 @@ def update_registration_entity(form, reg_id, iteration, no_entities): reg_id, form['ent_id_{}'.format(str_end)] ) - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -485,7 +488,7 @@ def delete_registration_entity(reg_id, ent_id): conn = None values = () try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -519,7 +522,7 @@ def get_registration_contacts(reg_id=None, submitter_code=None): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -588,7 +591,7 @@ def create_registration_contact(form, reg_id, iteration, from_update_reg=None, o contact_email ) VALUES (%s,%s,%s,%s,%s,%s)""" - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -632,7 +635,7 @@ def update_registration_contact(form, reg_id, iteration, no_contacts): reg_id, form[f'cont_id_{iteration}'] ) - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -669,7 +672,7 @@ def delete_registration_contact(reg_id, cont_id): conn = None values = () try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -703,7 +706,7 @@ def create_submitter(form, reg_data): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -763,7 +766,7 @@ def create_other_exception(form, sub_data): conn = None values = () try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -816,7 +819,7 @@ def create_threshold_exception(form, iteration, sub_data): conn = None values = () try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -873,7 +876,7 @@ def get_cdl_exceptions(file_type): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -909,7 +912,7 @@ def get_submissions(user): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -943,7 +946,7 @@ def get_submission_logs(submission_id): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -984,7 +987,7 @@ def get_user_submissions_and_logs(user): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -1040,7 +1043,7 @@ def get_all_submissions_and_logs(): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -1142,7 +1145,7 @@ def create_extension(form, iteration, sub_data): explanation_justification ) VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s) """ - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -1168,7 +1171,7 @@ def update_extension(form): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -1231,7 +1234,7 @@ def get_submitter_info(user): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -1269,7 +1272,7 @@ def get_applicable_data_periods(submitter_id): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -1295,7 +1298,7 @@ def get_current_exp_date(submitter_id, applicable_data_period): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -1321,7 +1324,7 @@ def get_all_extensions(): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -1369,7 +1372,7 @@ def get_all_exceptions(): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], @@ -1423,7 +1426,7 @@ def update_exception(form): cur = None conn = None try: - conn = psycopg2.connect( + conn = psycopg.connect( host=APCD_DB['host'], dbname=APCD_DB['database'], user=APCD_DB['user'], diff --git a/apcd-cms/src/apps/view_users/apps.py b/apcd-cms/src/apps/view_users/apps.py index 4bbdca3e..43dc1b21 100644 --- a/apcd-cms/src/apps/view_users/apps.py +++ b/apcd-cms/src/apps/view_users/apps.py @@ -2,4 +2,4 @@ class ViewUsersConfig(AppConfig): - name = 'view_users' + name = 'apps.view_users' diff --git a/apcd-cms/src/taccsite_cms/urls_custom.py b/apcd-cms/src/taccsite_cms/urls_custom.py index 55cbe897..cfc03d8d 100644 --- a/apcd-cms/src/taccsite_cms/urls_custom.py +++ b/apcd-cms/src/taccsite_cms/urls_custom.py @@ -1,7 +1,7 @@ from django.urls import path, include custom_urls = [ - path('administration/', include('apps.admin_regis_table.urls', namespace='administration')), + path('administration/', include('apps.admin_regis_table.urls', namespace='admin_regis_table')), path('administration/', include('apps.view_users.urls', namespace='viewusers')), path('administration/', include('apps.admin_submissions.urls', namespace='admin_submission')), path('administration/', include('apps.admin_exception.urls', namespace='admin_exception')), diff --git a/apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/css/modal--conflicts-with-core.css b/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/modal--conflicts-with-core.css similarity index 100% rename from apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/css/modal--conflicts-with-core.css rename to apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/modal--conflicts-with-core.css diff --git a/apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/css/modal.css b/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/modal.css similarity index 100% rename from apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/css/modal.css rename to apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/modal.css diff --git a/apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/css/site.cms.css b/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/site.cms.css similarity index 100% rename from apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/css/site.cms.css rename to apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/site.cms.css diff --git a/apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/css/table--conflicts-with-core.css b/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/table--conflicts-with-core.css similarity index 100% rename from apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/css/table--conflicts-with-core.css rename to apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/table--conflicts-with-core.css diff --git a/apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/css/table.css b/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/table.css similarity index 100% rename from apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/css/table.css rename to apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/css/table.css diff --git a/apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/img/favicons/favicon.ico b/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/favicons/favicon.ico similarity index 100% rename from apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/img/favicons/favicon.ico rename to apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/favicons/favicon.ico diff --git a/apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/img/org_logos/apcd-black.png b/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/org_logos/apcd-black.png similarity index 100% rename from apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/img/org_logos/apcd-black.png rename to apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/org_logos/apcd-black.png diff --git a/apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/img/org_logos/apcd-white.png b/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/org_logos/apcd-white.png similarity index 100% rename from apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/img/org_logos/apcd-white.png rename to apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/org_logos/apcd-white.png diff --git a/apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/img/org_logos/tacc-white.png b/apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/org_logos/tacc-white.png similarity index 100% rename from apcd-cms/src/taccsite_custom/apcd-cms/static/apcd-cms/img/org_logos/tacc-white.png rename to apcd-cms/src/taccsite_custom/apcd_cms/static/apcd-cms/img/org_logos/tacc-white.png diff --git a/apcd-cms/src/taccsite_custom/apcd-cms/templates/assets_custom.html b/apcd-cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html similarity index 96% rename from apcd-cms/src/taccsite_custom/apcd-cms/templates/assets_custom.html rename to apcd-cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html index f15a38fb..c60cbc26 100644 --- a/apcd-cms/src/taccsite_custom/apcd-cms/templates/assets_custom.html +++ b/apcd-cms/src/taccsite_custom/apcd_cms/templates/assets_custom.html @@ -7,7 +7,7 @@ {# COPIED FROM CORE #} {# https://github.com/TACC/Core-CMS/blob/64a72e2/taccsite_cms/templates/assets_custom.html #} -{% load staticfiles %} +{% load static %} {% with settings.FAVICON as favicon %} diff --git a/apcd-cms/src/taccsite_custom/apcd-cms/templates/snippets/tup-175-css-alerts-messages-ui-pattern.html b/apcd-cms/src/taccsite_custom/apcd_cms/templates/snippets/tup-175-css-alerts-messages-ui-pattern.html similarity index 100% rename from apcd-cms/src/taccsite_custom/apcd-cms/templates/snippets/tup-175-css-alerts-messages-ui-pattern.html rename to apcd-cms/src/taccsite_custom/apcd_cms/templates/snippets/tup-175-css-alerts-messages-ui-pattern.html