[Openfirst-cvscommit] www/htdocs/bugzilla/attachment choose.html.tmpl,NONE,1.1 diff-file.html.tmpl,N
Brought to you by:
xtimg
Menu
▾
▴
[Openfirst-cvscommit] www/htdocs/bugzilla/attachment choose.html.tmpl,NONE,1.1 diff-file.html.tmpl,NONE,1.1 diff-footer.html.tmpl,NONE,1.1 diff-header.html.tmpl,NONE,1.1 content-types.html.tmpl,1.1,1.2 create.html.tmpl,1.1,1.2 created.html.tmpl,1.1,1.2 edit.html.tmpl,1.1,1.2 list.html.tmpl,1.1,1.2 show-multiple.html.tmpl,1.1,1.2 updated.html.tmpl,1.1,1.2
|
From: Tim G. <xt...@us...> - 2005-05-15 15:05:33
|
Update of /cvsroot/openfirst/www/htdocs/bugzilla/attachment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32743/attachment Modified Files: content-types.html.tmpl create.html.tmpl created.html.tmpl edit.html.tmpl list.html.tmpl show-multiple.html.tmpl updated.html.tmpl Added Files: choose.html.tmpl diff-file.html.tmpl diff-footer.html.tmpl diff-header.html.tmpl Log Message: Bring templates up to date for Bugzilla 2.18.1 Index: content-types.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/content-types.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** content-types.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- content-types.html.tmpl 15 May 2005 15:04:53 -0000 1.2 *************** *** 1,3 **** ! <!-- 1....@bu... --> [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file --- 1,3 ---- ! [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file --- NEW FILE: diff-footer.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): John Keiser <jk...@ne...> #%] </form> [% IF headers %] <br> [% PROCESS global/footer.html.tmpl %] [% ELSE %] </body> </html> [% END %] Index: edit.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/edit.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** edit.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- edit.html.tmpl 15 May 2005 15:04:53 -0000 1.2 *************** *** 1,3 **** ! <!-- 1....@bu... --> [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file --- 1,3 ---- ! [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file *************** *** 20,38 **** #%] [%# Define strings that will serve as the title and header of this page %] ! [% title = BLOCK %]Edit Attachment #[% attachid %] for Bug #[% bugid %][% END %] ! [% h1 = BLOCK %]Edit Attachment #[% attachid %] for <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a>[% END %] [% h2 = BLOCK %][% bugsummary FILTER html %][% END %] ! [% PROCESS global/header.html.tmpl title = title h1 = h1 h2 = h2 style = " ! th { text-align: right; vertical-align: top; } ! td { text-align: left; vertical-align: top; } ! td#info { text-align: right; vertical-align: top; } ! td#actions { text-align: right; vertical-align: bottom; } ! td#noview { text-align: left; vertical-align: center; } " %] --- 20,41 ---- #%] + [% PROCESS global/variables.none.tmpl %] + [%# Define strings that will serve as the title and header of this page %] ! [% title = BLOCK %]Edit Attachment #[% attachid %] for [% terms.Bug %] #[% bugid %][% END %] ! [% h1 = BLOCK %]Edit Attachment #[% attachid %] for ! [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %] [% h2 = BLOCK %][% bugsummary FILTER html %][% END %] ! [% PROCESS global/header.html.tmpl title = title h1 = h1 h2 = h2 style = " ! table.attachment_info th { text-align: right; vertical-align: top; } ! table.attachment_info td { text-align: left; vertical-align: top; } ! #noview { text-align: left; vertical-align: middle; } ! ! table#flags th, table#flags td { font-size: small; vertical-align: baseline; text-align: left; } " %] *************** *** 40,43 **** --- 43,50 ---- <script type="application/x-javascript" language="JavaScript"> <!-- + var prev_mode = 'raw'; + var current_mode = 'raw'; + var has_edited = 0; + var has_viewed_as_diff = 0; function editAsComment() { *************** *** 54,58 **** if ( contentType == 'text/plain' ) { ! theContent = theContent.replace( /^<html><head\/><body><pre>/i , "" ); theContent = theContent.replace( /<\/pre><\/body><\/html>$/i , "" ); theContent = theContent.replace( /</gi , "<" ); --- 61,65 ---- if ( contentType == 'text/plain' ) { ! theContent = theContent.replace( /^<html><head\/?><body><pre>/i , "" ); theContent = theContent.replace( /<\/pre><\/body><\/html>$/i , "" ); theContent = theContent.replace( /</gi , "<" ); *************** *** 67,108 **** theContent = theContent.replace( /(.*\n|.+)/g , ">$1" ); ! hideElementById('viewFrame'); ! hideElementById('editButton'); ! hideElementById('smallCommentFrame'); ! ! showElementById('undoEditButton'); ! ! // Show the TEXTAREA that will contain the editable attachment ! // and copy the content of the attachment into it. ! showElementById('editFrame'); var editFrame = document.getElementById('editFrame'); editFrame.value = theContent; editFrame.value += "\n\n"; } function undoEditAsComment() { ! // Hide the "edit attachment as comment" TEXTAREA and the "undo" button. ! hideElementById('undoEditButton'); ! hideElementById('editFrame'); ! ! // Show the "view attachment" IFRAME, the "redo" button that allows the user ! // to go back to editing the attachment as a comment, and the small comment field. ! showElementById('viewFrame'); ! showElementById('redoEditButton'); ! showElementById('smallCommentFrame'); ! } function redoEditAsComment() { ! // Hide the "view attachment" IFRAME, the "redo" button that allows the user ! // to go back to editing the attachment as a comment, and the small comment field. ! hideElementById('viewFrame'); ! hideElementById('redoEditButton'); ! hideElementById('smallCommentFrame'); ! // Show the "edit attachment as comment" TEXTAREA and the "undo" button. ! showElementById('undoEditButton'); ! showElementById('editFrame'); } --- 74,162 ---- theContent = theContent.replace( /(.*\n|.+)/g , ">$1" ); ! switchToMode('edit'); + // Copy the contents of the diff into the textarea var editFrame = document.getElementById('editFrame'); editFrame.value = theContent; editFrame.value += "\n\n"; + + has_edited = 1; } function undoEditAsComment() { ! switchToMode(prev_mode); } function redoEditAsComment() { ! switchToMode('edit'); ! } ! [% IF patchviewerinstalled %] ! function viewDiff() ! { ! switchToMode('diff'); ! // If we have not viewed as diff before, set the view diff frame URL ! if (!has_viewed_as_diff) { ! var viewDiffFrame = document.getElementById('viewDiffFrame'); ! viewDiffFrame.src = ! 'attachment.cgi?id=[% attachid %]&action=diff&headers=0'; ! has_viewed_as_diff = 1; ! } ! } ! [% END %] ! function viewRaw() ! { ! switchToMode('raw'); ! } ! ! function switchToMode(mode) ! { ! if (mode == current_mode) { ! alert('switched to same mode! This should not happen.'); ! return; ! } ! ! // Switch out of current mode ! if (current_mode == 'edit') { ! hideElementById('editFrame'); ! hideElementById('undoEditButton'); ! } else if (current_mode == 'raw') { ! hideElementById('viewFrame'); ! [% IF patchviewerinstalled %] ! hideElementById('viewDiffButton'); ! [% END %] ! hideElementById(has_edited ? 'redoEditButton' : 'editButton'); ! hideElementById('smallCommentFrame'); ! } else if (current_mode == 'diff') { ! [% IF patchviewerinstalled %] ! hideElementById('viewDiffFrame'); ! [% END %] ! hideElementById('viewRawButton'); ! hideElementById(has_edited ? 'redoEditButton' : 'editButton'); ! hideElementById('smallCommentFrame'); ! } ! ! // Switch into new mode ! if (mode == 'edit') { ! showElementById('editFrame'); ! showElementById('undoEditButton'); ! } else if (mode == 'raw') { ! showElementById('viewFrame'); ! [% IF patchviewerinstalled %] ! showElementById('viewDiffButton'); ! [% END %] ! showElementById(has_edited ? 'redoEditButton' : 'editButton'); ! showElementById('smallCommentFrame'); ! } else if (mode == 'diff') { ! [% IF patchviewerinstalled %] ! showElementById('viewDiffFrame'); ! [% END %] ! showElementById('viewRawButton'); ! showElementById(has_edited ? 'redoEditButton' : 'editButton'); ! showElementById('smallCommentFrame'); ! } ! ! prev_mode = current_mode; ! current_mode = mode; } *************** *** 148,152 **** <input type="hidden" name="contenttypemethod" value="manual"> ! <table width="100%"> <tr> --- 202,206 ---- <input type="hidden" name="contenttypemethod" value="manual"> ! <table class="attachment_info" width="100%"> <tr> *************** *** 156,180 **** <textarea rows="3" cols="25" name="description" wrap="soft">[% description FILTER html %]</textarea><br> <b>MIME Type:</b><br> <input type="text" size="20" name="contenttypeentry" value="[% contenttype FILTER html %]"><br> ! <b>Flags:</b><br> ! <input type="checkbox" name="ispatch" value="1"[% " checked" IF ispatch %]>patch ! <input type="checkbox" name="isobsolete" value="1"[% " checked" IF isobsolete %]>obsolete<br> ! [% IF statusdefs.size %] ! <b>Status:</b><br> ! [% FOREACH def = statusdefs %] ! <input type="checkbox" name="status" value="[% def.id %]"[% " checked" IF statuses.${def.id} %]>[% def.name FILTER html %]<br> ! [% END %] [% END %] <div id="smallCommentFrame"> ! <b>Comment (on the bug):</b><br> <textarea name="comment" rows="5" cols="25" wrap="soft"></textarea><br> </div> ! <input type="submit" value="Submit"> ! </small> </td> --- 210,245 ---- <textarea rows="3" cols="25" name="description" wrap="soft">[% description FILTER html %]</textarea><br> + <b>Filename:</b><br> + <input type="text" size="20" name="filename" value="[% filename FILTER html %]"><br> + <b>Size: </b>[% datasize FILTER unitconvert %]<br> + <b>MIME Type:</b><br> <input type="text" size="20" name="contenttypeentry" value="[% contenttype FILTER html %]"><br> ! <input type="checkbox" id="ispatch" name="ispatch" value="1" ! [% 'checked="checked"' IF ispatch %]> ! <label for="ispatch">patch</label> ! <input type="checkbox" id="isobsolete" name="isobsolete" value="1" ! [% 'checked="checked"' IF isobsolete %]> ! <label for="isobsolete">obsolete</label><br> ! [% IF (Param("insidergroup") && UserInGroup(Param("insidergroup"))) %] ! <input type="checkbox" name="isprivate" value="1"[% " checked" IF isprivate %]> private<br><br> ! [% ELSE %]<br> ! [% END %] ! [% IF flag_types.size > 0 %] ! [% PROCESS "flag/list.html.tmpl" bug_id=bugid attach_id=attachid %]<br> [% END %] <div id="smallCommentFrame"> ! <b>Comment (on the [% terms.bug %]):</b><br> <textarea name="comment" rows="5" cols="25" wrap="soft"></textarea><br> </div> ! <input type="submit" value="Submit"><br><br> ! <strong>Actions:</strong> <a href="attachment.cgi?id=[% attachid %]">View</a> ! [% IF ispatch && patchviewerinstalled %] ! | <a href="attachment.cgi?id=[% attachid %]&action=diff">Diff</a> ! [% END %] </small> </td> *************** *** 183,196 **** <td width="75%"> <textarea id="editFrame" name="comment" style="height: 400px; width: 100%; display: none;" cols="80" wrap="soft"></textarea> ! <iframe id="viewFrame" src="attachment.cgi?id=[% attachid %]&action=view" style="height: 400px; width: 100%;"> <b>You cannot view the attachment while editing it because your browser does not support IFRAMEs. ! <a href="attachment.cgi?id=[% attachid %]&action=view">View the attachment on a separate page</a>.</b> </iframe> <script type="application/x-javascript" language="JavaScript"> <!-- if (typeof document.getElementById == "function") { document.write('<button type="button" id="editButton" onclick="editAsComment();">Edit Attachment As Comment</button>'); document.write('<button type="button" id="undoEditButton" onclick="undoEditAsComment();" style="display: none;">Undo Edit As Comment</button>'); document.write('<button type="button" id="redoEditButton" onclick="redoEditAsComment();" style="display: none;">Redo Edit As Comment</button>'); } //--> --- 248,268 ---- <td width="75%"> <textarea id="editFrame" name="comment" style="height: 400px; width: 100%; display: none;" cols="80" wrap="soft"></textarea> ! <iframe id="viewFrame" src="attachment.cgi?id=[% attachid %]" style="height: 400px; width: 100%;"> <b>You cannot view the attachment while editing it because your browser does not support IFRAMEs. ! <a href="attachment.cgi?id=[% attachid %]">View the attachment on a separate page</a>.</b> </iframe> <script type="application/x-javascript" language="JavaScript"> <!-- if (typeof document.getElementById == "function") { + [% IF patchviewerinstalled %] + document.write('<iframe id="viewDiffFrame" style="height: 400px; width: 100%; display: none;"></iframe>'); + [% END %] document.write('<button type="button" id="editButton" onclick="editAsComment();">Edit Attachment As Comment</button>'); document.write('<button type="button" id="undoEditButton" onclick="undoEditAsComment();" style="display: none;">Undo Edit As Comment</button>'); document.write('<button type="button" id="redoEditButton" onclick="redoEditAsComment();" style="display: none;">Redo Edit As Comment</button>'); + [% IF patchviewerinstalled %] + document.write('<button type="button" id="viewDiffButton" onclick="viewDiff();">View Attachment As Diff</button>'); + [% END %] + document.write('<button type="button" id="viewRawButton" onclick="viewRaw();" style="display: none;">View Attachment As Raw</button>'); } //--> *************** *** 200,205 **** <td id="noview" width="50%"> <p><b> ! Attachment cannot be viewed because its MIME type is not either text/*, image/*, or application/vnd.mozilla.*. ! <a href="attachment.cgi?id=[% attachid %]&action=view">Download the attachment instead</a>. </b></p> </td> --- 272,281 ---- <td id="noview" width="50%"> <p><b> ! Attachment is not viewable in your browser because its MIME type ! ([% contenttype FILTER html %]) is not one that your browser is ! able to display. ! </b></p> ! <p><b> ! <a href="attachment.cgi?id=[% attachid %]">Download the attachment</a>. </b></p> </td> *************** *** 210,214 **** </table> ! Attachments on this Bug: [% FOREACH a = attachments %] [% IF a == attachid %] --- 286,290 ---- </table> ! Attachments on this [% terms.Bug %]: [% FOREACH a = attachments %] [% IF a == attachid %] --- NEW FILE: diff-file.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): John Keiser <jk...@ne...> #%] [%# This line is really long for a reason: to get rid of any possible textnodes # between the elements. This is necessary because DOM parent-child-sibling # relations can change and screw up the javascript for restoring, collapsing # and expanding. Do not change without testing all three of those. #%] <table class="file_table"><thead><tr><td class="file_head" colspan="2"><a href="#" onclick="return twisty_click(this)">[% collapsed ? '(+)' : '(-)' %]</a><input type="checkbox" name="[% file.filename FILTER html %]"[% collapsed ? '' : ' checked' %] style="display: none"> [% IF lxr_prefix && !file.is_add %] <a href="[% lxr_prefix %]">[% file.filename FILTER html %]</a> [% ELSE %] [% file.filename FILTER html %] [% END %] [% IF file.plus_lines %] [% IF file.minus_lines %] (-[% file.minus_lines %] / +[% file.plus_lines %] lines) [% ELSE %] (+[% file.plus_lines %] lines) [% END %] [% ELSE %] [% IF file.minus_lines %] (-[% file.minus_lines %] lines) [% END %] [% END %] </td></tr></thead><tbody class="[% collapsed ? 'file_collapse' : 'file' %]"> <script type="application/x-javascript" language="JavaScript"> incremental_restore() </script> [% section_num = 0 %] [% FOREACH section = sections %] [% section_num = section_num + 1 %] <tr><th class="section_head" colspan="2"> [% IF file.is_add %] Added [% ELSIF file.is_remove %] [% IF bonsai_prefix %] <a href="[% bonsai_prefix %]">Removed</a> [% ELSE %] Removed [% END %] [% ELSE %] [% IF bonsai_prefix %] <a href="[% bonsai_prefix %]#[% section.old_start %]"> [% END %] [% IF section.old_lines > 1 %] Lines [% section.old_start %]-[% section.old_start + section.old_lines - 1 %] [% ELSE %] Line [% section.old_start %] [% END %] [% IF bonsai_prefix %] </a> [% END %] [% END %] (<a name="[% file.filename FILTER html %]_sec[% section_num %]" href="#[% file.filename FILTER html %]_sec[% section_num %]">Link Here</a>) </th></tr> [% FOREACH group = section.groups %] [% IF group.context %] [% FOREACH line = group.context %] <tr><td><pre>[% line FILTER html %]</pre></td><td><pre>[% line FILTER html %]</pre></td></tr> [% END %] [% END %] [% IF group.plus.size %] [% IF group.minus.size %] [% i = 0 %] [% WHILE (i < group.plus.size || i < group.minus.size) %] [% currentloop = 0 %] [% WHILE currentloop < 500 && (i < group.plus.size || i < group.minus.size) %] <tr class="changed"> <td><pre>[% group.minus.$i FILTER html %]</pre></td> <td><pre>[% group.plus.$i FILTER html %]</pre></td> </tr> [% currentloop = currentloop + 1 %] [% i = i + 1 %] [% END %] [% END %] [% ELSE %] [% FOREACH line = group.plus %] [% IF file.is_add %] <tr> <td class="added" colspan="2"><pre>[% line FILTER html %]</pre></td> </tr> [% ELSE %] <tr> <td></td> <td class="added"><pre>[% line FILTER html %]</pre></td> </tr> [% END %] [% END %] [% END %] [% ELSE %] [% IF group.minus.size %] [% FOREACH line = group.minus %] [% IF file.is_remove %] <tr> <td class="removed" colspan="2"><pre>[% line FILTER html %]</pre></td> </tr> [% ELSE %] <tr> <td class="removed"><pre>[% line FILTER html %]</pre></td> <td></td> </tr> [% END %] [% END %] [% END %] [% END %] [% END %] [% END %] </table> Index: list.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/list.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** list.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- list.html.tmpl 15 May 2005 15:04:53 -0000 1.2 *************** *** 1,3 **** ! <!-- 1....@bu... --> [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file --- 1,3 ---- ! [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file *************** *** 25,41 **** <th bgcolor="#cccccc" align="left">Attachment</th> <th bgcolor="#cccccc" align="left">Type</th> ! <th bgcolor="#cccccc" align="left">Modified</th> ! <th bgcolor="#cccccc" align="left">Status</th> <th bgcolor="#cccccc" align="left">Actions</th> </tr> ! [% FOREACH attachment = attachments %] ! <tr> <td valign="top"> ! [% IF attachment.isobsolete %] ! <strike><a href="attachment.cgi?id=[% attachment.attachid %]&action=view">[% attachment.description FILTER html %]</a></strike> ! [% ELSE %] ! <a href="attachment.cgi?id=[% attachment.attachid %]&action=view">[% attachment.description FILTER html %]</a> ! [% END %] </td> --- 25,41 ---- <th bgcolor="#cccccc" align="left">Attachment</th> <th bgcolor="#cccccc" align="left">Type</th> ! <th bgcolor="#cccccc" align="left">Created</th> ! <th bgcolor="#cccccc" align="left">Size</th> ! [% IF show_attachment_flags %] ! <th bgcolor="#cccccc" align="left">Flags</th> ! [% END %] <th bgcolor="#cccccc" align="left">Actions</th> </tr> ! [% canseeprivate = !Param("insidergroup") || UserInGroup(Param("insidergroup")) %] [% FOREACH attachment = attachments %] ! [% IF !attachment.isprivate || canseeprivate %] ! <tr [% "class=\"bz_private\"" IF attachment.isprivate %]> <td valign="top"> ! <a href="attachment.cgi?id=[% attachment.attachid %]">[% attachment.description FILTER html FILTER obsolete(attachment.isobsolete) %]</a> </td> *************** *** 48,80 **** </td> ! <td valign="top">[% attachment.date %]</td> ! <td valign="top"> ! [% IF attachment.statuses.size == 0 %] ! <i>none</i> ! [% ELSE %] ! [% FOREACH s = attachment.statuses %] ! [% s FILTER html FILTER replace('\s', ' ') %]<br> [% END %] ! [% END %] ! </td> ! <td valign="top"> [% IF attachment.canedit %] <a href="attachment.cgi?id=[% attachment.attachid %]&action=edit">Edit</a> ! [% ELSE %] ! None [% END %] </td> </tr> [% END %] <tr> ! <td colspan="4"> <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create a New Attachment</a> (proposed patch, testcase, etc.) </td> ! <td colspan="1"> ! <a href="attachment.cgi?bugid=[% bugid %]&action=viewall">View All</a> ! </td> </tr> </table> --- 48,100 ---- </td> ! <td valign="top">[% attachment.date FILTER time %]</td> ! <td valign="top">[% attachment.datasize FILTER unitconvert %]</td> ! [% IF show_attachment_flags %] ! <td valign="top"> ! [% IF attachment.flags.size == 0 %] ! <i>none</i> ! [% ELSE %] ! [% FOREACH flag = attachment.flags %] ! [% IF flag.setter %] ! [% flag.setter.nick FILTER html %]: ! [% END %] ! [%+ flag.type.name FILTER html %][% flag.status %] ! [%+ IF flag.status == "?" && flag.requestee %] ! ([% flag.requestee.nick FILTER html %]) ! [% END %]<br> ! [% END %] [% END %] ! </td> ! [% END %] ! <td valign="top"> [% IF attachment.canedit %] <a href="attachment.cgi?id=[% attachment.attachid %]&action=edit">Edit</a> ! [% END %] ! [% IF attachment.ispatch && patchviewerinstalled %] ! [% IF attachment.canedit %] ! | ! [% END %] ! <a href="attachment.cgi?id=[% attachment.attachid %]&action=diff">Diff</a> [% END %] </td> </tr> + [% END %] [% END %] <tr> ! <td colspan="[% show_attachment_flags ? 5 : 4 %]"> <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create a New Attachment</a> (proposed patch, testcase, etc.) </td> ! [% IF attachments.size %] ! <td> ! <a href="attachment.cgi?bugid=[% bugid %]&action=viewall">View All</a> ! </td> ! [% ELSE %] ! <td class="bz_disabled"> ! View All ! </td> ! [% END %] </tr> </table> --- NEW FILE: diff-header.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): John Keiser <jk...@ne...> #%] [%# Define strings that will serve as the title and header of this page %] [% PROCESS global/variables.none.tmpl %] [% title = BLOCK %] [% IF attachid %] Attachment #[% attachid %] for [% terms.bug %] #[% bugid %] [% ELSE %] Interdiff of #[% oldid %] and #[% newid %] for #[% terms.bug %] #[% bugid %] [% END %] [% END %] [% 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; width: 100%; empty-cells: show; 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; border-right: 1px dashed black; width: 50%; } tbody.file pre { display: inline; white-space: -moz-pre-wrap; 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 } [% END %] [%# SCRIPT FUNCTIONS %] [% javascript = BLOCK %] function collapse_all() { var elem = document.checkboxform.firstChild; while (elem != null) { if (elem.firstChild != null) { var tbody = elem.firstChild.nextSibling; if (tbody.className == 'file') { tbody.className = 'file_collapse'; twisty = get_twisty_from_tbody(tbody); twisty.firstChild.nodeValue = '(+)'; twisty.nextSibling.checked = false; } } elem = elem.nextSibling; } return false; } function expand_all() { var elem = document.checkboxform.firstChild; while (elem != null) { if (elem.firstChild != null) { var tbody = elem.firstChild.nextSibling; if (tbody.className == 'file_collapse') { tbody.className = 'file'; twisty = get_twisty_from_tbody(tbody); twisty.firstChild.nodeValue = '(-)'; twisty.nextSibling.checked = true; } } elem = elem.nextSibling; } return false; } var current_restore_elem; function restore_all() { current_restore_elem = null; incremental_restore(); } function incremental_restore() { if (!document.checkboxform.restore_indicator.checked) { return; } var next_restore_elem; if (current_restore_elem) { next_restore_elem = current_restore_elem.nextSibling; } else { next_restore_elem = document.checkboxform.firstChild; } while (next_restore_elem != null) { current_restore_elem = next_restore_elem; if (current_restore_elem.firstChild != null) { restore_elem(current_restore_elem.firstChild.nextSibling); } next_restore_elem = current_restore_elem.nextSibling; } } function restore_elem(elem, alertme) { if (elem.className == 'file_collapse') { twisty = get_twisty_from_tbody(elem); if (twisty.nextSibling.checked) { elem.className = 'file'; twisty.firstChild.nodeValue = '(-)'; } } else if (elem.className == 'file') { twisty = get_twisty_from_tbody(elem); if (!twisty.nextSibling.checked) { elem.className = 'file_collapse'; twisty.firstChild.nodeValue = '(+)'; } } } function twisty_click(twisty) { tbody = get_tbody_from_twisty(twisty); if (tbody.className == 'file') { tbody.className = 'file_collapse'; twisty.firstChild.nodeValue = '(+)'; twisty.nextSibling.checked = false; } else { tbody.className = 'file'; twisty.firstChild.nodeValue = '(-)'; twisty.nextSibling.checked = true; } return false; } function get_tbody_from_twisty(twisty) { return twisty.parentNode.parentNode.parentNode.nextSibling; } function get_twisty_from_tbody(tbody) { return tbody.previousSibling.firstChild.firstChild.firstChild; } [% END %] [% onload = 'restore_all(); document.checkboxform.restore_indicator.checked = true' %] [% BLOCK viewurl %]attachment.cgi?id=[% id %][% END %] [% BLOCK editurl %][% PROCESS viewurl %]&action=edit[% END %] [% BLOCK diffurl %][% PROCESS viewurl %]&action=diff[% END %] [% IF headers %] [% h1 = BLOCK %] [% IF attachid %] Attachment #[% attachid %]: [% description FILTER html %] [% ELSE %] Diff Between #[% oldid %]: <a href="[% PROCESS diffurl id=oldid %]">[% old_desc FILTER html %]</a> and #[% newid %]: <a href="[% PROCESS diffurl id=newid %]">[% new_desc FILTER html %]</a> [% END %] for <a href="show_bug.cgi?id=[% bugid %]">[% terms.bug %] #[% bugid %]</a> [% END %] [% h2 = BLOCK %] [% bugsummary FILTER html %] [% END %] [% PROCESS global/header.html.tmpl %] [% ELSE %] <html> <head> <style type="text/css"> [% style %] </style> <script type="text/javascript" language="JavaScript"> <!-- [% javascript %] --> </script> </head> <body onload="[% onload FILTER html %]"> [% END %] [%# If we have attachid, we are in diff, otherwise we're in interdiff %] [% IF attachid %] [%# HEADER %] [% IF headers %] <a href="[% PROCESS viewurl id=attachid %]">View</a> | <a href="[% PROCESS editurl id=attachid %]">Edit</a> | <a href="[% PROCESS diffurl id=attachid %]&context=[% context FILTER html %]&collapsed=[% collapsed FILTER html %]&headers=[% headers FILTER html %]&format=raw">Raw Unified</a> [% END %] [% IF other_patches.size > 0 %] [% IF headers %] |[%END%] Differences between <form style="display: inline" action=""> <select name="oldid"> [% FOREACH patch = other_patches %] <option value="[% patch.id %]" [% IF patch.selected %] selected[% END %] >[% patch.desc FILTER html %]</option> [% END %] </select> and this patch <input type="submit" value="Diff"> <input type="hidden" name="action" value="interdiff"> <input type="hidden" name="newid" value="[% attachid %]"> <input type="hidden" name="headers" value="[% headers FILTER html %]"> </form> [% END %] <br> [% ELSE %] [% IF headers %] <a href="attachment.cgi?oldid=[% oldid %]&newid=[% newid %]&action=interdiff&format=raw">Raw Unified</a> | [% END %] [% END %] [%# Collapse / Expand %] <a href="#" onmouseover="lastStatus = window.status; window.status='Collapse All'; return true" onmouseout="window.status = lastStatus; return true" onclick="return collapse_all()">Collapse All</a> | <a href="#" onmouseover="lastStatus = window.status; window.status='Expand All'; return true" onmouseout="window.status = lastStatus; return true" onclick="return expand_all()">Expand All</a> [% IF do_context %] [%# only happens for normal viewing, not interdiff %] | <span style='font-weight: bold'>Context:</span> [% IF context == "patch" %] (<strong>Patch</strong> / [% ELSE %] (<a href="[% PROCESS diffurl id=attachid %]&headers=[% headers FILTER html %]">Patch</a> / [% END %] [% IF context == "file" %] <strong>File</strong> / [% ELSE %] <a href="[% PROCESS diffurl id=attachid %]&headers=[% headers FILTER html %]&context=file">File</a> / [% END %] [% IF context == "patch" || context == "file" %] [% context = 3 %] [% 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 %] [% IF warning %] <h2 class="warning">Warning: [% IF warning == "interdiff1" %] this difference between two patches may show things in the wrong places due to a limitation in [% terms.Bugzilla %] when comparing patches with different sets of files. [% END %] [% IF warning == "interdiff2" %] this difference between two patches may be inaccurate due to a limitation in [%+ terms.Bugzilla %] when comparing patches made against different revisions. [% END %] </h2> [% ELSE %] <br><br> [% END %] [%# Restore Stuff %] <form name="checkboxform" action=""> <input type="checkbox" name="restore_indicator" style="display: none"> --- NEW FILE: choose.html.tmpl --- [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file # except in compliance with the License. You may obtain a copy of # the License at http://www.mozilla.org/MPL/ # # Software distributed under the License is distributed on an "AS # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or # implied. See the License for the specific language governing # rights and limitations under the License. # # The Original Code is the Bugzilla Bug Tracking System. # # The Initial Developer of the Original Code is Netscape Communications # Corporation. Portions created by Netscape are # Copyright (C) 1998 Netscape Communications Corporation. All # Rights Reserved. # # Contributor(s): Gavin Shelley <bug...@ch...> #%] [% PROCESS global/variables.none.tmpl %] [% PROCESS global/header.html.tmpl title = "Locate attachment" %] <form method="get" action="attachment.cgi"> <p>Access an attachment by entering its ID into the form below:</p> <p>Attachment ID: <input name="id" size="6"> <button name="action" value="edit"> Edit </button> <button name="action" value="view">View</button> </p> </form> <form method="get" action="show_bug.cgi"> <p>Or, access it from the list of attachments in its associated [% terms.bug %] report:</p> <p>[% terms.Bug %] ID: <input name="id" size="6"> <input type="submit" name="action" value="View"> </p> </form> [% PROCESS global/footer.html.tmpl %] Index: updated.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/updated.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** updated.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- updated.html.tmpl 15 May 2005 15:04:53 -0000 1.2 *************** *** 1,3 **** ! <!-- 1....@bu... --> [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file --- 1,3 ---- ! [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file *************** *** 24,31 **** # bugid: integer. ID of the bug we are updating. # attachid: integer. ID of the attachment we just attached. - # mailresults: string. Who was mailed and who wasn't. #%] ! ! [% PROCESS global/header.html.tmpl title = "Changes Submitted" style = "th { text-align: left; }" --- 24,32 ---- # bugid: integer. ID of the bug we are updating. # attachid: integer. ID of the attachment we just attached. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! ! [% PROCESS global/header.html.tmpl title = "Changes Submitted" style = "th { text-align: left; }" *************** *** 37,49 **** <tr> <td> ! <h2>Changes to <a href="attachment.cgi?id=[% attachid %]&action=edit">attachment [% attachid %]</a> ! of bug [% bugid %] submitted </h2> ! [% mailresults %] </td> <td> ! <a href="show_bug.cgi?id=[% bugid %]">Back to Bug #[% bugid %]</a> </td> </tr> --- 38,50 ---- <tr> <td> ! <h2>Changes to <a href="attachment.cgi?id=[% attachid %]&action=edit">attachment [% attachid %]</a> ! of [% terms.bug %] [%+ bugid %] submitted </h2> ! [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %] </td> <td> ! <a href="show_bug.cgi?id=[% bugid %]">Back to [% terms.Bug %] #[% bugid %]</a> </td> </tr> Index: create.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/create.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** create.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- create.html.tmpl 15 May 2005 15:04:53 -0000 1.2 *************** *** 1,3 **** ! <!-- 1....@bu... --> [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file --- 1,3 ---- ! [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file *************** *** 20,35 **** #%] [%# Define strings that will serve as the title and header of this page %] ! [% title = BLOCK %]Create New Attachment for Bug #[% bugid %][% END %] ! [% h1 = BLOCK %]Create New Attachment for <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a>[% END %] [% h2 = BLOCK %][% bugsummary FILTER html %][% END %] ! [% PROCESS global/header.html.tmpl title = title h1 = h1 h2 = h2 style = " ! th { text-align: right; vertical-align: baseline; white-space: nowrap; } ! td { text-align: left; vertical-align: baseline; padding-bottom: 5px; } " onload="setContentTypeDisabledState();" --- 20,47 ---- #%] + [% PROCESS global/variables.none.tmpl %] + [%# Define strings that will serve as the title and header of this page %] ! [% title = BLOCK %]Create New Attachment for [% terms.Bug %] #[% bugid %][% END %] ! [% h1 = BLOCK %]Create New Attachment for ! [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %] [% h2 = BLOCK %][% bugsummary FILTER html %][% END %] ! [% PROCESS global/header.html.tmpl title = title h1 = h1 h2 = h2 style = " ! table.attachment_entry th { ! text-align: right; ! vertical-align: baseline; ! white-space: nowrap; ! } ! ! table.attachment_entry td { ! text-align: left; ! vertical-align: baseline; ! padding-bottom: 5px; ! } " onload="setContentTypeDisabledState();" *************** *** 39,44 **** <input type="hidden" name="bugid" value="[% bugid %]"> <input type="hidden" name="action" value="insert"> ! ! <table> <tr> <th>File:</th> --- 51,56 ---- <input type="hidden" name="bugid" value="[% bugid %]"> <input type="hidden" name="action" value="insert"> ! ! <table class="attachment_entry"> <tr> <th>File:</th> *************** *** 64,80 **** <td> <em>If the attachment is a patch, check the box below.</em><br> ! <input type="checkbox" name="ispatch" value="1" onchange="setContentTypeDisabledState();"> patch<br><br> <em>Otherwise, choose a method for determining the content type.</em><br> ! <input type="radio" name="contenttypemethod" value="autodetect"> ! auto-detect<br> ! <input type="radio" name="contenttypemethod" value="list"> ! select from list: <select name="contenttypeselection" onchange="this.form.contenttypemethod[1].checked = true;"> [% PROCESS "attachment/content-types.html.tmpl" %] </select><br> ! <input type="radio" name="contenttypemethod" value="manual"> ! enter manually: <input type="text" name="contenttypeentry" size="30" maxlength="200" onchange="if (this.value) this.form.contenttypemethod[2].checked = true;"> </td> </tr> <tr> <th>Obsoletes:</th> --- 76,111 ---- <td> <em>If the attachment is a patch, check the box below.</em><br> ! <input type="checkbox" id="ispatch" name="ispatch" value="1" ! onchange="setContentTypeDisabledState();"> ! <label for="ispatch">patch</label><br><br> <em>Otherwise, choose a method for determining the content type.</em><br> ! <input type="radio" id="autodetect" ! name="contenttypemethod" value="autodetect"> ! <label for="autodetect">auto-detect</label><br> ! <input type="radio" id="list" ! name="contenttypemethod" value="list"> ! <label for="list">select from list:</label> ! <select name="contenttypeselection" ! onchange="this.form.contenttypemethod[1].checked = true;"> [% PROCESS "attachment/content-types.html.tmpl" %] </select><br> ! <input type="radio" id="manual" ! name="contenttypemethod" value="manual"> ! <label for="manual">enter manually:</label> ! <input type="text" name="contenttypeentry" size="30" maxlength="200" ! onchange="if (this.value) this.form.contenttypemethod[2].checked = true;"> </td> </tr> + [% IF (Param("insidergroup") && UserInGroup(Param("insidergroup"))) %] + <tr> + <th>Privacy:</th> + <td> + <em>If the attachment is private, check the box below.</em><br> + <input type="checkbox" name="isprivate" id="isprivate" value="1"> + <label for="isprivate">Private</label> + </td> + </tr> + [% END %] <tr> <th>Obsoletes:</th> *************** *** 83,88 **** [% IF attachments.size %] [% FOREACH attachment = attachments %] ! <input type="checkbox" name="obsolete" value="[% attachment.id %]"> ! <a href="attachment.cgi?id=[% attachment.id %]&action=edit">[% attachment.id %]: [% attachment.description FILTER html %]</a><br> [% END %] [% ELSE %] --- 114,123 ---- [% IF attachments.size %] [% FOREACH attachment = attachments %] ! [% IF ((attachment.isprivate == 0) || (Param("insidergroup") ! && UserInGroup(Param("insidergroup")))) %] ! <input type="checkbox" id="[% attachment.id %]" ! name="obsolete" value="[% attachment.id %]"> ! <a href="attachment.cgi?id=[% attachment.id %]&action=edit">[% attachment.id %]: [% attachment.description FILTER html %]</a><br> ! [% END %] [% END %] [% ELSE %] *************** *** 91,98 **** </td> </tr> <tr> <th>Comment:</th> <td> ! <em>(optional) Add a comment about this attachment to the bug.</em><br> <textarea wrap="soft" name="comment" rows="6" cols="80"></textarea> </td> --- 126,145 ---- </td> </tr> + + [% IF (user.id != bugassignee_id) AND user.groups.editbugs %] + <tr> + <th>Reassignment:</th> + <td> + <em>If you want to assign this [% terms.bug %] to yourself, + check the box below.</em><br> + <input type="checkbox" id="takebug" name="takebug" value="1"> + <label for="takebug">take [% terms.bug %]</label> + </td> + </tr> + [% END %] <tr> <th>Comment:</th> <td> ! <em>(optional) Add a comment about this attachment to the [% terms.bug %].</em><br> <textarea wrap="soft" name="comment" rows="6" cols="80"></textarea> </td> *************** *** 108,117 **** <script language="JavaScript" type="text/javascript"> <!-- ! function setContentTypeDisabledState() { var entryform = document.entryform; var isdisabled = false; ! if (entryform.ispatch.checked) isdisabled = true; --- 155,164 ---- <script language="JavaScript" type="text/javascript"> <!-- ! function setContentTypeDisabledState() { var entryform = document.entryform; var isdisabled = false; ! if (entryform.ispatch.checked) isdisabled = true; Index: show-multiple.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/show-multiple.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** show-multiple.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- show-multiple.html.tmpl 15 May 2005 15:04:53 -0000 1.2 *************** *** 1,3 **** ! <!-- 1....@bu... --> [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file --- 1,3 ---- ! [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file *************** *** 20,33 **** #%] [% filtered_summary = bugsummary FILTER html %] ! [% PROCESS global/header.html.tmpl ! title = "View All Attachments for Bug #$bugid" ! h1 = "View All Attachments for <a href=\"show_bug.cgi?id=$bugid\">Bug #$bugid</a>" h2 = filtered_summary style = " ! th { text-align: right; vertical-align: top; } ! td { text-align: left; vertical-align: top; } ! td#info { text-align: right; vertical-align: top; } ! td#actions { text-align: right; vertical-align: bottom; } " %] --- 20,34 ---- #%] + [% PROCESS global/variables.none.tmpl %] [% filtered_summary = bugsummary FILTER html %] ! [% h1 = BLOCK %]View All Attachments for ! [%+ GetBugLink(bugid, "$terms.Bug $bugid") %][% END %] ! [% PROCESS global/header.html.tmpl ! title = "View All Attachments for $terms.Bug #$bugid" ! h1 = h1 h2 = filtered_summary style = " ! table.attachment_info th { text-align: right; vertical-align: top; } ! table.attachment_info td { text-align: left; vertical-align: top; } " %] *************** *** 38,44 **** <div align="center"> ! <table cellspacing="0" cellpadding="4" border="1" width="75%"> <tr> ! <td valign="top" bgcolor="#cccccc" colspan="5"> <big><b>Attachment #[% a.attachid %]</b></big> </td> --- 39,45 ---- <div align="center"> ! <table class="attachment_info" cellspacing="0" cellpadding="4" border="1" width="75%"> <tr> ! <td valign="top" bgcolor="#cccccc" colspan="6"> <big><b>Attachment #[% a.attachid %]</b></big> </td> *************** *** 46,54 **** <tr> <td valign="top"> ! [% IF a.isobsolete %] ! <strike>[% a.description FILTER html %]</strike> ! [% ELSE %] ! [% a.description FILTER html %] ! [% END %] </td> --- 47,51 ---- <tr> <td valign="top"> ! [% a.description FILTER html FILTER obsolete(a.isobsolete) %] </td> *************** *** 61,72 **** </td> ! <td valign="top">[% a.date %]</td> <td valign="top"> ! [% IF a.statuses.size == 0 %] ! <i>none</i> [% ELSE %] ! [% FOREACH s = a.statuses %] ! [% s FILTER html FILTER replace('\s', ' ') %]<br> [% END %] [% END %] --- 58,77 ---- </td> ! <td valign="top">[% a.date FILTER time %]</td> ! <td valign="top">[% a.datasize FILTER unitconvert %]</td> <td valign="top"> ! [% IF a.flags.size == 0 %] ! <i>no flags</i> [% ELSE %] ! [% FOREACH flag = a.flags %] ! [% IF flag.setter %] ! [% flag.setter.nick FILTER html %]: ! [% END %] ! [%+ flag.type.name FILTER html %][% flag.status %] ! [% IF flag.status == "?" && flag.requestee %] ! ([% flag.requestee.nick FILTER html %]) ! [% END %] ! [% ", " IF !loop.last %] [% END %] [% END %] *************** *** 74,78 **** <td valign="top"> ! <a href="attachment.cgi?id=[% a.attachid %]&action=edit">Edit</a> </td> </tr> --- 79,83 ---- <td valign="top"> ! <a href="attachment.cgi?id=[% a.attachid %]&action=edit">Edit</a> </td> </tr> *************** *** 87,91 **** <p><b> Attachment cannot be viewed because its MIME type is not text/*, image/*, or application/vnd.mozilla.*. ! <a href="attachment.cgi?id=[% a.attachid %]&action=view">Download the attachment instead</a>. </b></p> [% END %] --- 92,96 ---- <p><b> Attachment cannot be viewed because its MIME type is not text/*, image/*, or application/vnd.mozilla.*. ! <a href="attachment.cgi?id=[% a.attachid %]&action=view">Download the attachment instead</a>. </b></p> [% END %] Index: created.html.tmpl =================================================================== RCS file: /cvsroot/openfirst/www/htdocs/bugzilla/attachment/created.html.tmpl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** created.html.tmpl 28 Jun 2004 00:46:30 -0000 1.1 --- created.html.tmpl 15 May 2005 15:04:53 -0000 1.2 *************** *** 1,3 **** ! <!-- 1....@bu... --> [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file --- 1,3 ---- ! [%# 1....@bu... %] [%# The contents of this file are subject to the Mozilla Public # License Version 1.1 (the "License"); you may not use this file *************** *** 27,34 **** # contenttypemethod: string. How we got the content type of the attachment. # Possible values: autodetect, list, manual. - # mailresults: string. who was mailed, and who wasn't. #%] ! ! [% PROCESS global/header.html.tmpl title = "Changes Submitted" style = "th { text-align: left; }" --- 27,35 ---- # contenttypemethod: string. How we got the content type of the attachment. # Possible values: autodetect, list, manual. #%] ! ! [% PROCESS global/variables.none.tmpl %] ! ! [% PROCESS global/header.html.tmpl title = "Changes Submitted" style = "th { text-align: left; }" *************** *** 39,53 **** <td> <h2> ! <a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&action=edit">Attachment #[% attachid %]</a> ! to <a href="show_bug.cgi?id=[% bugid %]">Bug #[% bugid %]</a> Created </h2> ! [% mailresults %] [% IF contenttypemethod == 'autodetect' %] <p> ! <b>Note:</b> Bugzilla automatically detected the content type ! <em>[% contenttype %]</em> for this attachment. If this is ! incorrect, correct the value by <a href="attachment.cgi?id=[% attachid %]&action=edit">editing the attachment</a>. </p> --- 40,54 ---- <td> <h2> ! <a title="[% description FILTER html %]" href="attachment.cgi?id=[% attachid %]&action=edit">Attachment #[% attachid %]</a> ! to <a href="show_bug.cgi?id=[% bugid %]">[% terms.Bug %] #[% bugid %]</a> Created </h2> ! [% PROCESS "bug/process/bugmail.html.tmpl" mailing_bugid = bugid %] [% IF contenttypemethod == 'autodetect' %] <p> ! <b>Note:</b> [% terms.Bugzilla %] automatically detected the content type ! <em>[% contenttype %]</em> for this attachment. If this is ! incorrect, correct the value by <a href="attachment.cgi?id=[% attachid %]&action=edit">editing the attachment</a>. </p> *************** *** 55,59 **** </td> <td> ! <a href="show_bug.cgi?id=[% bugid %]">Go back to bug #[% bugid %]</a> </td> </tr> --- 56,60 ---- </td> <td> ! <a href="show_bug.cgi?id=[% bugid %]">Go back to [% terms.bug %] #[% bugid %]</a> </td> </tr> *************** *** 61,65 **** <p> ! <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create Another Attachment to Bug #[% bugid %]</a> </p> --- 62,67 ---- <p> ! <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Create ! Another Attachment to [% terms.Bug %] #[% bugid %]</a> </p> |
