Merge remote-tracking branch 'airsonic/pr/945'

master
Andrew DeMaria 6 years ago
commit 221a0ed933
No known key found for this signature in database
GPG Key ID: 0A3F5E91F8364EDF
  1. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
  2. 4
      airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp
  3. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
  4. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
  5. 4
      airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp
  6. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
  7. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp
  8. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
  9. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
  10. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp
  11. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp
  12. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp
  13. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
  14. 2
      airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
  15. 5
      airsonic-main/src/main/webapp/style/default-without-mediaelement.css

@ -168,7 +168,7 @@
<p class="warning"><fmt:message key="advancedsettings.ldapRequiresRestart"/></p>
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
<input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
<a href="nowPlaying.view"><input type="button" value="<fmt:message key="common.cancel"/>"></a>
</form:form>

@ -119,10 +119,10 @@
<p>
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
<input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
<a href="nowPlaying.view"><input type="button" value="<fmt:message key="common.cancel"/>"></a>
</p>
</form:form>
</body>
</html>
</html>

@ -65,7 +65,7 @@
<p>
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
<input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
<a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
</p>
</form>

@ -158,7 +158,7 @@
<tr>
<td colspan="2" style="padding-top:1.5em">
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
<input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
<a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
</td>
</tr>

@ -49,7 +49,7 @@
<tr>
<td style="padding-top:1.5em" colspan="5">
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
<input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
<a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
</td>
</tr>
</table>
@ -64,4 +64,4 @@
<script language="javascript" type="text/javascript">parent.frames.left.location.href="left.view?"</script>
</c:if>
</body></html>
</body></html>

@ -139,7 +139,7 @@
<p >
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
<input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
<a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
</p>
</form:form>

@ -38,7 +38,7 @@
<tr>
<td colspan="3" style="padding-top:1.5em">
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
<input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
<a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
</td>
</tr>

@ -208,7 +208,7 @@
<p style="padding-top:1em;padding-bottom:1em">
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em"/>
<input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
<a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
</p>
<h2><fmt:message key="personalsettings.avatar.title"/></h2>

@ -196,7 +196,7 @@ $(document).ready(function() {
</c:if>
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-top:1em;margin-right:0.3em">
<input type="button" value="<fmt:message key="common.cancel"/>" style="margin-top:1em" onclick="location.href='nowPlaying.view'">
<a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>" style="margin-top:1em"></a>
</form:form>
</c:otherwise>
</c:choose>

@ -80,7 +80,7 @@
<tr>
<td style="padding-top:1.5em" colspan="2">
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
<input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
<a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
</td>
</tr>

@ -58,7 +58,7 @@
<p style="padding-top:1em">
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
<input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'" style="margin-right:2.0em">
<a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>" style="margin-right:2.0em"></a>
<input type="checkbox" id="deleteExpired" name="deleteExpired" class="checkbox"/>
<label for="deleteExpired"><fmt:message key="sharesettings.deleteexpired"/></label>
</p>

@ -56,7 +56,7 @@
<p>
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
<input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'">
<a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>"></a>
</p>
</form>

@ -87,7 +87,7 @@
<p style="padding-top:0.75em">
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-right:0.3em">
<input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'" style="margin-right:1.3em">
<a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>" style="margin-right:1.3em"></a>
<a href="https://airsonic.github.io/docs/transcode/" target="_blank"><fmt:message key="transcodingsettings.recommended"/></a>
</p>

@ -215,7 +215,7 @@
</c:choose>
<input type="submit" value="<fmt:message key="common.save"/>" style="margin-top:1.5em;margin-right:0.3em">
<input type="button" value="<fmt:message key="common.cancel"/>" onclick="location.href='nowPlaying.view'" style="margin-top:1.5em">
<a href='nowPlaying.view'><input type="button" value="<fmt:message key="common.cancel"/>" style="margin-top:1.5em"></a>
</form:form>
</body></html>

@ -193,6 +193,11 @@ input[type=submit], input[type=button] {
background: white;
padding-left: 1em;
padding-right: 1em;
color: black;
}
input[type=submit]:hover, input[type=button]:hover {
text-decoration: none;
}
input[type=submit]:active, input[type=button]:active {

Loading…
Cancel
Save