Thread: [Bugzilla-fr-cvs] Bugzilla-fr_2.18/fr/default/attachment diff-header.html.tmpl

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/bugzilla-fr/Bugzilla-fr_2.18/fr/default/attachment
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10248/default/attachment

Modified Files:
	diff-header.html.tmpl 
Log Message:
Premiere partie de la maj vers 2.18rc3

Index: diff-header.html.tmpl
===================================================================
RCS file: /cvsroot/bugzilla-fr/Bugzilla-fr_2.18/fr/default/attachment/diff-header.html.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** diff-header.html.tmpl	29 Oct 2004 23:23:25 -0000	1.2
--- diff-header.html.tmpl	15 Dec 2004 12:29:51 -0000	1.3
***************
*** 26,32 ****
  [% title = BLOCK %]
    [% IF attachid %]
! PiÃ¨ce jointe #[% attachid %] pour le [% terms.Bug %] #[% bugid %]
    [% ELSE %]
! Interdiff de #[% oldid %] et #[% newid %] pour le #[% terms.Bug %] #[% bugid %]
    [% END %]
  [% END %]
--- 26,32 ----
  [% title = BLOCK %]
    [% IF attachid %]
! PiÃ¨ce jointe #[% attachid %] pour le [% terms.bug %] #[% bugid %]
    [% ELSE %]
! Interdiff de #[% oldid %] et #[% newid %] pour le #[% terms.bug %] #[% bugid %]
    [% END %]
  [% END %]
