Adding optional discard defaults by variable merge_extra_fields

.editorconfig

@@ -6,7 +6,7 @@ insert_final_newline = false
 trim_trailing_whitespace = false
 
 # Set default charset
-[*.{js,py,rst,json,yml,html,txt,scss}]
+[*.{js,py,rst,json,yml,html,txt,css,scss}]
 charset = utf-8
 
 [*.{js,py,rst,yml,html,scss}]
@@ -18,7 +18,7 @@ line_length=119
 indent_style = space
 indent_size = 4
 
-[*.{html,js,rst,scss}]
+[*.{html,js,rst,css,scss}]
 indent_style = tab
 indent_size = 4
 

.gitignore

@@ -23,3 +23,5 @@ workdir/
 filer_public/
 filer_public_thumbnails/
 examples/bs3demo/private_settings.py
+.venv/
+poetry.lock

cmsplugin_cascade/__init__.py

@@ -19,6 +19,6 @@
 15. git commit -m 'Start with <version>'
 16. git push
 """
-__version__ = "1.2.3"
+__version__ = "1.3.dev"
 
 default_app_config = 'cmsplugin_cascade.apps.CascadeConfig'

cmsplugin_cascade/app_settings.py

@@ -21,7 +21,7 @@ def CMSPLUGIN_CASCADE(self):
         from django.forms.fields import NumberInput
         from django.core.exceptions import ImproperlyConfigured
         from django.utils.translation import ugettext_lazy
-        from cmsplugin_cascade.fields import (ColorField, SelectTextAlignField, SelectOverflowField, SizeField,
+        from cmsplugin_cascade.fields import (ColorFieldExtra, SelectTextAlignField, SelectOverflowField, SizeField,
                                               BorderChoiceField)
 
         if hasattr(self, '_config_CMSPLUGIN_CASCADE'):
@@ -96,7 +96,7 @@ def CMSPLUGIN_CASCADE(self):
             (['line-height'], NumberInput))
         extra_inline_styles.setdefault(
             'Colors',
-            (['color', 'background-color'], ColorField))
+            (['color', 'background-color'], ColorFieldExtra))
         extra_inline_styles.setdefault(
             'Border',
             (['border', 'border-top', 'border-right', 'border-bottom', 'border-left'], BorderChoiceField))
@@ -130,7 +130,18 @@ def CMSPLUGIN_CASCADE(self):
 
         config.setdefault('cache_strides', True)
 
+        config.setdefault('merge_extra_fields',True)
+
+        config.setdefault('fallback',{
+          # default
+          'path_main_scss': 'bs4demo/css/main.scss',
+          'image':{'color':'hsla(221.7, 57.5%, 84.3%, 0.8)', 'svg':''},
+          'picture':{'color':'hsla(0, 40%, 80.4%, 0.8)', 'svg':'' },
+          'jumbotron':{'color':'hsl(62, 90%, 90%, 0.8)', 'svg':''},
+         })
+
         config.setdefault('register_page_editor', True)
+
 
         for module_name in self.CASCADE_PLUGINS:
             try:

cmsplugin_cascade/bootstrap4/accordion.py

@@ -10,7 +10,7 @@
 from cmsplugin_cascade.plugin_base import TransparentWrapper, TransparentContainer
 from cmsplugin_cascade.widgets import NumberInputWidget
 from .plugin_base import BootstrapPluginBase
-
+from cmsplugin_cascade.helpers import used_compact_form, entangled_nested
 
 class AccordionFormMixin(ManageChildrenFormMixin, EntangledModelFormMixin):
     num_children = IntegerField(
@@ -35,6 +35,9 @@ class AccordionFormMixin(ManageChildrenFormMixin, EntangledModelFormMixin):
          help_text=_("Start with the first card open.")
     )
 
+    if used_compact_form:
+        entangled_nested(num_children, close_others,first_is_open, data_nested='accordion')
+
     class Meta:
         untangled_fields = ['num_children']
         entangled_fields = {'glossary': ['close_others', 'first_is_open']}
@@ -85,6 +88,9 @@ class AccordionGroupFormMixin(EntangledModelFormMixin):
          help_text=_("Add standard padding to card body."),
     )
 
+    if used_compact_form:
+        entangled_nested(heading,body_padding,  data_nested='accordion_group')
+
     class Meta:
         entangled_fields = {'glossary': ['heading', 'body_padding']}
 

cmsplugin_cascade/bootstrap4/buttons.py

@@ -9,7 +9,10 @@
 from cmsplugin_cascade.icon.forms import IconFormMixin
 from cmsplugin_cascade.link.config import LinkPluginBase, LinkFormMixin
 from cmsplugin_cascade.link.plugin_base import LinkElementMixin
+from cmsplugin_cascade.helpers import used_compact_form, entangled_nested
 
+from sass_processor.processor import sass_processor
+sass_processor('cascade/css/admin/compact_forms/bootstrap4-colors.scss')
 
 class ButtonTypeWidget(widgets.RadioSelect):
     """
