From e49a062b19bb973a1eb506832f90c8e2a3952a97 Mon Sep 17 00:00:00 2001 From: Patrik Johansson Date: Sun, 27 Dec 2015 14:48:22 +0100 Subject: [PATCH] More design --- .../controller/StatusChartController.java | 4 +- .../controller/UserChartController.java | 10 +- .../i18n/ResourceBundle_en.properties | 2 +- .../src/main/webapp/WEB-INF/jsp/login.jsp | 2 +- .../src/main/webapp/WEB-INF/jsp/more.jsp | 94 ------------------- .../src/main/webapp/style/default.css | 2 +- 6 files changed, 10 insertions(+), 104 deletions(-) diff --git a/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/StatusChartController.java b/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/StatusChartController.java index 878b8ae..5c35b88 100644 --- a/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/StatusChartController.java +++ b/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/StatusChartController.java @@ -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. diff --git a/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/UserChartController.java b/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/UserChartController.java index 0428eff..a252d20 100644 --- a/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/UserChartController.java +++ b/subsonic-main/src/main/java/net/sourceforge/subsonic/controller/UserChartController.java @@ -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); @@ -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); diff --git a/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_en.properties b/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_en.properties index 6b24ee1..9b80af3 100644 --- a/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_en.properties +++ b/subsonic-main/src/main/resources/net/sourceforge/subsonic/i18n/ResourceBundle_en.properties @@ -246,7 +246,7 @@ more.apps.text =

Check out the steadily growing list of Click here to start it. \ +more.jamstash.text =

Jamstash is an HTML5 player for Booksonic and Subsonic. Click here to start it. \ Also available as a Chrome App.

more.status.title = Network Status more.status.text = Monitor the real-time status of all network media streams. diff --git a/subsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp b/subsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp index 569970d..7d51b54 100644 --- a/subsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/subsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp @@ -42,7 +42,7 @@ - + diff --git a/subsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp b/subsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp index 1246b14..fe668d7 100644 --- a/subsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp +++ b/subsonic-main/src/main/webapp/WEB-INF/jsp/more.jsp @@ -46,100 +46,12 @@ - -

- " alt=""/> - -

- -
- - - - - - - - - - - - - - - - - -
- - - - - - - - - "> -
- - -
-
- - -Apps" style="float: right;margin-left: 3em; margin-right: 3em"/> -

" alt=""/>

- -

- " alt=""/> - -

- - - -" target="_blank"> - Jamstash" style="float: right;margin-left: 3em; margin-right: 3em"/> - -

" alt=""/> @@ -152,12 +64,6 @@

-

- " alt=""/> - -

- -

diff --git a/subsonic-main/src/main/webapp/style/default.css b/subsonic-main/src/main/webapp/style/default.css index 9d3cdff..a08969f 100644 --- a/subsonic-main/src/main/webapp/style/default.css +++ b/subsonic-main/src/main/webapp/style/default.css @@ -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 {