diff --git a/modules/bibformat/etc/format_templates/ENACExportfullconference.bft b/modules/bibformat/etc/format_templates/ENACExportfullconference.bft
index 7ae34e79a..9124ba19e 100644
--- a/modules/bibformat/etc/format_templates/ENACExportfullconference.bft
+++ b/modules/bibformat/etc/format_templates/ENACExportfullconference.bft
@@ -1,10 +1,10 @@
 <name>Export detailed ENAC</name>
 <description>Detailed format for article, review</description>
 <div class="more">
 
 <BFE_EPFL_ICON link="yes" link_class="thumb advance-link" />
-<h3 class="infoscience_title"><BFE_TITLE prefix="" suffix=". " latex_to_html="no" link_to_fulltext="no"/></h3>
+<h3 class="infoscience_title"><BFE_TITLE prefix="" punctuation="." suffix=" " latex_to_html="no" link_to_fulltext="no"/></h3>
 <p class="infoscience_authors"><BFE_AUTHORS_DETAILED prefix="" suffix=". " print_links="no" author_class="infoscience_author" /></p>
 <p class="infoscience_host"><BFE_CONFERENCE separator=", " suffix=". "/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series" suffix="."/></p>
 <BFE_ABSTRACT prefix='<span class="toggler"><a class="label">Abstract preview</a></span><p class="infoscience_abstract" style="display:none">' suffix='</p>'  print_lang="en" />
 </div>
diff --git a/modules/bibformat/etc/format_templates/Exportdetailedconference.bft b/modules/bibformat/etc/format_templates/Exportdetailedconference.bft
index f0b95431c..b14e8bb1a 100644
--- a/modules/bibformat/etc/format_templates/Exportdetailedconference.bft
+++ b/modules/bibformat/etc/format_templates/Exportdetailedconference.bft
@@ -1,5 +1,5 @@
 <name>Export detailed - conferences</name>
 <description>Detailed format for conf, poster, talk</description>
-<h3 class="infoscience_title"><BFE_TITLE suffix=". " latex_to_html="no" link_to_fulltext="no"/></h3>
+<h3 class="infoscience_title"><BFE_TITLE punctuation=". " latex_to_html="no" link_to_fulltext="no"/></h3>
 <p class="infoscience_authors"><BFE_AUTHORS_DETAILED suffix=". "  print_links="no" author_class="infoscience_author" /></p>
 <p class="infoscience_host"><BFE_CONFERENCE separator=", " suffix="."/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series" suffix="." /></p>
\ No newline at end of file
diff --git a/modules/bibformat/etc/format_templates/ExportdetailedconferenceAU.bft b/modules/bibformat/etc/format_templates/ExportdetailedconferenceAU.bft
index 70fbb95e6..709ff8420 100644
--- a/modules/bibformat/etc/format_templates/ExportdetailedconferenceAU.bft
+++ b/modules/bibformat/etc/format_templates/ExportdetailedconferenceAU.bft
@@ -1,5 +1,5 @@
 <name>Export detailed - conferences, links on authors</name>
 <description>Detailed format for conf, poster, talk, with links on authors</description>
-<h3 class="infoscience_title"><BFE_TITLE suffix=". " latex_to_html="no" link_to_fulltext="no"/></h3>
+<h3 class="infoscience_title"><BFE_TITLE punctuation=". " latex_to_html="no" link_to_fulltext="no"/></h3>
 <p class="infoscience_authors"><BFE_AUTHORS_DETAILED suffix=". "  print_links="yes" author_class="infoscience_author" /></p>
 <p class="infoscience_host"><BFE_CONFERENCE separator=", " suffix="."/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series" suffix="." /></p>
\ No newline at end of file
diff --git a/modules/bibformat/etc/format_templates/ExportdetailedconferenceAUENAC.bft b/modules/bibformat/etc/format_templates/ExportdetailedconferenceAUENAC.bft
index 152594f1e..69149e18e 100644
--- a/modules/bibformat/etc/format_templates/ExportdetailedconferenceAUENAC.bft
+++ b/modules/bibformat/etc/format_templates/ExportdetailedconferenceAUENAC.bft
@@ -1,6 +1,6 @@
 <name>Export detailed ENAC - conferences, links on authors</name>
 <description>Detailed format for conf, poster, talk, with links on authors</description>
 <BFE_EPFL_ICON />
