GUI update. Should have cleaned out the last music only features from…

… the GUI and changed the colors to Booksonic style
popeen · Feb 6, 2016 · 52f5cdc · 52f5cdc
1 parent c977b87
commit 52f5cdc
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 136 deletions.
diff --git a/subsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp b/subsonic-main/src/main/webapp/WEB-INF/jsp/albumMain.jsp
@@ -17,7 +17,7 @@
         #playButton {
             cursor: pointer;
             font-size:24px;
-            color:#E65100;
+            color:#3184A5;
             margin-left:1.0em;
             margin-right:0.5em;
         }
@@ -307,7 +307,7 @@
 
 <c:forEach items="${model.files}" var="song" varStatus="loopStatus" end="0">
 	<%--@elvariable id="song" type="net.sourceforge.subsonic.domain.MediaFile"--%>
-	<div style="background: #6dc1e3; color: #424242; padding: 5px;">${fn:escapeXml(song.description)}<br/><b><fmt:message key="main.narrated"/>:</b> ${fn:escapeXml(song.narrator)}</div>
+	<div style="background: #F5F5F5; color: #424242; padding: 5px;">${fn:escapeXml(song.description)}<br/><b><fmt:message key="main.narrated"/>:</b> ${fn:escapeXml(song.narrator)}</div>
 </c:forEach>
 
 <table cellpadding="0" style="width:100%;padding-top: 0.3em;padding-bottom: 1em">

diff --git a/subsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp b/subsonic-main/src/main/webapp/WEB-INF/jsp/homePager.jsp
@@ -75,11 +75,5 @@
                 </c:if>
             </c:otherwise>
         </c:choose>
-
-        <c:if test="${not empty model.albums}">
-            <td style="padding-left:3em">
-                <i class="fa fa-random fa-lg fa-fw icon"></i>&nbsp;<a href="javascript:playShuffle()"><fmt:message key="home.shuffle"/></a>
-            </td>
-        </c:if>
     </tr>
 </table>
diff --git a/subsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp b/subsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
@@ -47,87 +47,10 @@
 
 <h1><fmt:message key="more.title"/></h1>
 
