Polish the template for article.

models/db_widgets.py

@@ -90,6 +90,11 @@ formModifier.merge_fields('conference_title',
                           title=T('Conference'),
                           flex=1)
 
+formModifier.merge_fields('report_numbers', 
+                          'id_reports',
+                          dbui.Spacer(height=220),
+                          title=T('Report'),
+                          flex=1)
 
 formModifier.merge_fields('authors_cppm',
                           'id_teams',
@@ -99,11 +104,6 @@ formModifier.merge_fields('authors_cppm',
                           title='CPPM',
                           flex=1)
 
-formModifier.merge_fields('report_numbers', 
-                          'id_reports',
-                          dbui.Spacer(height=220),
-                          title=T('Report'),
-                          flex=1)
 
 #
 # Organize fieldSet within a TabPanel embedded in the publication form
@@ -129,14 +129,13 @@ formModifier.configure(buttonAlign='right',
 tpl = ['<b>{PublicationsTitle}</b><br>',
        '{PublicationsAuthors}',
        '<tpl if="PublicationsId_collaborations  &gt; 1">, {CollaborationsCollaboration}</tpl>',
-       '<tpl if="PublicationsDoi"><br>{PublicationsDoi}</tpl>',
-       '<tpl if="PublicationsId_publishers  &gt; 1"><br>{PublishersAbbreviation}',
+       '<tpl if="PublicationsDoi">, {PublicationsDoi}</tpl>',
+       '<tpl if="PublicationsId_publishers  &gt; 1">, {PublishersAbbreviation}',
            '<tpl if="PublicationsVolume"> {PublicationsVolume}</tpl>',
            '<tpl if="PublicationsYear"> ({PublicationsYear}) </tpl>',
            '<tpl if="PublicationsFirst_page"> {PublicationsFirst_page}</tpl>',
            '<tpl if="PublicationsLast_page">-{PublicationsLast_page}</tpl>',
        '</tpl>',
-       '<tpl if="PublicationsE_print"><br>{PublicationsE_print}</tpl>',
        '<tpl if="PublicationsConference_title"><br><br>{PublicationsConference_title}',
            '<tpl if="PublicationsConference_town"><br>{PublicationsConference_town}</tpl>',
            '<tpl if="CountriesCountry">, {CountriesCountry}</tpl>',
@@ -148,8 +147,7 @@ tpl = ['<b>{PublicationsTitle}</b><br>',
        '<tpl if="PublicationsReport_numbers"><br><br>',
            '<tpl if="PublicationsId_reports &gt; 1">{ReportsType}, </tpl>',
            '{PublicationsReport_numbers}',
-       '</tpl>',
-       '<br>Auteurs CPPM : {PublicationsAuthors_cppm}'
+       '</tpl>'
        ]
 
 gridModifier = dbui.GridModifier('publications')
@@ -161,7 +159,6 @@ gridModifier.merge_columns('title',
                            'volume',
                            'first_page',
                            'last_page',
-                           'e_print',
                            'conference_title',
                            'conference_url',
                            'conference_start',
@@ -171,13 +168,14 @@ gridModifier.merge_columns('title',
                            'conference_speaker',
                            'report_numbers',
                            'id_reports',
-                           'authors_cppm',
                            autohide=True,
                            header=T('Publication'),
                            position=0,
                            tpl=tpl,
                            width=700)
 
+gridModifier.hide_columns('authors_cppm',
+                          'e_print')
 #
 # Setup a filter panel for the publication grid
 #