-<h3 class="infoscience_title"><BFE_TITLE suffix=". " latex_to_html="no" link_to_fulltext="no"/></h3>
+<h3 class="infoscience_title"><BFE_TITLE punctuation=". " latex_to_html="no" link_to_fulltext="no"/></h3>
 <p class="infoscience_authors"><BFE_AUTHORS_DETAILED suffix=". "  print_links="yes" author_class="infoscience_author" /></p>
 <p class="infoscience_host"><BFE_CONFERENCE separator=", " suffix="."/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series" suffix="." /></p>
\ No newline at end of file
diff --git a/modules/bibformat/etc/format_templates/ExportdetailedconferenceENAC.bft b/modules/bibformat/etc/format_templates/ExportdetailedconferenceENAC.bft
index 324860ab6..fb145989c 100644
--- a/modules/bibformat/etc/format_templates/ExportdetailedconferenceENAC.bft
+++ b/modules/bibformat/etc/format_templates/ExportdetailedconferenceENAC.bft
@@ -1,6 +1,6 @@
 <name>Export detailed - conferences</name>
 <description>Detailed format for conf, poster, talk</description>
 <BFE_EPFL_ICON />
-<h3 class="infoscience_title"><BFE_TITLE suffix=". " latex_to_html="no" link_to_fulltext="no"/></h3>
+<h3 class="infoscience_title"><BFE_TITLE punctuation=". " latex_to_html="no" link_to_fulltext="no"/></h3>
 <p class="infoscience_authors"><BFE_AUTHORS_DETAILED suffix=". "  print_links="no" author_class="infoscience_author" /></p>
 <p class="infoscience_host"><BFE_CONFERENCE separator=", " suffix="."/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series" suffix="." /></p>
\ No newline at end of file
diff --git a/modules/bibformat/etc/format_templates/ExportdetailedconferenceTI.bft b/modules/bibformat/etc/format_templates/ExportdetailedconferenceTI.bft
index 280f6a94c..33bfd919d 100644
--- a/modules/bibformat/etc/format_templates/ExportdetailedconferenceTI.bft
+++ b/modules/bibformat/etc/format_templates/ExportdetailedconferenceTI.bft
@@ -1,5 +1,5 @@
 <name>Export detailed - conferences, links on titles</name>
 <description>Detailed format for conf, poster, talk, with links on titles</description>
-<h3 class="infoscience_title"><BFE_TITLE suffix=". " latex_to_html="no" link_to_fulltext="yes"/></h3>
+<h3 class="infoscience_title"><BFE_TITLE punctuation=". " latex_to_html="no" link_to_fulltext="yes"/></h3>
 <p class="infoscience_authors"><BFE_AUTHORS_DETAILED suffix=". "  print_links="no" author_class="infoscience_author" /></p>
 <p class="infoscience_host"><BFE_CONFERENCE separator=", " suffix="."/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series" suffix="." /></p>
\ No newline at end of file
diff --git a/modules/bibformat/etc/format_templates/ExportdetailedconferenceTIAU.bft b/modules/bibformat/etc/format_templates/ExportdetailedconferenceTIAU.bft
index 2884f6a0c..42f9a9140 100644
--- a/modules/bibformat/etc/format_templates/ExportdetailedconferenceTIAU.bft
+++ b/modules/bibformat/etc/format_templates/ExportdetailedconferenceTIAU.bft
@@ -1,5 +1,5 @@
 <name>Export detailed - conferences, links on titles, authors</name>
 <description>Detailed format for conf, poster, talk, with links on titles, authors</description>
-<h3 class="infoscience_title"><BFE_TITLE suffix=". " latex_to_html="no" link_to_fulltext="yes"/></h3>
+<h3 class="infoscience_title"><BFE_TITLE punctuation=". " latex_to_html="no" link_to_fulltext="yes"/></h3>
 <p class="infoscience_authors"><BFE_AUTHORS_DETAILED suffix=". "  print_links="yes" author_class="infoscience_author" /></p>
 <p class="infoscience_host"><BFE_CONFERENCE separator=", " suffix="."/><BFE_SERIES_INTEXT suffix=', ' css_class="infoscience_series" suffix="." /></p>
