Moving preview message to the right place

Luan
1 parent 40b7e25c
Showing 2 changed files with 20 additions and 16 deletions Show diff stats
src/templates/search/preview-search.html
src/templates/search/search.html
 {% load i18n %}
 {% load highlight %}
  
+<li class="preview-message">
 <span class="glyphicon glyphicon-{{ result.icon_name }}" title="{{ result.type }}"></span>
  
 {% if result.mailinglist_url %}
@@ -29,3 +30,21 @@
       <!-- a striptags filter was raising an error here because using with highlight -->
   <span class="quiet">- {% highlight result.description with query max_length "150" %}</span>
 {% endif %}
+
+{% if result.author or result.modified %}
+  <div class="quiet">
+    {% if result.author %}
+      <span class="pull-left">{% trans "by" %}
+        {% if result.author and result.author_url %}
+          <a href="{{ result.author_url }}">{% highlight result.author with query %}</a>
+        {% else %}
+          <span>{{ result.author }}</span>
+        {% endif %}
+      </span>
+    {% endif %}
+    {% if result.modified %}
+    <span class="pull-right">{{ result.modified|timesince }} {% trans "ago" %}</span>
+    {% endif %}
+  </div>
+{% endif %}
+</li>
@@ -48,22 +48,7 @@
     <div class="col-lg-10">
       <ul class="none indent list-unstyled">
       {% for result in page.object_list  %}
-        <li class="preview-message">
-          {% include "search/preview-search.html" %}
-
-          {% if result.author %}
-            <div class="quiet">
-              <span class="pull-left">{% trans "by" %}
-                {% if result.author and result.author_url %}
-                  <a href="{{ result.author_url }}">{% highlight result.author with query %}</a>
-                {% else %}
-                  <span>{{ result.author }}</span>
-                {% endif %}
-              </span>
-              <span class="pull-right">{{ result.modified|timesince }} {% trans "ago" %}</span>
-            </div>
-          {% endif %}
-        </li>
+        {% include "search/preview-search.html" %}
       {% empty %}
         <li class="text-center">
           {% trans "No results for your search." %}
1	1	{% load i18n %}
2	2	{% load highlight %}
3	3
	4	+<li class="preview-message">
4	5	<span class="glyphicon glyphicon-{{ result.icon_name }}" title="{{ result.type }}"></span>
5	6
6	7	{% if result.mailinglist_url %}
...	...	@@ -29,3 +30,21 @@
29	30	<!-- a striptags filter was raising an error here because using with highlight -->
30	31	<span class="quiet">- {% highlight result.description with query max_length "150" %}</span>
31	32	{% endif %}
	33	+
	34	+{% if result.author or result.modified %}
	35	+ <div class="quiet">
	36	+ {% if result.author %}
	37	+ <span class="pull-left">{% trans "by" %}
	38	+ {% if result.author and result.author_url %}
	39	+ <a href="{{ result.author_url }}">{% highlight result.author with query %}</a>
	40	+ {% else %}
	41	+ <span>{{ result.author }}</span>
	42	+ {% endif %}
	43	+ </span>
	44	+ {% endif %}
	45	+ {% if result.modified %}
	46	+ <span class="pull-right">{{ result.modified\|timesince }} {% trans "ago" %}</span>
	47	+ {% endif %}
	48	+ </div>
	49	+{% endif %}
	50	+</li>
...	...
...	...	@@ -48,22 +48,7 @@
48	48	<div class="col-lg-10">
49	49	<ul class="none indent list-unstyled">
50	50	{% for result in page.object_list %}
51		- <li class="preview-message">
52		- {% include "search/preview-search.html" %}
53		-
54		- {% if result.author %}
55		- <div class="quiet">
56		- <span class="pull-left">{% trans "by" %}
57		- {% if result.author and result.author_url %}
58		- <a href="{{ result.author_url }}">{% highlight result.author with query %}</a>
59		- {% else %}
60		- <span>{{ result.author }}</span>
61		- {% endif %}
62		- </span>
63		- <span class="pull-right">{{ result.modified\|timesince }} {% trans "ago" %}</span>
64		- </div>
65		- {% endif %}
66		- </li>
	51	+ {% include "search/preview-search.html" %}
67	52	{% empty %}
68	53	<li class="text-center">
69	54	{% trans "No results for your search." %}
...	...