Merge pull request #340 from ontoportal/master

Feature: Align Bioportal and AgroPortal - part 2.2 and 3

.env.sample

@@ -8,7 +8,7 @@ UI_URL=http://localhost:3000
 API_URL=http://localhost:9393
 API_KEY=
 
-UI_THEME=ontoportal
+UI_THEME=bioportal
 
 BIOMIXER_URL=
 BIOMIXER_APIKEY=

app/assets/config/manifest.js

@@ -4,5 +4,7 @@
 //= link bp_annotator.js
 //= link bp_annotatorplus.js
 //= link vendor.js
+//= link_tree ../images
+//= link_directory ../javascripts .js
 //= link_directory ../stylesheets .css
 //= link application-esbuild.js

app/assets/javascripts/application.js

@@ -12,17 +12,13 @@
 //
 //= require bioportal
 //= require admin/licenses
-//= require bp_class_tree
 //= require bp_ajax_controller
-//= require bp_ontology_viewer
 //= require bp_notes
-//= require bp_ontolobridge
 //= require bp_form_complete
 //= require bp_create_mappings
 //= require bp_analytics
 //= require bp_search
 //= require bp_mappings
-//= require bp_visualize
 //= require bp_admin
 //= require bp_recommender
 //= require bp_property_tree
@@ -32,3 +28,6 @@
 //= require projects
 //= require submissions
 
+//= require application_esbuild
+
+

app/assets/javascripts/bioportal.js.erb

@@ -15,22 +15,6 @@ var cache = new Object();
 var que= new Array();
 var queIndex = 0;
 var thread=0;
-var currentOntology;
-var currentConcept;
-
-    function setOntology(ontology){
-        currentOntology = ontology;
-    }
-    function setConcept(concept){
-        currentConcept = concept;
-    }
-
-    function getOntology(){
-        return currentOntology;
-    }
-    function getConcept(){
-        return currentConcept;
-    }
 
 // Invalidate and Refetch
   function refreshCache(nodeID){

app/assets/javascripts/bp_notes.js

@@ -1,25 +1,6 @@
 var ontNotesTable;
 var ont_columns = { archived: 3, date: 7, subjectSort: 2 };
 
-jQuery(".ontologies.show").ready(function(){
-  setupNotesFaceboxSizing();
-  bindAddCommentClick();
-  bindAddProposalClick();
-  bindProposalChange();
-  bindReplyClick();
-  bindReplyCancelClick();
-  bindReplySaveClick();
-
-  jQuery("a.subscribe_to_notes").live("click", function(){
-    subscribeToNotes(this);
-  });
-
-  jQuery("#hide_archived_ont").click(function(){
-    hideOrUnhideArchivedOntNotes();
-  });
-
-  wireOntTable(jQuery("#ontology_notes_list"));
-});
 
 NOTES_PROPOSAL_TYPES = {
   "ProposalNewClass": "New Class Proposal",
@@ -38,7 +19,7 @@ function setupNotesFacebox() {
       jQuery(this).facebox();
       jQuery(this).data().faceboxInit = true;
     }
-  });;
+  })
 }
 
 function setupNotesFaceboxSizing() {
@@ -118,17 +99,6 @@ function bindReplySaveClick() {
   });
 }
 
-function validateReply(button) {
-
-}
-
-function validateNote(button) {
-
-}
-
-function validateProposal(button) {
-
-}
 
 var displayError = function(button) {
   jQuery(button).parent().children(".reply_status").html("Error, please try again");