python/django-maraudes
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

force 2columns in tables

Browse Source
This commit is contained in:
artus
2018-10-14 20:55:43 +02:00
parent 2f93fa1883
commit 65a31c0a1b
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
maraudes/models.py
View File

@@ -136,7 +136,7 @@ class Maraude(models.Model):
return '%(dayname)s %(day)i %(month)s' % { return '%(dayname)s %(day)i %(month)s' % {
'dayname': WEEKDAYS[self.date.weekday()][1], # Retrieve text inside tuple 'dayname': WEEKDAYS[self.date.weekday()][1], # Retrieve text inside tuple
'day': self.date.day, 'day': self.date.day,
'month': MONTHS[self.date.month][:3] + ".", 'month': MONTHS[self.date.month],
} }
def est_terminee(self): def est_terminee(self):

2
notes/templates/notes/liste.html
View File

@@ -32,5 +32,5 @@
</ul> </ul>
</div> </div>
{% endif %} {% endif %}
{% table object_list cols=3 cell_template=table_cell_template %} {% table object_list cols=2 cell_template=table_cell_template %}
{% endblock %} {% endblock %}

12
notes/templates/notes/table_cell_maraudes.html
View File

@@ -1,6 +1,10 @@
{% if object.est_terminee %}<a href="{% url 'notes:details-maraude' object.id %}" class="btn btn-link"> {% if object.est_terminee %}<a href="{% url 'notes:details-maraude' object.id %}" class="btn btn-link">
{% else %}<a href="#" class="btn btn-link disabled">{% endif %}{{ object }}</a> {% else %}<a href="#" class="btn btn-link disabled">{% endif %}
<div class="pull-right"> {{ object }}
<span class="label label-info">{{ object.binome }} & {{ object.referent }}</span> </a>
{% if object.est_terminee %}<span class="label label-success">{{object.rencontres.count}} rencontres</span>{% endif %} <div class="float-right">
<span class="badge badge-info">{{ object.binome }} & {{ object.referent }}</span>
{% if object.est_terminee %}<span class="badge badge-success">
{{object.rencontres.count}} rencontres
</span>{% endif %}
</div> </div>

5
notes/templates/notes/table_cell_sujets.html
View File

@@ -1,4 +1,7 @@
<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 text-left">
<span class="text-muted">{{object.genre}}</span> {{object.nom}} {{object.prenom}}<br />
{% if object.surnom %}<span class="text-muted">"{{object.surnom}}"</span>{% endif %}
</a>
<div class="float-right"> <div class="float-right">
<span class="badge badge-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 %}

6
website/templates/tables/table.html
View File

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