diff --git a/app/members/migrations/0013_alter_membergroupownerpage_sort_by_titlea_and_more.py b/app/members/migrations/0013_alter_membergroupownerpage_sort_by_titlea_and_more.py new file mode 100644 index 0000000..02db5aa --- /dev/null +++ b/app/members/migrations/0013_alter_membergroupownerpage_sort_by_titlea_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.7 on 2024-07-15 17:03 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0012_membergroupownerpage_view_all_text'), + ] + + operations = [ + migrations.AlterField( + model_name='membergroupownerpage', + name='sort_by_titlea', + field=models.CharField(default='Sort by Name Alphabetical'), + ), + migrations.AlterField( + model_name='membergroupownerpage', + name='sort_by_titlez', + field=models.CharField(default='Sort by Name Reverse Alphabetical'), + ), + ] diff --git a/app/news/templates/news/individual_news_page.html b/app/news/templates/news/individual_news_page.html index c91346e..796ecec 100644 --- a/app/news/templates/news/individual_news_page.html +++ b/app/news/templates/news/individual_news_page.html @@ -17,10 +17,7 @@

{{ page.title }}

{{page.get_parent.specific.authors_posted_by_text}} {% for author in page.authors %} - {{author.value.title}} - {% if not forloop.last %} - , - {% endif %} + {{author.value.title}}{% if not forloop.last %}, {% endif %} {% endfor %} {{page.get_parent.specific.authors_posted_on_text}} {{ page.date }}

