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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
benferreri
2019-10-03 17:33:50 -04:00
parent 207ee4569c f77a0d8b67
commit 38b602922b
3 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/java/org/airsonic/player/controller/TranscodingSettingsController.java
+2 -1
View File
@@ -69,9 +69,10 @@ public class TranscodingSettingsController {
public String doPost(HttpServletRequest request, RedirectAttributes redirectAttributes) throws Exception {
String error = handleParameters(request, redirectAttributes);
if (error != null) {
redirectAttributes.addFlashAttribute("error", error);
} else {
redirectAttributes.addFlashAttribute("settings_toast", true);
}
redirectAttributes.addFlashAttribute("error", error);
return "redirect:transcodingSettings.view";
}
airsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp
+21 -20
View File
@@ -132,28 +132,29 @@
</td>
<td style="padding-left:15pt;padding-right:5pt;vertical-align: middle;width: 100%;text-align: center">
<a href="<c:url value="/logout"/>" target="_top">
<c:choose>
<c:when test="${model.showAvatar}">
<sub:url value="avatar.view" var="avatarUrl">
<sub:param name="username" value="${model.user.username}"/>
</sub:url>
<div style="padding-bottom: 4px">
<c:if test="${model.user.settingsRole}"><a href="personalSettings.view" target="main"></c:if>
<img src="${avatarUrl}" alt="" width="30" height="30">
<c:if test="${model.user.settingsRole}"></a></c:if>
</div>
</c:when>
<c:otherwise>
<img src="<spring:theme code="logoutImage"/>" alt="logout" height="24">
</c:otherwise>
</c:choose>
<c:choose>
<c:when test="${model.showAvatar}">
<sub:url value="avatar.view" var="avatarUrl">
<sub:param name="username" value="${model.user.username}"/>
</sub:url>
<div style="padding-bottom: 4px">
<c:if test="${model.user.settingsRole}"><a href="personalSettings.view" target="main"></c:if>
<img src="${avatarUrl}" alt="" width="30" height="30">
<c:if test="${model.user.settingsRole}"></a></c:if>
<div class="detail">
<fmt:message key="top.logout" var="logout"><br/>
<fmt:param value="${model.user.username}"/></fmt:message>
${fn:escapeXml(logout)}
</div>
</c:when>
<c:otherwise>
<img src="<spring:theme code="logoutImage"/>" alt="logout" height="24">
</c:otherwise>
</c:choose>
<div class="detail">
<fmt:message key="top.logout" var="logout"><br/>
<fmt:param value="${model.user.username}"/></fmt:message>
<a href="<c:url value="/logout"/>" target="_top">${fn:escapeXml(logout)}</a>
</div>
</a>
</td>
</tr></table>
airsonic-main/src/main/webapp/style/default-without-mediaelement.css
+1
View File
@@ -194,6 +194,7 @@ input, textarea, select {
padding: 3px;
border-radius: 3px;
border: 1px solid lightgray;
vertical-align: middle;
}
input[type=submit], input[type=button] {