\ No newline at end of file
diff --git a/modules/bibformat/etc/format_templates/ExportdetailedconferenceTIAUENAC.bft b/modules/bibformat/etc/format_templates/ExportdetailedconferenceTIAUENAC.bft
index 809be5178..c336a7cdd 100644
--- a/modules/bibformat/etc/format_templates/ExportdetailedconferenceTIAUENAC.bft
+++ b/modules/bibformat/etc/format_templates/ExportdetailedconferenceTIAUENAC.bft
@@ -1,6 +1,6 @@
 <name>Export detailed ENAC - conferences, links on titles, authors</name>
 <description>Detailed format for conf, poster, talk, with links on titles, authors</description>
 <BFE_EPFL_ICON />
-<h3 class="infoscience_title"><BFE_TITLE suffix=". " latex_to_html="no" link_to_fulltext="yes"/></h3>
+<h3 class="infoscience_title"><BFE_TITLE punctuation=". " latex_to_html="no" link_to_fulltext="yes"/></h3>
 <p class="infoscience_authors"><BFE_AUTHORS_DETAILED suffix=". "  print_links="yes" author_class="infoscience_author" /></p>
 <p class="infoscience_host"><BFE_CONFERENCE separator=", " suffix="."/><BFE_SERIES_INTEXT suffix=', ' css_class="infoscience_series" suffix="." /></p>
\ No newline at end of file
diff --git a/modules/bibformat/etc/format_templates/ExportdetailedconferenceTIENAC.bft b/modules/bibformat/etc/format_templates/ExportdetailedconferenceTIENAC.bft
index 625e90770..c4e865a06 100644
--- a/modules/bibformat/etc/format_templates/ExportdetailedconferenceTIENAC.bft
+++ b/modules/bibformat/etc/format_templates/ExportdetailedconferenceTIENAC.bft
@@ -1,6 +1,6 @@
 <name>Export detailed ENAC- conferences, links on titles</name>
 <description>Detailed format for conf, poster, talk, with links on titles</description>
 <BFE_EPFL_ICON />
-<h3 class="infoscience_title"><BFE_TITLE suffix=". " latex_to_html="no" link_to_fulltext="yes"/></h3>
+<h3 class="infoscience_title"><BFE_TITLE punctuation=". " latex_to_html="no" link_to_fulltext="yes"/></h3>
 <p class="infoscience_authors"><BFE_AUTHORS_DETAILED suffix=". "  print_links="no" author_class="infoscience_author" /></p>
 <p class="infoscience_host"><BFE_CONFERENCE separator=", " suffix="."/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series" suffix="." /></p>
\ No newline at end of file
diff --git a/modules/bibformat/etc/format_templates/Exportfullconference.bft b/modules/bibformat/etc/format_templates/Exportfullconference.bft
index 98188e7a0..51aeebc9e 100644
--- a/modules/bibformat/etc/format_templates/Exportfullconference.bft
+++ b/modules/bibformat/etc/format_templates/Exportfullconference.bft
@@ -1,6 +1,6 @@
 <name>Export full - conferences</name>
 <description>Full format for conf, poster, talk</description>
-<h3 class="infoscience_title"><BFE_TITLE suffix=". " latex_to_html="no" link_to_fulltext="no"/></h3>
+<h3 class="infoscience_title"><BFE_TITLE punctuation=". " latex_to_html="no" link_to_fulltext="no"/></h3>
 <p class="infoscience_authors"><BFE_AUTHORS_DETAILED suffix=". "  print_links="no" author_class="infoscience_author" /></p>
 <p class="infoscience_host"><BFE_CONFERENCE separator=", " suffix=". "/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series" suffix="."/></p>
 <BFE_ABSTRACT_EXPORT prefix='<p class="infoscience_abstract">' suffix='</p>' />
\ No newline at end of file
diff --git a/modules/bibformat/etc/format_templates/ExportfullconferenceAU.bft b/modules/bibformat/etc/format_templates/ExportfullconferenceAU.bft
index d247f2508..44019364e 100644
--- a/modules/bibformat/etc/format_templates/ExportfullconferenceAU.bft
+++ b/modules/bibformat/etc/format_templates/ExportfullconferenceAU.bft
@@ -1,6 +1,6 @@
 <name>Export full - conferences, links on authors</name>
 <description>Full format for conf, poster, talk, with links on authors</description>
