ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

Overflow on collapsing tables and Bootstrap4 style

This commit is contained in:
Alexandre Iooss 2020-02-21 12:29:11 +01:00
parent 8d87b2b8f5
commit b395d3a633
No known key found for this signature in database
GPG Key ID: 6C79278F3FCDCC02
3 changed files with 22 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/member/tables.py
View File

@ -10,11 +10,10 @@ from .models import Club
class ClubTable(tables.Table): class ClubTable(tables.Table):
class Meta: class Meta:
attrs = { attrs = {
'class': 'class': 'table table-condensed table-striped table-hover'
'table table-bordered table-condensed table-striped table-hover'
} }
model = Club model = Club
template_name = 'django_tables2/bootstrap.html' template_name = 'django_tables2/bootstrap4.html'
fields = ('id', 'name', 'email') fields = ('id', 'name', 'email')
row_attrs = { row_attrs = {
'class': 'table-row', 'class': 'table-row',
@ -28,9 +27,8 @@ class UserTable(tables.Table):
class Meta: class Meta:
attrs = { attrs = {
'class': 'class': 'table table-condensed table-striped table-hover'
'table table-bordered table-condensed table-striped table-hover'
} }
template_name = 'django_tables2/bootstrap.html' template_name = 'django_tables2/bootstrap4.html'
fields = ('last_name', 'first_name', 'username', 'email') fields = ('last_name', 'first_name', 'username', 'email')
model = User model = User

4
apps/note/tables.py
View File

@ -11,10 +11,10 @@ class HistoryTable(tables.Table):
class Meta: class Meta:
attrs = { attrs = {
'class': 'class':
'table table-bordered table-condensed table-striped table-hover' 'table table-condensed table-striped table-hover'
} }
model = Transaction model = Transaction
template_name = 'django_tables2/bootstrap.html' template_name = 'django_tables2/bootstrap4.html'
sequence = ('...', 'total', 'valid') sequence = ('...', 'total', 'valid')
total = tables.Column() # will use Transaction.total() !! total = tables.Column() # will use Transaction.total() !!

37
templates/member/profile_detail.html
View File

@ -47,33 +47,28 @@
<div class="col-md-9"> <div class="col-md-9">
<div class="accordion" id="accordionProfile"> <div class="accordion" id="accordionProfile">
<div class="card"> <div class="card">
<div class="card-header" id="headingOne"> <div class="card-header position-relative" id="clubListHeading">
<h5 class="mb-0"> <a class="btn btn-link stretched-link font-weight-bold"
<button class="btn btn-link" type="button" data-toggle="collapse" data-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne"> data-toggle="collapse" data-target="#clubListCollapse"
<i class="fa fa-users"></i> {% trans "View my memberships" %} aria-expanded="true" aria-controls="clubListCollapse">
</button> <i class="fa fa-users"></i> {% trans "View my memberships" %}
</h5> </a>
</div>
<div id="collapseOne" class="collapse show" aria-labelledby="headingOne" data-parent="#accordionProfile">
<div class="card-body">
{% render_table club_list %}
</div> </div>
<div id="clubListCollapse" class="collapse overflow-auto show" aria-labelledby="clubListHeading" data-parent="#accordionProfile">
{% render_table club_list %}
</div> </div>
</div> </div>
<div class="card"> <div class="card">
<div class="card-header" id="headingTwo"> <div class="card-header position-relative" id="historyListHeading">
<h5 class="mb-0"> <a class="btn btn-link stretched-link collapsed font-weight-bold"
<button class="btn btn-link collapsed" type="button" data-toggle="collapse" data-target="#collapseTwo" aria-expanded="false" aria-controls="collapseTwo"> data-toggle="collapse" data-target="#historyListCollapse"
<i class="fa fa-euro"></i> Historique des transactions aria-expanded="false" aria-controls="historyListCollapse">
</button> <i class="fa fa-euro"></i> Historique des transactions
</h5> </a>
</div> </div>
<div id="collapseTwo" class="collapse" aria-labelledby="headingTwo" data-parent="#accordionProfile"> <div id="historyListCollapse" class="collapse overflow-auto" aria-labelledby="historyListHeading" data-parent="#accordionProfile">
<div class="card-body"> {% render_table history_list %}
{% render_table history_list %}
</div>
</div> </div>
</div> </div>
</div> </div>