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

NIHVIVO-2280. Worked on markup and styles for account main page, add account, and edit account. Work in progress.

Browse source
This commit is contained in:
manolobevia 2011-05-25 02:29:29 +00:00
parent 0aef0368c6
commit b8c058384f
4 changed files with 56 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
webapp/web/css/edit.css
View file

@ -356,3 +356,7 @@ div.sparqlform .parenthetical {
background: #FFF6BF; background: #FFF6BF;
color: #7F7034; color: #7F7034;
} }
.note {
font-size: .8em;
line-height: 1.3em;
}

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

@ -2,7 +2,7 @@
<#-- Template for adding a user account --> <#-- Template for adding a user account -->
<h1>Add new account</h1> <h3>Add new account</h3>
<#if errorEmailIsEmpty??> <#if errorEmailIsEmpty??>
<#assign errorMessage = "You must supply an email address." /> <#assign errorMessage = "You must supply an email address." />
@ -24,18 +24,6 @@
<#assign errorMessage = "You must select a role." /> <#assign errorMessage = "You must select a role." />
</#if> </#if>
<#if errorPasswordIsEmpty??>
<#assign errorMessage = "No password supplied." />
</#if>
<#if errorPasswordIsWrongLength??>
<#assign errorMessage = "Password must be between 6 and 12 characters." />
</#if>
<#if errorPasswordsDontMatch??>
<#assign errorMessage = "Passwords do not match." />
</#if>
<#if errorMessage?has_content> <#if errorMessage?has_content>
<section id="error-alert" role="alert"> <section id="error-alert" role="alert">
<img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon"/> <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon"/>
@ -43,52 +31,49 @@
</section> </section>
</#if> </#if>
<form method="POST" action="${formUrls.add}"> <section id="add-account" role="region">
Email address * <fieldset>
<br/> <legend>Add new account</legend>
<input type="text" name="emailAddress" value="${emailAddress}" />
<br/> <form method="POST" action="${formUrls.add}" class="customForm" role="add new account">
First name * <label for="email-address">Email address<span class="requiredHint"> *</span></label>
<br/> <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input "/>
<input type="text" name="firstName" value="${firstName}" />
<br/> <label for="first-name">First name<span class="requiredHint"> *</span></label>
Last name * <input type="text" name="firstName" value="${firstName}" id="first-name" role="input "/>
<br/>
<input type="text" name="lastName" value="${lastName}" /> <label for="last-name">Last name<span class="requiredHint"> *</span></label>
<br/> <input type="text" name="lastName" value="${lastName}" id="last-name" role="input "/>
<br/>
Roles * <p>Roles<span class="requiredHint"> *</span> </p>
<br/>
<#list roles as role> <#list roles as role>
<input type="radio" name="role" value="${role.uri}" <#if selectedRole = role.uri>checked</#if> />${role.label} <input type="radio" name="role" value="${role.uri}" role="radio" <#if selectedRole = role.uri>selected</#if> />
<br> <label class="inline" for="${role.label}"> ${role.label}</label>
<br />
</#list> </#list>
<br/>
<#if !emailIsEnabled??> <p>Associate a profile with this account</p>
Initial password * <input type="radio" name="associate" value="yes" role="radio" <#if associate??>checked</#if> id="associate" />
<input type="password" name="initialPassword" value="${initialPassword}" /> <label class="inline" for="associate"> Yes</label>
<br/>
Confirm initial password *
<input type="password" name="confirmPassword" value="${confirmPassword}" />
<br/>
</#if>
Associate a profile with this account <input type="radio" name="associate" value="no" role="radio" <#if !associate??>checked</#if> id="no-associate" />
<br/> <label class="inline" for="no-associate"> No</label>
<input type="radio" name="associate" value="yes" <#if associate??>checked</#if> />Yes
<br/>
<input type="radio" name="associate" value="no" <#if !associate??>checked</#if> />No
<br/>
<#if emailIsEnabled??> <br />
<p> <input type="checkbox" name="resetPassword" value="" id="reset-password" role="checkbox" />
<label class="inline" for="reset-password"> Reset password</label>
<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>
</#if>
<input type="submit" name="submitAdd" value="Add new account" /> <input type="submit" name="submitAdd" value="Add new account" class="submit"/> or <a href="${formUrls.list}">Cancel</a>
or <a href="${formUrls.list}">Cancel</a>
<p class="requiredHint">* required fields</p>
</form> </form>
</fieldset>
</section>
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/edit/forms/css/customForm.css" />')}

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

@ -2,5 +2,5 @@
<#-- Template for editing a user account --> <#-- Template for editing a user account -->
<h1>Edit user account</h1> <h3>Edit user account</h3>

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

@ -2,7 +2,7 @@
<#-- Template for displaying list of user accounts --> <#-- Template for displaying list of user accounts -->
<form method="POST" action="${formUrls.list}"> <form method="POST" action="${formUrls.list}" class="customForm" role="">
<#--current page: <input type="text" name="pageIndex" value="${page.current}" /> <#--current page: <input type="text" name="pageIndex" value="${page.current}" />
<br />--> <br />-->
@ -38,7 +38,7 @@
<input type="submit" name="list" value="Refresh page" />--> <input type="submit" name="list" value="Refresh page" />-->
</form> </form>
<form method="POST" action="${formUrls.add}"> <form method="POST" action="${formUrls.add}" class="customForm" role="">
<h3>Account | <input type="submit" class="submit" value="Add new account" /></h3> <h3>Account | <input type="submit" class="submit" value="Add new account" /></h3>
</form> </form>
@ -75,7 +75,7 @@
</select> </select>
</section> </section>
<form method="POST" action="${formUrls.list}"> <form method="POST" action="${formUrls.list}" class="customForm" role="">
<section id="search-accounts"> <section id="search-accounts">
<input type="text" name="" /> <input type="text" name="" />
<input class="submit" type="submit" value="Search accounts"/> <input class="submit" type="submit" value="Search accounts"/>
@ -96,7 +96,7 @@
} }
</SCRIPT> </SCRIPT>
<form method="POST" action="${formUrls.list}"> <form method="POST" action="${formUrls.list}" id="account-display" class="customForm" role="">
<section class="accounts"> <section class="accounts">
<input type="submit" class="submit delete-account" value="Delete" onClick="changeAction(this.form, '${formUrls.delete}')" /> <input type="submit" class="submit delete-account" value="Delete" onClick="changeAction(this.form, '${formUrls.delete}')" />
<!-- <!--