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

NIHVIVO-2280: Removed unnecessary <fieldset> tags.

Browse source
This commit is contained in:
manolobevia 2011-07-06 18:55:01 +00:00
parent dfc09f6ac7
commit dbdbd81d11
4 changed files with 122 additions and 130 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
webapp/web/templates/freemarker/body/accounts/userAccounts-add.ftl
View file

@ -52,55 +52,53 @@
</#if> </#if>
<section id="add-account" role="region"> <section id="add-account" role="region">
<fieldset> <form method="POST" action="${formUrls.add}" class="customForm" role="add new account">
<legend>Add new account</legend> <legend>Add new account</legend>
<form method="POST" action="${formUrls.add}" class="customForm" role="add new account"> <label for="email-address">Email address<span class="requiredHint"> *</span></label>
<label for="email-address">Email address<span class="requiredHint"> *</span></label> <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input "/>
<input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input "/>
<label for="first-name">First name<span class="requiredHint"> *</span></label> <label for="first-name">First name<span class="requiredHint"> *</span></label>
<input type="text" name="firstName" value="${firstName}" id="first-name" role="input "/> <input type="text" name="firstName" value="${firstName}" id="first-name" role="input "/>
<label for="last-name">Last name<span class="requiredHint"> *</span></label> <label for="last-name">Last name<span class="requiredHint"> *</span></label>
<input type="text" name="lastName" value="${lastName}" id="last-name" role="input "/> <input type="text" name="lastName" value="${lastName}" id="last-name" role="input "/>
<#include "userAccounts-associateProfilePanel.ftl"> <#include "userAccounts-associateProfilePanel.ftl">
<p>Roles<span class="requiredHint"> *</span> </p> <p>Roles<span class="requiredHint"> *</span> </p>
<#list roles as role> <#list roles as role>
<input type="radio" name="role" value="${role.uri}" role="radio" <#if selectedRole = role.uri>checked</#if> /> <input type="radio" name="role" value="${role.uri}" role="radio" <#if selectedRole = role.uri>checked</#if> />
<label class="inline" for="${role.label}"> ${role.label}</label> <label class="inline" for="${role.label}"> ${role.label}</label>
<br /> <br />
</#list> </#list>
<#if emailIsEnabled??> <#if emailIsEnabled??>
<p class="note"> <p class="note">
Note: An email will be sent to the address entered above Note: An email will be sent to the address entered above
notifying that an account has been created. notifying that an account has been created.
It will include instructions for activating the account and creating a password. It will include instructions for activating the account and creating a password.
</p> </p>
<#else> <#else>
<table> <table>
<tr> <tr>
<td> <td>
<label for="initial-password">Initial password<span class="requiredHint"> *</span></label> <label for="initial-password">Initial password<span class="requiredHint"> *</span></label>
<input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" role="input "/> <input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" role="input "/>
</td> </td>
<td> <td>
<label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label> <label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label>
<input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" /> <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
</td> </td>
</tr> </tr>
</table> </table>
<p>Minimum of ${minimumLength} characters in length.</p> <p>Minimum of ${minimumLength} characters in length.</p>
</#if> </#if>
<input type="submit" name="submitAdd" value="Add new account" class="submit"/> or <a class="cancel" href="${formUrls.list}">Cancel</a> <input type="submit" name="submitAdd" value="Add new account" class="submit"/> or <a class="cancel" href="${formUrls.list}">Cancel</a>
<p class="requiredHint">* required fields</p> <p class="requiredHint">* required fields</p>
</form> </form>
</fieldset>
</section> </section>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}

88
webapp/web/templates/freemarker/body/accounts/userAccounts-edit.ftl
View file

@ -52,61 +52,59 @@
</#if> </#if>
<section id="edit-account" role="region"> <section id="edit-account" role="region">
<fieldset> <form method="POST" action="${formUrls.edit}" id="userAccountForm" class="customForm" role="edit account">
<legend>Edit new account</legend> <legend>Edit new account</legend>
<form method="POST" action="${formUrls.edit}" id="userAccountForm" class="customForm" role="edit account"> <label for="email-address">Email address<span class="requiredHint"> *</span></label>
<label for="email-address">Email address<span class="requiredHint"> *</span></label> <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
<input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
<label for="first-name">First name<span class="requiredHint"> *</span></label> <label for="first-name">First name<span class="requiredHint"> *</span></label>
<input type="text" name="firstName" value="${firstName}" id="first-name" role="input" /> <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
<label for="last-name">Last name<span class="requiredHint"> *</span></label> <label for="last-name">Last name<span class="requiredHint"> *</span></label>
<input type="text" name="lastName" value="${lastName}" id="last-name" role="input" /> <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
<#include "userAccounts-associateProfilePanel.ftl"> <#include "userAccounts-associateProfilePanel.ftl">
<#if roles?has_content> <#if roles?has_content>
<p>Roles<span class="requiredHint"> *</span> </p> <p>Roles<span class="requiredHint"> *</span> </p>
<#list roles as role> <#list roles as role>
<input type="radio" name="role" value="${role.uri}" role="radio" <#if selectedRole = role.uri>checked</#if> /> <input type="radio" name="role" value="${role.uri}" role="radio" <#if selectedRole = role.uri>checked</#if> />
<label class="inline" for="${role.label}"> ${role.label}</label> <label class="inline" for="${role.label}"> ${role.label}</label>
<br /> <br />
</#list> </#list>
</#if> </#if>
<#if emailIsEnabled??> <#if emailIsEnabled??>
<input type="checkbox" name="resetPassword" value="" id="reset-password" role="checkbox" <#if resetPassword??>checked</#if> /> <input type="checkbox" name="resetPassword" value="" id="reset-password" role="checkbox" <#if resetPassword??>checked</#if> />
<label class="inline" for="reset-password"> Reset password</label> <label class="inline" for="reset-password"> Reset password</label>
<p class="note"> <p class="note">
Note: Instructions for resetting the password will Note: Instructions for resetting the password will
be emailed to the address entered above. The password will not be emailed to the address entered above. The password will not
be reset until the user follows the link provided in this email. be reset until the user follows the link provided in this email.
</p> </p>
<#else> <#else>
<table> <table>
<tr> <tr>
<td> <td>
<label for="new-password">New password<span class="requiredHint"> *</span></label> <label for="new-password">New password<span class="requiredHint"> *</span></label>
<input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" /> <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
</td> </td>
<td> <td>
<label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label> <label for="confirm-password">Confirm initial password<span class="requiredHint"> *</span></label>
<input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" /> <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
</td> </td>
</tr> </tr>
</table> </table>
<p>Minimum of ${minimumLength} characters in length.</p> <p>Minimum of ${minimumLength} characters in length.</p>
<p>Leaving this blank means that the password will not be changed.</p> <p>Leaving this blank means that the password will not be changed.</p>
</#if> </#if>
<input type="submit" name="submitEdit" value="Save changes" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a> <input type="submit" name="submitEdit" value="Save changes" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a>
<p class="requiredHint">* required fields</p> <p class="requiredHint">* required fields</p>
</form> </form>
</fieldset>
</section> </section>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}