diff --git a/app/rfp/__init__.py b/app/rfp/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/rfp/admin.py b/app/rfp/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/app/rfp/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/app/rfp/apps.py b/app/rfp/apps.py new file mode 100644 index 0000000..94559f5 --- /dev/null +++ b/app/rfp/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class RfpConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'app.rfp' diff --git a/app/rfp/migrations/0001_initial.py b/app/rfp/migrations/0001_initial.py new file mode 100644 index 0000000..e934dc5 --- /dev/null +++ b/app/rfp/migrations/0001_initial.py @@ -0,0 +1,59 @@ +# Generated by Django 4.2.7 on 2024-07-15 20:55 + +from django.db import migrations, models +import django.db.models.deletion +import wagtail.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('wagtailcore', '0089_log_entry_data_json_null_to_object'), + ] + + operations = [ + migrations.CreateModel( + name='IndividualRequestForProposalPage', + fields=[ + ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')), + ('posters', wagtail.fields.StreamField([('poster', wagtail.blocks.PageChooserBlock(page_type=['members.IndividualMemberPage']))], blank=True, null=True, use_json_field=True)), + ('intro', wagtail.fields.RichTextField(blank=True)), + ('article_body', wagtail.fields.StreamField([('text_block', wagtail.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'document-link', 'image', 'embed', 'code', 'blockquote']))], blank=True, null=True, use_json_field=True)), + ('role', models.CharField(blank=True)), + ('application_close_date', models.DateField(blank=True)), + ('project_duration', models.CharField(blank=True)), + ('work_location', models.CharField(blank=True)), + ('contract_type', models.CharField(blank=True)), + ('direct_contact', models.CharField(blank=True)), + ('submission_email', models.EmailField(blank=True, max_length=254)), + ], + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), + ), + migrations.CreateModel( + name='RequestForProposalOwnerPage', + fields=[ + ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')), + ('posted_by_prefix_text', models.CharField(default='Posted by')), + ('terms_of_reference_title', models.CharField(default='Terms of Reference')), + ('role_title', models.CharField(default='Role:')), + ('application_close_title', models.CharField(default='Application Close Date:')), + ('project_duration_title', models.CharField(default='Duration of Project:')), + ('work_location_title', models.CharField(default='Work Location:')), + ('contract_type_title', models.CharField(default='Type of Contract:')), + ('direct_contact_title', models.CharField(default='Direct Contact:')), + ('cta_title', models.CharField(blank=True)), + ('submission_email_button', models.CharField(default='Submission Email')), + ('go_back_text', models.CharField(default='Go Back to Request for Proposals')), + ], + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), + ), + ] diff --git a/app/rfp/migrations/0002_individualrequestforproposalpage_post_date_and_more.py b/app/rfp/migrations/0002_individualrequestforproposalpage_post_date_and_more.py new file mode 100644 index 0000000..3a19662 --- /dev/null +++ b/app/rfp/migrations/0002_individualrequestforproposalpage_post_date_and_more.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.7 on 2024-07-15 20:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('rfp', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='individualrequestforproposalpage', + name='post_date', + field=models.DateField(blank=True, null=True), + ), + migrations.AlterField( + model_name='individualrequestforproposalpage', + name='application_close_date', + field=models.DateField(blank=True, null=True), + ), + ] diff --git a/app/rfp/migrations/__init__.py b/app/rfp/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/rfp/models.py b/app/rfp/models.py new file mode 100644 index 0000000..953a170 --- /dev/null +++ b/app/rfp/models.py @@ -0,0 +1,84 @@ +from django.db import models + +from wagtail.admin.panels import FieldPanel, MultiFieldPanel +from wagtail.fields import RichTextField, StreamField +from wagtail.blocks import CharBlock, StreamBlock, StructBlock, URLBlock, RichTextBlock, PageChooserBlock +from wagtail.models import Page + + +class RequestForProposalOwnerPage(Page): + subpage_types = [ + 'rfp.IndividualRequestForProposalPage' + ] + + max_count = 1 + + posted_by_prefix_text = models.CharField(default="Posted by") + + terms_of_reference_title = models.CharField(default="Terms of Reference") + role_title = models.CharField(default="Role:") + application_close_title = models.CharField(default="Application Close Date:") + project_duration_title = models.CharField(default="Duration of Project:") + work_location_title = models.CharField(default="Work Location:") + contract_type_title = models.CharField(default="Type of Contract:") + direct_contact_title = models.CharField(default="Direct Contact:") + cta_title = models.CharField(blank=True) + submission_email_button = models.CharField(default="Submission Email") + + go_back_text = models.CharField(default="Go Back to Request for Proposals") + + content_panels = Page.content_panels + [ + FieldPanel('posted_by_prefix_text'), + MultiFieldPanel([ + FieldPanel('terms_of_reference_title'), + FieldPanel('role_title'), + FieldPanel('application_close_title'), + FieldPanel('project_duration_title'), + FieldPanel('work_location_title'), + FieldPanel('contract_type_title'), + FieldPanel('direct_contact_title'), + FieldPanel('cta_title'), + FieldPanel('submission_email_button'), + ], heading="Sidebar"), + FieldPanel('go_back_text'), + ] + + +class IndividualRequestForProposalPage(Page): + parent_page_type = [ + 'rfp.RequestForProposalOwnerPage' + ] + + posters = StreamField([('poster', PageChooserBlock(page_type="members.IndividualMemberPage"))], use_json_field=True, null=True, blank=True) + post_date = models.DateField(blank=True, null=True) + + intro = RichTextField(blank=True) + article_body = StreamField([ + ('text_block', RichTextBlock(features=[ + 'h1', 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'document-link', 'image', 'embed', 'code', 'blockquote' + ])) + ], use_json_field=True, null=True, blank=True) + + role = models.CharField(blank=True) + application_close_date = models.DateField(blank=True, null=True) + project_duration = models.CharField(blank=True) + work_location = models.CharField(blank=True) + contract_type = models.CharField(blank=True) + direct_contact = models.CharField(blank=True) + submission_email = models.EmailField(blank=True) + + content_panels = Page.content_panels + [ + FieldPanel('posters'), + FieldPanel('post_date'), + FieldPanel('intro'), + FieldPanel('article_body'), + MultiFieldPanel([ + FieldPanel('role'), + FieldPanel('application_close_date'), + FieldPanel('project_duration'), + FieldPanel('work_location'), + FieldPanel('contract_type'), + FieldPanel('direct_contact'), + FieldPanel('submission_email'), + ], heading="Sidebar"), + ] diff --git a/app/rfp/templates/rfp/components/SidebarSection.html b/app/rfp/templates/rfp/components/SidebarSection.html new file mode 100644 index 0000000..3490c2d --- /dev/null +++ b/app/rfp/templates/rfp/components/SidebarSection.html @@ -0,0 +1,11 @@ +
+ {% if not no_divider %} +
+ {% endif %} +

