Switch to unified view

a/Allura/allura/templates/master.html b/Allura/allura/templates/master.html
...
...
6
      py:strip="True">
6
      py:strip="True">
7
  <?python 
7
  <?python 
8
g.register_forge_js('js/jquery-base.js')
8
g.register_forge_js('js/jquery-base.js')
9
g.register_forge_js('js/allura-base.js')
9
g.register_forge_js('js/allura-base.js')
10
g.register_forge_css('css/forge/hilite.css')
10
g.register_forge_css('css/forge/hilite.css')
11
if g.production_mode: g.register_forge_js('js/analytics.js')
12
g.resource_manager.register_widgets(c) 
11
g.resource_manager.register_widgets(c) 
13
?>
12
?>
14
  <xi:include href="header.html" />
13
  <xi:include href="header.html" />
15
  <xi:include href="sidebars.html" />
14
  <xi:include href="sidebars.html" />
16
  <xi:include href="footer.html" />
15
  <xi:include href="footer.html" />
...
...
32
<!--[if IE]>
31
<!--[if IE]>
33
        <style type="text/css">
32
        <style type="text/css">
34
            .sfdl p.hide, .sfdls p.hide {display: none !important;}
33
            .sfdl p.hide, .sfdls p.hide {display: none !important;}
35
        </style>
34
        </style>
36
<![endif]-->
35
<![endif]-->
36
    <py:if test="g.production_mode">${g.analytics.display()}</py:if>
37
  </head>
37
  </head>
38
  
38
  
39
  <body py:match="body" py:attrs="select('@*')" xml:space="preserve">
39
  <body py:match="body" py:attrs="select('@*')" xml:space="preserve">
40
    <py:for each="blob in g.resource_manager.emit('body_top_js')">$blob</py:for>
40
    <py:for each="blob in g.resource_manager.emit('body_top_js')">$blob</py:for>
41
    ${main_menu()}
41
    ${main_menu()}
...
...
64
        $n.text
64
        $n.text
65
      </div>
65
      </div>
66
    </div>
66
    </div>
67
    <py:for each="blob in g.resource_manager.emit('body_js')">$blob</py:for>
67
    <py:for each="blob in g.resource_manager.emit('body_js')">$blob</py:for>
68
    <py:for each="blob in g.resource_manager.emit('body_js_tail')">$blob</py:for>
68
    <py:for each="blob in g.resource_manager.emit('body_js_tail')">$blob</py:for>
69
    <!--! Analytics holder and noscript tag -->
70
    <div id="analytics"/>
71
    <noscript py:if="g.production_mode">
72
      <img src="//secure.quantserve.com/pixel/p-93nPV3-Eb4x22.gif" 
73
           style="display: none;" border="0" height="1" width="1" alt="Quantcast"/>
74
      <img src="http://b.scorecardresearch.com/p?c1=2&amp;c2=6035546&amp;c3=&amp;c4=&amp;c5=&amp;c6=&amp;c15=&amp;cj=1" alt="comScore2" />
75
    </noscript>
76
    <!--! End analytics -->
77
  </body>
69
  </body>
78
</html>
70
</html>