🔥 remove icon field in fds_page_extension

Author: krmax44

fragdenstaat_de/fds_cms/models.py

@@ -22,7 +22,9 @@
 
 @extension_pool.register
 class FdsPageExtension(PageExtension):
-    search_index = models.BooleanField(default=True)
+    search_index = models.BooleanField(
+        _("Show in search results and search engines"), default=True
+    )
     image = FilerImageField(
         null=True,
         blank=True,
@@ -33,21 +35,22 @@ class FdsPageExtension(PageExtension):
     breadcrumb_ancestor = PageField(
         null=True,
         blank=True,
-        help_text=_("If present, this page will be displayed as the ancestor in the breadcrumbs."),
-        verbose_name=_("Ancestor"),
-        related_name='breadcrumb_ancestor'
-    )
-    ancestor_only_upwards = models.BooleanField(_("Only show the breadcrumb ancestor on this page, but not its children"), default=True)
-    icon = models.CharField(
-        _("Icon"),
-        max_length=50,
-        blank=True,
         help_text=_(
-            """Enter an icon name from the <a href="https://fontawesome.com/v4.7.0/icons/" target="_blank">FontAwesome 4 icon set</a>"""
+            "If present, this page will be displayed as the ancestor in the breadcrumbs."
         ),
+        verbose_name=_("Ancestor"),
+        related_name="breadcrumb_ancestor",
+    )
+    ancestor_only_upwards = models.BooleanField(
+        _("Only show the breadcrumb ancestor on this page, but not its children"),
+        default=True,
     )
     breadcrumb_background = models.CharField(
-        _("Breadcrumbs background"), choices=BACKGROUND, default="", max_length=50, blank=True
+        _("Breadcrumbs background"),
+        choices=BACKGROUND,
+        default="",
+        max_length=50,
+        blank=True,
     )
 
 

fragdenstaat_de/fds_cms/templates/cms/breadcrumbs.html

@@ -1,27 +1,22 @@
 {% load i18n %}
 {% load fds_cms_tags %}
 {% load cms_tags %}
-
 <li class="breadcrumb-item">
     {% page_url "home" as home_url %}
     <a href="{{ home_url|default:'/' }}">
         <i class="fa fa-home"></i>
         <span class="sr-only">{% trans "Home Page" %}</span>
     </a>
 </li>
-
 {% get_breadcrumb_ancestor ancestors.0 as custom_ancestor %}
 {% if custom_ancestor %}
-<li class="breadcrumb-item">
-    {% if custom_ancestor.icon %}<i class="fa fa-{{ custom_ancestor.icon }}" aria-hidden="true"></i>{% endif %}
-    <a href="{{ custom_ancestor.url }}">
-        {{ custom_ancestor.title }}
-    </a>
-</li>
+    <li class="breadcrumb-item">
+        <a href="{{ custom_ancestor.url }}">{{ custom_ancestor.title }}</a>
+    </li>
 {% endif %}
-
 {% for ance in ancestors %}
     <li {% if forloop.last %}class="breadcrumb-item active" aria-current="page"{% else %}class="breadcrumb-item"{% endif %}>
-        <a href="{{ ance.get_absolute_url }}"{% if forloop.last %} aria-current="page"{% endif %}>{{ ance.get_menu_title }}</a>
+        <a href="{{ ance.get_absolute_url }}"
+           {% if forloop.last %}aria-current="page"{% endif %}>{{ ance.get_menu_title }}</a>
     </li>
 {% endfor %}

fragdenstaat_de/fds_cms/templatetags/fds_cms_tags.py

@@ -81,7 +81,6 @@ def get_soft_root(page):
 
 @register.simple_tag(takes_context=True)
 def get_breadcrumb_ancestor(context, navigation_node):
-    print(context)
     if navigation_node is None:
         return
 
@@ -90,7 +89,6 @@ def get_breadcrumb_ancestor(context, navigation_node):
     except KeyError:
         return
 
-
     try:
         page = Page.objects.get(pk=navigation_node.id)
         ancestor = page.fdspageextension.breadcrumb_ancestor
@@ -106,6 +104,5 @@ def get_breadcrumb_ancestor(context, navigation_node):
 
     title = ancestor.get_title(language=request.LANGUAGE_CODE)
     url = ancestor.get_absolute_url(language=request.LANGUAGE_CODE)
-    icon = ancestor.fdspageextension.icon
 
-    return {"title": title, "url": url, "icon": icon}
+    return {"title": title, "url": url}