improves tables a little

This commit is contained in:
artus
2018-10-14 17:24:48 +02:00
parent 5ed4706069
commit 2f93fa1883
4 changed files with 14 additions and 15 deletions

View File

@@ -32,8 +32,5 @@
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
<!-- Table --> {% table object_list cols=3 cell_template=table_cell_template %}
<div class="card card-body">
{% table object_list cols=3 cell_template=table_cell_template header=table_header %}
</div>
{% endblock %} {% endblock %}

View File

@@ -1,8 +1,8 @@
<a href="{% url 'notes:details-sujet' object.pk %}" class="btn btn-link">{{object}}</a> <a href="{% url 'notes:details-sujet' object.pk %}" class="btn btn-link">{{object}}</a>
<div class="pull-right" style="padding-right: 20px;"> <div class="float-right">
<span class="label label-info">{{ object.notes.count }} notes</span> <span class="badge badge-info">{{ object.notes.count }} notes</span>
{% with object.statistiques.info_completed as completed %} {% with object.statistiques.info_completed as completed %}
<span class="label label-{% if completed <= 80 %}warning{%else%}success{%endif%}">{{ completed }} %</span> <span class="badge badge-{% if completed <= 80 %}warning{%else%}success{%endif%}">{{ completed }} %</span>
{% endwith %} {% endwith %}
</div> </div>

View File

@@ -1,5 +1,5 @@
<tr > <tr >
<th class="bg-{{bg_color}}" width="20%"> <th class="border-{{bg_color}}" width="20%">
{% if link %} {% if link %}
<a href="{{link}}"><strong>{{header}}</strong></a> <a href="{{link}}"><strong>{{header}}</strong></a>
{% else %} {% else %}
@@ -8,9 +8,9 @@
<br /> <br />
<div style="margin:5px 0px;"> <div style="margin:5px 0px;">
{% for label in labels %} {% for label in labels %}
<span class="label label-{{bg_label_color}}" style="padding:2px 5px;">{{label}}</span> <span class="badge badge-{{bg_label_color}}" style="padding:2px 5px;">{{label}}</span>
{% endfor %} {% endfor %}
</div> </div>
</th> </th>
<td style="background-color:#fff" width="80%"><p>{{text | linebreaks }}</p></td> <td class="border-{{bg_color}}" width="80%"><p>{{text | linebreaks }}</p></td>
</tr> </tr>

View File

@@ -1,7 +1,9 @@
<table class="table table-condensed table-striped"> <table class="table table-responsize table-sm table-striped table-borderless shadow">
{% if header %}<tr><th colspan="{{ cols_number }}" class="text-center">{{ header }}</th></tr>{% endif %} {% if header %}<tr>
{% for row in rows %}<tr> <th colspan="{{ cols_number }}" class="thead-dark text-center">{{ header }}</th>
{% for object in row %}<td> </tr>{% endif %}
{% for row in rows %}<tr class="d-flex justify-content-between">
{% for object in row %}<td class="flex-shrink-1">
{% if object %}{% include cell_template with object=object %}{%endif%} {% if object %}{% include cell_template with object=object %}{%endif%}
</td> </td>
{% endfor %} {% endfor %}