-<h3 class="infoscience_title"><BFE_TITLE suffix=". " latex_to_html="no" link_to_fulltext="no"/></h3>
+<h3 class="infoscience_title"><BFE_TITLE punctuation=". " latex_to_html="no" link_to_fulltext="no"/></h3>
 <p class="infoscience_authors"><BFE_AUTHORS_DETAILED suffix=". "  print_links="yes" author_class="infoscience_author" /></p>
 <p class="infoscience_host"><BFE_CONFERENCE separator=", " suffix=". " /><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series" suffix="."/></p>
 <BFE_ABSTRACT_EXPORT prefix='<p class="infoscience_abstract">' suffix='</p>' />
\ No newline at end of file
diff --git a/modules/bibformat/etc/format_templates/ExportfullconferenceTI.bft b/modules/bibformat/etc/format_templates/ExportfullconferenceTI.bft
index 9a02f16b6..b5a1e1ea5 100644
--- a/modules/bibformat/etc/format_templates/ExportfullconferenceTI.bft
+++ b/modules/bibformat/etc/format_templates/ExportfullconferenceTI.bft
@@ -1,6 +1,6 @@
 <name>Export full - conferences, links on titles</name>
 <description>Full format for conf, poster, talk, with links on titles</description>
-<h3 class="infoscience_title"><BFE_TITLE suffix=". " latex_to_html="no" link_to_fulltext="yes"/></h3>
+<h3 class="infoscience_title"><BFE_TITLE punctuation=". " latex_to_html="no" link_to_fulltext="yes"/></h3>
 <p class="infoscience_authors"><BFE_AUTHORS_DETAILED suffix=". "  print_links="no" author_class="infoscience_author" /></p>
 <p class="infoscience_host"><BFE_CONFERENCE separator=", " suffix=". " /><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series" suffix="."/></p>
 <BFE_ABSTRACT_EXPORT prefix='<p class="infoscience_abstract">' suffix='</p>' />
\ No newline at end of file
diff --git a/modules/bibformat/etc/format_templates/ExportfullconferenceTIAU.bft b/modules/bibformat/etc/format_templates/ExportfullconferenceTIAU.bft
index 8a610db66..7f4533e02 100644
--- a/modules/bibformat/etc/format_templates/ExportfullconferenceTIAU.bft
+++ b/modules/bibformat/etc/format_templates/ExportfullconferenceTIAU.bft
@@ -1,6 +1,6 @@
 <name>Export full - conferences, links on titles, authors</name>
 <description>Full format for conf, poster, talk, with links on titles, authors</description>
-<h3 class="infoscience_title"><BFE_TITLE suffix=". " latex_to_html="no" link_to_fulltext="yes"/></h3>
+<h3 class="infoscience_title"><BFE_TITLE punctuation=". " latex_to_html="no" link_to_fulltext="yes"/></h3>
 <p class="infoscience_authors"><BFE_AUTHORS_DETAILED suffix=". "  print_links="yes" author_class="infoscience_author" /></p>
 <p class="infoscience_host"><BFE_CONFERENCE separator=", " suffix=". " /><BFE_SERIES_INTEXT suffix=', ' css_class="infoscience_series" suffix="."/></p>
 <BFE_ABSTRACT_EXPORT prefix='<p class="infoscience_abstract">' suffix='</p>' />
\ No newline at end of file
diff --git a/modules/bibformat/etc/format_templates/Exportshortconference.bft b/modules/bibformat/etc/format_templates/Exportshortconference.bft
index af2577ad5..d7eee67a5 100644
--- a/modules/bibformat/etc/format_templates/Exportshortconference.bft
+++ b/modules/bibformat/etc/format_templates/Exportshortconference.bft
@@ -1,3 +1,3 @@
 <name>Export short - conference</name>
 <description>Short format for conference, poster, proccedings, talk</description>
