From f6ea5a5dacaab171a870fc5b7a0004e2d3d0cd7b Mon Sep 17 00:00:00 2001
From: Todd Dembrey <todd.dembrey@torchbox.com>
Date: Thu, 11 Jan 2018 09:55:07 +0000
Subject: [PATCH] Rename the templates to play nice with the new app_label
---
opentech/public/funds/blocks.py | 4 ++--
.../public/funds/templates/funds/blocks/related_projects.html | 3 ---
.../funds/templates/public_funds/blocks/related_projects.html | 3 +++
.../{funds => public_funds}/blocks/related_reviewers.html | 0
.../funds/templates/{funds => public_funds}/fund_index.html | 0
.../funds/templates/{funds => public_funds}/fund_page.html | 4 ++--
.../{funds => public_funds}/includes/fund_apply_cta.html | 0
.../{funds => public_funds}/includes/project_listing.html | 0
8 files changed, 7 insertions(+), 7 deletions(-)
delete mode 100644 opentech/public/funds/templates/funds/blocks/related_projects.html
create mode 100644 opentech/public/funds/templates/public_funds/blocks/related_projects.html
rename opentech/public/funds/templates/{funds => public_funds}/blocks/related_reviewers.html (100%)
rename opentech/public/funds/templates/{funds => public_funds}/fund_index.html (100%)
rename opentech/public/funds/templates/{funds => public_funds}/fund_page.html (69%)
rename opentech/public/funds/templates/{funds => public_funds}/includes/fund_apply_cta.html (100%)
rename opentech/public/funds/templates/{funds => public_funds}/includes/project_listing.html (100%)
diff --git a/opentech/public/funds/blocks.py b/opentech/public/funds/blocks.py
index 65dbea765..694ddc0a5 100644
--- a/opentech/public/funds/blocks.py
+++ b/opentech/public/funds/blocks.py
@@ -7,14 +7,14 @@ class ProjectsBlock(StaticBlock):
class Meta:
icon = 'grip'
label = 'List of Projects funded'
- template = 'funds/blocks/related_projects.html'
+ template = 'public_funds/blocks/related_projects.html'
class ReviewersBlock(StaticBlock):
class Meta:
icon = 'grip'
label = 'List of fund Reviewers'
- template = 'funds/blocks/related_reviewers.html'
+ template = 'public_funds/blocks/related_reviewers.html'
class FundBlock(StoryBlock):
diff --git a/opentech/public/funds/templates/funds/blocks/related_projects.html b/opentech/public/funds/templates/funds/blocks/related_projects.html
deleted file mode 100644
index 692e68dbb..000000000
--- a/opentech/public/funds/templates/funds/blocks/related_projects.html
+++ /dev/null
@@ -1,3 +0,0 @@
-{% for project in page.projects %}
- {% include "publicpages/includes/project_listing.html" with project=project %}
-{% endfor %}
diff --git a/opentech/public/funds/templates/public_funds/blocks/related_projects.html b/opentech/public/funds/templates/public_funds/blocks/related_projects.html
new file mode 100644
index 000000000..a1a791e99
--- /dev/null
+++ b/opentech/public/funds/templates/public_funds/blocks/related_projects.html
@@ -0,0 +1,3 @@
+{% for project in page.projects %}
+ {% include "public_funds/includes/project_listing.html" with project=project %}
+{% endfor %}
diff --git a/opentech/public/funds/templates/funds/blocks/related_reviewers.html b/opentech/public/funds/templates/public_funds/blocks/related_reviewers.html
similarity index 100%
rename from opentech/public/funds/templates/funds/blocks/related_reviewers.html
rename to opentech/public/funds/templates/public_funds/blocks/related_reviewers.html
diff --git a/opentech/public/funds/templates/funds/fund_index.html b/opentech/public/funds/templates/public_funds/fund_index.html
similarity index 100%
rename from opentech/public/funds/templates/funds/fund_index.html
rename to opentech/public/funds/templates/public_funds/fund_index.html
diff --git a/opentech/public/funds/templates/funds/fund_page.html b/opentech/public/funds/templates/public_funds/fund_page.html
similarity index 69%
rename from opentech/public/funds/templates/funds/fund_page.html
rename to opentech/public/funds/templates/public_funds/fund_page.html
index c0a5492da..7c6f6f516 100644
--- a/opentech/public/funds/templates/funds/fund_page.html
+++ b/opentech/public/funds/templates/public_funds/fund_page.html
@@ -2,7 +2,7 @@
{% load wagtailcore_tags wagtailimages_tags navigation_tags static %}
{% block content %}
- {% include "publicpages/includes/fund_apply_cta.html" with fund_type=page.fund_type.specific %}
+ {% include "public_funds/includes/fund_apply_cta.html" with fund_type=page.fund_type.specific %}
<div class="wrapper wrapper--flex">
<section class="section section--main">
<h1>{{ page.title }}</h1>
@@ -11,6 +11,6 @@
{% include_block page.body %}
</section>
</div>
- {% include "publicpages/includes/fund_apply_cta.html" with fund_type=page.fund_type.specific %}
+ {% include "public_funds/includes/fund_apply_cta.html" with fund_type=page.fund_type.specific %}
{% include "includes/relatedcontent.html" with related_pages=page.related_pages.all %}
{% endblock %}
diff --git a/opentech/public/funds/templates/funds/includes/fund_apply_cta.html b/opentech/public/funds/templates/public_funds/includes/fund_apply_cta.html
similarity index 100%
rename from opentech/public/funds/templates/funds/includes/fund_apply_cta.html
rename to opentech/public/funds/templates/public_funds/includes/fund_apply_cta.html
diff --git a/opentech/public/funds/templates/funds/includes/project_listing.html b/opentech/public/funds/templates/public_funds/includes/project_listing.html
similarity index 100%
rename from opentech/public/funds/templates/funds/includes/project_listing.html
rename to opentech/public/funds/templates/public_funds/includes/project_listing.html
--
GitLab