merging 9966 to the trunk

This commit is contained in:
tworrall 2012-07-11 16:40:14 +00:00
parent 732617f62f
commit 46d5b47e92
5 changed files with 29 additions and 3 deletions

View file

@ -1,9 +1,12 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Template for adding a user account -->
<#import "lib-vivo-form.ftl" as lvf>
<h3><a class="account-menu" href="accountsAdmin" title="add new account">User accounts</a> > Add new account</h3>
<@lvf.unsupportedBrowser urls.base />
<#if errorEmailIsEmpty??>
<#assign errorMessage = "You must supply an email address." />
</#if>

View file

@ -1,9 +1,12 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<#-- Template for editing a user account -->
<#import "lib-vivo-form.ftl" as lvf>
<h3><a class="account-menu" href="accountsAdmin" title="edit account">User accounts</a> > Edit account</h3>
<@lvf.unsupportedBrowser urls.base />
<#if errorEmailIsEmpty??>
<#assign errorMessage = "You must supply an email address." />
</#if>