Fixes to reduce confusion of column names

Author: lqez

pythonkr_backend/pythonkr/migrations/0001_initial.py

@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
             name='PKHomePage',
             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')),
-                ('body', wagtail.fields.RichTextField(blank=True)),
+                ('content', wagtail.fields.RichTextField(blank=True)),
             ],
             options={
                 'abstract': False,

pythonkr_backend/pythonkr/models.py

@@ -13,7 +13,7 @@ class Meta:
         abstract = True
 
     def get_context(self, request, *args, **kwargs):
-        "common context for PK"
+        "common context for Python Korea"
         context = super().get_context(request, *args, **kwargs)
 
         SponsorPageModel = apps.get_model("pythonkr", "PKSponsors")
@@ -81,17 +81,17 @@ def save(self, *args, **kwargs):
 
 class PKHomePage(PKBasePage):
     template = "pythonkr/pk_home.html"
-    body = RichTextField(blank=True)
+    content = RichTextField(blank=True)
 
     subpage_types = [
         PKPage,
         PKDocPage,
     ]
 
     content_panels = Page.content_panels + [
-        FieldPanel("body"),
+        FieldPanel("content"),
     ]
 
     def get_context(self, request, *args, **kwargs):
         context = super().get_context(request, *args, **kwargs)
-        return context
+        return context

pythonkr_backend/pythonkr/templates/pythonkr/pk_base.html

@@ -35,7 +35,7 @@
     <nav class="navbar navbar-expand-lg navbar-light bg-light fixed-top">
         <div class="container">
             <a class="navbar-brand" href="{% pageurl current_site.root_page %}">
-                <img src="{% static 'pao/01-Main2.png' %}" alt="Python Asia Organization Logo"
+                <img src="{% static 'pythonkr/pythonkr-badge.png' %}" alt="Python Korea Logo"
                     height="80"/>
             </a>
             <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarNav">
@@ -53,7 +53,9 @@
 
     <!-- Main Content -->
     <main class="container mt-5 pt-5">
-        {% block content %}{% endblock content %}
+        {% block content %}
+            {{ page.content|richtext }}
+        {% endblock %}
     </main>
 
     <!-- Footer -->

pythonkr_backend/pythonkr/templates/pythonkr/pk_home.html

@@ -1,8 +1,2 @@
 {% extends 'pythonkr/pk_base.html' %}
 {% load wagtailcore_tags %}
-
-{% block title %}Home - Python Asia - {{ page.title }}{% endblock %}
-
-{% block content %}
-    {{ page.body|richtext }}
-{% endblock %}

pythonkr_backend/pythonkr/templates/pythonkr/pk_page.html

@@ -1,8 +1,2 @@
 {% extends 'pythonkr/pk_base.html' %}
 {% load wagtailcore_tags %}
-
-{% block title %}Home - Python Asia - {{ page.title }}{% endblock %}
-
-{% block content %}
-    {{ page.body|richtext }}
-{% endblock %}