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

updates to associated concept and user defined concept generators, related preprocessors, css, and javascript file

Browse source
This commit is contained in:
hjkhjk54 2011-11-23 22:08:43 +00:00
parent c3d1d16d9b
commit b54b8c566d
8 changed files with 645 additions and 107 deletions
Download patch file Download diff file Expand all files Collapse all files

41
productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
View file

@ -37,20 +37,22 @@
<ul id="existingTerms" >
<ul id="existingConcepts" >
<script type="text/javascript">
var existingTermsData = [];
var existingConceptsData = [];
</script>
<#list existingConcepts as existingConcept>
<li class="existingTerm">
<li class="existingConcept">
<span class="term">
<span class="concept">
<span class="termWrapper">
<span class="termLabel">
${existingConcept.conceptLabel}
<span class="conceptWrapper">
<span class="conceptLabel"> ${existingConcept.conceptLabel}
<#if existingConcept.vocabURI?has_content && existingConcept.vocabLabel?has_content>
(${existingConcept.vocabLabel})
</#if>
</span>
</span>
<a href="${urls.base}/edit/primitiveDelete" class="remove">Remove</a>
@ -58,7 +60,7 @@
</li>
<script type="text/javascript">
existingTermsData.push({
existingConceptsData.push({
"conceptNodeUri": "${existingConcept.conceptURI}",
"conceptLabel": "${existingConcept.conceptLabel}"
});
@ -74,25 +76,26 @@
</#if>
<div id="showAddForm">
<input type="submit" value="Add Term" id="showAddFormButton" name="showAddFormButton"> or
<input type="submit" value="Add Concept" id="showAddFormButton" name="showAddFormButton"> or
<a class="cancel" href="${cancelUrl}">Return</a>
</div>
<form id="addTerminologyForm" class="customForm" action="${urls.base}/edit/processTerminologyAnnotation">
<form id="addConceptForm" class="customForm" action="${submitUrl}">
<#list sources as source>
<input type="radio" name="source" value="${source.uri}" role="radio" <#if selectedSource = source.uri>checked</#if> />
<input type="radio" id="source" name="source" value="${source.uri}" role="radio" <#if selectedSource = source.uri>checked</#if> />
<label class="inline" for="${source.label}"> ${source.label}</label>
<br />
</#list>
<p class="inline">
<input type="text" id="searchTerm" label="Search UMLS Terms" class="acSelector" size="35" />
<input type="text" id="searchTerm" label="Search" class="acSelector" size="35" />
<input type="button" id="searchButton" name="searchButton" value="Search"/>
</p>
<input type="hidden" id="externalConceptURI" name="externalConceptURI" value=""/> <!-- Field value populated by JavaScript -->
<input type="hidden" id="externalConceptLabel" name="externalConceptLabel" value="" /> <!-- Field value populated by JavaScript -->
<div id="selectedTerm" name="selectedTerm" class="acSelection">
<input type="hidden" id="conceptNode" name="conceptNode" value=""/> <!-- Field value populated by JavaScript -->
<input type="hidden" id="ConceptLabel" name="conceptLabel" value="" /> <!-- Field value populated by JavaScript -->
<!--TODO: Change this so this is populated by the javascript-->
<input type="hidden" id="conceptSource" name="conceptSource" value="" /> <!-- Field value populated by JavaScript -->
<div id="selectedConcept" name="selectedConcept" class="acSelection">
<%-- RY maybe make this a label and input field. See what looks best. --%>
<p class="inline">
</p>
@ -118,8 +121,12 @@
};
</script>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" />')}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}
${scripts.add('<script type="text/javascript" src="${urls.base}/edit/forms/js/addTerminology.js"></script>')}
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/addConcept.css" />')}
${scripts.add('<script type="text/javascript" src="${urls.base}/edit/forms/js/addConcept.js"></script>')}

10
productMods/templates/freemarker/edit/forms/addUserDefinedConcept.ftl
View file

@ -11,13 +11,12 @@
<h2>Add Your Own Concept</h2>
<form id="addUserDefinedConceptForm" class="editForm" action = "${submitUrl}" method="post">
<form id="addUserDefinedConceptForm" class="customForm noIE67" action = "${submitUrl}" method="post">
<input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
<#--Autocomplete for looking up existing skos concepts -->
<p>
<p>
<label for="relatedIndLabel">Concept <span class='requiredHint'> *</span></label>
<input class="acSelector" size="50" type="text" id="relatedIndLabel" name="conceptLabel"
<#if (disabledVal?length > 0)>disabled="${disabledVal}"</#if> value="" />
<input class="acSelector" size="50" type="text" id="relatedIndLabel" name="conceptLabel" value="" />
</p>
<div class="acSelection">
@ -42,13 +41,14 @@
</form>
<#assign sparqlQueryUrl = "/ajax/sparqlQuery" >
<#assign sparqlQueryUrl = "${urls.base}/ajax/sparqlQuery" >
<script type="text/javascript">
var customFormData = {
sparqlForAcFilter: '${sparqlForAcFilter}',
sparqlQueryUrl: '${sparqlQueryUrl}',
acUrl: '${urls.base}/autocomplete?tokenize=true',
acType: 'http://www.w3.org/2004/02/skos/core#Concept',
submitButtonTextType: 'simple',
editMode: 'add',
defaultTypeName: 'concept' // used in repair mode to generate button text