@@ -24,7 +27,6 @@ class ButtonSizeWidget(widgets.RadioSelect):
     """
     template_name = 'cascade/admin/legacy_widgets/button_sizes.html' if DJANGO_VERSION < (2, 0) else 'cascade/admin/widgets/button_sizes.html'
 
-
 class ButtonFormMixin(EntangledModelFormMixin):
     BUTTON_TYPES = [
         ('btn-primary', _("Primary")),
@@ -104,20 +106,27 @@ class ButtonFormMixin(EntangledModelFormMixin):
         help_text=_("Add an Icon before or after the button content."),
     )
 
+    if used_compact_form:
+        entangled_nested(link_content,button_type,button_size,button_options,\
+           stretched_link, data_nested='button')
+        entangled_nested(button_type, data_nested='button', template_key='button_type')
+        entangled_nested(icon_align, data_nested='icon')
+
     class Meta:
         entangled_fields = {'glossary': ['link_content', 'button_type', 'button_size', 'button_options', 'icon_align',
                                          'stretched_link']}
 
 
 class BootstrapButtonMixin(IconPluginMixin):
     require_parent = True
-    parent_classes = ['BootstrapColumnPlugin', 'SimpleWrapperPlugin']
+    parent_classes = ['BootstrapColumnPlugin', 'SimpleWrapperPlugin','BootstrapNavItemsPlugin', 'BootstrapListsPlugin']
     render_template = 'cascade/bootstrap4/button.html'
     allow_children = False
     default_css_class = 'btn'
     default_css_attributes = ['button_type', 'button_size', 'button_options', 'stretched_link']
     ring_plugin = 'ButtonMixin'
 
+
     class Media:
         css = {'all': ['cascade/css/admin/bootstrap4-buttons.css', 'cascade/css/admin/iconplugin.css']}
         js = ['admin/js/jquery.init.js', 'cascade/js/admin/buttonmixin.js']
@@ -148,6 +157,7 @@ class BootstrapButtonPlugin(BootstrapButtonMixin, LinkPluginBase):
     form = BootstrapButtonFormMixin
     ring_plugin = 'ButtonPlugin'
     DEFAULT_BUTTON_ATTRIBUTES = {'role': 'button'}
+#    render_template_fallback = "cascade/generic/fallback_button.html" # mode stride gallery
 
     class Media:
         js = ['admin/js/jquery.init.js', 'cascade/js/admin/buttonplugin.js']
@@ -168,6 +178,9 @@ def get_css_classes(cls, obj):
         css_classes = cls.super(BootstrapButtonPlugin, cls).get_css_classes(obj)
         if obj.glossary.get('stretched_link'):
             css_classes.append('stretched_link')
+        if hasattr(obj, 'parent') and hasattr(obj.parent,'parent') and hasattr(obj.parent.parent,'plugin_type'):
+            if obj.parent.parent.plugin_type == 'BootstrapNavBrandPlugin':
+                css_classes.insert(0,'nav-link text-left')
         return css_classes
 
     @classmethod

cmsplugin_cascade/bootstrap4/carousel.py

@@ -14,6 +14,7 @@
 from cmsplugin_cascade.bootstrap4.utils import IMAGE_RESIZE_OPTIONS
 from cmsplugin_cascade.forms import ManageChildrenFormMixin
 from cmsplugin_cascade.image import ImagePropertyMixin, ImageFormMixin
+from cmsplugin_cascade.helpers import used_compact_form, entangled_nested
 
 logger = logging.getLogger('cascade')
 
@@ -55,6 +56,9 @@ class CarouselSlidesFormMixin(ManageChildrenFormMixin, EntangledModelFormMixin):
         initial=['upscale', 'crop', 'subject_location', 'high_resolution'],
     )
 
+    if used_compact_form:
+        entangled_nested(resize_options, container_max_heights,options,interval,num_children, data_nested='carousel')
+
     class Meta:
         untangled_fields = ['num_children']
         entangled_fields = {'glossary': ['interval', 'options', 'container_max_heights', 'resize_options']}

cmsplugin_cascade/bootstrap4/container.py

@@ -11,6 +11,7 @@
 from cmsplugin_cascade import app_settings
 from cmsplugin_cascade.bootstrap4.grid import Breakpoint
 from cmsplugin_cascade.forms import ManageChildrenFormMixin
+from cmsplugin_cascade.helpers import entangled_nested, used_compact_form
 from .plugin_base import BootstrapPluginBase
 from . import grid
 
@@ -19,17 +20,26 @@ def get_widget_choices():
     breakpoints = app_settings.CMSPLUGIN_CASCADE['bootstrap4']['fluid_bounds']
     widget_choices = []
     for index, (bp, bound) in enumerate(breakpoints.items()):
-        if index == 0:
-            widget_choices.append((bp.name, "{} (<{:.1f}px)".format(bp.label, bound.max)))
-        elif index == len(breakpoints) - 1:
-            widget_choices.append((bp.name, "{} (≥{:.1f}px)".format(bp.label, bound.min)))
+        if not used_compact_form:
+            if index == 0:
+                widget_choices.append((bp.name, "{} (<{:.1f}px)".format(bp.label, bound.max)))
+            elif index == len(breakpoints) - 1:
+                widget_choices.append((bp.name, "{} (≥{:.1f}px)".format(bp.label, bound.min)))
+            else:
+                widget_choices.append((bp.name, "{} (≥{:.1f}px and <{:.1f}px)".format(bp.label, bound.min, bound.max)))
         else:
-            widget_choices.append((bp.name, "{} (≥{:.1f}px and <{:.1f}px)".format(bp.label, bound.min, bound.max)))
+            if index == 0:
+                 widget_choices.append((bp.name, "{} <{:.1f}px".format(bp._name_, bound.max)))
+            else:
+                 widget_choices.append((bp.name, "{} ≥{:.1f}px".format(bp._name_, bound.min)))
     return widget_choices
 
 
 class ContainerBreakpointsWidget(widgets.CheckboxSelectMultiple):
-    template_name = 'cascade/admin/legacy_widgets/container_breakpoints.html' if DJANGO_VERSION < (2, 0) else 'cascade/admin/widgets/container_breakpoints.html'
+    if not used_compact_form:
+        template_name = 'cascade/admin/legacy_widgets/container_breakpoints.html' if DJANGO_VERSION < (2, 0) else 'cascade/admin/widgets/container_breakpoints.html'
+    else:
+        template_name = 'cascade/admin/compact_forms/widgets/container_breakpoints.html'
 
 
 class ContainerFormMixin(EntangledModelFormMixin):
@@ -48,6 +58,9 @@ class ContainerFormMixin(EntangledModelFormMixin):
         help_text=_("Changing your outermost '.container' to '.container-fluid'.")
     )
 
+    if used_compact_form:
+        entangled_nested( breakpoints, fluid, data_nested="container")
+
     class Meta:
         entangled_fields = {'glossary': ['breakpoints', 'fluid']}
 
@@ -121,6 +134,9 @@ class BootstrapRowFormMixin(ManageChildrenFormMixin, EntangledModelFormMixin):
         help_text=_('Number of columns to be created with this row.'),
     )
 
+    if used_compact_form:
+        entangled_nested( num_children, data_nested="row")
+
     class Meta:
         untangled_fields = ['num_children']
 
@@ -196,7 +212,7 @@ def choose_help_text(*phrases):
                 return phrases[1].format(bs4_breakpoints[first].min)
             else:
                 return phrases[2]
-            
+
         if 'parent' in self._cms_initial_attributes:
             container=self._cms_initial_attributes['parent'].get_ancestors().order_by('depth').last().get_bound_plugin()
         else:
@@ -325,6 +341,13 @@ def choose_help_text(*phrases):
         glossary_fields.extend(reorder_fields.keys())
         glossary_fields.extend(responsive_fields.keys())
 
+
+        if used_compact_form:
+            entangled_nested(width_fields, data_nested="column", template_key="column", )
+            entangled_nested(offset_fields, data_nested="offset", template_key="column", )
+            entangled_nested(reorder_fields, data_nested="reorder", template_key="column",)
+            entangled_nested(responsive_fields, data_nested="responsive", template_key="column")
+
         class Meta:
             entangled_fields = {'glossary': glossary_fields}
 

cmsplugin_cascade/bootstrap4/icon.py

@@ -8,7 +8,7 @@
 from cmsplugin_cascade.link.plugin_base import LinkElementMixin
 from cmsplugin_cascade.icon.forms import IconFormMixin
 from cmsplugin_cascade.icon.plugin_base import IconPluginMixin
-
+from cmsplugin_cascade.helpers import used_compact_form, entangled_nested
 
 class FramedIconFormMixin(IconFormMixin):
     SIZE_CHOICES = [('{}em'.format(c), "{} em".format(c)) for c in range(1, 13)]
@@ -56,6 +56,10 @@ class FramedIconFormMixin(IconFormMixin):
         required=False,
     )
 
+    if used_compact_form:
+        entangled_nested(font_size, color, background_color, text_align, border,
+                                         border_radius, data_nested='icon')
+
     class Meta:
         entangled_fields = {'glossary': ['font_size', 'color', 'background_color', 'text_align', 'border',
                                          'border_radius']}

cmsplugin_cascade/bootstrap4/image.py

@@ -10,6 +10,7 @@
 from cmsplugin_cascade.fields import SizeField
 from cmsplugin_cascade.link.config import LinkPluginBase, LinkFormMixin
 from cmsplugin_cascade.link.plugin_base import LinkElementMixin
+from cmsplugin_cascade.helpers import used_compact_form, entangled_nested
 
 logger = logging.getLogger('cascade.bootstrap4')
 
@@ -67,6 +68,10 @@ class BootstrapImageFormMixin(ImageFormMixin):
         help_text=_("How to align a non-responsive image."),
     )
 
+    if used_compact_form:
+        entangled_nested(image_shapes, image_width_responsive, image_width_fixed,
+         image_height, resize_options, image_alignment, data_nested='image_setting')
+
     class Meta:
         entangled_fields = {'glossary': ['image_shapes', 'image_width_responsive', 'image_width_fixed',
                                          'image_height', 'resize_options', 'image_alignment']}

cmsplugin_cascade/bootstrap4/jumbotron.py

@@ -12,6 +12,7 @@
 from cmsplugin_cascade.bootstrap4.container import ContainerGridMixin
 from cmsplugin_cascade.bootstrap4.fields import BootstrapMultiSizeField
 from cmsplugin_cascade.bootstrap4.picture import get_picture_elements
+from cmsplugin_cascade.helpers import entangled_nested, used_compact_form
 
 logger = logging.getLogger('cascade')
 
@@ -154,6 +155,11 @@ class JumbotronFormMixin(EntangledModelFormMixin):
         help_text=_("This property specifies the width and height of a background image in px or %."),
     )
 
+    if used_compact_form:
+        entangled_nested(fluid, background_color, element_heights, image_file,
+                                 background_repeat, background_attachment,
+                                 background_vertical_position, background_horizontal_position,
+                                 background_size, background_width_height, data_nested='jumbotron')
     class Meta:
         entangled_fields = {'glossary': ['fluid', 'background_color', 'element_heights', 'image_file',
                                          'background_repeat', 'background_attachment',
@@ -195,6 +201,7 @@ class BootstrapJumbotronPlugin(BootstrapPluginBase):
     form = JumbotronFormMixin
     raw_id_fields = ['image_file']
     render_template = 'cascade/bootstrap4/jumbotron.html'
+    render_template_fallback = "cascade/generic/fallback_jumbotron.html" # mode stride gallery
     ring_plugin = 'JumbotronPlugin'
     footnote_html = """<p>
     For more information about the Jumbotron please read the

