diff --git a/caps/__init__.py b/cape/__init__.py similarity index 100% rename from caps/__init__.py rename to cape/__init__.py diff --git a/caps/admin.py b/cape/admin.py similarity index 94% rename from caps/admin.py rename to cape/admin.py index 3b9e3ede4..57b411c03 100755 --- a/caps/admin.py +++ b/cape/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from caps.models import Council, PlanDocument, DataType, DataPoint +from cape.models import Council, PlanDocument, DataType, DataPoint class CouncilAdmin(admin.ModelAdmin): diff --git a/caps/api/routers.py b/cape/api/routers.py similarity index 74% rename from caps/api/routers.py rename to cape/api/routers.py index 93387accc..f0c6649eb 100644 --- a/caps/api/routers.py +++ b/cape/api/routers.py @@ -1,4 +1,4 @@ -from caps.api.views import APIView +from cape.api.views import APIView from rest_framework import routers diff --git a/caps/api/serializers.py b/cape/api/serializers.py similarity index 97% rename from caps/api/serializers.py rename to cape/api/serializers.py index 582cd5559..1c5e22cfc 100644 --- a/caps/api/serializers.py +++ b/cape/api/serializers.py @@ -1,4 +1,4 @@ -from caps.models import Council, SavedSearch, Promise +from cape.models import Council, SavedSearch, Promise from rest_framework import serializers, reverse diff --git a/caps/api/views.py b/cape/api/views.py similarity index 99% rename from caps/api/views.py rename to cape/api/views.py index 7011042c0..51a69eaaa 100644 --- a/caps/api/views.py +++ b/cape/api/views.py @@ -10,8 +10,8 @@ from rest_framework.exceptions import APIException from rest_framework.pagination import PageNumberPagination -from caps.models import Council, SavedSearch, PlanDocument, Promise -from caps.api.serializers import ( +from cape.models import Council, SavedSearch, PlanDocument, Promise +from cape.api.serializers import ( CouncilSerializer, SearchTermSerializer, PromiseSerializer, diff --git a/caps/apps.py b/cape/apps.py similarity index 63% rename from caps/apps.py rename to cape/apps.py index 0992abf5e..ec78885ae 100755 --- a/caps/apps.py +++ b/cape/apps.py @@ -2,4 +2,5 @@ class CapsConfig(AppConfig): - name = "caps" + name = "cape" + label = "caps" diff --git a/caps/charts.py b/cape/charts.py similarity index 100% rename from caps/charts.py rename to cape/charts.py diff --git a/caps/context_processors.py b/cape/context_processors.py similarity index 100% rename from caps/context_processors.py rename to cape/context_processors.py diff --git a/caps/dataframe/__init__.py b/cape/dataframe/__init__.py similarity index 100% rename from caps/dataframe/__init__.py rename to cape/dataframe/__init__.py diff --git a/caps/dataframe/la.py b/cape/dataframe/la.py similarity index 100% rename from caps/dataframe/la.py rename to cape/dataframe/la.py diff --git a/caps/filters.py b/cape/filters.py similarity index 100% rename from caps/filters.py rename to cape/filters.py diff --git a/caps/fixtures/test_council_tags.json b/cape/fixtures/test_council_tags.json similarity index 100% rename from caps/fixtures/test_council_tags.json rename to cape/fixtures/test_council_tags.json diff --git a/caps/forms.py b/cape/forms.py similarity index 97% rename from caps/forms.py rename to cape/forms.py index 296eb545e..136258acc 100644 --- a/caps/forms.py +++ b/cape/forms.py @@ -3,7 +3,7 @@ from haystack.query import SearchQuerySet from haystack.inputs import Exact -from caps.models import Distance, ComparisonType, Council +from cape.models import Distance, ComparisonType, Council class HighlightedSearchForm(SearchForm): diff --git a/caps/import_utils.py b/cape/import_utils.py similarity index 100% rename from caps/import_utils.py rename to cape/import_utils.py diff --git a/caps/management/commands/add_authority_codes.py b/cape/management/commands/add_authority_codes.py similarity index 97% rename from caps/management/commands/add_authority_codes.py rename to cape/management/commands/add_authority_codes.py index 8766a3a2c..171115d28 100755 --- a/caps/management/commands/add_authority_codes.py +++ b/cape/management/commands/add_authority_codes.py @@ -8,7 +8,7 @@ from django.conf import settings -from caps.import_utils import ( +from cape.import_utils import ( get_data_files, add_extra_authority_info, add_authority_codes, diff --git a/caps/management/commands/add_council_websites.py b/cape/management/commands/add_council_websites.py similarity index 100% rename from caps/management/commands/add_council_websites.py rename to cape/management/commands/add_council_websites.py diff --git a/caps/management/commands/add_related_councils.py b/cape/management/commands/add_related_councils.py similarity index 98% rename from caps/management/commands/add_related_councils.py rename to cape/management/commands/add_related_councils.py index 9b87d964f..c00650c07 100644 --- a/caps/management/commands/add_related_councils.py +++ b/cape/management/commands/add_related_councils.py @@ -1,7 +1,7 @@ from pathlib import Path import requests -from caps.models import ( +from cape.models import ( ComparisonLabel, ComparisonLabelAssignment, ComparisonType, diff --git a/caps/management/commands/add_text.py b/cape/management/commands/add_text.py similarity index 98% rename from caps/management/commands/add_text.py rename to cape/management/commands/add_text.py index 9f128eaba..cd3fd87d3 100755 --- a/caps/management/commands/add_text.py +++ b/cape/management/commands/add_text.py @@ -8,7 +8,7 @@ from django.core.management.base import BaseCommand, CommandError from django.conf import settings -from caps.models import PlanDocument +from cape.models import PlanDocument def generate_text(pdf_path, df, index): diff --git a/caps/management/commands/create_zip_file.py b/cape/management/commands/create_zip_file.py similarity index 95% rename from caps/management/commands/create_zip_file.py rename to cape/management/commands/create_zip_file.py index afb635ba0..45c1fdba1 100644 --- a/caps/management/commands/create_zip_file.py +++ b/cape/management/commands/create_zip_file.py @@ -3,7 +3,7 @@ import math import zipfile -from caps.models import Council, PlanDocument +from cape.models import Council, PlanDocument from django.core.management.base import BaseCommand, CommandError from django.core.files import File diff --git a/caps/management/commands/fetch_and_process_promises.py b/cape/management/commands/fetch_and_process_promises.py similarity index 97% rename from caps/management/commands/fetch_and_process_promises.py rename to cape/management/commands/fetch_and_process_promises.py index 4312aab32..b2ee2a2a0 100644 --- a/caps/management/commands/fetch_and_process_promises.py +++ b/cape/management/commands/fetch_and_process_promises.py @@ -1,7 +1,7 @@ from django.core.management.base import BaseCommand from django.conf import settings -from caps.import_utils import ( +from cape.import_utils import ( add_authority_codes, add_gss_codes, get_google_sheet_as_csv, diff --git a/caps/management/commands/fetch_scottish_reporting_data.py b/cape/management/commands/fetch_scottish_reporting_data.py similarity index 99% rename from caps/management/commands/fetch_scottish_reporting_data.py rename to cape/management/commands/fetch_scottish_reporting_data.py index adc174367..ea0c0019d 100644 --- a/caps/management/commands/fetch_scottish_reporting_data.py +++ b/cape/management/commands/fetch_scottish_reporting_data.py @@ -18,7 +18,7 @@ import ssl -from caps.import_utils import add_authority_codes +from cape.import_utils import add_authority_codes BASE_URL = "https://sustainablescotlandnetwork.org/" diff --git a/caps/management/commands/import_council_projects.py b/cape/management/commands/import_council_projects.py similarity index 98% rename from caps/management/commands/import_council_projects.py rename to cape/management/commands/import_council_projects.py index 7d123d7c7..040e92022 100644 --- a/caps/management/commands/import_council_projects.py +++ b/cape/management/commands/import_council_projects.py @@ -7,7 +7,7 @@ from django.conf import settings from django.db import transaction -from caps.models import Council, CouncilProject +from cape.models import Council, CouncilProject class Command(BaseCommand): diff --git a/caps/management/commands/import_council_tags.py b/cape/management/commands/import_council_tags.py similarity index 97% rename from caps/management/commands/import_council_tags.py rename to cape/management/commands/import_council_tags.py index c6c8752b2..439ec5e60 100644 --- a/caps/management/commands/import_council_tags.py +++ b/cape/management/commands/import_council_tags.py @@ -6,9 +6,9 @@ from django.db.models import F -from caps.models import Tag, CouncilTag, Council +from cape.models import Tag, CouncilTag, Council from scoring.models import PlanSectionScore, PlanScore, PlanQuestionScore -from caps.import_utils import get_google_sheet_as_csv, replace_csv_headers +from cape.import_utils import get_google_sheet_as_csv, replace_csv_headers def get_tags(): diff --git a/caps/management/commands/import_declarations.py b/cape/management/commands/import_declarations.py similarity index 96% rename from caps/management/commands/import_declarations.py rename to cape/management/commands/import_declarations.py index 140365c42..5e85ae3ae 100644 --- a/caps/management/commands/import_declarations.py +++ b/cape/management/commands/import_declarations.py @@ -6,9 +6,9 @@ from django.conf import settings from django.db import transaction -from caps.models import Council, EmergencyDeclaration -from caps.utils import char_from_text, date_from_text -from caps.import_utils import ( +from cape.models import Council, EmergencyDeclaration +from cape.utils import char_from_text, date_from_text +from cape.import_utils import ( add_authority_codes, add_gss_codes, get_google_sheet_as_csv, diff --git a/caps/management/commands/import_emissions_data.py b/cape/management/commands/import_emissions_data.py similarity index 98% rename from caps/management/commands/import_emissions_data.py rename to cape/management/commands/import_emissions_data.py index 88e01a8ca..0aeac7cdb 100644 --- a/caps/management/commands/import_emissions_data.py +++ b/cape/management/commands/import_emissions_data.py @@ -2,7 +2,7 @@ Import local authority_emissions """ import pandas as pd -from caps.models import Council, DataPoint, DataType +from cape.models import Council, DataPoint, DataType from django.core.management.base import BaseCommand from django.db.models import Count from mysoc_dataset import get_dataset_url diff --git a/caps/management/commands/import_filter_data.py b/cape/management/commands/import_filter_data.py similarity index 98% rename from caps/management/commands/import_filter_data.py rename to cape/management/commands/import_filter_data.py index a56ebcf55..8de69f9fa 100644 --- a/caps/management/commands/import_filter_data.py +++ b/cape/management/commands/import_filter_data.py @@ -15,7 +15,7 @@ from os.path import join from scoring.models import PlanScore -from caps.models import PlanDocument +from cape.models import PlanDocument FILTER_DATA_URL = "https://raw.githubusercontent.com/mysociety/climate_league_filter_datasets/main/data/outputs/all_filters.csv" FILTER_CSV = join(settings.DATA_DIR, "all_filters.csv") diff --git a/caps/management/commands/import_plans.py b/cape/management/commands/import_plans.py similarity index 99% rename from caps/management/commands/import_plans.py rename to cape/management/commands/import_plans.py index 479272cd5..1c412a859 100755 --- a/caps/management/commands/import_plans.py +++ b/cape/management/commands/import_plans.py @@ -4,8 +4,8 @@ import pandas as pd -from caps.models import Council, PlanDocument -from caps.utils import ( +from cape.models import Council, PlanDocument +from cape.utils import ( boolean_from_text, char_from_text, date_from_text, diff --git a/caps/management/commands/import_promises.py b/cape/management/commands/import_promises.py similarity index 93% rename from caps/management/commands/import_promises.py rename to cape/management/commands/import_promises.py index 4b095e6e6..8d3a4ae96 100644 --- a/caps/management/commands/import_promises.py +++ b/cape/management/commands/import_promises.py @@ -6,9 +6,9 @@ from django.conf import settings from django.db import transaction -from caps.models import Council, PlanDocument, Promise -from caps.import_utils import add_authority_codes, add_gss_codes -from caps.utils import char_from_text +from cape.models import Council, PlanDocument, Promise +from cape.import_utils import add_authority_codes, add_gss_codes +from cape.utils import char_from_text """ Wrap this in a transaction and delete all the things as it makes more sense diff --git a/caps/management/commands/link_combined_authorities.py b/cape/management/commands/link_combined_authorities.py similarity index 98% rename from caps/management/commands/link_combined_authorities.py rename to cape/management/commands/link_combined_authorities.py index eee1c4447..e33bf0d8e 100644 --- a/caps/management/commands/link_combined_authorities.py +++ b/cape/management/commands/link_combined_authorities.py @@ -7,7 +7,7 @@ import pandas as pd -from caps.models import Council +from cape.models import Council # Download file link from https://geoportal.statistics.gov.uk/datasets/local-authority-district-to-combined-authority-december-2019-lookup-in-england COMBINED_AUTHORITY_MAPPING_URL = "https://prod-hub-indexer.s3.amazonaws.com/files/db4f8bae6bfa41babfafea3ec8a38c0e/0/full/4326/db4f8bae6bfa41babfafea3ec8a38c0e_0_full_4326.csv" diff --git a/caps/management/commands/postprocess.py b/cape/management/commands/postprocess.py similarity index 98% rename from caps/management/commands/postprocess.py rename to cape/management/commands/postprocess.py index be1805bd3..cb2fb3b45 100644 --- a/caps/management/commands/postprocess.py +++ b/cape/management/commands/postprocess.py @@ -9,7 +9,7 @@ from django.core.management.base import BaseCommand, CommandError from django.conf import settings -from caps.models import PlanDocument +from cape.models import PlanDocument def remove_internal_data(): diff --git a/caps/management/commands/preprocess.py b/cape/management/commands/preprocess.py similarity index 98% rename from caps/management/commands/preprocess.py rename to cape/management/commands/preprocess.py index ae1db9d41..965153c9e 100755 --- a/caps/management/commands/preprocess.py +++ b/cape/management/commands/preprocess.py @@ -13,8 +13,8 @@ from django.core.management.base import BaseCommand, CommandError from django.conf import settings -from caps.models import PlanDocument -from caps.import_utils import get_google_sheet_as_csv, replace_csv_headers +from cape.models import PlanDocument +from cape.import_utils import get_google_sheet_as_csv, replace_csv_headers import ssl diff --git a/caps/management/commands/process_scottish_reporting_data.py b/cape/management/commands/process_scottish_reporting_data.py similarity index 100% rename from caps/management/commands/process_scottish_reporting_data.py rename to cape/management/commands/process_scottish_reporting_data.py diff --git a/caps/mapit.py b/cape/mapit.py similarity index 100% rename from caps/mapit.py rename to cape/mapit.py diff --git a/caps/migrations/0001_initial.py b/cape/migrations/0001_initial.py similarity index 100% rename from caps/migrations/0001_initial.py rename to cape/migrations/0001_initial.py diff --git a/caps/migrations/0002_auto_20201016_1709.py b/cape/migrations/0002_auto_20201016_1709.py similarity index 100% rename from caps/migrations/0002_auto_20201016_1709.py rename to cape/migrations/0002_auto_20201016_1709.py diff --git a/caps/migrations/0003_auto_20201016_1721.py b/cape/migrations/0003_auto_20201016_1721.py similarity index 100% rename from caps/migrations/0003_auto_20201016_1721.py rename to cape/migrations/0003_auto_20201016_1721.py diff --git a/caps/migrations/0004_auto_20201019_1432.py b/cape/migrations/0004_auto_20201019_1432.py similarity index 100% rename from caps/migrations/0004_auto_20201019_1432.py rename to cape/migrations/0004_auto_20201019_1432.py diff --git a/caps/migrations/0005_plandocument_url_hash.py b/cape/migrations/0005_plandocument_url_hash.py similarity index 100% rename from caps/migrations/0005_plandocument_url_hash.py rename to cape/migrations/0005_plandocument_url_hash.py diff --git a/caps/migrations/0006_auto_20201019_1740.py b/cape/migrations/0006_auto_20201019_1740.py similarity index 100% rename from caps/migrations/0006_auto_20201019_1740.py rename to cape/migrations/0006_auto_20201019_1740.py diff --git a/caps/migrations/0007_auto_20201019_1744.py b/cape/migrations/0007_auto_20201019_1744.py similarity index 100% rename from caps/migrations/0007_auto_20201019_1744.py rename to cape/migrations/0007_auto_20201019_1744.py diff --git a/caps/migrations/0008_auto_20201019_1746.py b/cape/migrations/0008_auto_20201019_1746.py similarity index 100% rename from caps/migrations/0008_auto_20201019_1746.py rename to cape/migrations/0008_auto_20201019_1746.py diff --git a/caps/migrations/0009_auto_20201019_1746.py b/cape/migrations/0009_auto_20201019_1746.py similarity index 100% rename from caps/migrations/0009_auto_20201019_1746.py rename to cape/migrations/0009_auto_20201019_1746.py diff --git a/caps/migrations/0010_auto_20201019_1852.py b/cape/migrations/0010_auto_20201019_1852.py similarity index 100% rename from caps/migrations/0010_auto_20201019_1852.py rename to cape/migrations/0010_auto_20201019_1852.py diff --git a/caps/migrations/0011_auto_20201020_1018.py b/cape/migrations/0011_auto_20201020_1018.py similarity index 100% rename from caps/migrations/0011_auto_20201020_1018.py rename to cape/migrations/0011_auto_20201020_1018.py diff --git a/caps/migrations/0012_auto_20201023_1641.py b/cape/migrations/0012_auto_20201023_1641.py similarity index 88% rename from caps/migrations/0012_auto_20201023_1641.py rename to cape/migrations/0012_auto_20201023_1641.py index becc95c02..aa17d3bb4 100644 --- a/caps/migrations/0012_auto_20201023_1641.py +++ b/cape/migrations/0012_auto_20201023_1641.py @@ -1,6 +1,6 @@ # Generated by Django 2.2.8 on 2020-10-23 16:41 -import caps.models +import cape.models from django.db import migrations, models @@ -20,6 +20,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='plandocument', name='file', - field=models.FileField(storage=caps.models.OverwriteStorage(), upload_to='', verbose_name='plans'), + field=models.FileField(storage=cape.models.OverwriteStorage(), upload_to='', verbose_name='plans'), ), ] diff --git a/caps/migrations/0013_auto_20201023_1749.py b/cape/migrations/0013_auto_20201023_1749.py similarity index 100% rename from caps/migrations/0013_auto_20201023_1749.py rename to cape/migrations/0013_auto_20201023_1749.py diff --git a/caps/migrations/0014_auto_20201027_1829.py b/cape/migrations/0014_auto_20201027_1829.py similarity index 100% rename from caps/migrations/0014_auto_20201027_1829.py rename to cape/migrations/0014_auto_20201027_1829.py diff --git a/caps/migrations/0015_council_gss_code.py b/cape/migrations/0015_council_gss_code.py similarity index 100% rename from caps/migrations/0015_council_gss_code.py rename to cape/migrations/0015_council_gss_code.py diff --git a/caps/migrations/0016_auto_20201028_1528.py b/cape/migrations/0016_auto_20201028_1528.py similarity index 100% rename from caps/migrations/0016_auto_20201028_1528.py rename to cape/migrations/0016_auto_20201028_1528.py diff --git a/caps/migrations/0017_datapoint.py b/cape/migrations/0017_datapoint.py similarity index 100% rename from caps/migrations/0017_datapoint.py rename to cape/migrations/0017_datapoint.py diff --git a/caps/migrations/0018_auto_20201028_1557.py b/cape/migrations/0018_auto_20201028_1557.py similarity index 100% rename from caps/migrations/0018_auto_20201028_1557.py rename to cape/migrations/0018_auto_20201028_1557.py diff --git a/caps/migrations/0019_auto_20201028_1600.py b/cape/migrations/0019_auto_20201028_1600.py similarity index 100% rename from caps/migrations/0019_auto_20201028_1600.py rename to cape/migrations/0019_auto_20201028_1600.py diff --git a/caps/migrations/0020_auto_20201028_1602.py b/cape/migrations/0020_auto_20201028_1602.py similarity index 100% rename from caps/migrations/0020_auto_20201028_1602.py rename to cape/migrations/0020_auto_20201028_1602.py diff --git a/caps/migrations/0021_auto_20201028_1656.py b/cape/migrations/0021_auto_20201028_1656.py similarity index 100% rename from caps/migrations/0021_auto_20201028_1656.py rename to cape/migrations/0021_auto_20201028_1656.py diff --git a/caps/migrations/0022_council_combined_authority.py b/cape/migrations/0022_council_combined_authority.py similarity index 100% rename from caps/migrations/0022_council_combined_authority.py rename to cape/migrations/0022_council_combined_authority.py diff --git a/caps/migrations/0023_council_related_authorities.py b/cape/migrations/0023_council_related_authorities.py similarity index 100% rename from caps/migrations/0023_council_related_authorities.py rename to cape/migrations/0023_council_related_authorities.py diff --git a/caps/migrations/0024_auto_20201106_1656.py b/cape/migrations/0024_auto_20201106_1656.py similarity index 100% rename from caps/migrations/0024_auto_20201106_1656.py rename to cape/migrations/0024_auto_20201106_1656.py diff --git a/caps/migrations/0025_auto_20201112_0954.py b/cape/migrations/0025_auto_20201112_0954.py similarity index 100% rename from caps/migrations/0025_auto_20201112_0954.py rename to cape/migrations/0025_auto_20201112_0954.py diff --git a/caps/migrations/0026_auto_20210406_1835.py b/cape/migrations/0026_auto_20210406_1835.py similarity index 100% rename from caps/migrations/0026_auto_20210406_1835.py rename to cape/migrations/0026_auto_20210406_1835.py diff --git a/caps/migrations/0027_savedsearch.py b/cape/migrations/0027_savedsearch.py similarity index 100% rename from caps/migrations/0027_savedsearch.py rename to cape/migrations/0027_savedsearch.py diff --git a/caps/migrations/0028_council_promises.py b/cape/migrations/0028_council_promises.py similarity index 100% rename from caps/migrations/0028_council_promises.py rename to cape/migrations/0028_council_promises.py diff --git a/caps/migrations/0028_fix_first_and_last_found.py b/cape/migrations/0028_fix_first_and_last_found.py similarity index 100% rename from caps/migrations/0028_fix_first_and_last_found.py rename to cape/migrations/0028_fix_first_and_last_found.py diff --git a/caps/migrations/0029_merge_20211019_1547.py b/cape/migrations/0029_merge_20211019_1547.py similarity index 100% rename from caps/migrations/0029_merge_20211019_1547.py rename to cape/migrations/0029_merge_20211019_1547.py diff --git a/caps/migrations/0030_add_emergency_declaration.py b/cape/migrations/0030_add_emergency_declaration.py similarity index 100% rename from caps/migrations/0030_add_emergency_declaration.py rename to cape/migrations/0030_add_emergency_declaration.py diff --git a/caps/migrations/0031_council_twitter_details.py b/cape/migrations/0031_council_twitter_details.py similarity index 100% rename from caps/migrations/0031_council_twitter_details.py rename to cape/migrations/0031_council_twitter_details.py diff --git a/caps/migrations/0032_historicalplandocument.py b/cape/migrations/0032_historicalplandocument.py similarity index 100% rename from caps/migrations/0032_historicalplandocument.py rename to cape/migrations/0032_historicalplandocument.py diff --git a/caps/migrations/0033_historicalpromise.py b/cape/migrations/0033_historicalpromise.py similarity index 100% rename from caps/migrations/0033_historicalpromise.py rename to cape/migrations/0033_historicalpromise.py diff --git a/caps/migrations/0034_savedseach_council_restriction.py b/cape/migrations/0034_savedseach_council_restriction.py similarity index 100% rename from caps/migrations/0034_savedseach_council_restriction.py rename to cape/migrations/0034_savedseach_council_restriction.py diff --git a/caps/migrations/0035_auto_20211209_1457.py b/cape/migrations/0035_auto_20211209_1457.py similarity index 100% rename from caps/migrations/0035_auto_20211209_1457.py rename to cape/migrations/0035_auto_20211209_1457.py diff --git a/caps/migrations/0036_add_council_tags.py b/cape/migrations/0036_add_council_tags.py similarity index 100% rename from caps/migrations/0036_add_council_tags.py rename to cape/migrations/0036_add_council_tags.py diff --git a/caps/migrations/0037_alter_comparisonlabelassignment_label.py b/cape/migrations/0037_alter_comparisonlabelassignment_label.py similarity index 100% rename from caps/migrations/0037_alter_comparisonlabelassignment_label.py rename to cape/migrations/0037_alter_comparisonlabelassignment_label.py diff --git a/caps/migrations/0038_add_document_title.py b/cape/migrations/0038_add_document_title.py similarity index 100% rename from caps/migrations/0038_add_document_title.py rename to cape/migrations/0038_add_document_title.py diff --git a/caps/migrations/0039_council_projects.py b/cape/migrations/0039_council_projects.py similarity index 100% rename from caps/migrations/0039_council_projects.py rename to cape/migrations/0039_council_projects.py diff --git a/caps/migrations/0040_add_region_and_county.py b/cape/migrations/0040_add_region_and_county.py similarity index 100% rename from caps/migrations/0040_add_region_and_county.py rename to cape/migrations/0040_add_region_and_county.py diff --git a/caps/migrations/0041_add_document_types.py b/cape/migrations/0041_add_document_types.py similarity index 100% rename from caps/migrations/0041_add_document_types.py rename to cape/migrations/0041_add_document_types.py diff --git a/caps/migrations/0042_add_council_population.py b/cape/migrations/0042_add_council_population.py similarity index 100% rename from caps/migrations/0042_add_council_population.py rename to cape/migrations/0042_add_council_population.py diff --git a/caps/migrations/0043_alter_council_authority_type.py b/cape/migrations/0043_alter_council_authority_type.py similarity index 100% rename from caps/migrations/0043_alter_council_authority_type.py rename to cape/migrations/0043_alter_council_authority_type.py diff --git a/caps/migrations/__init__.py b/cape/migrations/__init__.py similarity index 100% rename from caps/migrations/__init__.py rename to cape/migrations/__init__.py diff --git a/caps/models.py b/cape/models.py similarity index 99% rename from caps/models.py rename to cape/models.py index 00b3be15b..d38c2ff6f 100755 --- a/caps/models.py +++ b/cape/models.py @@ -20,7 +20,7 @@ from django.forms import Select, TextInput from django.utils.text import slugify from simple_history.models import HistoricalRecords -from caps.filters import DefaultSecondarySortFilter +from cape.filters import DefaultSecondarySortFilter def query_lookup( diff --git a/caps/search_indexes.py b/cape/search_indexes.py similarity index 95% rename from caps/search_indexes.py rename to cape/search_indexes.py index 1d90efd09..85de78594 100644 --- a/caps/search_indexes.py +++ b/cape/search_indexes.py @@ -1,5 +1,5 @@ from haystack import indexes -from caps.models import PlanDocument +from cape.models import PlanDocument from django.utils.html import strip_tags diff --git a/caps/static/caps/img/avatar-alex.jpg b/cape/static/cape/img/avatar-alex.jpg similarity index 100% rename from caps/static/caps/img/avatar-alex.jpg rename to cape/static/cape/img/avatar-alex.jpg diff --git a/caps/static/caps/img/avatar-annie.jpg b/cape/static/cape/img/avatar-annie.jpg similarity index 100% rename from caps/static/caps/img/avatar-annie.jpg rename to cape/static/cape/img/avatar-annie.jpg diff --git a/caps/static/caps/img/avatar-isaac.jpg b/cape/static/cape/img/avatar-isaac.jpg similarity index 100% rename from caps/static/caps/img/avatar-isaac.jpg rename to cape/static/cape/img/avatar-isaac.jpg diff --git a/caps/static/caps/img/avatar-louise.jpg b/cape/static/cape/img/avatar-louise.jpg similarity index 100% rename from caps/static/caps/img/avatar-louise.jpg rename to cape/static/cape/img/avatar-louise.jpg diff --git a/caps/static/caps/img/avatar-zarino.jpg b/cape/static/cape/img/avatar-zarino.jpg similarity index 100% rename from caps/static/caps/img/avatar-zarino.jpg rename to cape/static/cape/img/avatar-zarino.jpg diff --git a/caps/static/caps/img/british-isles-blue.png b/cape/static/cape/img/british-isles-blue.png similarity index 100% rename from caps/static/caps/img/british-isles-blue.png rename to cape/static/cape/img/british-isles-blue.png diff --git a/caps/static/caps/img/british-isles.png b/cape/static/cape/img/british-isles.png similarity index 100% rename from caps/static/caps/img/british-isles.png rename to cape/static/cape/img/british-isles.png diff --git a/caps/static/caps/img/logo-beis.png b/cape/static/cape/img/logo-beis.png similarity index 100% rename from caps/static/caps/img/logo-beis.png rename to cape/static/cape/img/logo-beis.png diff --git a/caps/static/caps/img/logo-ceuk.png b/cape/static/cape/img/logo-ceuk.png similarity index 100% rename from caps/static/caps/img/logo-ceuk.png rename to cape/static/cape/img/logo-ceuk.png diff --git a/caps/static/caps/img/logo-mapolitical.png b/cape/static/cape/img/logo-mapolitical.png similarity index 100% rename from caps/static/caps/img/logo-mapolitical.png rename to cape/static/cape/img/logo-mapolitical.png diff --git a/caps/static/caps/img/logo-mysociety.png b/cape/static/cape/img/logo-mysociety.png similarity index 100% rename from caps/static/caps/img/logo-mysociety.png rename to cape/static/cape/img/logo-mysociety.png diff --git a/caps/static/caps/img/logo-scorecards.png b/cape/static/cape/img/logo-scorecards.png similarity index 100% rename from caps/static/caps/img/logo-scorecards.png rename to cape/static/cape/img/logo-scorecards.png diff --git a/caps/static/caps/img/mysoc-footer-dark/icon-facebook.png b/cape/static/cape/img/mysoc-footer-dark/icon-facebook.png similarity index 100% rename from caps/static/caps/img/mysoc-footer-dark/icon-facebook.png rename to cape/static/cape/img/mysoc-footer-dark/icon-facebook.png diff --git a/caps/static/caps/img/mysoc-footer-dark/icon-facebook.svg b/cape/static/cape/img/mysoc-footer-dark/icon-facebook.svg similarity index 100% rename from caps/static/caps/img/mysoc-footer-dark/icon-facebook.svg rename to cape/static/cape/img/mysoc-footer-dark/icon-facebook.svg diff --git a/caps/static/caps/img/mysoc-footer-dark/icon-github.png b/cape/static/cape/img/mysoc-footer-dark/icon-github.png similarity index 100% rename from caps/static/caps/img/mysoc-footer-dark/icon-github.png rename to cape/static/cape/img/mysoc-footer-dark/icon-github.png diff --git a/caps/static/caps/img/mysoc-footer-dark/icon-github.svg b/cape/static/cape/img/mysoc-footer-dark/icon-github.svg similarity index 100% rename from caps/static/caps/img/mysoc-footer-dark/icon-github.svg rename to cape/static/cape/img/mysoc-footer-dark/icon-github.svg diff --git a/caps/static/caps/img/mysoc-footer-dark/icon-linkedin.png b/cape/static/cape/img/mysoc-footer-dark/icon-linkedin.png similarity index 100% rename from caps/static/caps/img/mysoc-footer-dark/icon-linkedin.png rename to cape/static/cape/img/mysoc-footer-dark/icon-linkedin.png diff --git a/caps/static/caps/img/mysoc-footer-dark/icon-linkedin.svg b/cape/static/cape/img/mysoc-footer-dark/icon-linkedin.svg similarity index 100% rename from caps/static/caps/img/mysoc-footer-dark/icon-linkedin.svg rename to cape/static/cape/img/mysoc-footer-dark/icon-linkedin.svg diff --git a/caps/static/caps/img/mysoc-footer-dark/icon-twitter.png b/cape/static/cape/img/mysoc-footer-dark/icon-twitter.png similarity index 100% rename from caps/static/caps/img/mysoc-footer-dark/icon-twitter.png rename to cape/static/cape/img/mysoc-footer-dark/icon-twitter.png diff --git a/caps/static/caps/img/mysoc-footer-dark/icon-twitter.svg b/cape/static/cape/img/mysoc-footer-dark/icon-twitter.svg similarity index 100% rename from caps/static/caps/img/mysoc-footer-dark/icon-twitter.svg rename to cape/static/cape/img/mysoc-footer-dark/icon-twitter.svg diff --git a/caps/static/caps/img/mysoc-footer-dark/logo-ceuk.png b/cape/static/cape/img/mysoc-footer-dark/logo-ceuk.png similarity index 100% rename from caps/static/caps/img/mysoc-footer-dark/logo-ceuk.png rename to cape/static/cape/img/mysoc-footer-dark/logo-ceuk.png diff --git a/caps/static/caps/img/mysoc-footer-dark/logo-ceuk@2x.png b/cape/static/cape/img/mysoc-footer-dark/logo-ceuk@2x.png similarity index 100% rename from caps/static/caps/img/mysoc-footer-dark/logo-ceuk@2x.png rename to cape/static/cape/img/mysoc-footer-dark/logo-ceuk@2x.png diff --git a/caps/static/caps/img/mysoc-footer-dark/logo-mysociety.png b/cape/static/cape/img/mysoc-footer-dark/logo-mysociety.png similarity index 100% rename from caps/static/caps/img/mysoc-footer-dark/logo-mysociety.png rename to cape/static/cape/img/mysoc-footer-dark/logo-mysociety.png diff --git a/caps/static/caps/img/mysoc-footer-dark/logo-mysociety.svg b/cape/static/cape/img/mysoc-footer-dark/logo-mysociety.svg similarity index 100% rename from caps/static/caps/img/mysoc-footer-dark/logo-mysociety.svg rename to cape/static/cape/img/mysoc-footer-dark/logo-mysociety.svg diff --git a/caps/static/caps/img/nzlh-become-an-advocate.png b/cape/static/cape/img/nzlh-become-an-advocate.png similarity index 100% rename from caps/static/caps/img/nzlh-become-an-advocate.png rename to cape/static/cape/img/nzlh-become-an-advocate.png diff --git a/caps/static/caps/img/nzlh-dots-blue.svg b/cape/static/cape/img/nzlh-dots-blue.svg similarity index 100% rename from caps/static/caps/img/nzlh-dots-blue.svg rename to cape/static/cape/img/nzlh-dots-blue.svg diff --git a/caps/static/caps/img/nzlh-dots-yellow.svg b/cape/static/cape/img/nzlh-dots-yellow.svg similarity index 100% rename from caps/static/caps/img/nzlh-dots-yellow.svg rename to cape/static/cape/img/nzlh-dots-yellow.svg diff --git a/caps/static/caps/img/nzlh-get-involved.png b/cape/static/cape/img/nzlh-get-involved.png similarity index 100% rename from caps/static/caps/img/nzlh-get-involved.png rename to cape/static/cape/img/nzlh-get-involved.png diff --git a/caps/static/caps/img/nzlh-logo.png b/cape/static/cape/img/nzlh-logo.png similarity index 100% rename from caps/static/caps/img/nzlh-logo.png rename to cape/static/cape/img/nzlh-logo.png diff --git a/caps/static/caps/img/nzlh-make-contact.png b/cape/static/cape/img/nzlh-make-contact.png similarity index 100% rename from caps/static/caps/img/nzlh-make-contact.png rename to cape/static/cape/img/nzlh-make-contact.png diff --git a/caps/static/caps/img/nzlh-screenshot.png b/cape/static/cape/img/nzlh-screenshot.png similarity index 100% rename from caps/static/caps/img/nzlh-screenshot.png rename to cape/static/cape/img/nzlh-screenshot.png diff --git a/caps/static/caps/img/nzlh-sign-up.png b/cape/static/cape/img/nzlh-sign-up.png similarity index 100% rename from caps/static/caps/img/nzlh-sign-up.png rename to cape/static/cape/img/nzlh-sign-up.png diff --git a/caps/static/caps/img/nzlh-stripes-blue.svg b/cape/static/cape/img/nzlh-stripes-blue.svg similarity index 100% rename from caps/static/caps/img/nzlh-stripes-blue.svg rename to cape/static/cape/img/nzlh-stripes-blue.svg diff --git a/caps/static/caps/img/nzlh-stripes-yellow.svg b/cape/static/cape/img/nzlh-stripes-yellow.svg similarity index 100% rename from caps/static/caps/img/nzlh-stripes-yellow.svg rename to cape/static/cape/img/nzlh-stripes-yellow.svg diff --git a/caps/static/caps/img/og-image-cape.jpg b/cape/static/cape/img/og-image-cape.jpg similarity index 100% rename from caps/static/caps/img/og-image-cape.jpg rename to cape/static/cape/img/og-image-cape.jpg diff --git a/caps/static/caps/img/og-image-nzlh.jpg b/cape/static/cape/img/og-image-nzlh.jpg similarity index 100% rename from caps/static/caps/img/og-image-nzlh.jpg rename to cape/static/cape/img/og-image-nzlh.jpg diff --git a/caps/static/caps/img/tag-best-of-2021.jpg b/cape/static/cape/img/tag-best-of-2021.jpg similarity index 100% rename from caps/static/caps/img/tag-best-of-2021.jpg rename to cape/static/cape/img/tag-best-of-2021.jpg diff --git a/caps/static/caps/img/tag-clear-communication.jpg b/cape/static/cape/img/tag-clear-communication.jpg similarity index 100% rename from caps/static/caps/img/tag-clear-communication.jpg rename to cape/static/cape/img/tag-clear-communication.jpg diff --git a/caps/static/caps/img/tag-good-adaptation.jpg b/cape/static/cape/img/tag-good-adaptation.jpg similarity index 100% rename from caps/static/caps/img/tag-good-adaptation.jpg rename to cape/static/cape/img/tag-good-adaptation.jpg diff --git a/caps/static/caps/img/tag-good-engagement.jpg b/cape/static/cape/img/tag-good-engagement.jpg similarity index 100% rename from caps/static/caps/img/tag-good-engagement.jpg rename to cape/static/cape/img/tag-good-engagement.jpg diff --git a/caps/static/caps/img/tag-good-fairness.jpg b/cape/static/cape/img/tag-good-fairness.jpg similarity index 100% rename from caps/static/caps/img/tag-good-fairness.jpg rename to cape/static/cape/img/tag-good-fairness.jpg diff --git a/caps/static/caps/img/tag-good-jobs-training.jpg b/cape/static/cape/img/tag-good-jobs-training.jpg similarity index 100% rename from caps/static/caps/img/tag-good-jobs-training.jpg rename to cape/static/cape/img/tag-good-jobs-training.jpg diff --git a/caps/static/caps/img/tag-good-mitigation.jpg b/cape/static/cape/img/tag-good-mitigation.jpg similarity index 100% rename from caps/static/caps/img/tag-good-mitigation.jpg rename to cape/static/cape/img/tag-good-mitigation.jpg diff --git a/caps/static/caps/img/tag-good-public-health.jpg b/cape/static/cape/img/tag-good-public-health.jpg similarity index 100% rename from caps/static/caps/img/tag-good-public-health.jpg rename to cape/static/cape/img/tag-good-public-health.jpg diff --git a/caps/static/caps/img/tag-integrated-local-plan.jpg b/cape/static/cape/img/tag-integrated-local-plan.jpg similarity index 100% rename from caps/static/caps/img/tag-integrated-local-plan.jpg rename to cape/static/cape/img/tag-integrated-local-plan.jpg diff --git a/caps/static/caps/img/talking-with-hands-unsplash-5QgIuuBxKwM.jpg b/cape/static/cape/img/talking-with-hands-unsplash-5QgIuuBxKwM.jpg similarity index 100% rename from caps/static/caps/img/talking-with-hands-unsplash-5QgIuuBxKwM.jpg rename to cape/static/cape/img/talking-with-hands-unsplash-5QgIuuBxKwM.jpg diff --git a/caps/static/caps/js/main.js b/cape/static/cape/js/main.js similarity index 100% rename from caps/static/caps/js/main.js rename to cape/static/cape/js/main.js diff --git a/caps/static/caps/scss/alpha-banner.scss b/cape/static/cape/scss/alpha-banner.scss similarity index 100% rename from caps/static/caps/scss/alpha-banner.scss rename to cape/static/cape/scss/alpha-banner.scss diff --git a/caps/static/caps/scss/awesomplete.scss b/cape/static/cape/scss/awesomplete.scss similarity index 100% rename from caps/static/caps/scss/awesomplete.scss rename to cape/static/cape/scss/awesomplete.scss diff --git a/caps/static/caps/scss/backgrounds.scss b/cape/static/cape/scss/backgrounds.scss similarity index 100% rename from caps/static/caps/scss/backgrounds.scss rename to cape/static/cape/scss/backgrounds.scss diff --git a/caps/static/caps/scss/blockquote.scss b/cape/static/cape/scss/blockquote.scss similarity index 100% rename from caps/static/caps/scss/blockquote.scss rename to cape/static/cape/scss/blockquote.scss diff --git a/caps/static/caps/scss/ceuk-card.scss b/cape/static/cape/scss/ceuk-card.scss similarity index 100% rename from caps/static/caps/scss/ceuk-card.scss rename to cape/static/cape/scss/ceuk-card.scss diff --git a/caps/static/caps/scss/ceuk-data-table.scss b/cape/static/cape/scss/ceuk-data-table.scss similarity index 100% rename from caps/static/caps/scss/ceuk-data-table.scss rename to cape/static/cape/scss/ceuk-data-table.scss diff --git a/caps/static/caps/scss/ceuk-tag.scss b/cape/static/cape/scss/ceuk-tag.scss similarity index 100% rename from caps/static/caps/scss/ceuk-tag.scss rename to cape/static/cape/scss/ceuk-tag.scss diff --git a/caps/static/caps/scss/council-documents.scss b/cape/static/cape/scss/council-documents.scss similarity index 100% rename from caps/static/caps/scss/council-documents.scss rename to cape/static/cape/scss/council-documents.scss diff --git a/caps/static/caps/scss/council-list.scss b/cape/static/cape/scss/council-list.scss similarity index 100% rename from caps/static/caps/scss/council-list.scss rename to cape/static/cape/scss/council-list.scss diff --git a/caps/static/caps/scss/council-powers.scss b/cape/static/cape/scss/council-powers.scss similarity index 100% rename from caps/static/caps/scss/council-powers.scss rename to cape/static/cape/scss/council-powers.scss diff --git a/caps/static/caps/scss/details.scss b/cape/static/cape/scss/details.scss similarity index 100% rename from caps/static/caps/scss/details.scss rename to cape/static/cape/scss/details.scss diff --git a/caps/static/caps/scss/display.scss b/cape/static/cape/scss/display.scss similarity index 100% rename from caps/static/caps/scss/display.scss rename to cape/static/cape/scss/display.scss diff --git a/caps/static/caps/scss/emissions-breakdown.scss b/cape/static/cape/scss/emissions-breakdown.scss similarity index 100% rename from caps/static/caps/scss/emissions-breakdown.scss rename to cape/static/cape/scss/emissions-breakdown.scss diff --git a/caps/static/caps/scss/equilateral-triangle.scss b/cape/static/cape/scss/equilateral-triangle.scss similarity index 100% rename from caps/static/caps/scss/equilateral-triangle.scss rename to cape/static/cape/scss/equilateral-triangle.scss diff --git a/caps/static/caps/scss/feedback-modal.scss b/cape/static/cape/scss/feedback-modal.scss similarity index 100% rename from caps/static/caps/scss/feedback-modal.scss rename to cape/static/cape/scss/feedback-modal.scss diff --git a/caps/static/caps/scss/forms.scss b/cape/static/cape/scss/forms.scss similarity index 100% rename from caps/static/caps/scss/forms.scss rename to cape/static/cape/scss/forms.scss diff --git a/caps/static/caps/scss/homepage.scss b/cape/static/cape/scss/homepage.scss similarity index 100% rename from caps/static/caps/scss/homepage.scss rename to cape/static/cape/scss/homepage.scss diff --git a/caps/static/caps/scss/icons.scss b/cape/static/cape/scss/icons.scss similarity index 100% rename from caps/static/caps/scss/icons.scss rename to cape/static/cape/scss/icons.scss diff --git a/caps/static/caps/scss/images.scss b/cape/static/cape/scss/images.scss similarity index 100% rename from caps/static/caps/scss/images.scss rename to cape/static/cape/scss/images.scss diff --git a/caps/static/caps/scss/interstitial-modal.scss b/cape/static/cape/scss/interstitial-modal.scss similarity index 100% rename from caps/static/caps/scss/interstitial-modal.scss rename to cape/static/cape/scss/interstitial-modal.scss diff --git a/caps/static/caps/scss/main.scss b/cape/static/cape/scss/main.scss similarity index 100% rename from caps/static/caps/scss/main.scss rename to cape/static/cape/scss/main.scss diff --git a/caps/static/caps/scss/mysociety-standard-footer.scss b/cape/static/cape/scss/mysociety-standard-footer.scss similarity index 100% rename from caps/static/caps/scss/mysociety-standard-footer.scss rename to cape/static/cape/scss/mysociety-standard-footer.scss diff --git a/caps/static/caps/scss/net-zero-local-hero.scss b/cape/static/cape/scss/net-zero-local-hero.scss similarity index 100% rename from caps/static/caps/scss/net-zero-local-hero.scss rename to cape/static/cape/scss/net-zero-local-hero.scss diff --git a/caps/static/caps/scss/scorecard-table.scss b/cape/static/cape/scss/scorecard-table.scss similarity index 100% rename from caps/static/caps/scss/scorecard-table.scss rename to cape/static/cape/scss/scorecard-table.scss diff --git a/caps/static/caps/scss/site-content.scss b/cape/static/cape/scss/site-content.scss similarity index 100% rename from caps/static/caps/scss/site-content.scss rename to cape/static/cape/scss/site-content.scss diff --git a/caps/static/caps/scss/site-footer.scss b/cape/static/cape/scss/site-footer.scss similarity index 100% rename from caps/static/caps/scss/site-footer.scss rename to cape/static/cape/scss/site-footer.scss diff --git a/caps/static/caps/scss/site-header.scss b/cape/static/cape/scss/site-header.scss similarity index 100% rename from caps/static/caps/scss/site-header.scss rename to cape/static/cape/scss/site-header.scss diff --git a/caps/static/caps/scss/site-hero.scss b/cape/static/cape/scss/site-hero.scss similarity index 100% rename from caps/static/caps/scss/site-hero.scss rename to cape/static/cape/scss/site-hero.scss diff --git a/caps/static/caps/scss/type.scss b/cape/static/cape/scss/type.scss similarity index 100% rename from caps/static/caps/scss/type.scss rename to cape/static/cape/scss/type.scss diff --git a/caps/static/caps/scss/variables.scss b/cape/static/cape/scss/variables.scss similarity index 100% rename from caps/static/caps/scss/variables.scss rename to cape/static/cape/scss/variables.scss diff --git a/caps/templates/caps/about.html b/cape/templates/caps/about.html similarity index 100% rename from caps/templates/caps/about.html rename to cape/templates/caps/about.html diff --git a/caps/templates/caps/about_data.html b/cape/templates/caps/about_data.html similarity index 100% rename from caps/templates/caps/about_data.html rename to cape/templates/caps/about_data.html diff --git a/caps/templates/caps/base.html b/cape/templates/caps/base.html similarity index 100% rename from caps/templates/caps/base.html rename to cape/templates/caps/base.html diff --git a/caps/templates/caps/council_detail.html b/cape/templates/caps/council_detail.html similarity index 100% rename from caps/templates/caps/council_detail.html rename to cape/templates/caps/council_detail.html diff --git a/caps/templates/caps/council_list.html b/cape/templates/caps/council_list.html similarity index 100% rename from caps/templates/caps/council_list.html rename to cape/templates/caps/council_list.html diff --git a/caps/templates/caps/home.html b/cape/templates/caps/home.html similarity index 100% rename from caps/templates/caps/home.html rename to cape/templates/caps/home.html diff --git a/caps/templates/caps/icons/check-bold.html b/cape/templates/caps/icons/check-bold.html similarity index 100% rename from caps/templates/caps/icons/check-bold.html rename to cape/templates/caps/icons/check-bold.html diff --git a/caps/templates/caps/icons/check-circle-fill.html b/cape/templates/caps/icons/check-circle-fill.html similarity index 100% rename from caps/templates/caps/icons/check-circle-fill.html rename to cape/templates/caps/icons/check-circle-fill.html diff --git a/caps/templates/caps/icons/check.html b/cape/templates/caps/icons/check.html similarity index 100% rename from caps/templates/caps/icons/check.html rename to cape/templates/caps/icons/check.html diff --git a/caps/templates/caps/icons/chevron-down.html b/cape/templates/caps/icons/chevron-down.html similarity index 100% rename from caps/templates/caps/icons/chevron-down.html rename to cape/templates/caps/icons/chevron-down.html diff --git a/caps/templates/caps/icons/chevron-left.html b/cape/templates/caps/icons/chevron-left.html similarity index 100% rename from caps/templates/caps/icons/chevron-left.html rename to cape/templates/caps/icons/chevron-left.html diff --git a/caps/templates/caps/icons/chevron-right.html b/cape/templates/caps/icons/chevron-right.html similarity index 100% rename from caps/templates/caps/icons/chevron-right.html rename to cape/templates/caps/icons/chevron-right.html diff --git a/caps/templates/caps/icons/download.html b/cape/templates/caps/icons/download.html similarity index 100% rename from caps/templates/caps/icons/download.html rename to cape/templates/caps/icons/download.html diff --git a/caps/templates/caps/icons/external-link.html b/cape/templates/caps/icons/external-link.html similarity index 100% rename from caps/templates/caps/icons/external-link.html rename to cape/templates/caps/icons/external-link.html diff --git a/caps/templates/caps/icons/file.html b/cape/templates/caps/icons/file.html similarity index 100% rename from caps/templates/caps/icons/file.html rename to cape/templates/caps/icons/file.html diff --git a/caps/templates/caps/icons/globe.html b/cape/templates/caps/icons/globe.html similarity index 100% rename from caps/templates/caps/icons/globe.html rename to cape/templates/caps/icons/globe.html diff --git a/caps/templates/caps/icons/info.html b/cape/templates/caps/icons/info.html similarity index 100% rename from caps/templates/caps/icons/info.html rename to cape/templates/caps/icons/info.html diff --git a/caps/templates/caps/icons/location.html b/cape/templates/caps/icons/location.html similarity index 100% rename from caps/templates/caps/icons/location.html rename to cape/templates/caps/icons/location.html diff --git a/caps/templates/caps/icons/pdf.html b/cape/templates/caps/icons/pdf.html similarity index 100% rename from caps/templates/caps/icons/pdf.html rename to cape/templates/caps/icons/pdf.html diff --git a/caps/templates/caps/icons/question-circle.html b/cape/templates/caps/icons/question-circle.html similarity index 100% rename from caps/templates/caps/icons/question-circle.html rename to cape/templates/caps/icons/question-circle.html diff --git a/caps/templates/caps/icons/scorecards-star.html b/cape/templates/caps/icons/scorecards-star.html similarity index 100% rename from caps/templates/caps/icons/scorecards-star.html rename to cape/templates/caps/icons/scorecards-star.html diff --git a/caps/templates/caps/icons/search.html b/cape/templates/caps/icons/search.html similarity index 100% rename from caps/templates/caps/icons/search.html rename to cape/templates/caps/icons/search.html diff --git a/caps/templates/caps/icons/sort.html b/cape/templates/caps/icons/sort.html similarity index 100% rename from caps/templates/caps/icons/sort.html rename to cape/templates/caps/icons/sort.html diff --git a/caps/templates/caps/includes/about-subnav.html b/cape/templates/caps/includes/about-subnav.html similarity index 100% rename from caps/templates/caps/includes/about-subnav.html rename to cape/templates/caps/includes/about-subnav.html diff --git a/caps/templates/caps/includes/alpha-banner.html b/cape/templates/caps/includes/alpha-banner.html similarity index 100% rename from caps/templates/caps/includes/alpha-banner.html rename to cape/templates/caps/includes/alpha-banner.html diff --git a/caps/templates/caps/includes/authority_type.html b/cape/templates/caps/includes/authority_type.html similarity index 100% rename from caps/templates/caps/includes/authority_type.html rename to cape/templates/caps/includes/authority_type.html diff --git a/caps/templates/caps/includes/council-powers.html b/cape/templates/caps/includes/council-powers.html similarity index 100% rename from caps/templates/caps/includes/council-powers.html rename to cape/templates/caps/includes/council-powers.html diff --git a/caps/templates/caps/includes/council-table.html b/cape/templates/caps/includes/council-table.html similarity index 100% rename from caps/templates/caps/includes/council-table.html rename to cape/templates/caps/includes/council-table.html diff --git a/caps/templates/caps/includes/data-feedback-modal.html b/cape/templates/caps/includes/data-feedback-modal.html similarity index 100% rename from caps/templates/caps/includes/data-feedback-modal.html rename to cape/templates/caps/includes/data-feedback-modal.html diff --git a/caps/templates/caps/includes/interstitial-modal.html b/cape/templates/caps/includes/interstitial-modal.html similarity index 100% rename from caps/templates/caps/includes/interstitial-modal.html rename to cape/templates/caps/includes/interstitial-modal.html diff --git a/caps/templates/caps/includes/location-search-autocomplete.html b/cape/templates/caps/includes/location-search-autocomplete.html similarity index 100% rename from caps/templates/caps/includes/location-search-autocomplete.html rename to cape/templates/caps/includes/location-search-autocomplete.html diff --git a/caps/templates/caps/includes/location-search-form.html b/cape/templates/caps/includes/location-search-form.html similarity index 100% rename from caps/templates/caps/includes/location-search-form.html rename to cape/templates/caps/includes/location-search-form.html diff --git a/caps/templates/caps/includes/related-council-table.html b/cape/templates/caps/includes/related-council-table.html similarity index 100% rename from caps/templates/caps/includes/related-council-table.html rename to cape/templates/caps/includes/related-council-table.html diff --git a/caps/templates/caps/includes/site-footer.html b/cape/templates/caps/includes/site-footer.html similarity index 100% rename from caps/templates/caps/includes/site-footer.html rename to cape/templates/caps/includes/site-footer.html diff --git a/caps/templates/caps/includes/site-header.html b/cape/templates/caps/includes/site-header.html similarity index 100% rename from caps/templates/caps/includes/site-header.html rename to cape/templates/caps/includes/site-header.html diff --git a/caps/templates/caps/includes/survey-email.html b/cape/templates/caps/includes/survey-email.html similarity index 100% rename from caps/templates/caps/includes/survey-email.html rename to cape/templates/caps/includes/survey-email.html diff --git a/caps/templates/caps/includes/tag.html b/cape/templates/caps/includes/tag.html similarity index 100% rename from caps/templates/caps/includes/tag.html rename to cape/templates/caps/includes/tag.html diff --git a/caps/templates/caps/includes/text-search-form.html b/cape/templates/caps/includes/text-search-form.html similarity index 100% rename from caps/templates/caps/includes/text-search-form.html rename to cape/templates/caps/includes/text-search-form.html diff --git a/caps/templates/caps/includes/text-search-result.html b/cape/templates/caps/includes/text-search-result.html similarity index 100% rename from caps/templates/caps/includes/text-search-result.html rename to cape/templates/caps/includes/text-search-result.html diff --git a/caps/templates/caps/location_results.html b/cape/templates/caps/location_results.html similarity index 100% rename from caps/templates/caps/location_results.html rename to cape/templates/caps/location_results.html diff --git a/caps/templates/caps/net_zero_local_hero.html b/cape/templates/caps/net_zero_local_hero.html similarity index 100% rename from caps/templates/caps/net_zero_local_hero.html rename to cape/templates/caps/net_zero_local_hero.html diff --git a/caps/templates/caps/projects_list.html b/cape/templates/caps/projects_list.html similarity index 100% rename from caps/templates/caps/projects_list.html rename to cape/templates/caps/projects_list.html diff --git a/caps/templates/caps/search_results.html b/cape/templates/caps/search_results.html similarity index 100% rename from caps/templates/caps/search_results.html rename to cape/templates/caps/search_results.html diff --git a/caps/templates/caps/style.html b/cape/templates/caps/style.html similarity index 100% rename from caps/templates/caps/style.html rename to cape/templates/caps/style.html diff --git a/caps/templates/caps/tag_detail.html b/cape/templates/caps/tag_detail.html similarity index 100% rename from caps/templates/caps/tag_detail.html rename to cape/templates/caps/tag_detail.html diff --git a/caps/templates/caps/tag_list.html b/cape/templates/caps/tag_list.html similarity index 100% rename from caps/templates/caps/tag_list.html rename to cape/templates/caps/tag_list.html diff --git a/caps/templatetags/__init__.py b/cape/templatetags/__init__.py similarity index 100% rename from caps/templatetags/__init__.py rename to cape/templatetags/__init__.py diff --git a/caps/templatetags/caps_templatetags.py b/cape/templatetags/caps_templatetags.py similarity index 96% rename from caps/templatetags/caps_templatetags.py rename to cape/templatetags/caps_templatetags.py index 754f5683e..5d5dbffec 100644 --- a/caps/templatetags/caps_templatetags.py +++ b/cape/templatetags/caps_templatetags.py @@ -5,7 +5,7 @@ from django import template from django.template.defaultfilters import stringfilter -from caps.models import PlanDocument +from cape.models import PlanDocument register = template.Library() diff --git a/caps/tests/__init__.py b/cape/tests/__init__.py similarity index 100% rename from caps/tests/__init__.py rename to cape/tests/__init__.py diff --git a/caps/tests/borsetshire_plan.pdf b/cape/tests/borsetshire_plan.pdf similarity index 100% rename from caps/tests/borsetshire_plan.pdf rename to cape/tests/borsetshire_plan.pdf diff --git a/caps/tests/test_api.py b/cape/tests/test_api.py similarity index 99% rename from caps/tests/test_api.py rename to cape/tests/test_api.py index 70ea230c6..270059a85 100644 --- a/caps/tests/test_api.py +++ b/cape/tests/test_api.py @@ -3,7 +3,7 @@ from datetime import datetime, date from rest_framework.test import APITestCase -from caps.models import Council, PlanDocument, SavedSearch, Promise +from cape.models import Council, PlanDocument, SavedSearch, Promise class CouncilsAPITestCase(APITestCase): diff --git a/caps/tests/test_council_tags.csv b/cape/tests/test_council_tags.csv similarity index 100% rename from caps/tests/test_council_tags.csv rename to cape/tests/test_council_tags.csv diff --git a/caps/tests/test_import.py b/cape/tests/test_import.py similarity index 99% rename from caps/tests/test_import.py rename to cape/tests/test_import.py index 920b940be..361ec7b27 100644 --- a/caps/tests/test_import.py +++ b/cape/tests/test_import.py @@ -4,9 +4,9 @@ import unittest from django.core.management import call_command -from caps.models import Council, PlanDocument, Promise, Tag, CouncilTag +from cape.models import Council, PlanDocument, Promise, Tag, CouncilTag -from caps.management.commands.import_council_tags import ( +from cape.management.commands.import_council_tags import ( create_tags, create_council_tags, ) diff --git a/caps/tests/test_mapit.py b/cape/tests/test_mapit.py similarity index 98% rename from caps/tests/test_mapit.py rename to cape/tests/test_mapit.py index 46279c55b..899c94f8d 100644 --- a/caps/tests/test_mapit.py +++ b/cape/tests/test_mapit.py @@ -2,9 +2,9 @@ from unittest.mock import patch -from caps.models import Council +from cape.models import Council -from caps.mapit import ( +from cape.mapit import ( MapIt, NotFoundException, BadRequestException, diff --git a/caps/tests/test_models.py b/cape/tests/test_models.py similarity index 99% rename from caps/tests/test_models.py rename to cape/tests/test_models.py index ab9b2d9c7..1028d6967 100755 --- a/caps/tests/test_models.py +++ b/cape/tests/test_models.py @@ -1,7 +1,7 @@ from django.test import TestCase -from caps.models import Council, PlanDocument, SavedSearch -from caps.utils import boolean_from_text +from cape.models import Council, PlanDocument, SavedSearch +from cape.utils import boolean_from_text class PlanDocumentStartEndEndYearsFromTimePeriodTestCase(TestCase): diff --git a/caps/tests/test_processed.csv b/cape/tests/test_processed.csv similarity index 100% rename from caps/tests/test_processed.csv rename to cape/tests/test_processed.csv diff --git a/caps/tests/test_processed_add_non_plan.csv b/cape/tests/test_processed_add_non_plan.csv similarity index 100% rename from caps/tests/test_processed_add_non_plan.csv rename to cape/tests/test_processed_add_non_plan.csv diff --git a/caps/tests/test_processed_add_plan.csv b/cape/tests/test_processed_add_plan.csv similarity index 100% rename from caps/tests/test_processed_add_plan.csv rename to cape/tests/test_processed_add_plan.csv diff --git a/caps/tests/test_processed_no_plans.csv b/cape/tests/test_processed_no_plans.csv similarity index 100% rename from caps/tests/test_processed_no_plans.csv rename to cape/tests/test_processed_no_plans.csv diff --git a/caps/tests/test_processed_plan_names.csv b/cape/tests/test_processed_plan_names.csv similarity index 100% rename from caps/tests/test_processed_plan_names.csv rename to cape/tests/test_processed_plan_names.csv diff --git a/caps/tests/test_processed_pre_delete.csv b/cape/tests/test_processed_pre_delete.csv similarity index 100% rename from caps/tests/test_processed_pre_delete.csv rename to cape/tests/test_processed_pre_delete.csv diff --git a/caps/tests/test_processed_remove_council.csv b/cape/tests/test_processed_remove_council.csv similarity index 100% rename from caps/tests/test_processed_remove_council.csv rename to cape/tests/test_processed_remove_council.csv diff --git a/caps/tests/test_processed_update.csv b/cape/tests/test_processed_update.csv similarity index 100% rename from caps/tests/test_processed_update.csv rename to cape/tests/test_processed_update.csv diff --git a/caps/tests/test_processed_update_url.csv b/cape/tests/test_processed_update_url.csv similarity index 100% rename from caps/tests/test_processed_update_url.csv rename to cape/tests/test_processed_update_url.csv diff --git a/caps/tests/test_promises.csv b/cape/tests/test_promises.csv similarity index 100% rename from caps/tests/test_promises.csv rename to cape/tests/test_promises.csv diff --git a/caps/tests/test_tags.csv b/cape/tests/test_tags.csv similarity index 100% rename from caps/tests/test_tags.csv rename to cape/tests/test_tags.csv diff --git a/caps/tests/test_views.py b/cape/tests/test_views.py similarity index 99% rename from caps/tests/test_views.py rename to cape/tests/test_views.py index 478858551..46d750fc4 100644 --- a/caps/tests/test_views.py +++ b/cape/tests/test_views.py @@ -4,7 +4,7 @@ from django.urls import reverse -from caps.models import Council, Promise, PlanDocument, EmergencyDeclaration +from cape.models import Council, Promise, PlanDocument, EmergencyDeclaration class TestPageRenders(TestCase): diff --git a/caps/tests/west-borsetshire_plan.pdf b/cape/tests/west-borsetshire_plan.pdf similarity index 100% rename from caps/tests/west-borsetshire_plan.pdf rename to cape/tests/west-borsetshire_plan.pdf diff --git a/caps/tests/west-borsetshire_strategy.pdf b/cape/tests/west-borsetshire_strategy.pdf similarity index 100% rename from caps/tests/west-borsetshire_strategy.pdf rename to cape/tests/west-borsetshire_strategy.pdf diff --git a/caps/urls.py b/cape/urls.py similarity index 93% rename from caps/urls.py rename to cape/urls.py index 71ee1794f..967ebb39a 100755 --- a/caps/urls.py +++ b/cape/urls.py @@ -3,10 +3,10 @@ from django.conf import settings import haystack.generic_views -from caps.forms import HighlightedSearchForm -import caps.views as views -import caps.api.views as api_views -from caps.api import routers +from cape.forms import HighlightedSearchForm +import cape.views as views +import cape.api.views as api_views +from cape.api import routers router = routers.Router() router.register(r"councils", api_views.CouncilViewSet, basename="council") diff --git a/caps/utils.py b/cape/utils.py similarity index 100% rename from caps/utils.py rename to cape/utils.py diff --git a/caps/views.py b/cape/views.py similarity index 99% rename from caps/views.py rename to cape/views.py index f73f3affa..550893b8b 100755 --- a/caps/views.py +++ b/cape/views.py @@ -16,7 +16,7 @@ from django_filters.views import FilterView from haystack.generic_views import SearchView as HaystackSearchView -from caps.models import ( +from cape.models import ( Council, CouncilFilter, PlanDocument, @@ -28,8 +28,8 @@ CouncilProject, ProjectFilter, ) -from caps.forms import HighlightedSearchForm -from caps.mapit import ( +from cape.forms import HighlightedSearchForm +from cape.mapit import ( MapIt, NotFoundException, BadRequestException, @@ -37,11 +37,11 @@ ForbiddenException, ) -import caps.charts as charts +import cape.charts as charts from charting import ChartCollection -from caps.utils import file_size, is_valid_postcode +from cape.utils import file_size, is_valid_postcode from scoring.models import ( PlanScore, diff --git a/proj/settings.py b/proj/settings.py index 4c2a8326d..19d09be3a 100755 --- a/proj/settings.py +++ b/proj/settings.py @@ -64,7 +64,7 @@ "django.template.context_processors.static", "django.template.context_processors.tz", "django.contrib.messages.context_processors.messages", - "caps.context_processors.analytics", + "cape.context_processors.analytics", ], }, }, @@ -107,7 +107,7 @@ PIPELINE = { "STYLESHEETS": { "caps": { - "source_filenames": ("caps/scss/main.scss",), + "source_filenames": ("cape/scss/main.scss",), "output_filename": "css/caps.css", }, "scoring": { @@ -184,7 +184,7 @@ "bootstrap4", "rest_framework", "simple_history", - "caps", + "cape", "scoring", "charting", ] diff --git a/proj/urls.py b/proj/urls.py index 227a7bf2e..869f07851 100755 --- a/proj/urls.py +++ b/proj/urls.py @@ -7,5 +7,5 @@ urlpatterns = static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) urlpatterns += [ - path("", include("caps.urls")), + path("", include("cape.urls")), ] diff --git a/scoring/filters.py b/scoring/filters.py index a27340f1e..f0ac89fea 100644 --- a/scoring/filters.py +++ b/scoring/filters.py @@ -1,6 +1,6 @@ import django_filters -from caps.models import Council +from cape.models import Council from scoring.models import PlanScore, PlanQuestionScore diff --git a/scoring/management/commands/fetch_and_import_plan_urls.py b/scoring/management/commands/fetch_and_import_plan_urls.py index 8aa7e072f..6df2ede1b 100644 --- a/scoring/management/commands/fetch_and_import_plan_urls.py +++ b/scoring/management/commands/fetch_and_import_plan_urls.py @@ -7,7 +7,7 @@ from django.conf import settings from django.db import transaction -from caps.import_utils import get_google_sheet_as_csv +from cape.import_utils import get_google_sheet_as_csv from scoring.models import PlanScore, PlanScoreDocument diff --git a/scoring/management/commands/import_plan_scores.py b/scoring/management/commands/import_plan_scores.py index 9a399c543..9be81f551 100644 --- a/scoring/management/commands/import_plan_scores.py +++ b/scoring/management/commands/import_plan_scores.py @@ -13,8 +13,8 @@ import tempfile import zipfile -from caps.models import Council -from caps.utils import char_from_text, integer_from_text +from cape.models import Council +from cape.utils import char_from_text, integer_from_text from scoring.models import ( PlanScore, PlanSection, diff --git a/scoring/mixins.py b/scoring/mixins.py index bf94e66d6..41aa3fdcc 100644 --- a/scoring/mixins.py +++ b/scoring/mixins.py @@ -2,7 +2,7 @@ from django.conf import settings from django.shortcuts import redirect -from caps.models import Council +from cape.models import Council from scoring.models import PlanScore diff --git a/scoring/models.py b/scoring/models.py index 98c22e70e..e22d541e8 100644 --- a/scoring/models.py +++ b/scoring/models.py @@ -3,7 +3,7 @@ from django.db import models from django.db.models import Avg, Max, Q, F, Count -from caps.models import Council +from cape.models import Council # define this here as mixins imports PlanScore so if we import that then we get diff --git a/scoring/tests/test_calculations.py b/scoring/tests/test_calculations.py index 8d207eeb9..b983119ea 100644 --- a/scoring/tests/test_calculations.py +++ b/scoring/tests/test_calculations.py @@ -1,6 +1,6 @@ from django.test import TestCase -from caps.models import Council +from cape.models import Council from scoring.models import PlanSection, PlanSectionScore, PlanScore diff --git a/scoring/tests/test_views.py b/scoring/tests/test_views.py index 0414a1d17..dafb0da0d 100644 --- a/scoring/tests/test_views.py +++ b/scoring/tests/test_views.py @@ -2,7 +2,7 @@ from django.urls import reverse -from caps.models import Council +from cape.models import Council from scoring.models import PlanSectionScore, PlanScore diff --git a/scoring/views.py b/scoring/views.py index b26481111..4513bbb06 100644 --- a/scoring/views.py +++ b/scoring/views.py @@ -11,7 +11,7 @@ from django_filters.views import FilterView -from caps.models import Council, Promise +from cape.models import Council, Promise from scoring.models import ( PlanScore, PlanScoreDocument, @@ -24,7 +24,7 @@ from scoring.forms import ScoringSort -from caps.views import BaseLocationResultsView +from cape.views import BaseLocationResultsView from scoring.mixins import CheckForDownPageMixin, AdvancedFilterMixin cache_settings = {