-<BFE_AUTHORS_SHORT prefix='<span class="infoscience_authors">' suffix="</span>. " print_links="no" /><BFE_TITLE prefix='<span class="infoscience_title">' suffix="</span>. " latex_to_html="no" link_to_fulltext="no"/><BFE_CONFERENCE prefix='<span class="infoscience_conference">' suffix="</span>" separator=", " year="no"/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series"/><BFE_YEAR prefix=", " suffix="." default="."/>
\ No newline at end of file
+<BFE_AUTHORS_SHORT prefix='<span class="infoscience_authors">' suffix="</span>. " print_links="no" /><BFE_TITLE prefix='<span class="infoscience_title">' punctuation=". " suffix="</span>" latex_to_html="no" link_to_fulltext="no"/><BFE_CONFERENCE prefix='<span class="infoscience_conference">' suffix="</span>" separator=", " year="no"/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series"/><BFE_YEAR prefix=", " suffix="." default="."/>
diff --git a/modules/bibformat/etc/format_templates/ExportshortconferenceAU.bft b/modules/bibformat/etc/format_templates/ExportshortconferenceAU.bft
index 087e6bc9a..fbb1a0a3d 100644
--- a/modules/bibformat/etc/format_templates/ExportshortconferenceAU.bft
+++ b/modules/bibformat/etc/format_templates/ExportshortconferenceAU.bft
@@ -1,3 +1,3 @@
 <name>Export short - conference, link on authors</name>
 <description>Short format for conference, poster, proccedings, talk, which puts links to fulltexts on authors</description>
-<BFE_AUTHORS_SHORT prefix='<span class="infoscience_authors">' suffix="</span>. "  print_links="yes" /><BFE_TITLE prefix='<span class="infoscience_title">' suffix="</span>. " latex_to_html="no" link_to_fulltext="no"/><BFE_CONFERENCE prefix='<span class="infoscience_conference">' suffix="</span>" separator=", "  year="no"/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series"/><BFE_YEAR prefix=", " suffix="." default="."/>    
\ No newline at end of file
+<BFE_AUTHORS_SHORT prefix='<span class="infoscience_authors">' suffix="</span>. "  print_links="yes" /><BFE_TITLE prefix='<span class="infoscience_title">' punctuation=". " suffix="</span>" latex_to_html="no" link_to_fulltext="no"/><BFE_CONFERENCE prefix='<span class="infoscience_conference">' suffix="</span>" separator=", "  year="no"/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series"/><BFE_YEAR prefix=", " suffix="." default="."/>    
diff --git a/modules/bibformat/etc/format_templates/ExportshortconferenceTI.bft b/modules/bibformat/etc/format_templates/ExportshortconferenceTI.bft
index 21f80551e..feca19d62 100644
--- a/modules/bibformat/etc/format_templates/ExportshortconferenceTI.bft
+++ b/modules/bibformat/etc/format_templates/ExportshortconferenceTI.bft
@@ -1,3 +1,3 @@
 <name>Export short - conference, link on titles</name>
 <description>Short format for conference, poster, proccedings, talk, which puts links to fulltexts on titles</description>
-<BFE_AUTHORS_SHORT prefix='<span class="infoscience_authors">' suffix="</span>. "  print_links="no" /><BFE_TITLE prefix='<span class="infoscience_title">' suffix="</span>. " latex_to_html="no" link_to_fulltext="yes"/><BFE_CONFERENCE prefix='<span class="infoscience_conference">' suffix="</span>" separator=", "  year="no"/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series"/><BFE_YEAR prefix=", " suffix="." default="."/>
\ No newline at end of file
+<BFE_AUTHORS_SHORT prefix='<span class="infoscience_authors">' suffix="</span>. "  print_links="no" /><BFE_TITLE prefix='<span class="infoscience_title">' punctuation=". " suffix="</span>" latex_to_html="no" link_to_fulltext="yes"/><BFE_CONFERENCE prefix='<span class="infoscience_conference">' suffix="</span>" separator=", "  year="no"/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series"/><BFE_YEAR prefix=", " suffix="." default="."/>
diff --git a/modules/bibformat/etc/format_templates/ExportshortconferenceTIAU.bft b/modules/bibformat/etc/format_templates/ExportshortconferenceTIAU.bft
index eab9c439e..5eb48bee6 100644
--- a/modules/bibformat/etc/format_templates/ExportshortconferenceTIAU.bft
+++ b/modules/bibformat/etc/format_templates/ExportshortconferenceTIAU.bft
@@ -1,3 +1,3 @@
 <name>Export short - conference, link on titles, authors</name>
 <description>Short format for conference, poster, proccedings, talk, which puts links to fulltexts on titles, authors</description>
