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

NIHVIVO-2280: Changed div for sections, removed inline styles, fixed display isuses for IE6 and 7 on add/edit account pages

Browse source
This commit is contained in:
manolobevia 2011-07-21 20:42:03 +00:00
parent 47c5b386d8
commit cf26240fc4
5 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
webapp/web/css/account/account.css
View file

@ -266,3 +266,10 @@ form.customForm input[name="confirmPassword"] {
a.disable-delete { a.disable-delete {
padding-left: 24px; padding-left: 24px;
} }
#passwordContainer p.note {
margin-top: -10px;
padding-bottom: 5px;
}
#passwordContainer {
margin-top: 20px;
}

6
webapp/web/css/vitroIE6.css
View file

@ -209,12 +209,12 @@ table#account th {
p.requiredHint { p.requiredHint {
clear: left; clear: left;
} }
add-account span.requiredHint { #add-account span.requiredHint {
float: none; float: none;
} }
input#externalAuthChkBox { input#externalAuthChkBox {
height: 18px; margin-top: 0;
width: 18px; margin-bottom: 0;
} }
#associated { #associated {
display: none; display: none;

7
webapp/web/css/vitroIE7.css
View file

@ -148,12 +148,15 @@ table#account th {
margin-top: 0; margin-top: 0;
margin-left: 5px; margin-left: 5px;
} }
#add-account span.requiredHint {
float: none;
}
p.requiredHint { p.requiredHint {
clear: left; clear: left;
} }
input#externalAuthChkBox { input#externalAuthChkBox {
height: 18px; margin-top: 0;
width: 18px; margin-bottom: 0;
} }
#associated { #associated {
display: none; display: none;

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

@ -79,14 +79,14 @@
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>
<div id="passwordContainer"> <section id="passwordContainer" role="region">
<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" />
<p class="note" style="margin-top:-10px">Minimum of ${minimumLength} characters in length.</p> <p class="note">Minimum of ${minimumLength} characters in length.</p>
<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" />
</div> </section>
</#if> </#if>
<p><input type="submit" name="submitAdd" value="Add new account" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a></p> <p><input type="submit" name="submitAdd" value="Add new account" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a></p>

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

@ -75,7 +75,7 @@
</#if> </#if>
<#if emailIsEnabled??> <#if emailIsEnabled??>
<div id="pwdResetContainer" <#if externalAuthOnly?? >class="hidden"</#if> > <section id="pwdResetContainer" <#if externalAuthOnly?? >class="hidden"</#if> role="region">
<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>
@ -84,17 +84,17 @@
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>
</div> </section>
<#else> <#else>
<div id="passwordContainer" <#if externalAuthOnly?? >class="hidden"</#if> > <section id="passwordContainer" <#if externalAuthOnly?? >class="hidden"</#if> role="region">
<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" style="margin-top:-10px">Minimum of ${minimumLength} characters in length.<br /> <p class="note">Minimum of ${minimumLength} characters in length.<br />
Leaving this blank means that the password will not be changed.</p> 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" />
</div> </section>
</#if> </#if>
<p><input type="submit" name="submitEdit" value="Save changes" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a></p> <p><input type="submit" name="submitEdit" value="Save changes" class="submit" /> or <a class="cancel" href="${formUrls.list}">Cancel</a></p>