Corrige un conflit

zestedesavoir · Aug 5, 2017 · d723821 · d723821
1 parent 74c543f
commit d723821
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/templates/pages/alerts.html b/templates/pages/alerts.html
@@ -28,17 +28,17 @@ <h1>{% trans "Liste des alertes en cours" %}</h1>
             <thead>
                 <th>{% trans "Type" %}</th>
                 <th>{% trans "Auteur" %}</th>
-                <th class="wide">{% trans "Date" %}</th>
-                <th class="wide">{% trans "Contenu signalé" %}</th>
+                <th>{% trans "Date" %}</th>
+                <th>{% trans "Contenu signalé" %}</th>
                 <th>{% trans "Auteur du message" %}</th>
             </thead>
             <tbody>
                 {% for alert in alerts %}
                     <tr>
                         <td>{{ alert.get_type }}</td>
-                        <td><a href="{% url "member-detail" alert.author.username %}">{{ alert.author.username }}</a></td>
-                        <td class="wide">{{ alert.pubdate|format_date|capfirst }}</td>
-                        <td class="wide">
+                        <td><a href="{% url 'member-detail' alert.author.username %}">{{ alert.author.username }}</a></td>
+                        <td>{{ alert.pubdate|format_date|capfirst }}</td>
+                        <td>
                             {% if alert.scope == 'CONTENT' and alert.content.in_public %}
                                 <a href="{{ alert.content.get_absolute_url_online }}">{{ alert.text }}</a>
                             {% elif alert.scope == 'CONTENT' %}
@@ -73,17 +73,17 @@ <h1>{% trans "Liste des alertes récemment résolues" %}</h1>
             <thead>
                 <th>{% trans "Type" %}</th>
                 <th>{% trans "Auteur" %}</th>
-                <th class="wide">{% trans "Date de résolution" %}</th>
-                <th class="wide">{% trans "Contenu signalé" %}</th>
+                <th>{% trans "Date de résolution" %}</th>
+                <th>{% trans "Contenu signalé" %}</th>
                 <th>{% trans "Résolu par" %}</th>
             </thead>
             <tbody>
                 {% for alert in solved %}
                     <tr>
                         <td>{{ alert.get_type }}</td>
-                        <td><a href="{% url "member-detail" alert.author.username %}">{{ alert.author.username }}</a></td>
-                        <td class="wide">{{ alert.solved_date|format_date|capfirst }}</td>
-                        <td class="wide">
+                        <td><a href="{% url 'member-detail' alert.author.username %}">{{ alert.author.username }}</a></td>
+                        <td>{{ alert.solved_date|format_date|capfirst }}</td>
+                        <td>
                             {% if alert.scope == 'CONTENT' and alert.content.in_public %}
                                 <a href="{{ alert.content.get_absolute_url_online }}">{{ alert.text }}</a>
                             {% elif alert.scope == 'CONTENT' %}