Skip to content
Snippets Groups Projects
Commit 1908b576 authored by Laurent's avatar Laurent
Browse files

Merge branch 'hotline#13072_newsletter_affichage_abonnes' into 'hotline_6.41'

Hotline#13072 Newsletter Affichage Abonnes
parents 632704e3 90c970f0
Branches
Tags
3 merge requests!258Dev/13872 Orphee Allow Hold Available Items,!73Ft/R13039,!66Hotline 6.41
ticket #13072: Correction de l'affichage de la liste des abonnés à une lettre d'information lorsque les nom, prenom, identifiant, mail sont trés longs
ticket #13140: Correction de la réaffectation des auteurs aux avis sur les notices aprés un réimport total
ticket #13172: Correction de l'affichage des kiosques si le titre de la boîte contient un caractère slash
......
......@@ -92,7 +92,7 @@ class ZendAfi_View_Helper_Admin_SubscribeUsers extends ZendAfi_View_Helper_BaseH
'%d utilisateurs',
$nb_users).'</div>';
$content .= '<table class="tablesorter"><thead><tr class="soustitre">';
$content .= '<table class="subscribers tablesorter"><thead><tr class="soustitre">';
foreach(array('Nom', 'Prénom', 'Identifiant', 'Email', '') as $column)
$content .= sprintf('<th>%s</th>', $column);
$content .= '</tr></thead><tbody>';
......
......@@ -540,6 +540,12 @@ table.models thead th.actions {
}
table.subscribers td {
max-width: 100px;
word-break: break-word;
}
/* Dernières critiques */
.vignette_notice {
border:none;
......
......@@ -720,25 +720,25 @@ class Admin_NewsletterControllerEditSubcsribersTest extends Admin_NewsletterCont
/** @test */
public function tdShouldContainsMarcel() {
$this->assertXPathContentContains('//td', 'Marcel');
$this->assertXPathContentContains('//table[@class="subscribers tablesorter"]//td', 'Marcel');
}
/** @test **/
public function tdShouldContainsDuchamp() {
$this->assertXPathContentContains('//td', 'Duchamp');
$this->assertXPathContentContains('//table[@class="subscribers tablesorter"]//td', 'Duchamp');
}
/** @test **/
public function tdShouldContainsmduchamp() {
$this->assertXPathContentContains('//td', 'mduchamp');
$this->assertXPathContentContains('//table[@class="subscribers tablesorter"]//td', 'mduchamp');
}
/** @test **/
public function tdShouldContainsMarcelAtFreeFr() {
$this->assertXPathContentContains('//td', 'marcel@free.fr');
$this->assertXPathContentContains('//table[@class="subscribers tablesorter"]//td', 'marcel@free.fr');
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment