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

Merged manually some changes

Browse source
This commit is contained in:
mb863 2010-07-23 15:52:13 +00:00
parent 89d9eaa431
commit 0f7d3cbaca
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -179,4 +179,10 @@ font-size:0.8em;
color:#615e5e;
}
.or{
display:inline;
vertical-align:middle;
}

2
webapp/web/templates/freemarker/body/login/login-forcedPasswordChange.ftl
View file

@ -18,6 +18,6 @@
<p class="passwordNote">Minimum of 6 characters in length.</p>
<label for="confirmPassword">Confirm Password</label>
<input id="confirmPassword" type="password" name="confirmPassword" />
<input name="passwordChangeForm" type="submit" class="submit" value="Save Changes"/> or <a class="cancel" href="${cancelUrl}">Cancel</a>
<input name="passwordChangeForm" type="submit" class="submit" value="Save Changes"/> <span class="or">or <a class="cancel" href="${cancelUrl}">Cancel</a></span>
</form>
</div>