diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2018-07-08 06:59:55 +0200 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-07-08 06:59:55 +0200 |
| commit | be1f92450788dc89280c9e04a4bf983b5d7fac54 (patch) | |
| tree | b5513fd846597fe5f152177dbbda88dca08fdf5f /template/en/default/attachment | |
| parent | 9bbd8d368598046c47964ee043620621b6c3634b (diff) | |
| parent | 446a08b30b0dbaac9f2b88e0a5cad410f0446140 (diff) | |
| download | bugzilla-be1f92450788dc89280c9e04a4bf983b5d7fac54.tar.gz bugzilla-be1f92450788dc89280c9e04a4bf983b5d7fac54.tar.xz | |
Merge remote-tracking branch 'bmo/master'
Diffstat (limited to 'template/en/default/attachment')
| -rw-r--r-- | template/en/default/attachment/createformcontents.html.tmpl | 6 | ||||
| -rw-r--r-- | template/en/default/attachment/show-multiple.html.tmpl | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/template/en/default/attachment/createformcontents.html.tmpl b/template/en/default/attachment/createformcontents.html.tmpl index 41a02a913..efb24e3e9 100644 --- a/template/en/default/attachment/createformcontents.html.tmpl +++ b/template/en/default/attachment/createformcontents.html.tmpl @@ -37,7 +37,8 @@ <em>Enter the path to the file on your computer</em> (or <a id="attachment_data_controller"> paste text as attachment</a>).<br> - <input type="file" id="data" name="data" size="50"> + <input type="file" id="data" name="data" size="50" aria-errormessage="data-error" aria-invalid="false"> + <div id="data-error" class="warning" aria-live="assertive"><div> </td> </tr> <tr class="attachment_text_field"> @@ -69,7 +70,7 @@ [%# Reset this whenever the page loads so that the JS state is up to date %] <script [% script_nonce FILTER none %]> $(function() { - $("#file").on("change", function() { + $("#data").on("change", function() { DataFieldHandler(); // Fire event to keep take-bug in sync. $("#ispatch").change(); @@ -119,6 +120,7 @@ {type => "image/gif", desc => "GIF image"}, {type => "image/jpeg", desc => "JPEG image"}, {type => "image/png", desc => "PNG image"}, + {type => "image/svg+xml", desc => "SVG image"}, {type => "application/pdf", desc => "PDF document"}, {type => "application/octet-stream", desc => "binary file"}] %] diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl index c28d5dfd6..6a7bb4b9b 100644 --- a/template/en/default/attachment/show-multiple.html.tmpl +++ b/template/en/default/attachment/show-multiple.html.tmpl @@ -35,7 +35,7 @@ %] [% IF hide_obsolete %] <div id="hidden_obsolete_message"> - Obsolete attachments are hidden. To view all attachments (including obsolete) + Obsolete attachments are hidden. To view all attachments (including obsolete) <a href="attachment.cgi?bugid=[% bug.id FILTER html %]&action=viewall">click here</a>. </div> [% END %] @@ -106,7 +106,7 @@ [% END %] [% ELSE %] <p><b> - Attachment cannot be viewed because its MIME type is not text/*, image/*, or application/vnd.mozilla.*. + Attachment cannot be viewed because its MIME type is not text/*, image/*, or application/pdf. <a href="attachment.cgi?id=[% a.id %]">Download the attachment instead</a>. </b></p> [% END %] |