django-cards 0.11.1__tar.gz → 0.11.3__tar.gz

{django-cards-0.11.1/django_cards.egg-info → django-cards-0.11.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.11.1
+Version: 0.11.3
 Summary: Django app that allows you make cards
 Home-page: https://github.com/django-advance-utils/django-cards
 Author: Thomas Turner

{django-cards-0.11.1 → django-cards-0.11.3}/cards/base.py

@@ -1,5 +1,6 @@
 import datetime
 import json
+from collections import defaultdict
 
 from ajax_helpers.utils import random_string
 from django.core.exceptions import FieldDoesNotExist
@@ -16,6 +17,7 @@ CARD_TYPE_ORDERED_DATATABLE = 3
 CARD_TYPE_HTML = 4
 CARD_TYPE_LIST_SELECTION = 5
 CARD_TYPE_CARD_GROUP = 6
+CARD_TYPE_CARD_LAYOUT = 7
 
 
 class CardBase:
@@ -41,6 +43,10 @@ class CardBase:
                                 'context': {'card_css_class': 'card django-card',
                                             'card_body_css_outer_class': 'card-body',
                                             'card_body_css_inner_class': 'row cards-list'}},
+                 'card_layout': {'name': 'cards/standard/card_group.html',
+                                 'context': {'card_body_css_outer_class': '',
+                                             'card_css_class': '',
+                                             'card_body_css_inner_class': 'row'}},
                  'list_selection': {'name': 'cards/standard/list_selection.html',
                                     'context': {'card_css_class': 'card django-card',
                                                 'card_link_css_class': 'list-group-item cards-list-group-item',
@@ -65,7 +71,8 @@ class CardBase:
                          CARD_TYPE_ORDERED_DATATABLE: 'datatable',
                          CARD_TYPE_HTML: 'html',
                          CARD_TYPE_LIST_SELECTION: 'list_selection',
-                         CARD_TYPE_CARD_GROUP: 'card_group'}
+                         CARD_TYPE_CARD_GROUP: 'card_group',
+                         CARD_TYPE_CARD_LAYOUT: 'card_layout'}
 
     button_menu_type = 'button_group'
     tab_menu_type = 'tabs'
@@ -410,11 +417,11 @@ class CardBase:
 
                 value_dict = {'value': value,
                               'label': label,
-                              'menu': menu,
                               'link': link,
                               **kwargs}
-
-                row_style_html = html_row_style.format(**value_dict)
+                if menu is not None:
+                    value_dict['menu'] = menu.render()
+                row_style_html = html_row_style.format_map(defaultdict(lambda: '', value_dict))
 
             entry = {'label': label,
                      'html': value,
@@ -560,7 +567,7 @@ class CardBase:
 
     def add_child_card_group(self, *args, div_css_class='', div_inner_css_class='',
                              div_inner_css='', override_card_context=None):
-        if self.group_type != CARD_TYPE_CARD_GROUP:
+        if self.group_type not in [CARD_TYPE_CARD_GROUP, CARD_TYPE_CARD_LAYOUT]:
             raise Exception('This will only work for card group')
         self.child_card_groups.append({'div_css_class': div_css_class,
                                        'div_inner_css_class': div_inner_css_class,

{django-cards-0.11.1 → django-cards-0.11.3}/cards/standard.py

@@ -4,7 +4,7 @@ from ajax_helpers.utils import is_ajax
 from django.http import HttpResponse
 from django.template.loader import render_to_string
 
-from cards.base import CardBase, CARD_TYPE_HTML
+from cards.base import CardBase, CARD_TYPE_HTML, CARD_TYPE_CARD_LAYOUT
 
 
 class CardPostError(Exception):
@@ -87,6 +87,10 @@ class CardMixin:
             self.cards[card_name] = card
         return card
 
+    def add_layout_card(self, card_name=None):
+        return self.add_card(card_name=card_name,
+                             group_type=CARD_TYPE_CARD_LAYOUT)
+
     def get_context_data(self, **kwargs):
         self.setup_datatable_cards()
         self.setup_cards()

{django-cards-0.11.1 → django-cards-0.11.3}/cards/templates/cards/standard/card_group.html

@@ -1,13 +1,17 @@
 {% load django_cards_tags %}
 <div class="{{ card_css_class }}" id="{{ card.code }}" data-title="">
+
+    {% if card.title or card.menu %}
     <div class="card-header">
         <div class="d-flex align-items-center">
             <h5 class="mr-auto">{{ card.title }}</h5>
             {{ card.menu.render }}
         </div>
     </div>
+    {% endif %}
     {{ card.tab_menu.render }}
-    <div class="{{ card_body_css_outer_class }}">
+
+    {% if card_body_css_outer_class %}<div class="{{ card_body_css_outer_class }}">{% endif %}
         <div class="{{ card_body_css_inner_class }}">
             {% for group in card.child_card_groups %}
                 <div class="{{ group.div_css_class }}">
@@ -23,7 +27,7 @@
                 </div>
             {% endfor %}
         </div>
-    </div>
+    {% if card_body_css_outer_class %}</div>{% endif %}
     {% if card.footer %}
         <div class="card-footer">
             <small style="text-align: left">{{ card.footer|safe }}</small>

{django-cards-0.11.1 → django-cards-0.11.3}/cards/templates/cards/standard/datatable.html

@@ -22,6 +22,7 @@
         {{ card.tab_menu.render }}
         <div class="{{ card_body_css_class }}{% if card.enable_collapse %} collapse{% if not card.collapsed %} show{% endif %}{% endif %}" id="{{ card.code }}_body"
              {% if card_body_css_style %}style="{{ card_body_css_style }}"{% endif %}>
+                {{ top|safe }}
             {% if show_search_bar and not show_pivot_table %}
                 <div class="d-flex">
                     <div class="p-2">{% no_of_results card.extra_card_info.datatable %}</div>
@@ -31,6 +32,7 @@
                 </div>
             {% endif %}
             {{ card.extra_card_info.datatable.render|safe }}
+            {{ bottom|safe }}
         </div>
         {% if card.footer %}
             <div class="card-footer">

{django-cards-0.11.1 → django-cards-0.11.3/django_cards.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-cards
-Version: 0.11.1
+Version: 0.11.3
 Summary: Django app that allows you make cards
 Home-page: https://github.com/django-advance-utils/django-cards
 Author: Thomas Turner

{django-cards-0.11.1 → django-cards-0.11.3}/setup.py

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