From 6b7d4dd24a5202ee194138909d29c46c7078dead Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Thu, 14 Sep 2017 15:22:21 +0100 Subject: [PATCH] Layout improvement for tenderfoot --- .../freemarker/edit/forms/js/addConcept.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js index e8f24207..78851c2c 100644 --- a/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js +++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js @@ -205,7 +205,7 @@ var addConceptForm = { var i; //For each result, display if(numberTotalMatches > 0) { - htmlAdd = ""; } else { htmlAdd+= "

" + addConceptForm.noResultsFound + "

"; } @@ -273,8 +273,8 @@ var addConceptForm = { return {"bestMatch":bestMatchResults, "alternate":alternateResults}; }, addResultsHeader:function(vocabSourceValue) { - var htmlAdd = "
  • " + - addConceptForm.getVocabSpecificColumnLabel(vocabSourceValue) + " " + addConceptForm.definitionString + "" + addConceptForm.bestMatchString + "
  • "; + var htmlAdd = "
  • " + + addConceptForm.getVocabSpecificColumnLabel(vocabSourceValue) + " " + addConceptForm.definitionString + "" + addConceptForm.bestMatchString + "
  • "; return htmlAdd; }, //currently just the first column label depends on which service has been utilized @@ -333,14 +333,16 @@ var addConceptForm = { }, generateIndividualConceptDisplay: function(cuiURI, label, altLabels, definition, type, definedBy, isBestMatch, broaderUris, narrowerUris) { var htmlAdd = "
  • " + - "
    " + + "
    " + + "
    " + "
    " + addConceptForm.generateIndividualCUIInput(cuiURI, label, type, definedBy, broaderUris, narrowerUris) + addConceptForm.generateIndividualLabelsDisplay(label, altLabels) + addConceptForm.generateIndividualTypeDisplay(type) + "
    " + addConceptForm.generateIndividualDefinitionDisplay(definition) + addConceptForm.generateBestOrAlternate(isBestMatch) + - "
    " + - "
  • "; + "" + + "" + + ""; return htmlAdd; }, generateIndividualCUIInput:function(cuiURI, label, type, definedBy, broaderUris, narrowerUris) {