Merge branch 'sobol-templates-hotfix' into release
authorStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:21:35 +0000 (17:21 -0400)
committerStephen Burrows <stephen.r.burrows@gmail.com>
Wed, 11 May 2011 21:21:35 +0000 (17:21 -0400)
1  2 
philo/contrib/sobol/templates/admin/sobol/search/grappelli_results.html
philo/contrib/sobol/templates/admin/sobol/search/results.html

@@@ -28,9 -28,8 +28,8 @@@
  {% block content %}
        <div class="container-grid delete-confirmation">
                {% for search in queryset %}
-               {% if not forloop.first and not forloop.last %}<h1>{{ search.string }}</h1>{% endif %}
                <div class="group tabular">
-                       <h2>{% blocktrans %}Results{% endblocktrans %}</h2>{% comment %}For the favored results, add a class?{% endcomment %}
+                       <h2>{{ search_string }}</h2>
                        <div class="module table">
                                <div class="module thead">
                                        <div class="tr">
@@@ -23,9 -23,8 +23,8 @@@
  
  {% block content %}
                {% for search in queryset %}
-               {% if not forloop.first and not forloop.last %}<h1>{{ search.string }}</h1>{% endif %}
                        <fieldset class="module">
-                               <h2>{% blocktrans %}Results{% endblocktrans %}</h2>{% comment %}For the favored results, add a class?{% endcomment %}
+                               <h2>{{ search.string }}</h2>
                                <table>
                                        <thead>
                                                <tr>