+ {{ title }} +

+

+ {{ text }} +

+
\ No newline at end of file diff --git a/app/rfp/templates/rfp/individual_request_for_proposal_page.html b/app/rfp/templates/rfp/individual_request_for_proposal_page.html new file mode 100644 index 0000000..980ad1f --- /dev/null +++ b/app/rfp/templates/rfp/individual_request_for_proposal_page.html @@ -0,0 +1,67 @@ +{% extends "base.html" %} +{% load static %} +{% load wagtailcore_tags %} +{% load wagtailimages_tags %} +{% load compress %} +{% block body_class %}template-individualrequestforproposalpage{% endblock %} +{% block extra_css %} + {% compress css %} + {% endcompress css %} +{% endblock extra_css %} + +{% block content %} +
+ {% comment %} HEADER {% endcomment %} +
+

{{ page.title }}

+

+ {{page.get_parent.specific.posted_by_prefix_text}} + {% for poster in page.posters %} + {{poster.value.title}}{% if not forloop.last %}, {% endif %} + {% endfor %} + • {{ page.post_date }} +

+
+ +
+ {% comment %} BODY {% endcomment %} +
+
+ {{ page.intro|safe }} +
+ {{ page.article_body }} +
+ + {% comment %} SIDEBAR {% endcomment %} +
+
+

+ {{ page.get_parent.specific.terms_of_reference_title }} +

+
+ + {% include "./components/SidebarSection.html" with title=page.get_parent.specific.role_title text=page.role no_divider=True %} + {% include "./components/SidebarSection.html" with title=page.get_parent.specific.application_close_title text=page.application_close_date %} + {% include "./components/SidebarSection.html" with title=page.get_parent.specific.project_duration_title text=page.project_duration %} + {% include "./components/SidebarSection.html" with title=page.get_parent.specific.work_location_title text=page.work_location %} + {% include "./components/SidebarSection.html" with title=page.get_parent.specific.contract_type_title text=page.contract_type %} + {% include "./components/SidebarSection.html" with title=page.get_parent.specific.direct_contact_title text=page.direct_contact %} + +
+

+ {{page.get_parent.specific.cta_title}} +

+ + {% include "components/branded_elements/button.html" with text=page.get_parent.specific.submission_email_button %} + +
+
+
+ +
+

+ {% include "ui/components/BaseLink.html" with linktext=page.get_parent.specific.go_back_text linkurl=page.get_parent.url %} +

