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

NIHVIVO-2280: Removed javascript code for userAccounts-list.ftl to accountUtils.js

Browse source
This commit is contained in:
manolobevia 2011-06-13 13:26:27 +00:00
parent 1077f283d6
commit 2118a510d7
2 changed files with 44 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
webapp/web/js/account/accountUtils.js
View file

@ -2,9 +2,15 @@
$(document).ready(function(){
// Change form actions in account main page
function changeAction(form, url) {
form.action = url;
return true;
}
//Accounts per page
//Hide is javascrip is disable
$('.accounts-per-page-form input[type="submit"]').hide();
//Hide is javascrip is enable
$('input[name="accounts-per-page"]').addClass('hide');
$('.accounts-per-page').change(function() {
$('#account-display').submit();

46
webapp/web/templates/freemarker/body/accounts/userAccounts-list.ftl
View file

@ -107,13 +107,6 @@
</section>
</form>
<SCRIPT TYPE="text/javascript">
function changeAction(form, url) {
form.action = url;
return true;
}
</SCRIPT>
<form method="POST" action="${formUrls.list}" id="account-display" class="customForm" role="">
<section class="accounts">
<input type="submit" name="delete-account" class="delete-account submit" value="Delete" onClick="changeAction(this.form, '${formUrls.delete}')" />
@ -126,6 +119,7 @@
<span>| <a href="#">n</a> accounts | </span>
<#assign counts = [25, 50, 100]>
<select name="accountsPerPage" class="accounts-per-page">
<#list counts as count>
<option value="${count}" <#if accountsPerPage= count>selected</#if> >${count}</option>
@ -137,9 +131,7 @@
-->
</select>
<input class="hide" type="submit" value="Update" />
accounts per page |
accounts per page <input type="submit" name="accounts-per-page" value="Update" /> |
<#if page.previous?has_content>
<a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.previous}">Previous</a> <!-- only present if current page is not 1.-->
@ -192,6 +184,40 @@
</#list>
</tbody>
</table>
<section class="accounts">
<input type="submit" name="delete-account" class="delete-account submit" value="Delete" onClick="changeAction(this.form, '${formUrls.delete}')" />
<!--
When this is clicked, the checkboxes are noticed and all other fields are ignored.
submit the form (submit action is formUrls.delete)
-->
<nav class="display-tools">
<span>| <a href="#">n</a> accounts | </span>
<#assign counts = [25, 50, 100]>
<select name="accountsPerPage" class="accounts-per-page-bottom">
<#list counts as count>
<option value="${count}" <#if accountsPerPage= count>selected</#if> >${count}</option>
</#list>
<!--
When accountsPerPage changes,
set pageIndex to 1
submit the form (submit action is formUrls.list)
-->
</select>
accounts per page <input type="submit" name="accounts-per-page" value="Update" /> |
<#if page.previous?has_content>
<a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.previous}">Previous</a> <!-- only present if current page is not 1.-->
</#if>
${page.current} of ${page.last}
<#if page.next?has_content>
<a href="${formUrls.list}?accountsPerPage=${accountsPerPage}&pageIndex=${page.next}">Next</a><!-- only present if current page is not last page.-->
</#if>
</nav>
</section>
</form>
${scripts.add('<script type="text/javascript" src="${urls.base}/js/account/accountUtils.js"></script>')}