litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Layout improvement for tenderfoot

Browse source
This commit is contained in:
Graham Triggs 2017-09-14 15:22:21 +01:00
parent 5ba226bde7
commit 6b7d4dd24a
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
webapp/src/main/webapp/templates/freemarker/edit/forms/js/addConcept.js
View file

@ -205,7 +205,7 @@ var addConceptForm = {
var i; var i;
//For each result, display //For each result, display
if(numberTotalMatches > 0) { if(numberTotalMatches > 0) {
htmlAdd = "<ul class='dd' id='concepts' name='concepts'>"; htmlAdd = "<div class='container'><ul class='dd' id='concepts' name='concepts'>";
htmlAdd+= addConceptForm.addResultsHeader(vocabSourceValue); htmlAdd+= addConceptForm.addResultsHeader(vocabSourceValue);
//Show best matches first //Show best matches first
for(i = 0; i < numberBestMatches; i++) { for(i = 0; i < numberBestMatches; i++) {
@ -217,7 +217,7 @@ var addConceptForm = {
var conceptResult = alternateResults[i]; var conceptResult = alternateResults[i];
htmlAdd+= addConceptForm.displayConceptSearchResult(conceptResult, false); htmlAdd+= addConceptForm.displayConceptSearchResult(conceptResult, false);
} }
htmlAdd+= "</ul>"; htmlAdd+= "</ul></div>";
} else { } else {
htmlAdd+= "<p>" + addConceptForm.noResultsFound + "</p>"; htmlAdd+= "<p>" + addConceptForm.noResultsFound + "</p>";
} }
@ -273,8 +273,8 @@ var addConceptForm = {
return {"bestMatch":bestMatchResults, "alternate":alternateResults}; return {"bestMatch":bestMatchResults, "alternate":alternateResults};
}, },
addResultsHeader:function(vocabSourceValue) { addResultsHeader:function(vocabSourceValue) {
var htmlAdd = "<li class='concepts'><div class='row'><span class='column conceptLabel'>" + var htmlAdd = "<li class='concepts'><div class='row'><div class='col-12'><span class='column conceptLabel'>" +
addConceptForm.getVocabSpecificColumnLabel(vocabSourceValue) + " </span><span class='column conceptDefinition'>" + addConceptForm.definitionString + "</span><span class='column'>" + addConceptForm.bestMatchString + "</span></div></li>"; addConceptForm.getVocabSpecificColumnLabel(vocabSourceValue) + " </span><span class='column conceptDefinition'>" + addConceptForm.definitionString + "</span><span class='column'>" + addConceptForm.bestMatchString + "</span></div></div></li>";
return htmlAdd; return htmlAdd;
}, },
//currently just the first column label depends on which service has been utilized //currently just the first column label depends on which service has been utilized
@ -334,13 +334,15 @@ var addConceptForm = {
generateIndividualConceptDisplay: function(cuiURI, label, altLabels, definition, type, definedBy, isBestMatch, broaderUris, narrowerUris) { generateIndividualConceptDisplay: function(cuiURI, label, altLabels, definition, type, definedBy, isBestMatch, broaderUris, narrowerUris) {
var htmlAdd = "<li class='concepts'>" + var htmlAdd = "<li class='concepts'>" +
"<div class='row'>" + "<div class='row'>" +
"<div class='col-12'>" +
"<div class='column conceptLabel'>" + "<div class='column conceptLabel'>" +
addConceptForm.generateIndividualCUIInput(cuiURI, label, type, definedBy, broaderUris, narrowerUris) + addConceptForm.generateIndividualCUIInput(cuiURI, label, type, definedBy, broaderUris, narrowerUris) +
addConceptForm.generateIndividualLabelsDisplay(label, altLabels) + addConceptForm.generateIndividualTypeDisplay(type) + "</div>" + addConceptForm.generateIndividualLabelsDisplay(label, altLabels) + addConceptForm.generateIndividualTypeDisplay(type) + "</div>" +
addConceptForm.generateIndividualDefinitionDisplay(definition) + addConceptForm.generateIndividualDefinitionDisplay(definition) +
addConceptForm.generateBestOrAlternate(isBestMatch) + addConceptForm.generateBestOrAlternate(isBestMatch) +
"</div>" + "</div>" +
"</li>"; "</div>" +
"</li>";
return htmlAdd; return htmlAdd;
}, },
generateIndividualCUIInput:function(cuiURI, label, type, definedBy, broaderUris, narrowerUris) { generateIndividualCUIInput:function(cuiURI, label, type, definedBy, broaderUris, narrowerUris) {