-<c:if test="${model.user.streamRole}">
-    <h2 class="more-header"><i class="fa fa-random fa-lg icon"></i>&nbsp;&nbsp;<fmt:message key="more.random.title"/></h2>
-
-    <form method="post" action="randomPlayQueue.view?">
-        <table>
-            <tr>
-                <td><fmt:message key="more.random.text"/></td>
-                <td>
-                    <select name="size">
-                        <option value="10"><fmt:message key="more.random.songs"><fmt:param value="10"/></fmt:message></option>
-                        <option value="20" selected><fmt:message key="more.random.songs"><fmt:param value="20"/></fmt:message></option>
-                        <option value="30"><fmt:message key="more.random.songs"><fmt:param value="30"/></fmt:message></option>
-                        <option value="40"><fmt:message key="more.random.songs"><fmt:param value="40"/></fmt:message></option>
-                        <option value="50"><fmt:message key="more.random.songs"><fmt:param value="50"/></fmt:message></option>
-                    </select>
-                </td>
-                <td><fmt:message key="more.random.genre"/></td>
-                <td>
-                    <select name="genre">
-                        <option value="any"><fmt:message key="more.random.anygenre"/></option>
-                        <c:forEach items="${model.genres}" var="genre">
-                            <option value="${genre.name}"><str:truncateNicely upper="20">${genre.name} (${genre.songCount})</str:truncateNicely></option>
-                        </c:forEach>
-                    </select>
-                </td>
-                <td><fmt:message key="more.random.year"/></td>
-                <td>
-                    <select name="year">
-                        <option value="any"><fmt:message key="more.random.anyyear"/></option>
-
-                        <c:forEach begin="0" end="${model.currentYear - 2010}" var="yearOffset">
-                            <c:set var="year" value="${model.currentYear - yearOffset}"/>
-                            <option value="${year} ${year}">${year}</option>
-                        </c:forEach>
-
-                        <option value="2010 2015">2010 &ndash; 2015</option>
-                        <option value="2005 2010">2005 &ndash; 2010</option>
-                        <option value="2000 2005">2000 &ndash; 2005</option>
-                        <option value="1990 2000">1990 &ndash; 2000</option>
-                        <option value="1980 1990">1980 &ndash; 1990</option>
-                        <option value="1970 1980">1970 &ndash; 1980</option>
-                        <option value="1960 1970">1960 &ndash; 1970</option>
-                        <option value="1950 1960">1950 &ndash; 1960</option>
-                        <option value="0 1949">&lt; 1950</option>
-                    </select>
-                </td>
-                <td><fmt:message key="more.random.folder"/></td>
-                <td>
-                    <select name="musicFolderId">
-                        <option value="-1"><fmt:message key="more.random.anyfolder"/></option>
-                        <c:forEach items="${model.musicFolders}" var="musicFolder">
-                            <option value="${musicFolder.id}">${musicFolder.name}</option>
-                        </c:forEach>
-                    </select>
-                </td>
-                <td>
-                    <input type="submit" value="<fmt:message key="more.random.ok"/>">
-                </td>
-            </tr>
-            <c:if test="${not model.clientSidePlaylist}">
-                <tr>
-                    <td colspan="9">
-                        <input type="checkbox" name="autoRandom" id="autoRandom" class="checkbox"/>
-                        <label for="autoRandom"><fmt:message key="more.random.auto"/></label>
-                    </td>
-                </tr>
-            </c:if>
-        </table>
-    </form>
-</c:if>
-
-<a href="http://subsonic.org/pages/apps.jsp" target="_blank"><img alt="Apps" src="<c:url value="/icons/default_light/apps.png"/>" style="float: right;margin-left: 3em; margin-right: 3em"/></a>
-
 <h2 class="more-header"><i class="fa fa-android fa-lg icon"></i>&nbsp;&nbsp;<fmt:message key="more.apps.title"/></h2>
 
 <fmt:message key="more.booksonic.text"/>
 
-<a href="<c:url value="${model.jamstashUrl}"/>" target="_blank">
-    <img alt="Jamstash" src="<c:url value="/icons/default_light/jamstash.png"/>" style="float: right;margin-left: 3em; margin-right: 3em"/>
-</a>
-
 <h2 class="more-header"><i class="fa fa-html5 fa-lg icon"></i>&nbsp;&nbsp;<fmt:message key="more.jamstash.title"/></h2>
 <fmt:message key="more.jamstash.text"><fmt:param>${model.jamstashUrl}</fmt:param></fmt:message>
 

diff --git a/subsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp b/subsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
@@ -20,7 +20,7 @@
     <style type="text/css">
         .ui-slider .ui-slider-handle {
             width: 12px; height: 12px; cursor: pointer;
-            background: #E65100;
+            background: #3184A5;
             display:none;
             border:none;
         }
@@ -29,16 +29,16 @@
             border:none;
         }
         .ui-slider-range-min {
-            background: #E65100;
+            background: #3184A5;
         }
         .ui-slider-handle:focus {
             outline:none;
         }
         #startButton, #stopButton {
-            cursor:pointer; font-size:30px; color:#E65100
+            cursor:pointer; font-size:30px; color:#3184A5
         }
         #bufferButton {
-            font-size:30px; color:#E65100
+            font-size:30px; color:#3184A5
         }
         #previousButton, #nextButton {
             cursor:pointer; font-size:18px; padding:10px; margin-left:10px; margin-right:10px
@@ -899,45 +899,12 @@
 
         <c:if test="${model.player.web or model.player.jukebox or model.player.external}">
             <td style="white-space:nowrap;"><span class="header"><a href="javascript:onClear()"><fmt:message key="playlist.clear"/></a></span> |</td>