-<BFE_AUTHORS_SHORT prefix='<span class="infoscience_authors">' suffix="</span>. "  print_links="yes" /><BFE_TITLE prefix='<span class="infoscience_title">' suffix="</span>. " latex_to_html="no" link_to_fulltext="yes"/><BFE_CONFERENCE prefix='<span class="infoscience_conference">' suffix="</span>" separator=", " year="no"/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series"/><BFE_YEAR prefix=", " suffix="." default="."/>    
\ No newline at end of file
+<BFE_AUTHORS_SHORT prefix='<span class="infoscience_authors">' suffix="</span>. "  print_links="yes" /><BFE_TITLE prefix='<span class="infoscience_title">' punctuation=". " suffix="</span>" latex_to_html="no" link_to_fulltext="yes"/><BFE_CONFERENCE prefix='<span class="infoscience_conference">' suffix="</span>" separator=", " year="no"/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series"/><BFE_YEAR prefix=", " suffix="." default="."/>    
diff --git a/modules/bibformat/etc/format_templates/HB_conf.bft b/modules/bibformat/etc/format_templates/HB_conf.bft
index a2a311ab5..70439c6cd 100644
--- a/modules/bibformat/etc/format_templates/HB_conf.bft
+++ b/modules/bibformat/etc/format_templates/HB_conf.bft
@@ -1,4 +1,4 @@
 <name>EPFL HTML brief - conference</name>
 <description>Brief format for conference, poster, proccedings, talk</description>
