MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/431' into develop

Browse Source
This commit is contained in:
Andrew DeMaria
2017-05-30 19:30:24 -06:00
parent 0c6b3df4df fefc34790a
commit 224981d0fc
2 changed files with 87 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libresonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
+35 -40
View File
@@ -1,5 +1,5 @@
<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="iso-8859-1"%>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<!DOCTYPE html>
<html><head>
<%@ include file="head.jsp" %>
@@ -10,57 +10,52 @@
</script>
</head>
<body class="mainframe bgcolor1" onload="document.getElementById('j_username').focus()">
<body style="min-width:550px" class="mainframe bgcolor1" onload="document.getElementById('j_username').focus()">
<form action="<c:url value="/login"/>" method="POST">
<form action="<c:url value="/login"/>" method="POST">
<sec:csrfInput />
<sec:csrfInput />
<div class="bgcolor2 shadow" align="center" style="padding:20px 50px 20px 50px; margin-top:100px;margin-left:50px;margin-right:50px">
<div id="loginframe" class="bgcolor2 shadow">
<div style="margin-bottom:1em;max-width:50em;text-align:left;"><sub:wiki text="${model.loginMessage}"/></div>
<img src="<spring:theme code="logoImage"/>" alt="">
<table>
<tr>
<td colspan="2" align="left" style="padding-bottom:10px">
<img src="<spring:theme code="logoImage"/>" alt="">
</td>
</tr>
<tr>
<td align="left" style="padding-right:10px"><fmt:message key="login.username"/></td>
<td align="left"><input type="text" id="j_username" name="j_username" style="width:12em" tabindex="1"></td>
</tr>
<div class="loginmessagetop"><sub:wiki text="${model.loginMessage}"/></div>
<tr>
<td align="left" style="padding-bottom:10px"><fmt:message key="login.password"/></td>
<td align="left" style="padding-bottom:10px"><input type="password" name="j_password" style="width:12em" tabindex="2"></td>
</tr>
<input type="text" id="j_username" name="j_username" tabindex="1" placeholder="<fmt:message key="login.username"/>">
<input type="password" name="j_password" tabindex="2" placeholder="<fmt:message key="login.password"/>">
<input name="submit" type="submit" value="<fmt:message key="login.login"/>" tabindex="4"></td>
<div class="details">
<div id="loginremember">
<label for="remember"><fmt:message key="login.remember"/></label>
<input type="checkbox" name="remember-me" id="remember" class="checkbox" tabindex="3">
</div>
<a href="recover.view"><fmt:message key="login.recover"/></a>
</div>
<tr>
<td align="left"><input name="submit" type="submit" value="<fmt:message key="login.login"/>" tabindex="4"></td>
<td align="left" class="detail">
<input type="checkbox" name="remember-me" id="remember" class="checkbox" tabindex="3">
<label for="remember"><fmt:message key="login.remember"/></label>
</td>
</tr>
<tr>
<td></td>
<td align="left" class="detail"><a href="recover.view"><fmt:message key="login.recover"/></a></td>
</tr>
<c:if test="${model.logout}">
<tr><td colspan="2" style="padding-top:10px"><b><fmt:message key="login.logout"/></b></td></tr>
<div class="loginmessagebottom">
<b><fmt:message key="login.logout"/></b>
</div>
</c:if>
<c:if test="${model.error}">
<tr><td colspan="2" style="padding-top:10px"><span class="warning"><fmt:message key="login.error"/></span></td></tr>
<div class="loginmessagebottom">
<span class="warning"><fmt:message key="login.error"/></span>
</div>
</c:if>
</table>
<c:if test="${model.insecure}">
<div class="loginmessagebottom">
<p class="warning"><fmt:message key="login.insecure"><fmt:param value="${model.brand}"/></fmt:message></p>
</div>
</c:if>
<c:if test="${model.insecure}">
<p class="warning"><fmt:message key="login.insecure"><fmt:param value="${model.brand}"/></fmt:message></p>
</c:if>
</div>
</form>
</div>
</form>
</body>
</html>
libresonic-main/src/main/webapp/style/default.css
+52 -1
View File
@@ -106,6 +106,57 @@ h2, h2 a, .topHeader a {
font-weight: normal;
}
/* Login page */
#loginframe {
padding: 20px 50px;
margin: 100px 50px;
display: list-item;
list-style: none;
text-align: center;
}
#loginframe > * {
margin: 0 auto;
display: block;
}
#loginframe .loginmessagetop {
margin-bottom: 1em;
max-width: 30rem;
}
#loginframe input[type=text],
#loginframe input[type=submit],
#loginframe input[type=password] {
width: 20rem;
margin-bottom: 0.5em;
}
#loginframe input[type=submit] {
margin: 1rem auto;
padding: 0.3rem;
background: #2f7bd9;
color: #f2f2f2;
transition: color 0.2s ease, background 0.2s ease;
}
#loginframe input[type=submit]:hover {
background: #f2f2f2;
color: #2d2d2d;
}
#loginremember {
display: inline-flex;
align-items: center;
margin-right: 10px;
}
#loginframe .loginmessagebottom {
margin-top: 1em;
max-width: 50em;
}
/***************************************************************************************
* The rest of the CSS is typically not changed in other themes (but not necessarily so).
***************************************************************************************/
@@ -383,4 +434,4 @@ img {
.context-menu-item {
color: black;
}
}