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

NIHVIVO-3335: Relocated RDF link for individual pages under popup for sharing URI profile

Browse source
This commit is contained in:
manolobevia 2011-11-17 19:01:04 +00:00
parent 119032ce03
commit cb99134a1d
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
webapp/web/js/individual/menuManagement.js
View file

@ -32,8 +32,18 @@ var menuManagement = {
menuItems.attr('title', 'Drag and drop to reorder menu items'); menuItems.attr('title', 'Drag and drop to reorder menu items');
/*$("#loading").ajaxStart(function(){
$(this).show();
});
$("#loading").ajaxStop(function(){
$(this).hide();
});*/
this.menuItemsList.sortable({ this.menuItemsList.sortable({
cursor: 'move', cursor: 'move',
update: function(event, ui) { update: function(event, ui) {
menuManagement.reorderMenuItems(event, ui); menuManagement.reorderMenuItems(event, ui);
} }
@ -45,6 +55,9 @@ var menuManagement = {
var menuItems = $('li.menuItem').map(function(index, el) { var menuItems = $('li.menuItem').map(function(index, el) {
return $(this).data('menuItemUri'); return $(this).data('menuItemUri');
}).get(); }).get();
$.ajax({ $.ajax({
url: menuManagement.reorderUrl, url: menuManagement.reorderUrl,
@ -61,7 +74,8 @@ var menuManagement = {
pos = index + 1; pos = index + 1;
// Set the new position for this element. The only function of this value // Set the new position for this element. The only function of this value
// is so we can reset an element to its original position in case reordering fails. // is so we can reset an element to its original position in case reordering fails.
menuManagement.setPosition(this, pos); menuManagement.setPosition(this, pos);
}); });
}, },
error: function(request, status, error) { error: function(request, status, error) {

21
webapp/web/templates/freemarker/body/individual/individual-vitro.ftl
View file

@ -32,21 +32,10 @@
<@p.label individual editable /> <@p.label individual editable />
<#-- Most-specific types --> <#-- Most-specific types -->
<@p.mostSpecificTypes individual /> <@p.mostSpecificTypes individual /><img id="uriIcon" title="${individual.uri}" class="middle" src="${urls.images}/individual/uriIcon.gif" alt="uri icon"/>
</h1> </h1>
</#if> </#if>
</header> </header>
<nav role="navigation">
<ul id ="individual-tools" role="list">
<li role="listitem"><img id="uriIcon" title="${individual.uri}" class="middle" src="${urls.images}/individual/uriIcon.gif" alt="uri icon"/></li>
<#assign rdfUrl = individual.rdfUrl>
<#if rdfUrl??>
<li role="listitem"><a title="View this individual in RDF format" class="icon-rdf" href="${rdfUrl}">RDF</a></li>
</#if>
</ul>
</nav>
<#if individualProductExtension??> <#if individualProductExtension??>
${individualProductExtension} ${individualProductExtension}
@ -63,6 +52,14 @@
<#-- Ontology properties --> <#-- Ontology properties -->
<#include "individual-properties.ftl"> <#include "individual-properties.ftl">
<#assign rdfUrl = individual.rdfUrl>
<#if rdfUrl??>
<script>
var individualRdfUrl = '${rdfUrl}';
</script>
</#if>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/individual/individual.css" />')}
${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>', ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/qtip/jquery.qtip-1.0.0-rc3.min.js"></script>',