--- a/Allura/allura/templates/master.html +++ b/Allura/allura/templates/master.html @@ -4,7 +4,12 @@ xmlns:py="http://genshi.edgewall.org/" xmlns:xi="http://www.w3.org/2001/XInclude" py:strip="True"> - <?python g.resource_manager.register_widgets(c) ?> + <?python +g.register_forge_js('js/jquery-base.js') +g.register_forge_js('js/allura-base.js') +if g.production_mode: g.register_forge_js('js/analytics.js') +g.resource_manager.register_widgets(c) +?> <xi:include href="header.html" /> <xi:include href="sidebars.html" /> <xi:include href="footer.html" /> @@ -28,17 +33,6 @@ .sfdl p.hide, .sfdls p.hide {display: none !important;} </style> <![endif]--> - <script type="text/javascript"> - var _gaq = _gaq || []; - _gaq.push(['_setAccount', 'UA-32013-6'], ['_trackPageview']); - - (function() { - var ga = document.createElement('script'); - ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; - ga.setAttribute('async', 'true'); - document.documentElement.firstChild.appendChild(ga); - })(); - </script> </head> <body py:match="body" py:attrs="select('@*')" xml:space="preserve"> @@ -69,41 +63,15 @@ $n.text </div> </div> - <script type="text/javascript" src="${g.forge_static('js/jquery-base.js')}"></script> - <script type="text/javascript" src="${g.forge_static('js/allura-base.js')}"/> <py:for each="blob in g.resource_manager.emit('body_js')">$blob</py:for> - <!-- Collective tag --> - <img src="//b.collective-media.net/seg/cm/cm_aa_gn1" width="1" height="1" alt=""/> - <!-- End Collective tag --> - - - <!-- Quantcast --> - <script type="text/javascript"> - _qoptions={qacct:"p-93nPV3-Eb4x22"}; - </script> - <script type="text/javascript" src="//secure.quantserve.com/quant.js"></script> - <noscript><img src="//secure.quantserve.com/pixel/p-93nPV3-Eb4x22.gif" style="display: none;" border="0" height="1" width="1" alt="Quantcast"/></noscript> - <!-- End Quantcast tag --> - - - <!-- Begin comScore Tag --> - <script type="text/javascript"> - document.write(unescape("%3Cscript src='" + (document.location.protocol == "https:" ? "https://sb" : "http://b") + ".scorecardresearch.com/beacon.js' %3E%3C/script%3E")); - </script> - <script type="text/javascript"> - COMSCORE.beacon({ - c1:2, - c2:6035546, - c3:"", - c4:"", - c5:"", - c6:"", - c15:"" - }); - </script> - <noscript> + <py:for each="blob in g.resource_manager.emit('body_js_tail')">$blob</py:for> + <!--! Analytics holder and noscript tag --> + <div id="analytics"/> + <noscript py:if="g.production_mode"> + <img src="//secure.quantserve.com/pixel/p-93nPV3-Eb4x22.gif" + style="display: none;" border="0" height="1" width="1" alt="Quantcast"/> <img src="http://b.scorecardresearch.com/p?c1=2&c2=6035546&c3=&c4=&c5=&c6=&c15=&cj=1" alt="comScore2" /> </noscript> - <!-- End comScore Tag --> + <!--! End analytics --> </body> </html>