38
webapp/web/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
View file

@ -32,32 +32,30 @@
</#if> </#if>
<section id="first-time-login" role="region"> <section id="first-time-login" role="region">
<fieldset> <p>Please provide your contact information to finish creating your account.</p>
<p>Please provide your contact information to finish creating your account.</p>
<form method="POST" action="${formUrls.firstTimeExternal}" class="customForm" role="my account"> <form method="POST" action="${formUrls.firstTimeExternal}" class="customForm" role="my account">
<input type="hidden" name="externalAuthId" value="${externalAuthId}" role="input" /> <input type="hidden" name="externalAuthId" value="${externalAuthId}" role="input" />
<input type="hidden" name="afterLoginUrl" value="${afterLoginUrl}" role="input" /> <input type="hidden" name="afterLoginUrl" value="${afterLoginUrl}" role="input" />
<label for="first-name">First name<span class="requiredHint"> *</span></label> <label for="first-name">First name<span class="requiredHint"> *</span></label>
<input type="text" name="firstName" value="${firstName}" id="first-name" role="input" /> <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
<label for="last-name">Last name<span class="requiredHint"> *</span></label> <label for="last-name">Last name<span class="requiredHint"> *</span></label>
<input type="text" name="lastName" value="${lastName}" id="last-name" role="input" /> <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
<label for="email-address">Email address<span class="requiredHint"> *</span></label> <label for="email-address">Email address<span class="requiredHint"> *</span></label>
<input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" /> <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
<#if emailIsEnabled??> <#if emailIsEnabled??>
<p class="note"> <p class="note">
Note: An email will be sent to the address entered above notifying Note: An email will be sent to the address entered above notifying
that an account has been created. that an account has been created.
</p> </p>
</#if> </#if>
<input type="submit" name="submit" value="Create account" class="submit"/> or <a class="cancel" href="${urls.home}">Cancel</a> <input type="submit" name="submit" value="Create account" class="submit"/> or <a class="cancel" href="${urls.home}">Cancel</a>
</form> </form>
</fieldset>
</section> </section>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}

38
webapp/web/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
View file

@ -58,36 +58,34 @@
</#if> </#if>
<section id="my-account" role="region"> <section id="my-account" role="region">
<fieldset> <form method="POST" action="${formUrls.myAccount}" class="customForm" role="my account">
<legend>My account</legend> <legend>My account</legend>
<form method="POST" action="${formUrls.myAccount}" class="customForm" role="my account"> <label for="email-address">Email address<span class="requiredHint"> *</span></label>
<label for="email-address">Email address<span class="requiredHint"> *</span></label> <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
<input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
<p class="note">Note: if email changes, a confirmation email will be sent to the new email address entered above.</p> <p class="note">Note: if email changes, a confirmation email will be sent to the new email address entered above.</p>
<label for="first-name">First name<span class="requiredHint"> *</span></label> <label for="first-name">First name<span class="requiredHint"> *</span></label>
<input type="text" name="firstName" value="${firstName}" id="first-name" role="input" /> <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
<label for="last-name">Last name<span class="requiredHint"> *</span></label> <label for="last-name">Last name<span class="requiredHint"> *</span></label>
<input type="text" name="lastName" value="${lastName}" id="last-name" role="input" /> <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
<#if !externalAuth??> <#if !externalAuth??>
<label for="new-password">New password</label> <label for="new-password">New password</label>
<input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" /> <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
<p class="note">Minimum of ${minimumLength} characters in length. Leaving this blank means that the password will not be changed.</p> <p class="note">Minimum of ${minimumLength} characters in length. Leaving this blank means that the password will not be changed.</p>
<label for="confirm-password">Confirm new password</label> <label for="confirm-password">Confirm new password</label>
<input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" /> <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
</#if> </#if>
<p><input type="submit" name="submitMyAccount" value="Save changes" class="submit" /></p> <p><input type="submit" name="submitMyAccount" value="Save changes" class="submit" /></p>
<p class="requiredHint">* required fields</p> <p class="requiredHint">* required fields</p>
</form> </form>
</fieldset>
</section> </section>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')} ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/account/account.css" />')}