diff --git a/app/assets/stylesheets/dmpopidor.scss b/app/assets/stylesheets/dmpopidor.scss index d7d2bc3..bcbded6 100644 --- a/app/assets/stylesheets/dmpopidor.scss +++ b/app/assets/stylesheets/dmpopidor.scss @@ -749,13 +749,15 @@ border: 0.5px groove $color-border-light; box-shadow: 0px 0px 0px 0px $color-shadow-dark; - .research-output-names { + .research-output-value { display: flex; - .research-output-fullname { - flex: 8; + strong { + flex: 2; + text-align: right; } - .research-output-abbreviation { - flex: 3; + span { + padding-left: 20px; + flex: 8; } } } diff --git a/app/views/branded/plans/_show_research_outputs.html.erb b/app/views/branded/plans/_show_research_outputs.html.erb index 8c2aa0a..b21e360 100644 --- a/app/views/branded/plans/_show_research_outputs.html.erb +++ b/app/views/branded/plans/_show_research_outputs.html.erb @@ -4,28 +4,28 @@ <% @research_outputs.each do |research_output|%> <% other_type_displayed = research_output.research_output_type && research_output.research_output_type.is_other ? '' : 'display:none;' %>
-
-
- <%= d_('dmpopidor', 'Abbreviated Name') %> - <%= research_output.abbreviation ? research_output.abbreviation : _('None') %> -
-
+
+ <%= d_('dmpopidor', 'Abbreviated Name') %> + <%= research_output.abbreviation ? research_output.abbreviation : _('None') %> +
+
<%= d_('dmpopidor', 'Fullname') %> <%= research_output.fullname ? research_output.fullname : _('None') %> -
-
- <%= d_('dmpopidor', 'Type') %> - - - +
+ + <%= d_('dmpopidor', 'Type') %> + + + + <%= research_output.research_output_type ? research_output.research_output_type.label : _('None') %>
-
+
<%= d_('dmpopidor', 'Other Type') %> <%= research_output.other_type_label %>
-
+
<%= d_('dmpopidor', 'Persistent Identifier') %> <%= research_output.pid ? research_output.pid : _('None') %>
diff --git a/config/locale/dmpopidor.pot b/config/locale/dmpopidor.pot index 5fd51fb..36d0de9 100644 --- a/config/locale/dmpopidor.pot +++ b/config/locale/dmpopidor.pot @@ -276,6 +276,9 @@ msgid "Abbreviated Name (20 chars max.)" msgstr "" +msgid "Abbreviated Name" +msgstr "" + msgid "Fullname" msgstr "" diff --git a/config/locale/en_GB/dmpopidor.po b/config/locale/en_GB/dmpopidor.po index 036b05c..ed1e7f0 100644 --- a/config/locale/en_GB/dmpopidor.po +++ b/config/locale/en_GB/dmpopidor.po @@ -272,6 +272,9 @@ msgid "Abbreviated Name (20 chars max.)" msgstr "Abbreviated Name (20 chars max.)" +msgid "Abbreviated Name" +msgstr "Abbreviated Name" + msgid "Fullname" msgstr "Fullname" diff --git a/config/locale/fr_FR/dmpopidor.po b/config/locale/fr_FR/dmpopidor.po index 8011a3b..e81bd70 100644 --- a/config/locale/fr_FR/dmpopidor.po +++ b/config/locale/fr_FR/dmpopidor.po @@ -272,6 +272,9 @@ msgid "Abbreviated Name (20 chars max.)" msgstr "Nom abbrégé (20 caractères max.)" +msgid "Abbreviated Name" +msgstr "Nom abbrégé" + msgid "Fullname" msgstr "Nom complet"