+
+
+{% endblock %} \ No newline at end of file diff --git a/app/rfp/tests.py b/app/rfp/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/app/rfp/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/app/rfp/views.py b/app/rfp/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/app/rfp/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/app/volunteer_opportunities/__init__.py b/app/volunteer_opportunities/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/volunteer_opportunities/admin.py b/app/volunteer_opportunities/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/app/volunteer_opportunities/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/app/volunteer_opportunities/apps.py b/app/volunteer_opportunities/apps.py new file mode 100644 index 0000000..66f4bd7 --- /dev/null +++ b/app/volunteer_opportunities/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class VolunteerOpportunitiesConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'app.volunteer_opportunities' diff --git a/app/volunteer_opportunities/migrations/0001_initial.py b/app/volunteer_opportunities/migrations/0001_initial.py new file mode 100644 index 0000000..e3a8a20 --- /dev/null +++ b/app/volunteer_opportunities/migrations/0001_initial.py @@ -0,0 +1,51 @@ +# Generated by Django 4.2.7 on 2024-07-15 18:06 + +from django.db import migrations, models +import django.db.models.deletion +import wagtail.blocks +import wagtail.fields + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('wagtailcore', '0089_log_entry_data_json_null_to_object'), + ] + + operations = [ + migrations.CreateModel( + name='IndividualVolunteerOpportunityPage', + fields=[ + ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')), + ('posters', wagtail.fields.StreamField([('poster', wagtail.blocks.PageChooserBlock(page_type=['members.IndividualMemberPage']))], blank=True, null=True, use_json_field=True)), + ('intro', wagtail.fields.RichTextField(blank=True)), + ('article_body', wagtail.fields.StreamField([('text_block', wagtail.blocks.RichTextBlock(features=['h1', 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'document-link', 'image', 'embed', 'code', 'blockquote']))], blank=True, null=True, use_json_field=True)), + ('contact_description', wagtail.fields.RichTextField(blank=True)), + ('application_description', wagtail.fields.RichTextField(blank=True)), + ('application_date', models.DateField()), + ('location_text', models.CharField(blank=True)), + ], + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), + ), + migrations.CreateModel( + name='VolunteerOpportunityOwnerPage', + fields=[ + ('page_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='wagtailcore.page')), + ('posted_by_prefix_text', models.CharField(default='Posted by')), + ('contact_title', models.CharField(default='Contact')), + ('application_date_title', models.CharField(default='Application Date')), + ('location_title', models.CharField(default='Location')), + ('share_text', models.CharField(default='Share')), + ('go_back_text', models.CharField(default='Go Back to Volunteer Opportunities')), + ], + options={ + 'abstract': False, + }, + bases=('wagtailcore.page',), + ), + ] diff --git a/app/volunteer_opportunities/migrations/__init__.py b/app/volunteer_opportunities/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/volunteer_opportunities/models.py b/app/volunteer_opportunities/models.py new file mode 100644 index 0000000..456fa28 --- /dev/null +++ b/app/volunteer_opportunities/models.py @@ -0,0 +1,68 @@ +from django.db import models + +from wagtail.admin.panels import FieldPanel, MultiFieldPanel +from wagtail.fields import RichTextField, StreamField +from wagtail.blocks import CharBlock, StreamBlock, StructBlock, URLBlock, RichTextBlock, PageChooserBlock +from wagtail.models import Page + + +class VolunteerOpportunityOwnerPage(Page): + subpage_types = [ + 'volunteer_opportunities.IndividualVolunteerOpportunityPage' + ] + + max_count = 1 + + posted_by_prefix_text = models.CharField(default="Posted by") + + contact_title = models.CharField(default="Contact") + application_date_title = models.CharField(default="Application Date") + location_title = models.CharField(default="Location") + + share_text = models.CharField(default="Share") + go_back_text = models.CharField(default="Go Back to Volunteer Opportunities") + + content_panels = Page.content_panels + [ + FieldPanel('posted_by_prefix_text'), + MultiFieldPanel([ + FieldPanel('contact_title'), + FieldPanel('application_date_title'), + FieldPanel('location_title'), + ], heading="Sidebar"), + MultiFieldPanel([ + FieldPanel('share_text'), + FieldPanel('go_back_text'), + ], heading="Bottom"), + ] + + +class IndividualVolunteerOpportunityPage(Page): + parent_page_type = [ + 'volunteer_opportunities.VolunteerOpportunityOwnerPage' + ] + + posters = StreamField([('poster', PageChooserBlock(page_type="members.IndividualMemberPage"))], use_json_field=True, null=True, blank=True) + + intro = RichTextField(blank=True) + article_body = StreamField([ + ('text_block', RichTextBlock(features=[ + 'h1', 'h2', 'h3', 'h4', 'bold', 'italic', 'link', 'ol', 'ul', 'hr', 'document-link', 'image', 'embed', 'code', 'blockquote' + ])) + ], use_json_field=True, null=True, blank=True) + + contact_description = RichTextField(blank=True) + application_description = RichTextField(blank=True) + application_date = models.DateField() + location_text = models.CharField(blank=True) + + content_panels = Page.content_panels + [ + FieldPanel('posters'), + FieldPanel('intro'), + FieldPanel('article_body'), + MultiFieldPanel([ + FieldPanel('contact_description'), + FieldPanel('application_description'), + FieldPanel('application_date'), + FieldPanel('location_text'), + ], heading="Sidebar"), + ] diff --git a/app/volunteer_opportunities/templates/volunteer_opportunities/individual_volunteer_opportunity_page.html b/app/volunteer_opportunities/templates/volunteer_opportunities/individual_volunteer_opportunity_page.html new file mode 100644 index 0000000..01bafa8 --- /dev/null +++ b/app/volunteer_opportunities/templates/volunteer_opportunities/individual_volunteer_opportunity_page.html @@ -0,0 +1,71 @@ +{% extends "base.html" %} +{% load static %} +{% load wagtailcore_tags %} +{% load wagtailimages_tags %} +{% load compress %} +{% block body_class %}template-individualvolunteeropportunitypage{% endblock %} +{% block extra_css %} + {% compress css %} + {% endcompress css %} +{% endblock extra_css %} + +{% block content %} +
+ {% comment %} HEADER {% endcomment %} +
+

