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

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

Browse Source
This commit is contained in:
Andrew DeMaria
2019-03-31 19:45:56 -04:00
parent edd097ad5b 5edebf7885
commit 221a0ed933
15 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/webapp/WEB-INF/jsp/advancedSettings.jsp
+1 -1
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/jsp/databaseSettings.jsp
+2 -2
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/jsp/dlnaSettings.jsp
+1 -1
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/jsp/generalSettings.jsp
+1 -1
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/jsp/internetRadioSettings.jsp
+2 -2
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
+1 -1
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/jsp/passwordSettings.jsp
+1 -1
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/jsp/personalSettings.jsp
+1 -1
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/jsp/playerSettings.jsp
+1 -1
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/jsp/podcastSettings.jsp
+1 -1
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/jsp/shareSettings.jsp
+1 -1
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/jsp/sonosSettings.jsp
+1 -1
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/jsp/transcodingSettings.jsp
+1 -1
View File
@@ -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>
airsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
+1 -1
View File
@@ -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>
airsonic-main/src/main/webapp/style/default-without-mediaelement.css
+5
View File
@@ -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 {