[Frenchmozilla-cvs] bugzilla/template/fr/default/email bugmail.html.tmpl, 1.4, 1.5

[Cédric C. <psy...@us...>]

Update of /cvsroot/frenchmozilla/bugzilla/template/fr/default/email
In directory vz-cvs-3.sog:/tmp/cvs-serv21753/template/fr/default/email

Modified Files:
	bugmail.html.tmpl 
Log Message:
Bug 604237 - Clean up the format of HTML Emails

Index: bugmail.html.tmpl
===================================================================
RCS file: /cvsroot/frenchmozilla/bugzilla/template/fr/default/email/bugmail.html.tmpl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** bugmail.html.tmpl	25 Mar 2011 18:46:44 -0000	1.4
--- bugmail.html.tmpl	7 Sep 2011 10:34:01 -0000	1.5
***************
*** 40,44 ****
        [% END %]
        </p>
!       
        <span>Vous recevez ce courriel car :</span>
        
--- 40,45 ----
        [% END %]
        </p>
! 
!       <hr>
        <span>Vous recevez ce courriel car :</span>
        
***************
*** 60,64 ****
  [% BLOCK generate_diffs %]
    
!   [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, full_url => 1) FILTER none %]
  
    [% last_changer = "" %]
--- 61,65 ----
  [% BLOCK generate_diffs %]
    
!   [% SET in_table = 0 %]
  
    [% last_changer = "" %]
***************
*** 67,87 ****
        [% IF !isnew && change.who.login != last_changer %]
          [% last_changer = change.who.login %]
          [% IF change.blocker %]
-           <tr>
-             <td colspan="3">
                [% "Le ${terms.Bug} ${bug.id}" FILTER bug_link(bug, full_url => 1) FILTER none  %] dépend
                du [% "${terms.bug} ${change.blocker.id}" 
                    FILTER bug_link(change.blocker, full_url => 1) FILTER none %],
                qui a changé d'état.
-           </td>
-           </tr>
          [% ELSE %]
-           <tr>
-             <td colspan="3">
                [% INCLUDE global/user.html.tmpl who = change.who %]
!               a modifié :
!             </td>
!           </tr>
          [% END %]
          <tr>
            <th>Quoi</th>
--- 68,89 ----
        [% IF !isnew && change.who.login != last_changer %]
          [% last_changer = change.who.login %]
+         [% IF in_table == 1 %]
+           [% in_table %]</table>
+           [% SET in_table = 0 %]
+         [% END %]
          [% IF change.blocker %]
                [% "Le ${terms.Bug} ${bug.id}" FILTER bug_link(bug, full_url => 1) FILTER none  %] dépend
                du [% "${terms.bug} ${change.blocker.id}" 
                    FILTER bug_link(change.blocker, full_url => 1) FILTER none %],
                qui a changé d'état.
          [% ELSE %]
                [% INCLUDE global/user.html.tmpl who = change.who %]
!               a modifié : [% "${terms.Bug} ${bug.id}" FILTER bug_link(bug, full_url => 1) FILTER none %]
          [% END %]
+         <br>
+           [% IF in_table == 0 %]
+              <table border="1" cellspacing="0" cellpadding="8">
+              [% SET in_table = 1 %]
+           [% END %]
          <tr>
            <th>Quoi</th>
***************
*** 92,96 ****
  
        [% PROCESS "email/bugmail-common.txt.tmpl" %]
! 
        [% IF isnew %]
          <tr>
--- 94,101 ----
  
        [% PROCESS "email/bugmail-common.txt.tmpl" %]
!       [% IF in_table == 0 %]
!          <table border="1" cellspacing="0" cellpadding="8">[% in_table%]
!          [% SET in_table = 1 %]
!       [% END %]
        [% IF isnew %]
          <tr>