-            <td style="white-space:nowrap;"><span class="header"><a href="javascript:onShuffle()"><fmt:message key="playlist.shuffle"/></a></span> |</td>
-            <td style="white-space:nowrap;"><span class="header"><a href="javascript:onToggleRepeat()"><span id="toggleRepeat"><fmt:message key="playlist.repeat_on"/></span></a></span>  |</td>
             <td style="white-space:nowrap;"><span class="header"><a href="javascript:onUndo()"><fmt:message key="playlist.undo"/></a></span>  |</td>
         </c:if>
 
         <c:if test="${model.user.settingsRole}">
             <td style="white-space:nowrap;"><span class="header"><a href="playerSettings.view?id=${model.player.id}" target="main"><fmt:message key="playlist.settings"/></a></span>  |</td>
         </c:if>
-
-        <c:if test="${model.player.web or model.player.jukebox or model.player.external}">
-            <td style="white-space:nowrap;"><select id="moreActions" onchange="actionSelected(this.options[selectedIndex].id)">
-                <option id="top" selected="selected"><fmt:message key="playlist.more"/></option>
-                <optgroup label="<fmt:message key="playlist.more.playlist"/>">
-                    <option id="savePlayQueue"><fmt:message key="playlist.saveplayqueue"/></option>
-                    <option id="loadPlayQueue"><fmt:message key="playlist.loadplayqueue"/></option>
-                    <option id="savePlaylist"><fmt:message key="playlist.save"/></option>
-                    <c:if test="${model.user.downloadRole}">
-                        <option id="downloadPlaylist"><fmt:message key="common.download"/></option>
-                    </c:if>
-                    <c:if test="${model.user.shareRole}">
-                        <option id="sharePlaylist"><fmt:message key="main.more.share"/></option>
-                    </c:if>
-                    <option id="sortByTrack"><fmt:message key="playlist.more.sortbytrack"/></option>
-                    <option id="sortByAlbum"><fmt:message key="playlist.more.sortbyalbum"/></option>
-                    <option id="sortByArtist"><fmt:message key="playlist.more.sortbyartist"/></option>
-                </optgroup>
-                <optgroup label="<fmt:message key="playlist.more.selection"/>">
-                    <option id="selectAll"><fmt:message key="playlist.more.selectall"/></option>
-                    <option id="selectNone"><fmt:message key="playlist.more.selectnone"/></option>
-                    <option id="removeSelected"><fmt:message key="playlist.remove"/></option>
-                    <c:if test="${model.user.downloadRole}">
-                        <option id="download"><fmt:message key="common.download"/></option>
-                    </c:if>
-                    <option id="appendPlaylist"><fmt:message key="playlist.append"/></option>
-                </optgroup>
-            </select>
-            </td>
-        </c:if>
-
     </tr></table>
 
 <div style="height:100px"></div>

diff --git a/subsonic-main/src/main/webapp/WEB-INF/jsp/settingsHeader.jsp b/subsonic-main/src/main/webapp/WEB-INF/jsp/settingsHeader.jsp
@@ -9,7 +9,7 @@
     </script>
 </c:if>
 
-<c:set var="categories" value="${param.restricted ? 'personal password player share premium' : 'musicFolder general advanced personal user player network share premium dlna sonos transcoding podcast'}"/>
+<c:set var="categories" value="${param.restricted ? 'personal password player share premium' : 'musicFolder general advanced personal user player network share dlna sonos transcoding podcast'}"/>
 <h1><i class="fa fa-cog fa-lg icon"></i>&nbsp;&nbsp;<fmt:message key="settingsheader.title"/></h1>
 
 <h2>

