Download as
Browse Code »

Commit f6d64bf66e2b6a0caa4b6f5bd77e27b780cd41d9

Authored by Alexandre A. Barbosa
2 parents 802bb413 71d6ad74
Exists in master and in 4 other branches 1.12.x, fix-dashboard, fix-message-preview, validate-passwd

Merge pull request #111 from colab/highlight_query 

Add query highlight for user and email search
Showing 3 changed files with 99 additions and 5 deletions   Show diff stats
colab/accounts/templates/search/user_search_preview.html
  Diff comments   View file @f6d64bf
... ... @@ -7,11 +7,19 @@
7 7 </a>
8 8 </div>
9 9 <div class="col-md-10">
10   - <strong><a href="{% url 'user_profile' username=result.username %}"><h4>{{ result.name }}</h4></a></strong>
  10 + <strong><a href="{% url 'user_profile' username=result.username %}">
  11 +
  12 + {% if query %}
  13 + <h4>{% highlight result.name with query %}</h4></a>
  14 + {% else %}
  15 + <h4>{{ result.name }}</h4></a>
  16 + {% endif %}
  17 +
  18 + </strong>
11 19 <small><strong>{% trans "Since" %}: {% date_format result.date_joined %}</strong></small><br>
12 20 <small>{% trans "Registered in" %}: <strong>{% trans "User" %}</strong></small><br>
13 21 </div>
14 22 </div>
15 23 <div class="row">
16 24 <hr>
17   -</div>
18 25 \ No newline at end of file
  26 +</div>
... ...
colab/super_archives/templates/search/thread_search_preview.html
  Diff comments   View file @f6d64bf
... ... @@ -2,10 +2,30 @@
2 2  
3 3 <div class="row">
4 4 <div class="col-md-12">
5   - <small>{% datetime_format result.modified %} - <a href="{{result.modified_by_url}}">{{ result.modified_by }}</a></small><br>
6   - <h4><a href="{{result.url}}">{{ result.title }}</a></h4>
  5 + <small>{% datetime_format result.modified %} -
  6 +
  7 + {% if query %}
  8 + <a href="{{result.modified_by_url}}">{% highlight result.modified_by with query max_length "1000" %}</a>
  9 + {% else %}
  10 + <a href="{{result.modified_by_url}}">{{result.modified_by }}</a>
  11 + {% endif %}
  12 +
  13 + </small><br>
  14 +
  15 + {% if query %}
  16 + <h4><a href="{{result.url}}">{% highlight result.title with query max_length "1000"%}</a></h4>
  17 + {% else %}
  18 + <h4><a href="{{result.url}}">{{ result.title }}</a></h4>
  19 + {% endif %}
  20 +
7 21 {% with result.latest_description|truncatewords:"85" as description %}
8   - {{description | default_if_none:"a"}}<br>
  22 +
  23 + {% if query %}
  24 + {% highlight description with query max_length "1000" %}<br>
  25 + {% else %}
  26 + {{description | default_if_none:"a"}}<br>
  27 + {% endif %}
  28 +
9 29 {% endwith %}
10 30 <small>{% trans "Registred in" %}: <strong>{% trans "Discussion" %}</strong></small>
11 31 </div>
... ...
docs/source/plugindev.rst
  Diff comments   View file @f6d64bf
... ... @@ -34,6 +34,7 @@ signals structure, some steps are required:
34 34 be seen below:
35 35  
36 36 .. code-block:: python
  37 +
37 38 from colab.celery import app
38 39  
39 40 @app.task(bind=True)
... ... @@ -48,6 +49,7 @@ signals structure, some steps are required:
48 49  
49 50  
50 51 .. code-block:: python
  52 +
51 53 from colab.plugins.utils.apps import ColabPluginAppConfig
52 54 from colab.signals.signals import register_signal, connect_signal
53 55 from colab.plugins.PLUGIN.tasks import HANDLING_METHOD
... ... @@ -71,6 +73,7 @@ signals structure, some steps are required:
71 73 \*\*kwargs. As you can see below:
72 74  
73 75 .. code-block:: python
  76 +
74 77 from colab.signals.signals import send
75 78  
76 79 send(signal_name, sender)
... ... @@ -78,4 +81,67 @@ signals structure, some steps are required:
78 81 * If you want to run celery manually to make some tests, you should execute:
79 82  
80 83 .. code-block:: shell
  84 +
81 85 colab-admin celeryC worker --loglevel=debug
  86 +
  87 +Search
  88 +----------
  89 +
  90 +In order to make some plugin model's searchable, it is necessary to create
  91 +some files. First of all, it is necessary to create a directory named "search"
  92 +inside the templates directory, that should be found on the plugin root
  93 +directory.
  94 +
  95 +Once the search folder exist, it is necessary to create a html file that will
  96 +describe how a model item will be displayed on the colab search page. This file
  97 +name must follow the pattern:
  98 +
  99 +MODELNAME_search_preview.html
  100 +
  101 +Where the MODELNAME should be the name of the model object that will be
  102 +represented on the html file. An example for this file can be seen bellow:
  103 +
  104 +.. code-block:: guess
  105 +
  106 + {% load i18n tz highlight gravatar date_format %}
  107 +
  108 + <div class="row">
  109 + <div class="col-md-2 center">
  110 + <a href="{% url 'user_profile' username=result.username %}">
  111 + {% block gravatar_img %}{% gravatar result.email 100 %}{% endblock gravatar_img %}
  112 + </a>
  113 + </div>
  114 + <div class="col-md-10">
  115 + <strong><a href="{% url 'user_profile' username=result.username %}">
  116 +
  117 + {% if query %}
  118 + <h4>{% highlight result.name with query %}</h4></a>
  119 + {% else %}
  120 + <h4>{{ result.name }}</h4></a>
  121 + {% endif %}
  122 +
  123 + </strong>
  124 + <small><strong>{% trans "Since" %}: {% date_format result.date_joined %}</strong></small><br>
  125 + <small>{% trans "Registered in" %}: <strong>{% trans "User" %}</strong></small><br>
  126 + </div>
  127 + </div>
  128 + <div class="row">
  129 + <hr>
  130 + </div>
  131 +
  132 +As can be seen in the above example, it also possible to highlight the elements being searched. This can be seen on
  133 +the following example:
  134 +
  135 +.. code-block:: html
  136 +
  137 + {% if query %}
  138 + <h4>{% highlight result.name with query %}</h4></a>
  139 + {% else %}
  140 + <h4>{{ result.name }}</h4></a>
  141 + {% endif %}
  142 +
  143 +It can be seen that if a query text was used on the search, it will highlight the element if it is present on the query, if not,
  144 +the element will be displayed without a highlight. Therefore, in order to highlight some fields, it is necessary
  145 +to first check if there is a query search. If there is, use the tag "highlight" before the field name. However, it
  146 +must be said that the highlight tag should be followed by a complement, such as "with query", as can be seen on the example
  147 +above. This complement is used to allow the highlight only if the attribute is actually present on the query used to perform a search.
... ...