cmsplugin_cascade/bootstrap4/lists.py

@@ -0,0 +1,64 @@
+from django.utils.html import format_html
+from django.utils.translation import ugettext_lazy as _
+from .plugin_base import BootstrapPluginBase
+from django.forms.fields import ChoiceField
+from cms.plugin_pool import plugin_pool
+from entangled.forms import EntangledModelFormMixin
+
+import logging
+logger = logging.getLogger('cascade')
+
+class  BootstrapListsMixin( EntangledModelFormMixin):
+    list_options = ChoiceField(
+        label=_("List Options"),
+        choices=[
+            ('inherit', _("inherit")),
+            ('inline-item', _('ul(class="inline-item").li(class="list-inline-item")')),
+            ('navbar-nav', _('ul(class="navbar-nav").li(class="nav-item")')),
+        ],
+        required=False,
+    )
+    class Meta:
+        entangled_fields = {'glossary': ['list_options']}
+
+
+@plugin_pool.register_plugin
+class  BootstrapListsPlugin(BootstrapPluginBase):
+    name = _("Lists")
+    alien_plugins = True
+    form = BootstrapListsMixin
+    alien_child_classes = True
+    render_template = 'cascade/bootstrap4/navbar_list.html'
+    default_css_class = ''
+    require_parent = False
+
+    @classmethod
+    def get_css_classes(cls, obj):
+        css_classes = cls.super(BootstrapListsPlugin, cls).get_css_classes(obj)
+        list_options = [obj.glossary.get('list_options')] if obj.glossary.get('list_options') else ''
+        if list_options:
+            for opts in list_options:
+               css_classes.append(opts)
+        return css_classes
+
+
+    @classmethod
+    def get_identifier(cls, obj):
+        identifier = super(BootstrapListsPlugin, cls).get_identifier(obj)
+        if hasattr(cls,'default_css_class'):
+            css_classes_without_default = obj.css_classes.replace( cls.default_css_class , '' , 1)
+        else:
+            css_classes_without_default = obj.css_classes
+        return format_html('<div style="font-size: smaller; white-space: pre-wrap;" >{0}{1}</div>',
+        identifier, css_classes_without_default )
+
+    @classmethod
+    def sanitize_model(cls, obj):
+        list_child_css_classes = obj.glossary['child_css_classes'].split(' ') if 'child_css_classes' in obj.glossary else []
+        list_options = 'list-inline-item' if obj.glossary.get('list_options') else ''
+        list_options = 'nav-item' if obj.glossary.get('list_options') == 'navbar-nav' else list_options 
+        if list_options:
+             list_child_css_classes.append(list_options)
+        obj.glossary['child_css_classes'] = ' '.join(list_child_css_classes)
+        super().sanitize_model(obj)
+