***************
*** 34,53 ****
  [% style = BLOCK %]
  .file_head {
-   font-size: x-large;
    font-weight: bold;
!   background-color: #d3d3d3;
    border: 1px solid black;
    width: 100%;
  }
  .file_collapse {
    display: none;
  }
  .section_head {
    width: 100%;
!   font-weight: bold;
!   background-color: #d3d3d3;
    border: 1px solid black;
    text-align: left;
  }
  table.file_table {
    table-layout: fixed;
--- 34,61 ----
  [% style = BLOCK %]
  .file_head {
    font-weight: bold;
!   font-size: 1em;
!   background-color: #c3c3c3;
    border: 1px solid black;
    width: 100%;
  }
+ 
+ .file_head a {
+   text-decoration: none;
+   font-family: monospace;
+   font-size: 1.1em;
+ }
+ 
  .file_collapse {
    display: none;
  }
+ 
  .section_head {
    width: 100%;
!   background-color: #f0f0f0;
    border: 1px solid black;
    text-align: left;
  }
+ 
  table.file_table {
    table-layout: fixed;
***************
*** 56,60 ****
--- 64,71 ----
    border-spacing: 0px;
    border-collapse: collapse;
+   /* draw border below last open context section in listing */
+   border-bottom: 1px solid black;
  }
+ 
  tbody.file td {
    border-left: 1px dashed black;
***************
*** 62,65 ****
--- 73,77 ----
    width: 50%;
  }
+ 
  tbody.file pre {
    display: inline;
***************
*** 67,83 ****
--- 79,100 ----
    font-size: 0.9em;
  }
+ 
  tbody.file pre:empty {
    display: block;
    height: 1em;
  }
+ 
  .changed {
    background-color: lightblue;
  }
+ 
  .added {
    background-color: lightgreen;
  }
+ 
  .removed {
    background-color: #FFCC99;
  }
+ 
  .warning {
    color: red
***************
*** 187,206 ****
  [% onload = 'restore_all(); document.checkboxform.restore_indicator.checked = true' %]

  [% IF headers %]
    [% h1 = BLOCK %]
      [% IF attachid %]
!       [% description FILTER html %] (#[% attachid %])
      [% ELSE %]
-       [% USE url %]
-       [% old_url = url('attachment.cgi', action = 'diff', id = oldid) %]
-       [% new_url = url('attachment.cgi', action = 'diff', id = newid) %]
        Diff Entre
!       <a href="[% old_url %]">[% old_desc FILTER html %]</a>
!       (#[% oldid %])
        et
!       <a href="[% new_url %]">[% new_desc FILTER html %]</a>
!       (#[% newid %])
      [% END %]
!     pour le <a href="show_bug.cgi?id=[% bugid %]">[% terms.Bug %] #[% bugid %]</a>
    [% END %]
    [% h2 = BLOCK %]
--- 204,222 ----
  [% onload = 'restore_all(); document.checkboxform.restore_indicator.checked = true' %]

+ [% BLOCK viewurl %]attachment.cgi?id=[% id %][% END %]
+ [% BLOCK editurl %][% PROCESS viewurl %]&amp;action=edit[% END %]
+ [% BLOCK diffurl %][% PROCESS viewurl %]&amp;action=diff[% END %]
+ 
  [% IF headers %]
    [% h1 = BLOCK %]
      [% IF attachid %]
!       Attachment #[% attachid %]: [% description FILTER html %]
      [% ELSE %]
        Diff Entre
!        #[% oldid %]: <a href="[% PROCESS diffurl id=oldid %]">[% old_desc FILTER html %]</a>
        et
!        #[% newid %]: <a href="[% PROCESS diffurl id=newid %]">[% new_desc FILTER html %]</a>
      [% END %]
!     pour le <a href="show_bug.cgi?id=[% bugid %]">[% terms.bug %] #[% bugid %]</a>
    [% END %]
    [% h2 = BLOCK %]
***************
*** 227,242 ****
    [%# HEADER %]
    [% IF headers %]
!     [% USE url('attachment.cgi', id = attachid) %]
!     <a href="[% url() %]">View</a>
!     | <a href="[% url(action = 'edit') %]">Edit</a>
!     [% USE url('attachment.cgi', id = attachid, context = context,
!                                  collapsed = collapsed, headers = headers,
!                                  action = 'diff') %]
!     | <a href="[% url(format = 'raw') %]">Raw Unified</a>
    [% END %]
    [% IF other_patches %]
      [% IF headers %] |[%END%]
      DiffÃ©rences entre
!     <form style="display: inline">
        <select name="oldid">
        [% FOREACH patch = other_patches %]
--- 243,254 ----
    [%# HEADER %]
    [% IF headers %]
!     <a href="[% PROCESS viewurl id=attachid %]">Voir</a>
!     | <a href="[% PROCESS editurl id=attachid %]">Modifier</a>
!     | <a href="[% PROCESS diffurl id=attachid %]&amp;context=[% context FILTER html %]&amp;collapsed=[% collapsed FILTER html %]&amp;headers=[% headers FILTER html %]&amp;format=raw">UnifiÃ©&nbsp;Cru</a>
    [% END %]
    [% IF other_patches %]
      [% IF headers %] |[%END%]
      DiffÃ©rences entre
!     <form style="display: inline" action="">
        <select name="oldid">
        [% FOREACH patch = other_patches %]
***************
*** 256,266 ****
  [% ELSE %]
    [% IF headers %]
!     [% USE url('attachment.cgi', newid = newid, oldid = oldid, action = 'interdiff') %]
!     <a href="[% url(format = 'raw') %]">Raw Unified</a>
!     [% IF attachid %]
!     <br>
!     [% ELSE %]
!     |
!     [% END %]
    [% END %]
  [% END %]
--- 268,272 ----
  [% ELSE %]
    [% IF headers %]
!     <a href="attachment.cgi?oldid=[% oldid %]&amp;newid=[% newid %]&amp;action=interdiff&amp;format=raw">UnifiÃ© Cru</a>    |
    [% END %]
  [% END %]
***************
*** 277,290 ****

  [% IF do_context %]
    | <span style='font-weight: bold'>Contexte :</span>
    [% IF context == "patch" %]
      (<strong>Patch</strong> / 
    [% ELSE %]
!     (<a href="[% url(context = '') %]">Patch</a> / 
    [% END %]
    [% IF context == "file" %]
      <strong>Fichier</strong> /
    [% ELSE %]
!     <a href="[% url(context = 'file') %]">Fichier</a> / 
    [% END %]

--- 283,297 ----

  [% IF do_context %]
+   [%# only happens for normal viewing, not interdiff %]
    | <span style='font-weight: bold'>Contexte :</span>
    [% IF context == "patch" %]
      (<strong>Patch</strong> / 
    [% ELSE %]
!     (<a href="[% PROCESS diffurl id=attachid %]&amp;headers=[% headers FILTER html %]">Patch</a> /
    [% END %]
    [% IF context == "file" %]
      <strong>Fichier</strong> /
    [% ELSE %]
!     <a href="[% PROCESS diffurl id=attachid %]&amp;headers=[% headers FILTER html %]&amp;context=file">File</a> /
    [% END %]

***************
*** 293,297 ****
    [% END %]
    [%# textbox for context %]
!   <form style="display: inline"><input type="hidden" name="action" value="diff"><input type="hidden" name="id" value="[% attachid %]"><input type="hidden" name="collapsed" value="[% collapsed FILTER html %]"><input type="hidden" name="headers" value="[% headers FILTER html %]"><input type="text" name="context" value="[% context FILTER html %]" size="3"></form>)
  [% END %]

--- 300,304 ----
    [% END %]
    [%# textbox for context %]
!   <form style="display: inline" action=""><input type="hidden" name="action" value="diff"><input type="hidden" name="id" value="[% attachid %]"><input type="hidden" name="collapsed" value="[% collapsed FILTER html %]"><input type="hidden" name="headers" value="[% headers FILTER html %]"><input type="text" name="context" value="[% context FILTER html %]" size="3"></form>)
  [% END %]

***************
*** 309,316 ****
    [% END %]
  </h2>
  [% END %]

  [%# Restore Stuff %]
! <form name="checkboxform">
  <input type="checkbox" name="restore_indicator" style="display: none">

--- 316,325 ----
    [% END %]
  </h2>
+ [% ELSE %]
+     <br><br>
  [% END %]

  [%# Restore Stuff %]
! <form name="checkboxform" action="">
  <input type="checkbox" name="restore_indicator" style="display: none">

Thread: [Bugzilla-fr-cvs] Bugzilla-fr_2.18/fr/default/attachment diff-header.html.tmpl

bugzilla-fr-cvs