From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Wed, 11 May 2011 21:21:35 +0000 (-0400)
Subject: Merge branch 'sobol-templates-hotfix' into release
X-Git-Tag: philo-0.9~12^2~19
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/943e8bc4af0c11b0ace3811199e3b0844c4c3fbc?hp=-c

Merge branch 'sobol-templates-hotfix' into release
---

943e8bc4af0c11b0ace3811199e3b0844c4c3fbc
diff --combined philo/contrib/sobol/templates/admin/sobol/search/grappelli_results.html
index 45135ff,f01eb88..f01eb88
--- a/philo/contrib/sobol/templates/admin/sobol/search/grappelli_results.html
+++ b/philo/contrib/sobol/templates/admin/sobol/search/grappelli_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">
diff --combined philo/contrib/sobol/templates/admin/sobol/search/results.html
index 44d4e7c,24442c7..24442c7
--- a/philo/contrib/sobol/templates/admin/sobol/search/results.html
+++ b/philo/contrib/sobol/templates/admin/sobol/search/results.html
@@@ -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>