-<div class="record_data"><BFE_AUTHORS_SHORT prefix='<span class="infoscience_authors">' suffix="</span> " punctuation="."  print_links="no" /><BFE_TITLE prefix='<span class="infoscience_title">' suffix=",</span> " latex_to_html="yes"><BFE_CONFERENCE prefix='<span class="infoscience_conference">' suffix=".</span> " separator=", "/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series" suffix=". "/></div>
-<span class="infoscience_links"><BFE_BRIEF_LINKS /></span>
\ No newline at end of file
+<div class="record_data"><BFE_AUTHORS_SHORT prefix='<span class="infoscience_authors">' suffix=".</span> "  print_links="no" /><BFE_TITLE prefix='<span class="infoscience_title">' suffix="</span> "  punctuation="." latex_to_html="yes"><BFE_CONFERENCE prefix='<span class="infoscience_conference">' suffix=".</span> " separator=", "/><BFE_SERIES_INTEXT prefix=', ' css_class="infoscience_series" suffix=". "/></div>
+<span class="infoscience_links"><BFE_BRIEF_LINKS /></span>
diff --git a/modules/bibformat/etc/format_templates/HD_EPFL_default.bft b/modules/bibformat/etc/format_templates/HD_EPFL_default.bft
index cfc3d9638..ec1a0ae88 100644
--- a/modules/bibformat/etc/format_templates/HD_EPFL_default.bft
+++ b/modules/bibformat/etc/format_templates/HD_EPFL_default.bft
@@ -1,92 +1,92 @@
 <name>EPFL HTML detailed - default</name>
 <description>Detailed format for article, review</description>
         <div id="tools">
           <!--<div class="button copy" stye="display: none;">
             <a href="/search?ln=<lang><en>en</en><fr>fr</fr></lang>&amp;p=recid%3A<BFE_RECID />&amp;rm=wrd">
               <button class="icon"></button>
               <span class="label"><lang><en>Similar records</en><fr>Notices similaires</fr></lang></span>
             </a>
           </div>-->
           
           <div class="button file" style="display: none">
             <div id="tooltip_trigger">
               <a href="" id="convert_records">
                 <button class="icon"></button>
                 <span class="label"><lang><en>Export</en><fr>Exporter</fr></span>
               </a>
             </div>
             <div class="tooltip bottom">
               <ul id="convert_formats">
                 <li><a href="/curator/convert/bibtex">BibTeX</a></li>
                 <li><a href="/curator/convert/dublincore">Dublin Core XML</a></li>
                 <li><a href="/curator/convert/ris">RIS (RefMan, EndNote)</a></li>
                 <li><a href="/curator/convert/marcxml">MARC XML</a></li>
               </ul>
             </div>
             <div class="clear"></div>
             <form id="infoscience-searchform" action="/curator/convert/marcxml" style="display: none">
               <input type="hidden" name="p" value="recid:<BFE_RECORD_ID />" />
               <input type="hidden" name="filename" value="<BFE_FIELD tag='037__a' />" />
             </form>
           </div>
           
         </div>
         <div id="content" class="content">
           <div class="left-col">
             <div class="doctype local-color"><BFE_DOCTYPE /></div>
             <BFE_EPFL_ICON />
           </div>
           <div class="record-container" id="record-container-<BFE_RECORD_ID />">
             <h1 class="h2"><BFE_TITLE prefix='' suffix="" latex_to_html="yes" /></h1>
             <div class="authors"><BFE_AUTHORS print_links="yes" limit="10" interactive="yes" extension="et al." separator="; "/></div>
             <ul class="record-metadata">
               <BFE_CONFERENCE prefix='<li><span class="field-label"><lang><en>Presented at:</en><fr>Présenté à:</fr></lang></span> ' suffix="</li>"/>
               <BFE_HOST prefix="<li>" display_label="yes" display_identifiers="yes" label_with_span="yes" />
               <BFE_SERIES_INTEXT prefix='<li><span class="field-label"><lang><en>Series:</en><fr>Série:</fr></lang></span> ' suffix="</li>" />
               <BFE_PATENT prefix='<li><span class="field-label"><lang><en>Patent number:</en><fr>Numéro de brevet:</fr></lang></span> ' suffix="</li>"/>
               <BFE_IMPRINT prefix='<li>' suffix="</li>" />
 
             </ul>
             <BFE_ABSTRACT prefix="<p>" suffix="</p>" latex_to_html="yes"  print_lang="en" />
             
             <BFE_KEYWORDS prefix='<p><span class="field-label"><lang><en>Keywords:</en><fr>Mots-clefs:</fr></lang></span> ' suffix="</p>" keyword_prefix="" keyword_suffix="" />
             <BFE_THESIS_INFO />
             <BFE_DEFENSE prefix='<p><lang><en>Public defense:</en><fr>Soutenance:</fr></lang> ' suffix="</p>" />
 
             <BFE_AWARD prefix='<p>' suffix="</p>" />
             <BFE_NOTE prefix='<p><span class="field-label">Note:</span> ' suffix="</p>" />
             
             <h4><lang><en>Reference</en><fr>Référence</fr></lang></h4>
             <ul>
               <BFE_REFERENCES />
             </ul>
             <BFE_EPFL_FULLTEXT style="url_list" display_fulltext="no" display_url="yes" display_replacement_text="no" />
             
             <p class="notice_date"><BFE_UPDATED_DATE /></p>
             <BFE_EDIT_RECORD />
           </div>
         </div>
         <div class="right-col">
           <div class="box overhead">
             <h3><lang><en>Fulltext</en><fr>Fulltext</fr></lang></h3>
             <BFE_EPFL_FULLTEXT style="fulltext_list" />
           </div>
            <div class="box">
-            <h3><lang><en>Related material</en><fr>Documents pertinents</fr></lang></h3>
+            <h3><lang><en>Related material</en><fr>Documents pertinents</fr></lang><a href="http://ellearn.com/?id=<BFE_RECORD_ID />&type=pub&source=EPFL" target="_new"><span style="float: right; width:30px;height:30px"></span></a></h3>
             <ul class="link-list" style="margin-bottom: 20px;">
               <li><a href="/search?ln=<lang><en>en</en><fr>fr</fr></lang>&amp;p=recid%3A<BFE_RECID />&amp;rm=wrd">
                   <lang><en>Similar EPFL publications</en><fr>Publications EPFL similaires</fr></lang></span></a>
               </li>
               <!--<li><img src="/media/img/logothem.png" style="vertical-align:-5px; margin-top:5px;" /> <a href="http://ellearn.com/?id=<BFE_RECORD_ID />&type=pub&source=EPFL" target="_new"> <lang><en>Similar courses, documents and services</en><fr>Cours, documents et services similaires</fr></lang></a>
             -->
             </ul>
           </div>
 
           <div class="box">
             <h3><lang><en>Contacts</en><fr>Contacts</fr></lang></h3>
             <ul class="link-list" style="margin-bottom: 20px;"><BFE_CONTACT_LAB kb_name="lab_name" kb_url="lab_url" /></ul>
             <BFE_CONTACT_AUTHORS prefix='<h4><lang><en>EPFL authors</en><fr>Auteurs EPFL</fr></lang></h4><ul class="link-list">' suffix='</ul>'  />
           </div>
         </div>
         <div class="clear"></div>
 
