Switch to unified view

a/Allura/allura/templates/jinja_master/master.html b/Allura/allura/templates/jinja_master/master.html
...
...
31
    {% if c.project %}
31
    {% if c.project %}
32
    {% for blob in g.resource_manager.emit('head_js') %}
32
    {% for blob in g.resource_manager.emit('head_js') %}
33
      {{ blob }}
33
      {{ blob }}
34
    {% endfor %}
34
    {% endfor %}
35
    {% endif %}
35
    {% endif %}
36
      
36
37
    {% if c.project and c.project.neighborhood.css %}
37
    {% if c.project and c.project.neighborhood.css %}
38
      <style type="text/css">
38
      <style type="text/css">
39
        {{c.project.neighborhood.css}}
39
        {{c.project.neighborhood.get_custom_css()|safe}}
40
      </style>
40
      </style>
41
    {% elif neighborhood and neighborhood.css %}
41
    {% elif neighborhood and neighborhood.css %}
42
      <style type="text/css">
42
      <style type="text/css">
43
        {{neighborhood.css}}
43
        {{neighborhood.get_custom_css()}}
44
      </style>
44
      </style>
45
    {% endif %}
45
    {% endif %}
46
    {% block extra_css %}{% endblock %}
46
    {% block extra_css %}{% endblock %}
47
      <style>.{{ g.antispam.honey_class }} { display:none }</style>
47
      <style>.{{ g.antispam.honey_class }} { display:none }</style>
48
48
...
...
81
          {% set inner_width = outer_width - 8 %}
81
          {% set inner_width = outer_width - 8 %}
82
              {% else %}
82
              {% else %}
83
          {% set inner_width = outer_width %}
83
          {% set inner_width = outer_width %}
84
        {% endif %}
84
        {% endif %}
85
        <div class="grid-{{outer_width}} pad">
85
        <div class="grid-{{outer_width}} pad">
86
          <h2 class="dark title">{% block header %}{% endblock %}
86
          <h2 class="dark{% block header_classes %} title{% endblock %}">{% block header %}{% endblock %}
87
            <!-- actions -->
87
            <!-- actions -->
88
            <small>
88
            <small>
89
            {% block actions %}{% endblock %}
89
            {% block actions %}{% endblock %}
90
            </small>
90
            </small>
91
            <!-- /actions -->
91
            <!-- /actions -->