Put attachment HTML code in own `div` tag

[martin@…]

I wanted to change the look of the attachment sections on the wiki pages using CSS today. To my surprise I saw that the attachments are not put into an own div tag, but just placed after the wikipage searchable div using h3 and a ul list:

<h3>Attachments</h3>
<ul>
  ...
</ul>

instead it should look like this:

<div id="attachments">
  <h3>Attachments</h3>
  <ul>
    ...
  </ul>
</div>

While this is a minor thing it also shouldn't take much to change it in the source code.

[osimons]

Makes sense, and same id as used for tickets. However, when looking at ticket page I see that the <H2> there is actually outside the div. Would be best if they both used same strategy.

I'll put it on my todo.

[Christian Boos]

While you're at it, you could move the attachment snippets outside of macros.html and make it includable (related to #6374).

[Remy Blank]

Simon, will you be able to do that for 0.12? If not, please move to a later milestone.

[Remy Blank]

With the recent changes that made attachments collapsible, the list of attachments now actually is in a <div>, but the id="attachments" is still in the inner <div>. We could move the id to the outer <div> for 0.12?

[Christian Boos]

Like in:

trac/htdocs/css/trac.css

@@ -413 +413 @@
 .attachment #preview { margin-top: 1em }
 
 /* Styles for the list of attachments. */
-#attachments { border: 1px outset #996; padding: 1em }
+#attachments > div { border: 1px outset #996; padding: 1em }
 #attachments .attachments { margin-left: 2em; padding: 0 }
 #attachments dt { display: list-item; list-style: square; }
 #attachments dd { font-style: italic; margin-left: 0; padding-left: 0; }

trac/templates/macros.html

@@ -158 +158 @@
       </i18n:msg>
     </py:def>
     <py:if test="alist.attachments or alist.can_create">
-      <div py:choose="">
+      <div id="attachments" py:choose="">
         <py:when test="compact and alist.attachments">
           <h3 class="${foldable and 'foldable' or None}">Attachments</h3>
           <ul>
@@ -172 +172 @@
         </py:when>
         <py:when test="not compact">
           <h2 class="${foldable and 'foldable' or None}">Attachments</h2>
-          <div py:if="alist.attachments or alist.can_create" id="attachments">
+          <div py:if="alist.attachments or alist.can_create">
             <dl py:if="alist.attachments" class="attachments">
               <py:for each="attachment in alist.attachments">
                 <dt>${show_one_attachment(attachment)}</dt>

Seems to work.

[Christian Boos]

Change above applied in [8794].