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

Merge from 1.5 branch: NIHVIVO-3954 Add OpenSocial bug fixes from Eric Meeks: make compound key in app_registry table, show sandbox login, ensure that randomly assigned Gadget ID is not negative, modify JS to find out whose page we are on.

Browse source
This commit is contained in:
j2blake 2012-09-07 15:42:30 +00:00
parent fdbd559edb
commit aabf529210
1 changed files with 45 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

11
themes/wilma/templates/gadgetLogin.ftl
View file

@ -2,11 +2,19 @@
<#-- Template for the body of the GadgetDetails page --> <#-- Template for the body of the GadgetDetails page -->
<style media="screen" type="text/css">
th {
vertical-align: top;
width: 150px;
text-align: right;
padding-right: 10px;
}
</style>
<div class="pageTitle" id="gadgets-title"><h2>${title}</h2></div> <div class="pageTitle" id="gadgets-title"><h2>${title}</h2></div>
<#-- VIVO OpenSocial Extension by UCSF --> <#-- VIVO OpenSocial Extension by UCSF -->
<#if openSocial??> <#if openSocial??>
<#if openSocial.visible>
<form method="POST"> <form method="POST">
<table border="0" cellspacing="0" cellpadding="0"> <table border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
@ -43,5 +51,4 @@
</tr> </tr>
</table> </table>
</form> </form>
</#if>
</#if> </#if>