diff --git a/modules/bibformat/lib/elements/bfe_title.py b/modules/bibformat/lib/elements/bfe_title.py
index 839edd6b9..8365fdbf6 100644
--- a/modules/bibformat/lib/elements/bfe_title.py
+++ b/modules/bibformat/lib/elements/bfe_title.py
@@ -1,115 +1,115 @@
 """BibFormat element - Prints titles
 """
 import cgi
 
 from invenio import bibformat_utils
 from invenio.bibdocfile import BibRecDocs
 from invenio.config import CFG_SITE_URL
 
 def add_link_to_fulltext(bfo, text):
     """
     Creates a link to fulltext on given text. 
     """
     documents = BibRecDocs(bfo.recID)
     
     # assert we have some files
     if documents and len(documents.bibdocs) == 0:
         return text
     
     # check visibility
     visible_list = []
     
     for doc in documents.bibdocs:
         files = doc.list_latest_files()
         if len(files):
             #try:
             fulltext = files[0]
             if fulltext.status in  ['', 'PUBLIC']:
                 visible_list.append(fulltext)
             #except IndexError:
             #    return        
             
     # build url
     if len(visible_list) == 0:
         return text
     elif len(visible_list) == 1:
         #only one, return a direct url to the last version
         return '<a href ="%s">%s</a>' % (visible_list[0].fullurl, text)
     else:
         return '<a href ="%s/record/%s/files">%s</a>' % (CFG_SITE_URL, bfo.recID, text)
 
 def format_element(bfo, separator=" ", highlight='no', latex_to_html='no', link_to_fulltext='no', punctuation = ''):
     """
     Prints the titles of a record.
 
     @param separator: separator between the different titles
     @param highlight: highlights the words corresponding to search query if set to 'yes'
     @param latex_to_html: if 'yes', interpret as LaTeX title
     @param link_to_fulltext: if 'yes', link title to fulltext if available.
     @param punctuation: add this char if the title don't already end with one
     """
     titles = []
 
     title = bfo.field('245__a')
     title_remainder = bfo.field('245__b')
     edition_statement = bfo.field('250__a')
     title_tome = bfo.field('245__n')
     title_part = bfo.field('245__p')
     
     #start with standard number if given
     standard_number = bfo.field('740__a')
     
     if len(standard_number) > 0:
         standard_number += ' - '
         titles.append(standard_number)
 
     if len(title) > 0:
         if title_remainder:
             title += ': ' + title_remainder
         if len(title_tome) > 0:
             title += ", " + title_tome
         if len(title_part) > 0:
             title += ": " + title_part
         titles.append( title )
 
     title = bfo.field('246__a')
     if len(title) > 0:
         titles.append( title )
 
     title = bfo.field('246__b')
     if len(title) > 0:
         titles.append( title )
 
     title = bfo.field('246_1a')
     if len(title) > 0:
         titles.append( title )
 
     titles = [cgi.escape(x) for x in titles]
 
     if highlight == 'yes':
         titles = [bibformat_utils.highlight(x, bfo.search_pattern) for x in titles]
     
     if len(edition_statement) > 0:
         out = separator.join(titles) + "; " + edition_statement
     else:
         out = separator.join(titles)
     
     if latex_to_html == 'yes':
         out = bibformat_utils.latex_to_html(out)
     
     if link_to_fulltext == 'yes':
         out = add_link_to_fulltext(bfo, out) 
         
     # add a , at the  end if not already
     if out and punctuation:
         if out[-1] not in [',', '.', '!', '?', ';']:
-            out.append(punctuation)
+            out += punctuation
     
     return out
 
 def escape_values(bfo):
     """
     Called by BibFormat in order to check if output of this element
     should be escaped.
     """
-    return 0
\ No newline at end of file
+    return 0