<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[1999] sites/trunk/trac.wordpress.org/templates: Trac: Ensure site.html changes are applied to ticket previews.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/1999">1999</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/1999","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>nacin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-18 22:23:21 +0000 (Sun, 18 Oct 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://meta.trac.wordpress.org/ticket/418">#418</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunktracwordpressorgtemplatessitehtml">sites/trunk/trac.wordpress.org/templates/site.html</a></li>
<li><a href="#sitestrunktracwordpressorgtemplatesticket_previewhtml">sites/trunk/trac.wordpress.org/templates/ticket_preview.html</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunktracwordpressorgtemplatessitetickethtml">sites/trunk/trac.wordpress.org/templates/site-ticket.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunktracwordpressorgtemplatessitetickethtml"></a>
<div class="addfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Added: sites/trunk/trac.wordpress.org/templates/site-ticket.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/trac.wordpress.org/templates/site-ticket.html (rev 0)
+++ sites/trunk/trac.wordpress.org/templates/site-ticket.html 2015-10-18 22:23:21 UTC (rev 1999)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,50 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:py="http://genshi.edgewall.org/"
+ xmlns:xi="http://www.w3.org/2001/XInclude"
+ py:strip="">
+
+<?python
+ profile_link = '//profiles.wordpress.org/'
+
+ 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
+?>
+
+<!--! 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}&s=48" srcset="//wordpress.org/grav-redirect.php?user=${ticket.reporter}&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}&s=48" srcset="//wordpress.org/grav-redirect.php?user=${ticket.owner}&s=96 2x" height="48" width="48" />
+ </a>
+ ${select('*|comment()|text()')}
+</td>
+</html>
</ins></span></pre></div>
<a id="sitestrunktracwordpressorgtemplatessitehtml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/trac.wordpress.org/templates/site.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/trac.wordpress.org/templates/site.html 2015-10-18 22:21:39 UTC (rev 1998)
+++ sites/trunk/trac.wordpress.org/templates/site.html 2015-10-18 22:23:21 UTC (rev 1999)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,7 +19,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> else :
</span><span class="cx" style="display: block; padding: 0 10px"> support_link = '//wordpress.org/support/'
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- profile_link = '//profiles.wordpress.org/'
</del><span class="cx" style="display: block; padding: 0 10px"> profile_to_edit = '//wordpress.org/support/profile/'
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> # Fix https://meta.trac.wordpress.org/ticket/21
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,31 +30,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> link['href'] = urllib.unquote(new_link[1])
</span><span class="cx" style="display: block; padding: 0 10px"> except (IndexError, KeyError):
</span><span class="cx" style="display: block; padding: 0 10px"> pass
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- 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
</del><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <!--! Styles and such. Load before first JS file (jquery.js) -->
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -221,22 +195,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <input type="submit" value="Agree and Upload" />
</span><span class="cx" style="display: block; padding: 0 10px"> </py:match>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<!--! 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}&s=48" srcset="//wordpress.org/grav-redirect.php?user=${ticket.reporter}&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}&s=48" srcset="//wordpress.org/grav-redirect.php?user=${ticket.owner}&s=96 2x" height="48" width="48" />
- </a>
- ${select('*|comment()|text()')}
-</td>
-
</del><span class="cx" style="display: block; padding: 0 10px"> <!--! Show number of Query results even when they fit on one page -->
</span><span class="cx" style="display: block; padding: 0 10px"> <py:match path="div[@id='content' and @class='query']/form[@id='query']">
</span><span class="cx" style="display: block; padding: 0 10px"> <form py:attrs="select('@*')">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,5 +326,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </py:if>
</span><span class="cx" style="display: block; padding: 0 10px"> </body>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<xi:include href="site-ticket.html" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <xi:include href="site-specific.html"><xi:fallback /></xi:include>
</span><span class="cx" style="display: block; padding: 0 10px"> </html>
</span></span></pre></div>
<a id="sitestrunktracwordpressorgtemplatesticket_previewhtml"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/trac.wordpress.org/templates/ticket_preview.html</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/trac.wordpress.org/templates/ticket_preview.html 2015-10-18 22:21:39 UTC (rev 1998)
+++ sites/trunk/trac.wordpress.org/templates/ticket_preview.html 2015-10-18 22:23:21 UTC (rev 1999)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,6 +8,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> py:with="can_append = 'TICKET_APPEND' in perm(ticket.resource);
</span><span class="cx" style="display: block; padding: 0 10px"> has_edit_comment = 'TICKET_EDIT_COMMENT' in perm(ticket.resource);"
</span><span class="cx" style="display: block; padding: 0 10px"> py:strip="">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <xi:include href="site-ticket.html"/>
</ins><span class="cx" style="display: block; padding: 0 10px"> <xi:include href="ticket_box.html"/>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="changelog">
</span><span class="cx" style="display: block; padding: 0 10px"> <div py:for="change in changes"
</span></span></pre>
</div>
</div>
</body>
</html>