Switch to unified view

a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
...
...
55
    {% for blob in g.resource_manager.emit('body_top_js') %}
55
    {% for blob in g.resource_manager.emit('body_top_js') %}
56
      {{ blob }}
56
      {{ blob }}
57
    {% endfor %}
57
    {% endfor %}
58
    {{theme_macros.header(c.user.username, c.user._id, c.user.display_name, g.login_url, '/auth/logout')}}
58
    {{theme_macros.header(c.user.username, c.user._id, c.user.display_name, g.login_url, '/auth/logout')}}
59
    {% set flash = tg.flash_obj.render('flash', use_js=False) %}
59
    {% set flash = tg.flash_obj.render('flash', use_js=False) %}
60
    {% if flash %}
61
      <div style="display:none">
62
        {{flash | safe}}
63
      </div>
64
    {% endif %}
65
    <section id="page-body" class="{{g.document_class(neighborhood)}}">
60
    <section id="page-body" class="{{g.document_class(neighborhood)}}">
66
        <div class="grid-24">
61
        <div class="grid-24">
67
        {% block nav_menu %}
62
        {% block nav_menu %}
68
        {% include g.theme.nav_menu %}
63
        {% include g.theme.nav_menu %}
69
        {% endblock %}
64
        {% endblock %}
...
...
128
      {{ neighborhood.site_specific_html | safe }}
123
      {{ neighborhood.site_specific_html | safe }}
129
    {% elif c.project.neighborhood %}
124
    {% elif c.project.neighborhood %}
130
      {{ c.project.neighborhood.site_specific_html | safe }}
125
      {{ c.project.neighborhood.site_specific_html | safe }}
131
    {% endif %}
126
    {% endif %}
132
    {{theme_macros.custom_js()}}
127
    {{theme_macros.custom_js()}}
128
    {% if flash %}
129
    <script type="text/javascript">{{flash | safe}}</script>
130
    {% endif %}
133
  </body>
131
  </body>
134
</html>
132
</html>