NIHVIVO-2343 Remove hardcoded kluges for base URL, matching property and AJAX URL. Only show the proxy panel if the user has a profile and is authorized to manage the proxy.

This commit is contained in:
j2blake 2011-10-30 16:54:23 +00:00
parent 743b96281e
commit b7ec17856e
5 changed files with 33 additions and 9 deletions

View file

@ -59,7 +59,9 @@
<section id="my-account" role="region">
<form id="main-form" method="POST" action="${formUrls.myAccount}" class="customForm" role="my account">
<#include "userAccounts-myProxiesPanel.ftl">
<#if showProxyPanel?? >
<#include "userAccounts-myProxiesPanel.ftl">
</#if>
<label for="email-address">Email address<span class="requiredHint"> *</span></label>
<input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />

View file

@ -52,6 +52,14 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/auto
</div>
</div>
<script type="text/javascript">
var proxyMechanism = {
baseUrl: '${urls.base}',
sparqlQueryUrl: '${formUrls.sparqlQueryAjax}',
matchingProperty: '${matchingProperty}'
};
</script>
${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/sparqlUtils.js"></script>',
'<script type="text/javascript" src="${urls.base}/js/account/accountProxyCommon.js"></script>',