Merge remote-tracking branch 'upstream/master'

airsonic-main/src/main/java/org/airsonic/player/controller/TranscodingSettingsController.java

@@ -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

@@ -132,7 +132,7 @@
         </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">
@@ -152,8 +152,9 @@
                 <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>
+                    ${fn:escapeXml(logout)}
                 </div>
+            </a>
         </td>
 
     </tr></table>

airsonic-main/src/main/webapp/style/default-without-mediaelement.css

@@ -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] {