django-cotton-bs5 0.3.0__tar.gz → 0.5.0__tar.gz

{django_cotton_bs5-0.3.0 → django_cotton_bs5-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-cotton-bs5
-Version: 0.3.0
+Version: 0.5.0
 Summary: Bootstrap 5 components for use with Django Cotton.
 License: MIT
 Author: Sam
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Provides-Extra: django-compressor
 Requires-Dist: django-compressor (>=4.5.1,<5.0.0) ; extra == "django-compressor"
-Requires-Dist: django-cotton (>2.1)
+Requires-Dist: django-cotton (>=2.3.1)
 Requires-Dist: django-libsass (>=0.9,<0.10)
 Description-Content-Type: text/markdown
 

django_cotton_bs5-0.5.0/cotton_bs5/templates/cotton/badge.html

@@ -0,0 +1,6 @@
+<c-vars variant="primary" pill text />
+{% with element=href|yesno:"a,span" %}
+  {# djlint:off #}
+<{{ element }} class="badge text-bg-{{ variant }}{% if pill %} rounded-pill{% endif %}{% if class %} {{ class }}{% endif %}" {{ attrs }}>{{ text }}{{ slot }}</{{ element }}>
+  {# djlint:on #}
+{% endwith %}

django_cotton_bs5-0.5.0/cotton_bs5/templates/cotton/breadcrumbs/index.html

@@ -0,0 +1,13 @@
+{% load i18n %}
+<c-vars ol_class divider="/" items class />
+<nav aria-label="{% trans "breadcrumb" %}"
+     style="--bs-breadcrumb-divider: '{{ divider }}'"
+     {{ attrs }}>
+  <ol class="breadcrumb {{ ol_class }}">
+    {% if items %}
+      {% for item in items %}<c-breadcrumbs.item :attrs="item" />{% endfor %}
+    {% else %}
+      {{ slot }}
+    {% endif %}
+  </ol>
+</nav>

django_cotton_bs5-0.5.0/cotton_bs5/templates/cotton/button_group.html

@@ -0,0 +1,9 @@
+{% load i18n %}
+<c-vars size
+        vertical
+        gap
+        class
+        label='{% trans "Button group" %}' />
+{# djlint:off #}
+<div class="{% if gap %}d-flex gap-{{ gap }}{% if vertical %} flex-column{% endif %}{% else %}btn-group{% if vertical %}-vertical{% endif %}{% endif %} {% if size %} btn-group-{{ size }}{% endif %} {{ class }}" role="group" aria-label="{{ label }}" {{ attrs }}>{{ slot }}</div>
+{# djlint:on #}

{django_cotton_bs5-0.3.0 → django_cotton_bs5-0.5.0}/cotton_bs5/templates/cotton/card/index.html

@@ -1,10 +1,10 @@
-<c-vars class header title minimal />
+<c-vars class header title minimal body_class />
 <div class="card {{ class }}" {{ attrs }}>
   {% if header %}<c-card.header text="{{ header }}" />{% endif %}
   {% if minimal %}
     {{ slot }}
   {% else %}
-    <c-card.body>
+    <c-card.body class="{{ body_class }}" only>
       {% if title %}<c-card.title text="{{ title }}" />{% endif %}
       {% if subtitle %}<c-card.subtitle text="{{ subtitle }}" />{% endif %}
       {{ slot }}

{django_cotton_bs5-0.3.0 → django_cotton_bs5-0.5.0}/cotton_bs5/templates/cotton/dropdown/index.html

@@ -1,4 +1,3 @@
-{% load cotton %}
 <c-vars direction="down"
         :dir_dict="{'up': 'dropup', 'down': 'dropdown', 'left': 'dropstart', 'right':'dropend'}"
         class />

django_cotton_bs5-0.5.0/cotton_bs5/templates/cotton/pagination/index.html

@@ -0,0 +1,91 @@
+{% load i18n %}
+<c-vars label
+        page_obj
+        page_window="5"
+        use_icons
+        show_first_and_last />
+{% if page_obj.paginator.num_pages > 1 %}
+  <c-pagination.wrapper :attrs="attrs">
+    {# --- First page --- #}
+    {% if not show_first_and_last %}
+      <c-pagination.link :page="1"
+                         :disabled="{{ page_obj.has_previous|yesno:"False,True" }}"
+                         text="{% trans "First" %}">
+        {% if use_icons %}
+          <svg height="1em"
+               style="vertical-align: -0.175em"
+               fill="currentColor"
+               viewBox="0 0 16 16">
+            <path fill-rule="evenodd" d="M8.354 1.646a.5.5 0 0 1 0 .708L2.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0" />
+            <path fill-rule="evenodd" d="M12.354 1.646a.5.5 0 0 1 0 .708L6.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0" />
+          </svg>
+        {% else %}
+          {% trans "First" %}
+        {% endif %}
+      </c-pagination.link>
+    {% endif %}
+    {# --- Previous page --- #}
+    <c-pagination.link :page="{% if page_obj.has_previous %}{{ page_obj.previous_page_number }}{% endif %}"
+                       :disabled="{{ page_obj.has_previous|yesno:"False,True" }}"
+                       text="{% trans "Previous" %}">
+      {% if use_icons %}
+        <svg height="1em"
+             style="vertical-align: -0.175em"
+             fill="currentColor"
+             viewBox="0 0 16 16">
+          <path fill-rule="evenodd" d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0" />
+        </svg>
+      {% else %}
+        {% trans "Previous" %}
+      {% endif %}
+    </c-pagination.link>
+    {% with "-"|add:page_window as negative_window %}
+      {% for num in page_obj.paginator.page_range %}
+        {% if forloop.first or forloop.last and show_first_and_last %}
+          <c-pagination.link page="{{ num }}"
+                             text="{{ num }}"
+                             :active="{% if num == page_obj.number %}True{% endif %}" />
+        {% elif num >= page_obj.number|add:negative_window and num <= page_obj.number|add:page_window %}
+          <c-pagination.link page="{{ num }}"
+                             text="{{ num }}"
+                             :active="{% if num == page_obj.number %}True{% endif %}" />
+        {% elif num == page_obj.number|add:negative_window|add:"-1" or num == page_obj.number|add:page_window|add:"1" %}
+          <c-pagination.link text="..." disabled />
+        {% endif %}
+      {% endfor %}
+    {% endwith %}
+    {# --- Next page --- #}
+    <c-pagination.link :page="{% if page_obj.has_next %}{{ page_obj.next_page_number }}{% endif %}"
+                       :disabled="{{ page_obj.has_next|yesno:"False,True" }}"
+                       text="{% trans "Next" %}">
+      {% if use_icons %}
+        <svg height="1em"
+             style="vertical-align: -0.175em"
+             fill="currentColor"
+             viewBox="0 0 16 16">
+          <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708" />
+        </svg>
+      {% else %}
+        {% trans "Next" %}
+      {% endif %}
+    </c-pagination.link>
+    {% if not show_first_and_last %}
+      {# --- Last page --- #}
+      <c-pagination.link :page="{{ page_obj.paginator.num_pages }}"
+                         :disabled="{{ page_obj.has_next|yesno:"False,True" }}"
+                         text="{% trans "Last" %}">
+        {% if use_icons %}
+          <svg height="1em"
+               style="vertical-align: -0.175em"
+               fill="currentColor"
+               viewBox="0 0 16 16">
+            <path fill-rule="evenodd" d="M3.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L9.293 8 3.646 2.354a.5.5 0 0 1 0-.708" />
+            <path fill-rule="evenodd" d="M7.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L13.293 8 7.646 2.354a.5.5 0 0 1 0-.708" />
+          </svg>
+        {% else %}
+          {% trans "Last" %}
+        {% endif %}
+      </c-pagination.link>
+    {% endif %}
+  </c-pagination.wrapper>
+{% endif %}

{django_cotton_bs5-0.3.0 → django_cotton_bs5-0.5.0}/cotton_bs5/templates/cotton/pagination/link.html

@@ -1,14 +1,24 @@
 <c-vars page text active disabled class />
 <li class="page-item{% if active %} active{% endif %}{% if disabled %} disabled{% endif %}">
   {% if disabled %}
-    <span class="page-link {{ class }}" {{ attrs }}>{{ text }} {{ slot }}</span>
+    <span class="page-link {{ class }}" {{ attrs }}>
+      {% if slot %}
+        {{ slot }}
+      {% else %}
+        {{ text }}
+      {% endif %}
+    </span>
   {% else %}
     <a class="page-link {{ class }}"
-       href="?page={{ page }}"
+       href="?{{ page_param|default:"page" }}={{ page }}"
        {% if active %}aria-current="page"{% endif %}
        {% if disabled %}tabindex="-1" aria-disabled="true"{% endif %}
        {{ attrs }}>
-      {{ text }} {{ slot }}
+      {% if slot %}
+        {{ slot }}
+      {% else %}
+        {{ text }}
+      {% endif %}
     </a>
   {% endif %}
 </li>

django_cotton_bs5-0.5.0/cotton_bs5/templates/cotton/pagination/wrapper.html

@@ -0,0 +1,9 @@
+{% load i18n %}
+<c-vars label="{% trans "Navigation page results" %}"
+        size
+        ul_class />
+<nav aria-label="{{ label }}" {{ attrs }}>
+  <ul class="pagination{% if size %} pagination-{{ size }}{% endif %} {{ ul_class }}">
+    {{ slot }}
+  </ul>
+</nav>

{django_cotton_bs5-0.3.0 → django_cotton_bs5-0.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-cotton-bs5"
-version = "v0.3.0"
+version = "v0.5.0"
 description = "Bootstrap 5 components for use with Django Cotton."
 authors = ["Sam <samuel.scott.jennings@gmail.com>"]
 license = "MIT"
@@ -9,7 +9,7 @@ packages = [{include = "cotton_bs5"}]
 
 [tool.poetry.dependencies]
 python = ">=3.10,<4.0"
-django-cotton = ">2.1"
+django-cotton = ">=2.3.1"
 django-compressor = {version = "^4.5.1", optional = true}
 django-libsass = "^0.9"
 
@@ -17,11 +17,11 @@ django-libsass = "^0.9"
 django-compressor = ["django-compressor"]
 
 [tool.poetry.group.dev.dependencies]
-Django = "^5.0.7"
-djlint = "^1.34.1"
+Django = ">=4.2,<6.0"
 django-crispy-forms = "^2.4"
 crispy-bootstrap5 = "^2025.6"
 shot-scraper = "^1.8"
+fairdm-dev-tools = {git = "https://github.com/FAIR-DM/dev-tools"}
 
 [build-system]
 requires = ["poetry-core"]

django_cotton_bs5-0.3.0/cotton_bs5/templates/cotton/badge.html

@@ -1,6 +0,0 @@
-<c-vars variant="primary" element="span" pill text class />
-<{{ element }} class="badge text-bg-{{ variant }}
-{% if pill %}rounded-pill{% endif %}
-{{ class }}" {{ attrs }}>
-{{ text }}{{ slot }}
-</{{ element }}>

django_cotton_bs5-0.3.0/cotton_bs5/templates/cotton/breadcrumbs/index.html

@@ -1,9 +0,0 @@
-{% load i18n %}
-<c-vars ol_class="py-1 mb-1" divider="/" class />
-<nav aria-label="{% trans "breadcrumb" %}"
-     style="--bs-breadcrumb-divider: '{{ divider }}'"
-     {{ attrs }}>
-  <ol class="breadcrumb {{ ol_class }}">
-    {{ slot }}
-  </ol>
-</nav>

django_cotton_bs5-0.3.0/cotton_bs5/templates/cotton/button_group.html

@@ -1,11 +0,0 @@
-{% load i18n %}
-<c-vars size
-        vertical
-        class
-        label='{% trans "Button group" %}' />
-<div class="btn-group{% if vertical %}-vertical{% endif %}{% if size %} btn-group-{{ size }}{% endif %} {{ class }}"
-     role="group"
-     aria-label="{{ label }}"
-     {{ attrs }}>
-  {{ slot }}
-</div>

django_cotton_bs5-0.3.0/cotton_bs5/templates/cotton/pagination/index.html

@@ -1,6 +0,0 @@
-<c-vars size="" class />
-<nav {{ attrs }}>
-  <ul class="pagination{% if size %} pagination-{{ size }}{% endif %} {{ class }}">
-    {{ slot }}
-  </ul>
-</nav>