{{ page.title }}

+

+ {{page.get_parent.specific.posted_by_prefix_text}} + {% for poster in page.posters %} + {{poster.value.title}}{% if not forloop.last %}, {% endif %} + {% endfor %} +

+
+ +
+ {% comment %} BODY {% endcomment %} +
+
+ {{ page.intro|safe }} +
+ {{ page.article_body }} +
+ + {% comment %} SIDEBAR {% endcomment %} +
+
+

+ {{ page.get_parent.specific.contact_title }} +

+ {{ page.contact_description|safe }} +
+
+
+

+ {{ page.get_parent.specific.application_date_title }} +

+ {{ page.application_description|safe }} +

+ {{ page.application_date }} +

+
+
+
+

+ {{ page.get_parent.specific.location_title }} +

+ {{ page.location_text|safe }} +
+
+
+ +
+
+ {% include "ui/components/sharers/ShareSection.html" %} +
+

+ {% include "ui/components/BaseLink.html" with linktext=page.get_parent.specific.go_back_text linkurl=page.get_parent.url %} +

+
+
+{% endblock %} \ No newline at end of file diff --git a/app/volunteer_opportunities/templates/volunteer_opportunities/volunteer_opportunity_owner_page.html b/app/volunteer_opportunities/templates/volunteer_opportunities/volunteer_opportunity_owner_page.html new file mode 100644 index 0000000..e69de29 diff --git a/app/volunteer_opportunities/tests.py b/app/volunteer_opportunities/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/app/volunteer_opportunities/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/app/volunteer_opportunities/views.py b/app/volunteer_opportunities/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/app/volunteer_opportunities/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/home/templatetags/debug_tags.py b/home/templatetags/debug_tags.py index 3d5c4a3..863ff3b 100644 --- a/home/templatetags/debug_tags.py +++ b/home/templatetags/debug_tags.py @@ -5,4 +5,4 @@ @register.simple_tag def is_debug(): - return "settings.DEBUG" + return settings.DEBUG diff --git a/hot_osm/settings/base.py b/hot_osm/settings/base.py index 725d67c..946516b 100644 --- a/hot_osm/settings/base.py +++ b/hot_osm/settings/base.py @@ -48,6 +48,8 @@ "app.get_involved", "app.tools_and_resources", "app.search_page", + "app.volunteer_opportunities", + "app.rfp", "search", "users", "utils",