Changeset 1999 for sites/trunk/trac.wordpress.org/templates/site.html

Timestamp:

10/18/2015 10:23:21 PM (9 years ago)

Author:

nacin

Message:

Trac: Ensure site.html changes are applied to ticket previews.

site.html is not loaded in this case. Thus, split off the functionality into site-ticket.html,
then load site-ticket.html in an overloaded ticket_preview.html.

fixes #418.

File:

• sites/trunk/trac.wordpress.org/templates/site.html (modified) (4 diffs)

sites/trunk/trac.wordpress.org/templates/site.html

@@ -20 +20 @@
         support_link = '//wordpress.org/support/'
 
-    profile_link = '//profiles.wordpress.org/'
     profile_to_edit = '//wordpress.org/support/profile/'
 
@@ -32 +31 @@
     except (IndexError, KeyError):
         pass
-
-    field_types = [ 'milestone', 'priority', 'type', 'severity', 'version', 'component', 'keywords', 'focuses', ]
-
-    # Sorting function
-    def sort_nicely(field1, field2):
-        try:
-            idx1 = field_types.index(field1['name'])
-        except ValueError:
-            idx1 = 1000 # no match, push to the end
-
-        try:
-            idx2 = field_types.index(field2['name'])
-        except ValueError:
-            idx2 = 1000 # no match, push to the end
-
-        return cmp(idx1, idx2)
-
-    if ticket and 'fields' in locals():
-        # Sort the fields
-        fields.sort(cmp=sort_nicely)
-
-        # Re-generate fields_map for use within the ticket template
-        fields_map = {}
-        for i in xrange(0, len(fields)):
-            fields_map[ fields[i]['name'] ] = i
 ?>
 
@@ -221 +195 @@
     <input type="submit" value="Agree and Upload" />
 </py:match>
-
-<!--! Gravatars for the ticket reporter -->
-<td py:match="td[@headers='h_reporter']" py:attrs="select('@*')">
-    <a href="${profile_link + ticket.reporter}">
-        <img class="avatar" src="//wordpress.org/grav-redirect.php?user=${ticket.reporter}&amp;s=48" srcset="//wordpress.org/grav-redirect.php?user=${ticket.reporter}&amp;s=96 2x" height="48" width="48" />
-    </a>
-    ${select('*|comment()|text()')}
-</td>
-
-<!--! Gravatars for the ticket owner -->
-<td py:match="td[@headers='h_owner']" py:attrs="select('@*')">
-    <a href="${profile_link + ticket.owner}" py:if="ticket.owner">
-        <img class="avatar" src="//wordpress.org/grav-redirect.php?user=${ticket.owner}&amp;s=48" srcset="//wordpress.org/grav-redirect.php?user=${ticket.owner}&amp;s=96 2x" height="48" width="48" />
-    </a>
-    ${select('*|comment()|text()')}
-</td>
 
 <!--! Show number of Query results even when they fit on one page -->
@@ -369 +327 @@
 </body>
 
+<xi:include href="site-ticket.html" />
 <xi:include href="site-specific.html"><xi:fallback /></xi:include>
 </html>