diff --git a/modules/bibformat/etc/templates/format_templates/Default_HTML_detailed.tpl b/modules/bibformat/etc/templates/format_templates/Default_HTML_detailed.tpl
index ea6001866..3d4b8bac1 100644
--- a/modules/bibformat/etc/templates/format_templates/Default_HTML_detailed.tpl
+++ b/modules/bibformat/etc/templates/format_templates/Default_HTML_detailed.tpl
@@ -1,37 +1,35 @@
-
- {{ tfn_get_back_to_search_links(record['recid'], g.ln) }}
-
-
{{ bfe_topbanner(bfo, prefix='', suffix='
') }}
{{ bfe_title(bfo, prefix="
", separator=" ", suffix=" ") }}
{{ bfe_authors(bfo, suffix=" ", limit="25", interactive="yes", print_affiliations="yes", affiliation_prefix=" (", affiliation_suffix=") ") }}
{{ bfe_addresses(bfo, ) }}
{{ bfe_affiliation(bfo, ) }}
{{ bfe_date(bfo, prefix=" ", suffix=" ") }}
{{ bfe_publisher(bfo, prefix="", suffix=" ") }}
{{ bfe_place(bfo, prefix="", suffix=" ") }}
{{ bfe_isbn(bfo, prefix=" ISBN: ") }}
{{ bfe_abstract(bfo, prefix_en="Abstract: ", prefix_fr="Résumé: ", suffix_en=" ", suffix_fr=" ") }}
{{ bfe_keywords(bfo, prefix="Keyword(s): ", keyword_prefix="", keyword_suffix=" ") }}
{{ bfe_notes(bfo, note_prefix="Note: ", note_suffix=" ", suffix=" ") }}
{{ bfe_publi_info(bfo, prefix="Published in: ") }}
{{ bfe_doi(bfo, prefix="DOI: ", suffix=" ") }}
{{ bfe_plots(bfo, width="200px", caption="no") }}
{{ bfe_appears_in_collections(bfo, prefix="The record appears in these collections: ", suffix="
") }}
{# WebTags #}
{{ tfn_webtag_record_tags(record['recid'], current_user.get_id())|prefix(' ') }}
+
+{{ tfn_get_back_to_search_links(record['recid'])|wrap(prefix='', suffix='
') }}
diff --git a/modules/bibformat/etc/templates/format_templates/Picture_HTML_detailed.tpl b/modules/bibformat/etc/templates/format_templates/Picture_HTML_detailed.tpl
index 3e90290ec..650dbb673 100644
--- a/modules/bibformat/etc/templates/format_templates/Picture_HTML_detailed.tpl
+++ b/modules/bibformat/etc/templates/format_templates/Picture_HTML_detailed.tpl
@@ -1,49 +1,51 @@
{{ bfe_topbanner(bfo, ) }}
{{ bfe_title(bfo, prefix="
", separator=" ", suffix=" ") }}
{{ bfe_notes(bfo, ) }}
{{ bfe_date(bfo, prefix="
", suffix=" ") }}
{{ bfe_contact(bfo, ) }}
{{ bfe_authors(bfo, prefix="Photographer: ", suffix=" ", print_links="yes", print_affiliations="yes", limit="10", interactive="yes") }}
{{ bfe_addresses(bfo, prefix="", suffix=" ", print_link="yes") }}
{{ bfe_keywords(bfo, prefix="
Keyword(s): ", suffix="") }}
{{ bfe_field(bfo, tag="909CP$s", prefix=" Original ref. : ", suffix=" ") }}
{{ bfe_field(bfo, tag="909CP$t", prefix="Available pictures : ", suffix=" ") }}
{{ bfe_abstract(bfo, prefix_en='
Caption ', suffix_en='
', prefix_fr='
Légende ', suffix_fr='
') }}
{{ bfe_external_publications(bfo, prefix='See also: ', suffix="
") }}
{{ bfe_photos(bfo, style="border:1px solid #bbb;padding:3px;margin:1px;", prefix='Resources ') }}
© CERN Geneva:
The use of photos requires prior authorization (from CERN copyright ).
The words CERN Photo must be quoted for each use.
{# WebTags #}
{{ tfn_webtag_record_tags(record['recid'], current_user.get_id())|prefix(' ') }}
+
+{{ tfn_get_back_to_search_links(record['recid'])|wrap(prefix='', suffix='
') }}
diff --git a/modules/bibformat/etc/templates/format_templates/Poetry_HTML_detailed.tpl b/modules/bibformat/etc/templates/format_templates/Poetry_HTML_detailed.tpl
index 69d8e51ee..52346dd70 100644
--- a/modules/bibformat/etc/templates/format_templates/Poetry_HTML_detailed.tpl
+++ b/modules/bibformat/etc/templates/format_templates/Poetry_HTML_detailed.tpl
@@ -1,34 +1,36 @@
{{ bfe_topbanner(bfo, prefix='', suffix='
') }}
{{ bfe_title(bfo, prefix="
", separator=" ", suffix=" ") }}
{{ bfe_authors(bfo, suffix=" ", limit="25", interactive="yes", print_affiliations="yes", affiliation_prefix=" (", affiliation_suffix=") ") }}
{{ bfe_addresses(bfo, ) }}
{{ bfe_affiliation(bfo, ) }}
{{ bfe_date(bfo, prefix=" ", suffix=" ") }}
{{ bfe_publisher(bfo, prefix="", suffix=" ") }}
{{ bfe_place(bfo, prefix="", suffix=" ") }}
{{ bfe_isbn(bfo, prefix=" ISBN: ") }}
{{ bfe_abstract(bfo, ) }}
{{ bfe_keywords(bfo, prefix="Keyword(s): ", keyword_prefix="", keyword_suffix=" ") }}
{{ bfe_notes(bfo, note_prefix="Note: ", note_suffix=" ", suffix=" ") }}
{{ bfe_publi_info(bfo, prefix="Published in: ") }}
{{ bfe_addthis(bfo, ) }}
{{ bfe_appears_in_collections(bfo, prefix="The record appears in these collections: ", suffix="
") }}
{# WebTags #}
{{ tfn_webtag_record_tags(record['recid'], current_user.get_id())|prefix(' ') }}
+
+{{ tfn_get_back_to_search_links(record['recid'])|wrap(prefix='', suffix='
') }}
diff --git a/modules/bibformat/etc/templates/format_templates/Video_HTML_detailed.tpl b/modules/bibformat/etc/templates/format_templates/Video_HTML_detailed.tpl
index 3177153d7..2e3cf3b0d 100644
--- a/modules/bibformat/etc/templates/format_templates/Video_HTML_detailed.tpl
+++ b/modules/bibformat/etc/templates/format_templates/Video_HTML_detailed.tpl
@@ -1,55 +1,57 @@
{{ bfe_video_platform_sources(bfo, ) }}
{{ bfe_field(bfo, tag="909C0Y") }}
{{ bfe_title(bfo, prefix="", suffix="", default="", escape="", highlight="no", separator=" ") }}
by {{ bfe_authors(bfo, prefix="", suffix="", default="", escape="", affiliation_suffix=")", extension="[...]", link_author_pages="no", limit="", print_links="yes", separator=" ; ", print_affiliations="no", highlight="no", interactive="no", affiliation_prefix=" (") }} {{ bfe_copyright(bfo, ) }}
{{ bfe_abstract(bfo, ) }}
Download Video
{{ bfe_comments(bfo, show_reviews="False") }}
{{ bfe_video_platform_suggestions(bfo, ) }}
{{ bfe_video_platform_downloads(bfo, ) }}
{# WebTags #}
{{ tfn_webtag_record_tags(record['recid'], current_user.get_id())|prefix(' ') }}
+
+{{ tfn_get_back_to_search_links(record['recid'])|wrap(prefix='', suffix='
') }}
diff --git a/modules/websearch/etc/templates/record_back_to_search_links.html b/modules/websearch/etc/templates/record_back_to_search_links.html
index c9e0a9d74..74a348886 100644
--- a/modules/websearch/etc/templates/record_back_to_search_links.html
+++ b/modules/websearch/etc/templates/record_back_to_search_links.html
@@ -1,85 +1,78 @@
{#
## This file is part of Invenio.
## Copyright (C) 2013 CERN.
##
## Invenio is free software; you can redistribute it and/or
## modify it under the terms of the GNU General Public License as
## published by the Free Software Foundation; either version 2 of the
## License, or (at your option) any later version.
##
## Invenio is distributed in the hope that it will be useful, but
## WITHOUT ANY WARRANTY; without even the implied warranty of
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
## General Public License for more details.
##
## You should have received a copy of the GNU General Public License
## along with Invenio; if not, write to the Free Software Foundation, Inc.,
## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
#}
{# Display links to quickly flip between detailed record pages #}
-{% block body %}
+{% set nb_recids = recids|length %}
- {% set nb_recids = recids|length %}
+
+
+
+ {{ _('Back to search') }}
+
{%- if nb_recids > 1 -%}
{% set pos = recids.index(recID) %}
{% set numrec = pos + 1 %}
{% set recIDfirst = recids[0] %}
{% set recIDprev = recids[pos - 1] %}
{% set recIDnext = recids[pos + 1] %}
{% set recIDlast = recids[nb_recids - 1] %}
{%- if pos == 0 -%}
{# to display only the links to the next and last record #}
-
- {{ numrec }} {{_('of')}} {{ nb_recids }}
-
-
-
-
-
-
-
+ {{ numrec }} {{_('of')}} {{ nb_recids }}
+
+
+
+
+
+
- {%- elif pos == nb_recids - 1 -%}
+ {%- elif pos == nb_recids - 1 -%}
{# to display only the links to the first and previous record #}
-
-
-
-
-
-
-
- {{ numrec }} {{_('of')}} {{ nb_recids }}
-
+
+
+
+
+
+
+ {{ numrec }} {{_('of')}} {{ nb_recids }}
{%- else -%}
{# to display all links: first, previous, next, last record, and "back to search" #}
-
-
-
-
-
-
-
- {{ numrec }} {{_('of')}} {{ nb_recids }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ numrec }} {{_('of')}} {{ nb_recids }}
+
+
+
+
+
+
{%- endif -%}
{%- endif -%}
-
-{% endblock %}
+
+