From: lpsolit%gmail.com <>
Date: Tue, 18 Mar 2008 13:33:18 +0000 (+0000)
Subject: Bug 365365: Fix various HTML and CSS validation errors when viewing attachments ... 
X-Git-Tag: bugzilla-3.0.4~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c9765f395291e76ac52777f2cc72e8ecaea6639;p=thirdparty%2Fbugzilla.git

Bug 365365: Fix various HTML and CSS validation errors when viewing attachments - Patch by Frédéric Buclin <LpSolit@gmail.com> r/a=justdave
---

diff --git a/skins/standard/global.css b/skins/standard/global.css
index 0b1d71c521..91d68093da 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -332,6 +332,22 @@ dl dl > dt {
     padding-left: 1em;
 }
 
+table.attachment_info th {
+    text-align: right;
+    vertical-align: top;
+}
+
+table.attachment_info td {
+    text-align: left;
+    vertical-align: top;
+}
+
+/* Text displayed when the attachment is not viewable by the web browser */
+#noview {
+    text-align: left;
+    vertical-align: middle;
+}
+
 div.user_match {
     margin-bottom: 1em;
 }
diff --git a/template/en/default/attachment/edit.html.tmpl b/template/en/default/attachment/edit.html.tmpl
index 94581ab564..1a65068261 100644
--- a/template/en/default/attachment/edit.html.tmpl
+++ b/template/en/default/attachment/edit.html.tmpl
@@ -36,13 +36,6 @@
   title = title
   header = header
   subheader = subheader
-  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; }
-  "
 %]
 
 <script type="text/javascript">
@@ -254,6 +247,7 @@
             <label for="isprivate">private</label><br>
           [% END %]
           <br>
+        </small>
 
         [% IF flag_types.size > 0 %]
           [% PROCESS "flag/list.html.tmpl" bug_id = attachment.bug_id
@@ -261,8 +255,8 @@
         [% END %]
 
         <div id="smallCommentFrame">
-          <b><label for="comment">Comment</label> (on the
-          [%+ terms.bug %]):</b><br>
+          <b><small><label for="comment">Comment</label> (on the
+          [%+ terms.bug %]):</small></b><br>
             [% INCLUDE global/textarea.html.tmpl
               id      = 'comment'
               name    = 'comment'
@@ -283,7 +277,6 @@
               && attachment.datasize > 0 %]
           | <a href="attachment.cgi?id=[% attachment.id %]&amp;action=delete">Delete</a>
         [% END %]
-        </small>
       </td>
 
       [% IF !attachment.datasize %]
@@ -306,15 +299,15 @@
             <!--
             if (typeof document.getElementById == "function") {
 [% IF patchviewerinstalled %]
-              document.write('<iframe id="viewDiffFrame" style="height: 400px; width: 100%; display: none;"></iframe>');
+              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>');
+              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>');
+              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>');
+              document.write('<button type="button" id="viewRawButton" onclick="viewRaw();" style="display: none;">View Attachment As Raw<\/button>');
             }
             //-->
           </script>
diff --git a/template/en/default/attachment/show-multiple.html.tmpl b/template/en/default/attachment/show-multiple.html.tmpl
index 9c0fc57b0e..6734f5a759 100644
--- a/template/en/default/attachment/show-multiple.html.tmpl
+++ b/template/en/default/attachment/show-multiple.html.tmpl
@@ -32,10 +32,6 @@
   title = title
   header = header
   subheader = filtered_summary
-  style = "
-    table.attachment_info th { text-align: right; vertical-align: top; }
-    table.attachment_info td { text-align: left; vertical-align: top; }
-  "
 %]
 
 <br>