<!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>[270] sites/trunk/trac.wordpress.org/templates/site.html: Trac template cleanup.</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">
<dt>Revision</dt> <dd><a href="http://meta.trac.wordpress.org/changeset/270">270</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2014-01-11 19:22:00 +0000 (Sat, 11 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Trac template cleanup.
* Move After the Deadline JS to the footer.
* Add some missing comments.
* Remove old Trac email preferences reminders, as the WP cookie auth plugin synchronizes them from the WP.org profile.
* Strip a lot of Trac wiki UI cruft off the home page.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunktracwordpressorgtemplatessitehtml">sites/trunk/trac.wordpress.org/templates/site.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunktracwordpressorgtemplatessitehtml"></a>
<div class="modfile"><h4>Modified: sites/trunk/trac.wordpress.org/templates/site.html (269 => 270)</h4>
<pre class="diff"><span>
<span class="info">--- sites/trunk/trac.wordpress.org/templates/site.html 2014-01-10 22:03:50 UTC (rev 269)
+++ sites/trunk/trac.wordpress.org/templates/site.html 2014-01-11 19:22:00 UTC (rev 270)
</span><span class="lines">@@ -42,8 +42,6 @@
</span><span class="cx">
</span><span class="cx"> <meta name="viewport" content="width=device-width" />
</span><span class="cx"> <link rel="stylesheet" type="text/css" href="//wordpress.org/style/trac/wp-trac.css?${scripts_version}" />
</span><del>- <script src="//openatd.svn.wordpress.org/atd-jquery/scripts/jquery.atd.textarea.js"></script>
- <script src="//openatd.svn.wordpress.org/atd-jquery/scripts/csshttprequest.js"></script>
</del><span class="cx"> <link rel="stylesheet" type="text/css" href="//openatd.svn.wordpress.org/atd-jquery/css/atd.css" media="screen" />
</span><span class="cx"> <link py:if="req.session['authenticated']" rel="stylesheet" href="//s.w.org/wp-includes/css/wp-auth-check.css?ver=3.9-alpha" type="text/css" media="all" />
</span><span class="cx"> </head>
</span><span class="lines">@@ -52,6 +50,7 @@
</span><span class="cx"> <div py:match="div[@id='header']" py:strip=""></div>
</span><span class="cx"> <div py:match="div[@id='footer']" py:strip=""></div>
</span><span class="cx">
</span><ins>+<!--! Notices and instructions when creating a new ticket -->
</ins><span class="cx"> <py:if test="req.environ['PATH_INFO'] == '/newticket'">
</span><span class="cx"> <py:match path="div[@id='content' and @class='ticket']/form">
</span><span class="cx"> <div class="wp-notice">
</span><span class="lines">@@ -68,7 +67,6 @@
</span><span class="cx"> <li>In case it's relevant to the ticket, what is the expected output? What did you see instead?</li>
</span><span class="cx"> <li>Does the problem occur even when you deactivate all plugins and use the default theme?</li>
</span><span class="cx"> <li>Please provide any additional information that you think we'd find useful. (OS and browser for UI defects, server environment for crashes, etc.)</li>
</span><del>- <li py:if="not req.session['email']">Please add your email address to <a href="/prefs">Trac preferences</a> so you are sent updates.</li>
</del><span class="cx"> </ul>
</span><span class="cx"> </py:if>
</span><span class="cx"> </div>
</span><span class="lines">@@ -78,24 +76,12 @@
</span><span class="cx"> </py:match>
</span><span class="cx"> </py:if>
</span><span class="cx">
</span><del>-<!--! Reports are collapsed by default but flicker because it waits for DOM ready to collapse them -->
-<div py:match="div[@id='content' and @class='report']/div[@class='reports']//div" py:if="req.environ['PATH_INFO'] == '/report'" py:attrs="select('@*')" class="collapsed">
- ${select('*|comment()|text()')}
-</div>
-
-<!--! new ticket modifications -->
</del><ins>+<!--! New ticket modifications -->
</ins><span class="cx"> <py:if test="req.environ['PATH_INFO'] == '/newticket'">
</span><span class="cx">
</span><span class="cx"> <py:if test="'preview' in req.args">
</span><span class="cx"> <py:match path="form[@id='propertyform']/div[@class='buttons']" once="true">
</span><span class="cx">
</span><del>- <!--! reminder on preview about setting a Trac email -->
- <py:if test="not req.session['email']">
- <div class="wp-caution" id="wp-email-pref-notice">
- <p><strong>Please</strong> add your email address to <a target="_blank" href="/prefs">Trac preferences</a> so you are sent updates.</p>
- </div>
- </py:if>
-
</del><span class="cx"> <!--! security component alert on preview -->
</span><span class="cx"> <py:if test="'Security' == ticket.component">
</span><span class="cx"> <div class="wp-notice" id="wp-security-notice">
</span><span class="lines">@@ -123,6 +109,11 @@
</span><span class="cx">
</span><span class="cx"> </py:if>
</span><span class="cx">
</span><ins>+<!--! Reports are collapsed by default but flicker because it waits for DOM ready to collapse them -->
+<div py:match="div[@id='content' and @class='report']/div[@class='reports']//div" py:if="req.environ['PATH_INFO'] == '/report'" py:attrs="select('@*')" class="collapsed">
+ ${select('*|comment()|text()')}
+</div>
+
</ins><span class="cx"> <!--! reporter-feedback notice. deliberately shows for closed tickets other than 'fixed' -->
</span><span class="cx"> <py:match path="div[@id='content' and @class='ticket']//div[@id='ticketchange']" once="true">
</span><span class="cx"> <div py:attrs="select('@*')">
</span><span class="lines">@@ -130,18 +121,27 @@
</span><span class="cx"> </div>
</span><span class="cx"> <div class="wp-notice" id="wp-reporter-feedback-notice" py:if="ticket.reporter == req.authname and 'reporter-feedback' in ticket.keywords and ticket.resolution != 'fixed'">
</span><span class="cx"> <p><strong>Howdy!</strong></p><p></p>
</span><del>- <p>A developer marked this ticket with the reporter-feedback keyword. <strong>That means we need feedback from you.</strong></p>
</del><ins>+ <p>A contributor marked this ticket with the reporter-feedback keyword. <strong>That means we need feedback from you.</strong></p>
</ins><span class="cx"> <p>Please answer their questions and address their concerns, then remove the keyword, below.</p>
</span><span class="cx"> <p>If this is a support question, you're better off in the <a href="${support_link}" class="ext-link"><span class="icon"> </span>support forums</a>.</p>
</span><span class="cx"> </div>
</span><span class="cx"> </py:match>
</span><span class="cx">
</span><del>-<!--! remove 'Replace existing attachment of the same name' checkbox for non-gardeners -->
</del><ins>+<!--! Remove 'wiki:Wikistart' and other wiki cruft from home page -->
+<py:if test="req.environ['PATH_INFO'] == '/'">
+ <py:match path="div[@id='pagepath']" py:strip="" />
+ <py:match path="div[@id='ctxtnav']" py:strip="" />
+ <py:match path="div[@class='trac-modifiedby']" py:strip="" />
+ <py:match path="div[@id='altlinks']/h3" py:strip="" />
+ <py:match path="div[@id='altlinks']/ul" py:strip="" />
+</py:if>
+
+<!--! Remove 'Replace existing attachment of the same name' checkbox for non-gardeners -->
</ins><span class="cx"> <py:if test="not ( 'TICKET_ADMIN' in perm(resource) or 'Bug Gardener' in perm(resource) )">
</span><span class="cx"> <py:match path="form[@id='attachment']//div[@class='options']" py:strip="" />
</span><span class="cx"> </py:if>
</span><span class="cx">
</span><del>-<!--! license notes when uploading patches -->
</del><ins>+<!--! License notes when uploading patches -->
</ins><span class="cx"> <py:match path="form[@id='attachment']/div[@class='buttons']" once="true">
</span><span class="cx"> <div class="wp-caution" id="wp-contributions-caution">
</span><span class="cx"> <p>By contributing code to ${project.name}, you grant its use under the GNU General Public License v2 (or later).</p>
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> <input type="submit" value="Agree and Upload" />
</span><span class="cx"> </py:match>
</span><span class="cx">
</span><del>-<!--! gravatars for the ticket reporter -->
</del><ins>+<!--! Gravatars for the ticket reporter -->
</ins><span class="cx"> <td py:match="td[@headers='h_reporter']" py:attrs="select('@*')">
</span><span class="cx"> <a href="${profile_link + ticket.reporter}">
</span><span class="cx"> <img class="avatar" src="//wordpress.org/grav-redirect.php?user=${ticket.reporter}&s=36" height="36" width="36" />
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> ${select('*|comment()|text()')}
</span><span class="cx"> </td>
</span><span class="cx">
</span><del>-<!--! gravatars for the ticket owner -->
</del><ins>+<!--! Gravatars for the ticket owner -->
</ins><span class="cx"> <td py:match="td[@headers='h_owner']" py:attrs="select('@*')">
</span><span class="cx"> <a href="${profile_link + ticket.owner}" py:if="ticket.owner">
</span><span class="cx"> <img class="avatar" src="//wordpress.org/grav-redirect.php?user=${ticket.owner}&s=36" height="36" width="36" />
</span><span class="lines">@@ -185,13 +185,13 @@
</span><span class="cx"> ${select('*|comment()|text()')}
</span><span class="cx"> </div>
</span><span class="cx">
</span><del>-<!--! remove anonymous 'Advanced' session management tab -->
</del><ins>+<!--! Remove anonymous 'Advanced' session management tab -->
</ins><span class="cx"> <py:match path="div[@id='content' and @class='prefs']/ul[@id='tabs']/li[@id='tab_advanced']" once="true" py:strip=""></py:match>
</span><span class="cx"> <!--! remove useless 'Keyboard Shortcuts' preferences tab -->
</span><span class="cx"> <py:match path="div[@id='content' and @class='prefs']/ul[@id='tabs']/li[@id='tab_keybindings']" once="true" py:strip=""></py:match>
</span><span class="cx">
</span><del>-<!--! email addresses are synced with Trac from WP.org, so remove the preference pane -->
-<py:if test="req.environ['PATH_INFO'] == '/prefs' and project_slug == 'core' and req.session['email'] and req.session['authenticated']">
</del><ins>+<!--! Email addresses are synced with Trac from WP.org, so remove the preference pane -->
+<py:if test="req.environ['PATH_INFO'] == '/prefs' and req.session['email'] and req.session['authenticated']">
</ins><span class="cx"> <py:match path="div[@id='content' and @class='prefs']/div[@id='tabcontent']" once="true">
</span><span class="cx"> <div id="tabcontent">
</span><span class="cx"> Notifications <!--can be configured <a href="//${wporg_endpoint}notifications/">here</a>. They--> are sent to the email listed in <a href="${profile_to_edit}${req.session['sid']}">your WordPress.org profile</a><py:if test="req.session['email']"> (${req.session['email']})</py:if>.
</span><span class="lines">@@ -218,23 +218,34 @@
</span><span class="cx"> <!--! WP.org Global Footer -->
</span><span class="cx"> <xi:include href="wporg-footer.html" />
</span><span class="cx">
</span><del>- <!--! footer javascript and such -->
</del><span class="cx"> <script py:if="'TICKET_ADMIN' in perm(resource) or 'Bug Gardener' in perm(resource)">
</span><span class="cx"> var wpBugGardener = true;
</span><span class="cx"> </script>
</span><ins>+
+ <!--! JavaScript -->
</ins><span class="cx"> <script src="//wordpress.org/style/trac/wp-trac.js?${scripts_version}"></script>
</span><ins>+
+ <!--! Check for security buzzwords on new tickets -->
</ins><span class="cx"> <script py:if="req.environ['PATH_INFO'] == '/newticket'" src="//wordpress.org/style/trac/trac-security.js?${scripts_version}"></script>
</span><ins>+
+ <!--! New ticket possibly related tickets for Core Trac -->
+ <script py:if="req.environ['PATH_INFO'] == '/newticket' and project_slug == 'core'" src="//wordpress.org/style/trac/trac-search.js?${scripts_version}"></script>
+
+ <!-- After the Deadline -->
+ <script src="//openatd.svn.wordpress.org/atd-jquery/scripts/jquery.atd.textarea.js"></script>
+ <script src="//openatd.svn.wordpress.org/atd-jquery/scripts/csshttprequest.js"></script>
+
+ <!--! Analytics for Core Trac -->
</ins><span class="cx"> <py:if test="project_slug == 'core'">
</span><del>- <script py:if="req.environ['PATH_INFO'] == '/newticket'" src="//wordpress.org/style/trac/trac-search.js?${scripts_version}"></script>
- <script type="text/javascript">
- var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
- document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
- </script>
- <script type="text/javascript">
- try {
- var pageTracker = _gat._getTracker("UA-52447-27");
- pageTracker._trackPageview();
- } catch(err) {}</script>
</del><ins>+ <script type="text/javascript">
+ var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+ document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+ </script>
+ <script type="text/javascript">
+ try {
+ var pageTracker = _gat._getTracker("UA-52447-27");
+ pageTracker._trackPageview();
+ } catch(err) {}</script>
</ins><span class="cx"> </py:if>
</span><span class="cx">
</span><span class="cx"> <!--! Trac auth check -->
</span></span></pre>
</div>
</div>
</body>
</html>