Merge remote-tracking branch 'upstream/master'

master
benferreri 5 years ago
commit 38b602922b
  1. 3
      airsonic-main/src/main/java/org/airsonic/player/controller/TranscodingSettingsController.java
  2. 43
      airsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp
  3. 1
      airsonic-main/src/main/webapp/style/default-without-mediaelement.css

@ -69,9 +69,10 @@ public class TranscodingSettingsController {
public String doPost(HttpServletRequest request, RedirectAttributes redirectAttributes) throws Exception { public String doPost(HttpServletRequest request, RedirectAttributes redirectAttributes) throws Exception {
String error = handleParameters(request, redirectAttributes); String error = handleParameters(request, redirectAttributes);
if (error != null) { if (error != null) {
redirectAttributes.addFlashAttribute("error", error);
} else {
redirectAttributes.addFlashAttribute("settings_toast", true); redirectAttributes.addFlashAttribute("settings_toast", true);
} }
redirectAttributes.addFlashAttribute("error", error);
return "redirect:transcodingSettings.view"; return "redirect:transcodingSettings.view";
} }

@ -132,28 +132,29 @@
</td> </td>
<td style="padding-left:15pt;padding-right:5pt;vertical-align: middle;width: 100%;text-align: center"> <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:choose>
<c:when test="${model.showAvatar}"> <c:when test="${model.showAvatar}">
<sub:url value="avatar.view" var="avatarUrl"> <sub:url value="avatar.view" var="avatarUrl">
<sub:param name="username" value="${model.user.username}"/> <sub:param name="username" value="${model.user.username}"/>
</sub:url> </sub:url>
<div style="padding-bottom: 4px"> <div style="padding-bottom: 4px">
<c:if test="${model.user.settingsRole}"><a href="personalSettings.view" target="main"></c:if> <c:if test="${model.user.settingsRole}"><a href="personalSettings.view" target="main"></c:if>
<img src="${avatarUrl}" alt="" width="30" height="30"> <img src="${avatarUrl}" alt="" width="30" height="30">
<c:if test="${model.user.settingsRole}"></a></c:if> <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>
<div class="detail">
<fmt:message key="top.logout" var="logout"><br/>
<fmt:param value="${model.user.username}"/></fmt:message>
${fn:escapeXml(logout)}
</div> </div>
</c:when> </a>
<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>
</td> </td>
</tr></table> </tr></table>

@ -194,6 +194,7 @@ input, textarea, select {
padding: 3px; padding: 3px;
border-radius: 3px; border-radius: 3px;
border: 1px solid lightgray; border: 1px solid lightgray;
vertical-align: middle;
} }
input[type=submit], input[type=button] { input[type=submit], input[type=button] {

Loading…
Cancel
Save