django-cards 0.9.5__tar.gz → 0.9.7__tar.gz

{django-cards-0.9.5 → django-cards-0.9.7}/PKG-INFO

@@ -1,11 +1,9 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.9.5
+Version: 0.9.7
 Summary: Django app that allows you make cards
 Home-page: https://github.com/django-advance-utils/django-cards
 Author: Thomas Turner
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -18,5 +16,3 @@ License-File: LICENSE
 
 # django-cards
 Django Cards
-
-

{django-cards-0.9.5 → django-cards-0.9.7}/cards/base.py

@@ -118,6 +118,7 @@ class CardBase:
             extra_info['datatable_id'] = kwargs.get('datatable_id', self.code)
             extra_info['datatable'] = kwargs.get('datatable')
             extra_info['datatable_model'] = kwargs.get('datatable_model')
+            extra_info['setup_table'] = kwargs.get('setup_table')
             if group_type == CARD_TYPE_ORDERED_DATATABLE:
                 extra_info['order_field'] = kwargs.get('order_field', 'order')
         elif group_type == CARD_TYPE_HTML:
@@ -403,7 +404,11 @@ class CardBase:
             else:
                 table = self.extra_card_info['datatable']
             setup_table_field = 'setup_table'
-            if self.code is not None:
+            if self.extra_card_info['setup_table'] is not None:
+                field_setup_table_field = f'setup_table_{self.extra_card_info["setup_table"]}'
+                if hasattr(self.view, field_setup_table_field):
+                    setup_table_field = field_setup_table_field
+            elif self.code is not None:
                 field_setup_table_field = f'setup_table_{self.code}'
                 if hasattr(self.view, field_setup_table_field):
                     setup_table_field = field_setup_table_field

{django-cards-0.9.5 → django-cards-0.9.7}/cards/templates/cards/standard/default_body.html

@@ -4,10 +4,10 @@
     <div class="list-group">
         {% for row in card.rows %}
             {% if row.type == 'html' %}<div class="{{ item_css_class }}">{{ row.html|safe }}</div>{% else %}
-            {% if row.type == 'multiple' %}<div class="row">{% endif %}
+            {% if row.type == 'multiple' %}<div class="{{ item_css_class }}"><div class="row">{% endif %}
             {% for entry in row.entries %}
                 {% if entry.entry_css_class %}<div class="{{ entry.entry_css_class }}">{% endif %}
-                {% if entry.link %}<a class="{{ item_css_class }} cards-list-group-item" href="{{ entry.link }}" style="{{ item_css }}">{% else %}<div class="{{ item_css_class }}" style="{{ item_css }}">{% endif %}
+                {% if entry.link %}<a class="{{ item_css_class }} cards-list-group-item" href="{{ entry.link }}" style="{{ item_css }}">{% elif row.type != 'multiple' %}<div class="{{ item_css_class }}" style="{{ item_css }}">{% endif %}
                     {% if entry.label %}
                         <div class="d-flex"><label class="mr-auto">{{ entry.label|safe }}</label>{{ entry.menu.render }}</div>
                         {% if entry.multiple_lines %}
@@ -20,10 +20,10 @@
                     {% else %}
                         {{ entry.html|safe }}
                     {% endif %}
-            {% if entry.link %}</a>{% else %}</div>{% endif %}
+            {% if entry.link %}</a>{% elif row.type != 'multiple' %}</div>{% endif %}
              {% if entry.entry_css_class %}</div>{% endif %}
             {% endfor %}
-            {% if row.type == 'multiple' %}</div>{% endif %}
+            {% if row.type == 'multiple' %}</div></div>{% endif %}
             {% endif %}
         {% endfor %}
     </div>

{django-cards-0.9.5 → django-cards-0.9.7}/django_cards.egg-info/PKG-INFO

@@ -1,11 +1,9 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.9.5
+Version: 0.9.7
 Summary: Django app that allows you make cards
 Home-page: https://github.com/django-advance-utils/django-cards
 Author: Thomas Turner
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -18,5 +16,3 @@ License-File: LICENSE
 
 # django-cards
 Django Cards
-
-

{django-cards-0.9.5 → django-cards-0.9.7}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="django-cards",
-    version="0.9.5",
+    version="0.9.7",
     author="Thomas Turner",
     description="Django app that allows you make cards",
     long_description=long_description,