diff --git a/colab/accounts/templates/accounts/user_search_preview.html b/colab/accounts/templates/accounts/user_search_preview.html index de4d161..ddbb3ec 100644 --- a/colab/accounts/templates/accounts/user_search_preview.html +++ b/colab/accounts/templates/accounts/user_search_preview.html @@ -1,7 +1,7 @@ {% load i18n tz highlight gravatar %} -
{% gravatar user.email 50 %} {{ user.name }} -Data joined: {{ user.date_joined }} -Registred in: link
+
+{% gravatar result.email 50 %} {{ result.name }} +Data joined: {{ result.date_joined }}
+Registred in: User
- diff --git a/colab/search/templates/message-preview.html b/colab/search/templates/message-preview.html new file mode 100644 index 0000000..c4fca7a --- /dev/null +++ b/colab/search/templates/message-preview.html @@ -0,0 +1,4 @@ +{% load i18n tz highlight search_preview_templates %} + +{% get_search_preview_templates result as template_target %} +{% include template_target %} diff --git a/colab/search/templatetags/__init__.py b/colab/search/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/colab/search/templatetags/__init__.py diff --git a/colab/search/templatetags/search_preview_templates.py b/colab/search/templatetags/search_preview_templates.py new file mode 100644 index 0000000..99deea4 --- /dev/null +++ b/colab/search/templatetags/search_preview_templates.py @@ -0,0 +1,18 @@ +from django import template + + +register = template.Library() + +@register.assignment_tag +def get_search_preview_templates(model_indexed): + app_type = model_indexed.type + app_name = "" + + if app_type in "user": + app_name = "accounts" + elif app_type in "thread": + app_name = "superarchives" + else: + app_name, app_type = app_type.split("_",1) + + return "{}/{}_search_preview.html".format(app_name, app_type) diff --git a/colab/super_archives/templates/message-preview.html b/colab/super_archives/templates/message-preview.html deleted file mode 100644 index b46860b..0000000 --- a/colab/super_archives/templates/message-preview.html +++ /dev/null @@ -1,18 +0,0 @@ -{% load i18n tz highlight %} - -{% if result.type in "user" %} - {% include "accounts/user_search_preview.html" with user=result %} -{% endif %} - -{% if result.type in "thread" %} - {% include "superarchives/thread_search_preview.html" with thread=result %} -{% endif%} - -{% if result.type in "noosfero_community"%} - {% include "noosfero/community_search_preview.html" with community=result %} -{% endif%} - -{% if result.type in "noosfero_article"%} - {% include "noosfero/article_search_preview.html" with article=result %} -{% endif%} - diff --git a/colab/super_archives/templates/superarchives/thread_search_preview.html b/colab/super_archives/templates/superarchives/thread_search_preview.html index 62a7cb7..c07c6a8 100644 --- a/colab/super_archives/templates/superarchives/thread_search_preview.html +++ b/colab/super_archives/templates/superarchives/thread_search_preview.html @@ -1,9 +1,9 @@ {% load i18n tz highlight %}
-

{{ thread.title }}

-{{ thread.latest_description }} +

{{ result.title }}

+{{ result.latest_description|truncatewords:"85" }}
-{{ thread.modified_by }} - {{ thread.modified |date:"d \d\e F \d\e Y" }} +{{ result.modified_by }} - {{ result.modified |date:"d \d\e F \d\e Y" }}
-- libgit2 0.21.2