git://source.jalview.org
/
proteocache.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into PROT-9-webservice
[proteocache.git]
/
webapp
/
view
/
login.jsp
diff --git
a/webapp/view/login.jsp
b/webapp/view/login.jsp
index
38e9ec8
..
32258d3
100644
(file)
--- a/
webapp/view/login.jsp
+++ b/
webapp/view/login.jsp
@@
-24,7
+24,7
@@
<c:choose>
<c:when test="${error == null}">
<div class="form-group">
<c:choose>
<c:when test="${error == null}">
<div class="form-group">
- <input class="form-control" type="text" name="j_username" id="UserName" placeholder="Username (email)" />
+ <input class="form-control" type="text" name="j_username" id="UserName" placeholder="Username or email" />
<p></p>
<input class="form-control" type="password" name="j_password" id="UserPass" placeholder="Password" />
<p></p>
<p></p>
<input class="form-control" type="password" name="j_password" id="UserPass" placeholder="Password" />
<p></p>