diff --git a/subsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp b/subsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp
@@ -98,7 +98,6 @@
         <span class="topHeader top-menu-item" onclick="showPage('artists.view')"><i class="fa fa-microphone fa-fw fa-lg icon"></i>&nbsp;${artists}</span>
         <span class="topHeader top-menu-item" onclick="showPage('nowPlaying.view')"><i class="fa fa-headphones fa-fw fa-lg icon"></i>&nbsp;${nowPlaying}</span>
         <span class="topHeader top-menu-item" onclick="showPage('starred.view')"><i class="fa fa-star fa-fw fa-lg icon"></i>&nbsp;${starred}</span>
-        <span class="topHeader top-menu-item" onclick="showPage('playlists.view')"><i class="fa fa-music fa-fw fa-lg icon"></i>&nbsp;${playlists}</span>
         <span class="topHeader top-menu-item" onclick="showPage('podcastChannels.view')"><i class="fa fa-rss fa-lg icon"></i>&nbsp;${podcast}</span>
 
         <span style="flex-grow:8"></span>

diff --git a/subsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp b/subsonic-main/src/main/webapp/WEB-INF/jsp/userSettings.jsp
@@ -104,10 +104,6 @@
                 <td><form:checkbox path="podcastRole" id="podcast" cssClass="checkbox"/></td>
                 <td><label for="podcast"><fmt:message key="usersettings.podcast"/></label></td>
             </tr>
-            <tr>
-                <td><form:checkbox path="videoConversionRole" id="videoConversion" cssClass="checkbox"/></td>
-                <td><label for="videoConversion"><fmt:message key="usersettings.videoconversion"/></label></td>
-            </tr>
         </table>
     </c:if>
 

diff --git a/subsonic-main/src/main/webapp/WEB-INF/jsp/videoConverter.jsp b/subsonic-main/src/main/webapp/WEB-INF/jsp/videoConverter.jsp
@@ -7,7 +7,7 @@
 
     <style type="text/css">
         .ui-progressbar-value {
-            background: #E65100;
+            background: #3184A5;
         }
     </style>
     <script type="text/javascript" src="<c:url value="/dwr/engine.js"/>"></script>

diff --git a/subsonic-main/src/main/webapp/style/base.css b/subsonic-main/src/main/webapp/style/base.css
@@ -18,7 +18,7 @@
 }
 
 .headerSelected {
-    border-bottom: 3px solid #E65100;
+    border-bottom: 3px solid #3184A5;
 }
 
 /* Background color for form controls (use default). */
@@ -56,7 +56,7 @@ a:hover, a:hover * {
 
 /* Color for warning messages. */
 .warning {
-    color: #E65100;
+    color: #3184A5;
 }
 
 /* Simple dark border. */

diff --git a/subsonic-main/src/main/webapp/style/default.css b/subsonic-main/src/main/webapp/style/default.css
@@ -21,9 +21,16 @@
 }
 
 .topframe {
-    background-color: #E65100;
+    background-color: #3184A5;
     color: white;
 }
 .topframe .icon {
     color: white;
 }
+
+#upper{
+	-webkit-box-shadow: 0 2px 2px 0px #999; 
+	-moz-box-shadow: 0 2px 2px 0px #999; 
+	box-shadow: 0 2px 2px 0px #999; 
+	z-index:1;
+}
diff --git a/subsonic-main/src/main/webapp/style/videoPlayer.css b/subsonic-main/src/main/webapp/style/videoPlayer.css
@@ -35,7 +35,7 @@
 
 #play, #pause, #buffer {
     font-size: 24px;
-    color: #E65100;
+    color: #3184A5;
     margin-right: 12px;
 }
 
@@ -85,14 +85,14 @@
 }
 
 #cc-on, #cast-active {
-    color: #E65100;
+    color: #3184A5;
 }
 
 .ui-slider .ui-slider-handle {
     width: 12px;
     height: 12px;
     cursor: pointer;
-    background: #E65100;
+    background: #3184A5;
     display: none;
     border: none;
 }
@@ -103,7 +103,7 @@
 }
 
 .ui-slider-range-min {
-    background: #E65100;
+    background: #3184A5;
 }
 
 .ui-slider-handle:focus {