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.
This commit is contained in:
parent
fdbd559edb
commit
aabf529210
1 changed files with 45 additions and 38 deletions
|
@ -2,11 +2,19 @@
|
|||
|
||||
<#-- 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>
|
||||
|
||||
<#-- VIVO OpenSocial Extension by UCSF -->
|
||||
<#if openSocial??>
|
||||
<#if openSocial.visible>
|
||||
<form method="POST">
|
||||
<table border="0" cellspacing="0" cellpadding="0">
|
||||
<tr>
|
||||
|
@ -44,4 +52,3 @@
|
|||
</table>
|
||||
</form>
|
||||
</#if>
|
||||
</#if>
|
||||
|
|
Loading…
Add table
Reference in a new issue