Skip to content

Commit

Permalink
More design
Browse files Browse the repository at this point in the history
  • Loading branch information
@popeen
popeen committed Dec 27, 2015
1 parent 8d1c8fc commit e49a062
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 104 deletions.
4 changes: 2 additions & 2 deletions subsonic-main/src/main/java/net/sourceforge/subsonic/controller/StatusChartController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,11 @@ public synchronized ModelAndView handleRequest(HttpServletRequest request, HttpS
XYPlot plot = (XYPlot) chart.getPlot();

plot.setRangeAxisLocation(AxisLocation.BOTTOM_OR_RIGHT);
Paint background = new GradientPaint(0, 0, Color.lightGray, 0, IMAGE_HEIGHT, Color.white);
Paint background = new GradientPaint(0, 0, new Color(0xBAD7E3), 0, IMAGE_HEIGHT, new Color(0xBAD7E3));
plot.setBackgroundPaint(background);

XYItemRenderer renderer = plot.getRendererForDataset(dataset);
renderer.setSeriesPaint(0, Color.blue.darker());
renderer.setSeriesPaint(0, new Color(0x3284A8));
renderer.setSeriesStroke(0, new BasicStroke(2f));

// Set theme-specific colors.
Expand Down
10 changes: 5 additions & 5 deletions subsonic-main/src/main/java/net/sourceforge/subsonic/controller/UserChartController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,11 +95,11 @@ private JFreeChart createChart(CategoryDataset dataset, HttpServletRequest reque
JFreeChart chart = ChartFactory.createBarChart(null, null, null, dataset, PlotOrientation.HORIZONTAL, false, false, false);

CategoryPlot plot = chart.getCategoryPlot();
Paint background = new GradientPaint(0, 0, Color.lightGray, 0, IMAGE_MIN_HEIGHT, Color.white);
Paint background = new GradientPaint(0, 0, new Color(0xBAD7E3), 0, IMAGE_MIN_HEIGHT, new Color(0xBAD7E3));
plot.setBackgroundPaint(background);
plot.setDomainGridlinePaint(Color.white);
plot.setDomainGridlinePaint(new Color(0xBAD7E3));
plot.setDomainGridlinesVisible(true);
plot.setRangeGridlinePaint(Color.white);
plot.setRangeGridlinePaint(new Color(0xBAD7E3));
plot.setRangeAxisLocation(AxisLocation.BOTTOM_OR_LEFT);

LogarithmicAxis rangeAxis = new LogarithmicAxis(null);
Expand All @@ -113,8 +113,8 @@ private JFreeChart createChart(CategoryDataset dataset, HttpServletRequest reque

// Set up gradient paint for series.
GradientPaint gp0 = new GradientPaint(
0.0f, 0.0f, Color.blue,
0.0f, 0.0f, new Color(0, 0, 64)
0.0f, 0.0f, new Color(0x3284A8),
0.0f, 0.0f, new Color(0x3284A8)
);
renderer.setSeriesPaint(0, gp0);

Expand Down
2 changes: 1 addition & 1 deletion subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_en.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ more.apps.text = <p>Check out the steadily growing list of <a href="http://subso
These provide fun and alternative ways to enjoy your media collection - no matter where you are. \
Apps are available for Android, iPhone, Windows Phone, BlackBerry, Roku and many more.</p>
more.jamstash.title = JamStash
more.jamstash.text = <p>Jamstash is an HTML5 player for Booksonic. <a href="{0}" target="_blank">Click here</a> to start it. \
more.jamstash.text = <p>Jamstash is an HTML5 player for Booksonic and Subsonic. <a href="{0}" target="_blank">Click here</a> to start it. \
Also available as a <a href="https://chrome.google.com/webstore/detail/jamstash/jccdpflnecheidefpofmlblgebobbloc" target="_blank">Chrome App</a>.</p>
more.status.title = Network Status
more.status.text = <a href="status.view">Monitor</a> the real-time status of all network media streams.
Expand Down
2 changes: 1 addition & 1 deletion subsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
</tr>
<tr>
<td></td>
<td align="left" class="detail"><a href="recover.view" class="light"><fmt:message key="login.recover"/></a></td>
<td align="left" class="detail"><a href="recover.view" style="color: #bad7e3"><fmt:message key="login.recover"/></a></td>
</tr>

<c:if test="${model.logout}">
Expand Down
94 changes: 0 additions & 94 deletions subsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,100 +46,12 @@
<span style="vertical-align: middle"><fmt:message key="more.title"/></span>
</h1>

<c:if test="${model.user.streamRole}">
<h2>
<img src="<spring:theme code="shuffleImage"/>" alt=""/>
<span style="vertical-align: middle"><fmt:message key="more.random.title"/></span>
</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>
<img src="<spring:theme code="androidImage"/>" alt=""/>
<span style="vertical-align: middle"><fmt:message key="more.booksonic.title"/></span>
</h2>
<fmt:message key="more.booksonic.text"/>


<h2>
<img src="<spring:theme code="androidImage"/>" alt=""/>
<span style="vertical-align: middle"><fmt:message key="more.apps.title"/></span>
</h2>
<fmt:message key="more.apps.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>
<img src="<spring:theme code="html5Image"/>" alt=""/>
<span style="vertical-align: middle"><fmt:message key="more.jamstash.title"/></span>
Expand All @@ -152,12 +64,6 @@
</h2>
<fmt:message key="more.status.text"/>

<h2>
<img src="<spring:theme code="podcastImage"/>" alt=""/>
<span style="vertical-align: middle"><fmt:message key="more.podcast.title"/></span>
</h2>
<fmt:message key="more.podcast.text"/>

<c:if test="${model.user.uploadRole}">

<h2>
Expand Down
2 changes: 1 addition & 1 deletion subsonic-main/src/main/webapp/style/default.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ a:link, a:active, a:visited, a:link *, a:active *, a:visited *, td .forward a{
color: #666;
}
/* Link color */
.topHeader a, .detail a, .forward a, .dense, .dense a, td .header a, #toggleRepeat, .bgcolor2 a, .playlistframe h2, .detail label, .light, td h2, #similarArtists a, #artistBio a, .detail{
.topHeader a, .detail a, .forward a, .dense, .dense a, td .header a, #toggleRepeat, .bgcolor2 a, .playlistframe h2, .detail label, .light, td h2, #similarArtists a, #artistBio a, .leftframe .detail{
color: #bad7e3;
}
.bgcolor1 a {
Expand Down

0 comments on commit e49a062

Please sign in to comment.