From b10ae5e6f535db08711d132d8beb14a1d99e171b Mon Sep 17 00:00:00 2001 From: Romain Neutron Date: Fri, 24 Aug 2012 11:38:12 +0200 Subject: [PATCH] [SearchEngine] Update templates --- templates/web/prod/results/answerabstract.html.twig | 8 ++++---- templates/web/prod/results/answergrid.html.twig | 6 +----- templates/web/prod/results/answerlist.html.twig | 5 +---- templates/web/prod/results/help.html.twig | 8 ++++---- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/templates/web/prod/results/answerabstract.html.twig b/templates/web/prod/results/answerabstract.html.twig index 9e3897c0b7..6628341e03 100644 --- a/templates/web/prod/results/answerabstract.html.twig +++ b/templates/web/prod/results/answerabstract.html.twig @@ -1,10 +1,10 @@ {% import 'prod/results/record.html.twig' as record_format %} -{% if results.get_error() %} -
{{results.get_error()}}
+{% if results.error() %} +
{{results.error()}}
{% else %} - {% if results.get_warning() %} -
{{results.get_warning()}}
+ {% if results.warning() %} +
{{results.warning()}}
{% endif %} {% if suggestions %} diff --git a/templates/web/prod/results/answergrid.html.twig b/templates/web/prod/results/answergrid.html.twig index 55233cdb3b..1135c84241 100644 --- a/templates/web/prod/results/answergrid.html.twig +++ b/templates/web/prod/results/answergrid.html.twig @@ -4,11 +4,7 @@ {% block content %} {% for record in results.get_datas() %} - - {% set ident = record.get_base_id ~ ' ' ~ record.get_record_id%} - {% set sbas_id = record.get_sbas_id %} - - {{record_format.block(record, highlight, searchEngine, 'IMGT', false)}} + {{record_format.block(record, highlight, searchEngine, 'IMGT', false)}} {% endfor %} {% endblock %} diff --git a/templates/web/prod/results/answerlist.html.twig b/templates/web/prod/results/answerlist.html.twig index 6fa6a979c9..0e43f27092 100644 --- a/templates/web/prod/results/answerlist.html.twig +++ b/templates/web/prod/results/answerlist.html.twig @@ -4,11 +4,8 @@ {% import 'common/caption_templates/answer.html.twig' as caption %} -{% for record in results.get_datas() %} +{% for record in results.results() %}
- - {% set ident = record.get_base_id ~ ' ' ~ record.get_record_id%} - {% set sbas_id = record.get_sbas_id %}
diff --git a/templates/web/prod/results/help.html.twig b/templates/web/prod/results/help.html.twig index 8c5067f4d3..24371e34ef 100644 --- a/templates/web/prod/results/help.html.twig +++ b/templates/web/prod/results/help.html.twig @@ -1,9 +1,9 @@ -{% if results.get_error() %} -
{{results.get_error()}}
+{% if results.error() %} +
{{results.error()}}
{% else %} - {% if results.get_warning() %} -
{{results.get_warning()}}
+ {% if results.warning() %} +
{{results.warning()}}
{% endif %} {% endif %}