Making WordPress.org

Changeset 10680


Ignore:
Timestamp:
02/16/2021 08:22:05 AM (3 years ago)
Author:
dd32
Message:

Trac: Revert [10677] as it's causing some template issues in production.

See https://wordpress.slack.com/archives/C02QB8GMM/p1613461994336000

Location:
sites/trunk/trac.wordpress.org/templates
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sites/trunk/trac.wordpress.org/templates/site.html

    r10679 r10680  
    5454<xi:include href="site-ticket.html" />
    5555
     56<!--! Append a version string to CSS files hosted on the w.org CDN -->
     57<py:match path="link[@rel='stylesheet' and starts-with(@href,'https://s.w.org/') and substring-after(@href,'.css') = '']">
     58    <link rel="stylesheet" href="${select('@href')}?v=${scripts_version}" />
     59</py:match>
     60
    5661<!--! Styles and such. Load before first JS file (jquery.js) -->
    57 <py:match path="head/script[contains(@src,'jquery.js')]">
     62<py:match path="head/title">
     63    <title py:attrs="select('@*')">
     64        ${select('*|comment()|text()')}
     65    </title>
     66
    5867    <link rel="dns-prefetch" href="//s.w.org" />
    5968    <link rel="dns-prefetch" href="//fonts.googleapis.com" />
     
    6978    <xi:include href="wporg-head.html" />
    7079    <meta name="viewport" content="width=device-width" />
    71     <link rel='stylesheet' href='https://s.w.org/wp-includes/css/dashicons.min.css?${scripts_version}' type='text/css' />
     80    <link rel='stylesheet' href='https://s.w.org/wp-includes/css/dashicons.min.css?20150710' type='text/css' />
    7281    <link rel="stylesheet" type="text/css" href="https://s.w.org/style/trac/wp-trac.css?${scripts_version}" />
    73     <link py:if="req.session['authenticated']" rel="stylesheet" href="https://s.w.org/wp-includes/css/wp-auth-check.css?${scripts_version}" type="text/css" media="all" />
    74 
    75     <script py:attrs="select('@*')"></script>
     82    <link py:if="req.session['authenticated']" rel="stylesheet" href="https://s.w.org/wp-includes/css/wp-auth-check.css?ver=3.9-alpha" type="text/css" media="all" />
    7683
    7784    <py:if test="req.environ['PATH_INFO'] == '/newticket'">
     
    9198        <meta name="robots" content="$robots"/>
    9299    </py:if>
     100</py:match>
     101
     102<!--! Append a version string to JS files hosted on the w.org CDN -->
     103<py:match path="script[starts-with(@src,'https://s.w.org/') and substring-after(@src,'.js') = '']">
     104    <script src="${select('@src')}?v=${scripts_version}">${select('*|comment()|text()')}</script>
    93105</py:match>
    94106
     
    320332
    321333    <!--! JavaScript -->
    322     <script src="https://s.w.org/style/js/navigation.min.js?${scripts_version}"></script>
    323     <script src="https://s.w.org/style/trac/jquery.caret.min.js?${scripts_version}"></script>
    324     <script src="https://s.w.org/style/trac/jquery.atwho.min.js?${scripts_version}"></script>
     334    <script src="https://s.w.org/style/js/navigation.min.js?20190128"></script>
     335    <script src="https://s.w.org/style/trac/jquery.caret.min.js?ver=2015-02-01"></script>
     336    <script src="https://s.w.org/style/trac/jquery.atwho.min.js?ver=1.0.1"></script>
    325337    <script src="https://s.w.org/style/trac/wp-trac.js?${scripts_version}"></script>
    326338
     
    370382
    371383<xi:include href="site-specific.html"><xi:fallback /></xi:include>
    372 
    373 <!--! The following rules should be just before `</html>` to ensure it affects all of the document. -->
    374 
    375 <!--! Append a version string to CSS files hosted on the w.org CDN -->
    376 <py:match path="link[@rel='stylesheet' and starts-with(@href,'https://s.w.org/') and substring-after(@href,'.css') = '']">
    377     <link rel="stylesheet" href="${select('@href')}?v=${scripts_version}" />
    378 </py:match>
    379 
    380 <!--! Append a version string to JS files hosted on the w.org CDN -->
    381 <py:match path="script[starts-with(@src,'https://s.w.org/') and substring-after(@src,'.js') = '']">
    382     <script src="${select('@src')}?v=${scripts_version}">${select('*|comment()|text()')}</script>
    383 </py:match>
    384 
    385 <!--! Allow bypassing the WordPress.org CDN for testing. -->
    386 <py:if test="'cdn' in req.args and 'wordpress.org' == req.args.cdn">
    387     <py:match path="link[@rel='stylesheet' and starts-with(@href,'https://s.w.org/')]">
    388         <link rel="stylesheet" href="${select('@href').render().replace('s.w.org','wordpress.org')}" />
    389     </py:match>
    390     <py:match path="script[starts-with(@src,'https://s.w.org/')]">
    391         <script src="${select('@src').render().replace('s.w.org','wordpress.org')}">${select('*|comment()|text()')}</script>
    392     </py:match>
    393 </py:if>
    394 
    395384</html>
  • sites/trunk/trac.wordpress.org/templates/wporg-head.html

    r10677 r10680  
    2424    </style>
    2525    <link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,400,300,600&amp;subset=latin,cyrillic-ext,greek-ext,greek,vietnamese,latin-ext,cyrillic' rel='stylesheet' type='text/css' />
    26     <link rel="stylesheet" href="https://s.w.org/style/wp4.css" />
     26    <link rel="stylesheet" href="https://s.w.org/style/wp4.css?80" />
    2727    <!--[if lte IE 8]>
    2828    <style type="text/css">
Note: See TracChangeset for help on using the changeset viewer.