Fix: global issue with the 2023 Q2 release (#380)

* make the recomender and annotator text bigger and have a place holder * update fair score label from N/A score to Not yet supported * remove organization name from the widgets tab title * extract the metadata help link to the settings file * remove notes tabs title * remove the subscribe button to the notes tab * add space to instance details title before the two points * fix the display of concepts if skos and classes if owl * add UM logo for support logos in home page * fix support images width in the home page
ontoportal-lirmm · Nov 8, 2023 · ccba40c · ccba40c
1 parent c1a1d4b
commit ccba40c
Show file tree

Hide file tree

Showing 12 changed files with 18 additions and 16 deletions.
diff --git a/app/assets/images/logos/collaboration/um_logo.png b/app/assets/images/logos/collaboration/um_logo.png
diff --git a/app/assets/stylesheets/home.scss b/app/assets/stylesheets/home.scss
@@ -237,7 +237,7 @@ i.fa.fa-caret-square-o-down {
 
 
 .home-recommendations-and-annotations{
-  font-size: 16px;
+  font-size: 20px;
   outline: none;
   padding: 20px;
   width: 100%;
@@ -364,6 +364,11 @@ i.fa.fa-caret-square-o-down {
   display: flex;
   justify-content: center;
   flex-wrap: wrap;
+  img{
+    object-fit: scale-down;
+    width: 100px;
+    height: 100px;
+  }
 
 }
 .home-support-items  > *:not(:first-child){

diff --git a/app/helpers/ontologies_helper.rb b/app/helpers/ontologies_helper.rb
@@ -304,9 +304,9 @@ def sections_to_show
     sections = ['summary']
 
     unless @ontology.summaryOnly || @submission_latest.nil?
-      sections += %w[classes properties notes mappings]
-      sections += %w[schemes collections] if skos?
-      sections += %w[instances] unless skos?
+      sections += %w[properties notes mappings]
+      sections += %w[schemes collections concepts] if skos?
+      sections += %w[instances classes] unless skos?
       sections += %w[widgets]
     end
     sections

diff --git a/app/helpers/schemes_helper.rb b/app/helpers/schemes_helper.rb
@@ -44,8 +44,8 @@ def concept_label_to_show(submission: @submission_latest)
 
   def section_name(section)
     section = concept_label_to_show(submission: @submission_latest || @submission) if section.eql?('classes')
-
-    t("ontology_details.sections.#{section}")
+    section
+    #t("ontology_details.sections.#{section}" , section)
   end
 
   def scheme_path(scheme_id = '', language = '')

diff --git a/app/helpers/submissions_helper.rb b/app/helpers/submissions_helper.rb
@@ -5,7 +5,7 @@ def metadata_help_link
           content_tag(:div, 'Please fill in basic general information about your ontology.') +
           content_tag(:span, 'AgroPortal will automatically extract metadata properties declared for the owl:Ontology object in the source file, ') +
           content_tag(:span, style: 'width: 10px; height: 10px') do
-            link_to(render(ExternalLinkTextComponent.new(text: 'see guidelines and recommendations for metadata here:')), "https://github.com/agroportal/documentation/wiki/Ontology-metadata", target: "_blank")
+            link_to(render(ExternalLinkTextComponent.new(text: 'see guidelines and recommendations for metadata here:')), Rails.configuration.settings.links[:metadata_help], target: "_blank")
           end
       end
 

diff --git a/app/javascript/mixins/useFairScore.js b/app/javascript/mixins/useFairScore.js
@@ -253,7 +253,7 @@ class FairScorePrincipleBar extends  FairScoreChart{
                 pointBackgroundColor: 'rgba(251, 192, 45, 1)'
             },
             {
-                label: 'N/A score',
+                label: 'Not yet supported',
                 data: na,
                 fill: true,
                 backgroundColor: 'rgba(176, 190, 197, 0.2)',
@@ -597,7 +597,7 @@ class FairScoreCriteriaBar extends  FairScoreChart{
                 pointBackgroundColor: 'rgba(251, 192, 45, 1)',
             },
             {
-                label: 'N/A score',
+                label: 'Not yet supported',
                 data: na,
                 fill: true,
                 backgroundColor: 'rgba(176, 190, 197, 0.2)',

diff --git a/app/views/instances/_instance_details.html.haml b/app/views/instances/_instance_details.html.haml
@@ -2,7 +2,7 @@
   - ontology_acronym = params[:ontology_id]
   - filter_properties = ["http://www.w3.org/1999/02/22-rdf-syntax-ns#type"]
   %h4
-    Details of  #{link_to_instance(@instance,ontology_acronym)} of type : #{@instance.types.map {|cls| link_to_class(ontology_acronym,cls)}.join(', ').html_safe}
+    Details of  #{link_to_instance(@instance,ontology_acronym)} of type: #{@instance.types.map {|cls| link_to_class(ontology_acronym,cls)}.join(', ').html_safe}
   %table.zebra{style:'width: 80vw'}
     %thead
       %tr

diff --git a/app/views/layouts/_ontology_viewer.html.haml b/app/views/layouts/_ontology_viewer.html.haml
@@ -50,7 +50,7 @@
       %div.ontologies-tabs-container{data:{action: 'tab-selected->ontology-viewer-tabs#updateLanguageSelector'}}
         = render TabsContainerComponent.new(id: 'ontology_viewer', url_parameter: 'p') do |t|
           - sections.each do |section_title|
-            - t.item(title: section_title,
+            - t.item(title: section_name(section_title),
                      path: ontology_path(@ontology.acronym, p: section_title),
                      selected: selected_section?(section_title),
                      page_name: ontology_viewer_page_name(@ontology.name, @concept&.prefLabel || '', section_title))

diff --git a/app/views/notes/_notes.html.haml b/app/views/notes/_notes.html.haml
@@ -6,9 +6,6 @@
       = add_comment_button(parent_id, parent_type)
     .add_proposal.mx-1
       = add_proposal_button(parent_id, parent_type)
-    .subscribe_to_notes.mx-1
-      = subscribe_button(@ontology.id)
-
   %div.ont_notes_filter.my-1.d-flex.justify-content-end.align-items-baseline
     Filter:
     %input#hide_archived_ont.mx-1{:checked => "true", :name => "hide_archived_ont", :type => "checkbox"}

diff --git a/app/views/ontologies/sections/_notes.html.haml b/app/views/ontologies/sections/_notes.html.haml
@@ -1,4 +1,3 @@
 = turbo_frame_tag 'notes' do
   %div#notes_content{style:"margin: 1em 0"}
-    %h2{style:"margin-bottom: -0.5em; font-size: x-large; padding: .5em .5em 0; float: left;"} Notes
     = render :partial => 'notes/ontology_list'
diff --git a/app/views/ontologies/sections/_widgets.html.haml b/app/views/ontologies/sections/_widgets.html.haml
@@ -8,7 +8,7 @@
         Widgets are only available for ontologies stored in #{$SITE}.
   - else
     #widgets_content
-      %h5.pb-3 Add #{$ORG} Web Widgets to your site for #{@ontology.acronym}
+      %h5.pb-3 Add #{portal_name} Web Widgets to your site for #{@ontology.acronym}
       %table#widget_table{width: "100%"}
         %tr
           %th

diff --git a/config/settings.yml b/config/settings.yml
@@ -21,6 +21,7 @@ shared:
     widgets: 'http://www.bioontology.org/wiki/NCBO_Widgets'
     wiki: 'https://www.bioontology.org/wiki/'
     mappings: 'https://www.bioontology.org/wiki/BioPortal_Help#Mappings_Tab'
+    metadata_help: 'https://doc.jonquetlab.lirmm.fr/share/32c082ff-97f5-45f4-bafe-05f41c9a5ce4'
 
 development:
   links: