update report.html template

Author: oberix

admin_reports/templates/admin/report.html

@@ -3,10 +3,14 @@
 
 {% block extrastyle %}
  {{ block.super }}
+ {% comment %}
  {% if suit %}
- <link rel="stylesheet" type="text/css" href="/static/suit/css/suit.css" media="all">
+ <link rel="stylesheet" type="text/css" href="/static/suit/css/suit.css" media="all">
+ {% endif %}
+ {% endcomment %}
+ {% if not suit %}
+ <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
  {% endif %}
- <link rel="stylesheet" type="text/css" href="{% static "admin/css/changelists.css" %}" />
  {% if has_filters %}
  <link rel="stylesheet" type="text/css" href="{% static "admin/css/forms.css" %}" />
  <script type="text/javascript" src="{% url 'admin:jsi18n' %}"></script>
@@ -51,9 +55,10 @@ <h3 style="padding:0px;">{{ title }}</h3>
 
  <p>&nbsp;</p>
 
- <div class="toolbar-content {% if suit %}clearfix{% endif %}">
- {% block search %}
- <div {% if suit %}id="toolbar" class="clearfix"{% else %} id="changelist" class="module filtered"{% endif %}>
+ <div id="changelist" class="{% if suit %}module-filtered{% else %}toolbar-content module{% endif %}">
+
+ <div id="toolbar" {% if suit %}class="clearfix"{% endif %}>
+ {% block search %}
  <form id="report-search" action="" method="get" class="form-inline">
  {% if has_filters %}
  <div>
@@ -63,69 +68,69 @@ <h3 style="padding:0px;">{{ title }}</h3>
  </span>
  {% endspaceless %}
  <input type="submit" value="{% trans 'Search' %}" class="btn btn-info"/>
+ <a href="{{ export_path }}" class="btn">{% trans 'Export' %}</a>
  <span class="small quiet result-count">
- <a href="{{ export_path }}" class="btn">{% trans 'Export' %}</a>
- {{ rl.full_result_count }} {% trans 'results' %}
+ {{ rl.get_result_count }} {% trans 'results' %}
  <a href="?">{% trans 'Clear query' %}</a>
  </span>
  </div>
  {% endif %}
- <div class="results">
- {% block result %}
- <table id="result_list" {% if suit %}class="table table-striped table-bordered table-hover table-condensed"{% endif %}>
- <thead>
- <tr>
- {% for header in rl.headers %}
- <th scope="col" {{ header.class_attrib }}>
- {% if header.sortable %}
- {% if header.sort_priority > 0 %}
- {% if suit %}<div class="relative-wrapper">{% endif %}
- <div class="sortoptions">
-
- {% if rl.num_sorted_fields > 1 %}<span class="sortpriority" title="{% blocktrans with priority_number=header.sort_priority %}Sorting priority: {{ priority_number }}{% endblocktrans %}">{{ header.sort_priority }}</span>{% endif %}
-
- <a href="{{ header.url_toggle }}" class="toggle {% if header.ascending %}ascending{% else %}descending{% endif %}" title="{% trans "Toggle sorting" %}"></a>
- <a class="sortremove" href="{{ header.url_remove }}" title="{% trans "Remove from sorting" %}"></a>
- {% if suit %}</div>{% endif %}
- </div>
- {% endif %}
- {% endif %}
- <div class="text">{% if header.sortable %}<a href="{{ header.url_primary }}">{{ header.label|capfirst }}</a>{% else %}<span>{{ header.label|capfirst }}</span>{% endif %}</div>
- <div class="clear"></div>
- </th>
- {% endfor %}
- </tr>
- </thead>
-
- {% if totals and totals_on_top %}
- {% include "admin/report_totals.html" %}
- {% endif %}
-
- <tbody>
- {% for result in rl.results %}
- <tr class="{% cycle 'row1' 'row2' %}">
- {% for alignment, item in result %}
- <td class="{{ alignment }}">{{ item }}</td>
- {% endfor %}
- </tr>
- {% endfor %}
- </tbody>
-
- {% if totals and not totals_on_top %}
- {% include "admin/report_totals.html" %}
- {% endif %}
-
- </table>
- {% endblock %}
- </div>
-
- {% block pagination %}{% pagination rl %}{% endblock %}
-
  </form>
- </div>
- {% endblock %}
+ {% endblock %}
+ </div>
+
+ <div class="results">
+ {% block result %}
+ <table id="result_list" {% if suit %}class="table table-striped table-bordered table-hover table-condensed"{% endif %}>
+ <thead>
+ <tr>
+ {% for header in rl.headers %}
+ <th scope="col" {{ header.class_attrib }}>
+ {% if header.sortable %}
+ {% if header.sort_priority > 0 %}
+ {% if suit %}<div class="relative-wrapper">{% endif %}
+ <div class="sortoptions">
+
+ {% if rl.num_sorted_fields > 1 %}<span class="sortpriority" title="{% blocktrans with priority_number=header.sort_priority %}Sorting priority: {{ priority_number }}{% endblocktrans %}">{{ header.sort_priority }}</span>{% endif %}
+
+ <a href="{{ header.url_toggle }}" class="toggle {% if header.ascending %}ascending{% else %}descending{% endif %}" title="{% trans "Toggle sorting" %}"></a>
+ <a class="sortremove" href="{{ header.url_remove }}" title="{% trans "Remove from sorting" %}"></a>
+ {% if suit %}</div>{% endif %}
+ </div>
+ {% endif %}
+ {% endif %}
+ <div class="text">{% if header.sortable %}<a href="{{ header.url_primary }}">{{ header.label|capfirst }}</a>{% else %}<span>{{ header.label|capfirst }}</span>{% endif %}</div>
+ <div class="clear"></div>
+ </th>
+ {% endfor %}
+ </tr>
+ </thead>
+
+ {% if totals and totals_on_top %}
+ {% include "admin/report_totals.html" %}
+ {% endif %}
+
+ <tbody>
+ {% for result in rl.results %}
+ <tr class="{% cycle 'row1' 'row2' %}">
+ {% for alignment, item in result %}
+ <td class="{{ alignment }}">{{ item }}</td>
+ {% endfor %}
+ </tr>
+ {% endfor %}
+ </tbody>
+
+ {% if totals and not totals_on_top %}
+ {% include "admin/report_totals.html" %}
+ {% endif %}
+
+ </table>
+ {% endblock %}
+ </div>
+
+ {% block pagination %}{% pagination rl %}{% endblock %}
+
  </div>
  </div>
  </div>
-
 {% endblock %}