Skip to content

Commit

Permalink
Branding and design update
Browse files Browse the repository at this point in the history
  • Loading branch information
@popeen
popeen committed Dec 26, 2015
1 parent 11c2427 commit 8d1c8fc
Show file tree
Hide file tree
Showing 25 changed files with 84 additions and 48 deletions.
4 changes: 2 additions & 2 deletions subsonic-main/src/main/java/net/sourceforge/subsonic/Logger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ private void add(Level level, Object message, Throwable error) {
try {
getPrintWriter().println(entry);
} catch (IOException x) {
System.err.println("Failed to write to subsonic.log. " + x);
System.err.println("Failed to write to booksonic.log. " + x);
}
entries.add(entry);
}
Expand All @@ -181,7 +181,7 @@ private static synchronized PrintWriter getPrintWriter() throws IOException {

public static File getLogFile() {
File subsonicHome = SettingsService.getSubsonicHome();
return new File(subsonicHome, "subsonic.log");
return new File(subsonicHome, "booksonic.log");
}

/**
Expand Down
2 changes: 1 addition & 1 deletion subsonic-main/src/main/java/net/sourceforge/subsonic/service/SettingsService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1031,7 +1031,7 @@ private Locale parseLocale(String line) {
* @return The brand name.
*/
public String getBrand() {
return "Subsonic";
return "Booksonic";
}

/**
Expand Down
18 changes: 9 additions & 9 deletions subsonic-main/src/main/java/net/sourceforge/subsonic/service/VersionService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ public synchronized Version getLocalVersion() {
if (localVersion == null) {
try {
localVersion = new Version(readLineFromResource("/version.txt"));
LOG.info("Resolved local Subsonic version to: " + localVersion);
LOG.info("Resolved local Booksonic version to: " + localVersion);
} catch (Exception x) {
LOG.warn("Failed to resolve local Subsonic version.", x);
LOG.warn("Failed to resolve local Booksonic version.", x);
}
}
return localVersion;
Expand Down Expand Up @@ -126,7 +126,7 @@ public synchronized Date getLocalBuildDate() {
String date = readLineFromResource("/build_date.txt");
localBuildDate = DATE_FORMAT.parse(date);
} catch (Exception x) {
LOG.warn("Failed to resolve local Subsonic build date.", x);
LOG.warn("Failed to resolve local Booksonic build date.", x);
}
}
return localBuildDate;
Expand All @@ -143,7 +143,7 @@ public synchronized String getLocalBuildNumber() {
try {
localBuildNumber = readLineFromResource("/build_number.txt");
} catch (Exception x) {
LOG.warn("Failed to resolve local Subsonic build number.", x);
LOG.warn("Failed to resolve local Booksonic build number.", x);
}
}
return localBuildNumber;
Expand Down Expand Up @@ -218,7 +218,7 @@ private void refreshLatestVersion() {
lastVersionFetched = now;
readLatestVersion();
} catch (Exception x) {
LOG.warn("Failed to resolve latest Subsonic version.", x);
LOG.warn("Failed to resolve latest Booksonic version.", x);
}
}
}
Expand All @@ -245,21 +245,21 @@ private void readLatestVersion() throws IOException {
}

BufferedReader reader = new BufferedReader(new StringReader(content));
Pattern finalPattern = Pattern.compile("SUBSONIC_FULL_VERSION_BEGIN(.*)SUBSONIC_FULL_VERSION_END");
Pattern betaPattern = Pattern.compile("SUBSONIC_BETA_VERSION_BEGIN(.*)SUBSONIC_BETA_VERSION_END");
Pattern finalPattern = Pattern.compile("BOOKSONIC_FULL_VERSION_BEGIN(.*)BOOKSONIC_FULL_VERSION_END");
Pattern betaPattern = Pattern.compile("BOOKSONIC_BETA_VERSION_BEGIN(.*)BOOKSONIC_BETA_VERSION_END");

try {
String line = reader.readLine();
while (line != null) {
Matcher finalMatcher = finalPattern.matcher(line);
if (finalMatcher.find()) {
latestFinalVersion = new Version(finalMatcher.group(1));
LOG.info("Resolved latest Subsonic final version to: " + latestFinalVersion);
LOG.info("Resolved latest Booksonic final version to: " + latestFinalVersion);
}
Matcher betaMatcher = betaPattern.matcher(line);
if (betaMatcher.find()) {
latestBetaVersion = new Version(betaMatcher.group(1));
LOG.info("Resolved latest Subsonic beta version to: " + latestBetaVersion);
LOG.info("Resolved latest Booksonic beta version to: " + latestBetaVersion);
}
line = reader.readLine();
}
Expand Down
6 changes: 3 additions & 3 deletions 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 @@ -79,9 +79,9 @@ top.trialdaysleft = {0} day(s) left of trial

# left.jsp
left.scanning = Scanning media folders...
left.statistics = {0}&nbsp;artists<br>\
{1}&nbsp;albums<br>\
{2}&nbsp;songs<br>\
left.statistics = {0}&nbsp;authors<br>\
{1}&nbsp;books<br>\
{2}&nbsp;tracks<br>\
{3}<br>\
{4}&nbsp;hours
left.shortcut = Shortcuts
Expand Down
15 changes: 15 additions & 0 deletions subsonic-main/src/main/resources/net/sourceforge/subsonic/theme/default_light.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ addImage = icons/default_light/add.png
addNextImage = icons/default_light/add_next.png
androidImage = icons/default_light/android.png
backImage = icons/default_light/back.png
backImageLight = icons/default_light/back_light.png
castActiveImage = icons/default_light/cast_active.png
castIdleImage = icons/default_light/cast_idle.png
castPauseImage = icons/default_light/cast_pause.png
Expand All @@ -17,40 +18,54 @@ donateSmallImage = icons/default_light/donate_small.png
downImage = icons/default_light/down.png
downloadImage = icons/default_light/download.png
forwardImage = icons/default_light/forward.png
forwardImageLight = icons/default_light/forward_light.png
helpImage = icons/default_light/help.png
helpImageLight = icons/default_light/help_light.png
helpPopupImage = icons/default_light/help_small.png
homeImage = icons/default_light/home.png
homeImageLight = icons/default_light/home_light.png
html5Image = icons/default_light/html5.png
logImage = icons/default_light/log.png
logoImage = icons/default_light/subsonic_logo.png
logoImageLight = icons/default_light/subsonic_logo_light.png
moreImage = icons/default_light/more.png
moreImageLight = icons/default_light/more_light.png
muteImage = icons/default_light/mute.png
nowPlayingImage = icons/default_light/now_playing.png
nowPlayingImageLight = icons/default_light/now_playing_light.png
playImage = icons/default_light/play.png
playImageLight = icons/default_light/play_light.png
playlistImage = icons/default_light/playlist.png
playlistImageLight = icons/default_light/playlist_light.png
playOverlayImage = icons/default_light/play_overlay.png
podcastImage = icons/default_light/podcast.png
podcastLargeImage = icons/default_light/podcast_large.png
podcastLargeImageLight = icons/default_light/podcast_large_light.png
randomImage = icons/default_light/random.png
ratingOnImage = icons/default_light/ratingOn.png
ratingOffImage = icons/default_light/ratingOff.png
ratingHalfImage = icons/default_light/ratingHalf.png
removeImage = icons/default_light/remove.png
scanningImage = icons/default_light/spinner.gif
searchImage = icons/default_light/search.png
searchImageLight = icons/default_light/search_light.png
settingsImage = icons/default_light/settings.png
settingsImageLight = icons/default_light/settings_light.png
shareSmallImage = icons/default_light/share_small.png
shareImage = icons/default_light/share.png
shareFacebookImage = icons/default_light/share_facebook.png
shareTwitterImage = icons/default_light/share_twitter.png
shuffleImage = icons/default_light/shuffle.png
starredImage = icons/default_light/starred.png
starredImageLight = icons/default_light/starred_light.png
statusImage = icons/default_light/status.png
statusSmallImage = icons/default_light/status_small.png
upImage = icons/default_light/up.png
uploadImage = icons/default_light/upload.png
viewAsListImage = icons/default_light/view_as_list.png
viewAsListImageLight = icons/default_light/view_as_list_light.png
viewAsGridImage = icons/default_light/view_as_grid.png
viewAsGridImageLight = icons/default_light/view_as_grid_light.png
volumeImage = icons/default_light/volume.png
errorImage = icons/default_light/error.png

Expand Down
4 changes: 2 additions & 2 deletions subsonic-main/src/main/webapp/WEB-INF/jsp/left.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
<a name="top"></a>

<div style="padding-bottom:1.5em">
<a href="help.view?" target="main"><img src="<spring:theme code="logoImage"/>" title="<fmt:message key="top.help"/>" alt=""></a>
<a href="help.view?" target="main"><img src="<spring:theme code="logoImageLight"/>" title="<fmt:message key="top.help"/>" alt=""></a>
</div>

<c:if test="${fn:length(model.musicFolders) > 1}">
Expand Down Expand Up @@ -119,7 +119,7 @@
<c:forEach items="${model.radios}" var="radio">
<p class="dense" style="padding-left: 2px">
<a target="hidden" href="${radio.streamUrl}">
<img src="<spring:theme code="playImage"/>" alt="<fmt:message key="common.play"/>" title="<fmt:message key="common.play"/>"></a>
<img src="<spring:theme code="playImageLight"/>" alt="<fmt:message key="common.play"/>" title="<fmt:message key="common.play"/>"></a>
<span style="vertical-align: middle">
<c:choose>
<c:when test="${empty radio.homepageUrl}">
Expand Down
10 changes: 5 additions & 5 deletions subsonic-main/src/main/webapp/WEB-INF/jsp/login.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,16 @@
<table>
<tr>
<td colspan="2" align="left" style="padding-bottom:10px">
<img src="<spring:theme code="logoImage"/>" alt="">
<img src="<spring:theme code="logoImageLight"/>" alt="">
</td>
</tr>
<tr>
<td align="left" style="padding-right:10px"><fmt:message key="login.username"/></td>
<td align="left" style="padding-right:10px" class="light"><fmt:message key="login.username"/></td>
<td align="left"><input type="text" id="j_username" name="j_username" style="width:12em" tabindex="1"></td>
</tr>

<tr>
<td align="left" style="padding-bottom:10px"><fmt:message key="login.password"/></td>
<td align="left" style="padding-bottom:10px" class="light"><fmt:message key="login.password"/></td>
<td align="left" style="padding-bottom:10px"><input type="password" name="j_password" style="width:12em" tabindex="2"></td>
</tr>

Expand All @@ -42,11 +42,11 @@
</tr>
<tr>
<td></td>
<td align="left" class="detail"><a href="recover.view"><fmt:message key="login.recover"/></a></td>
<td align="left" class="detail"><a href="recover.view" class="light"><fmt:message key="login.recover"/></a></td>
</tr>

<c:if test="${model.logout}">
<tr><td colspan="2" style="padding-top:10px"><b><fmt:message key="login.logout"/></b></td></tr>
<tr><td colspan="2" style="padding-top:10px" class="light"><b><fmt:message key="login.logout"/></b></td></tr>
</c:if>
<c:if test="${model.error}">
<tr><td colspan="2" style="padding-top:10px"><span class="warning"><fmt:message key="login.error"/></span></td></tr>
Expand Down
4 changes: 2 additions & 2 deletions subsonic-main/src/main/webapp/WEB-INF/jsp/playQueue.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -628,10 +628,10 @@

<c:if test="${model.player.web}">
<td><span class="header">
<img src="<spring:theme code="backImage"/>" alt="" onclick="onPrevious()" style="cursor:pointer"></span>
<img src="<spring:theme code="backImageLight"/>" alt="" onclick="onPrevious()" style="cursor:pointer"></span>
</td>
<td><span class="header">
<img src="<spring:theme code="forwardImage"/>" alt="" onclick="onNext(false)" style="cursor:pointer"></span>
<img src="<spring:theme code="forwardImageLight"/>" alt="" onclick="onNext(false)" style="cursor:pointer"></span>
</td>
</c:if>

Expand Down
22 changes: 11 additions & 11 deletions subsonic-main/src/main/webapp/WEB-INF/jsp/top.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,49 +72,49 @@
<table style="margin:0;padding-top:5px">
<tr>
<td style="padding-right:4.5em;">
<img id="show-left-frame" src="<spring:theme code="viewAsListImage"/>" onclick="showLeftFrame()" alt="" style="display:${model.showSideBar ? 'none' : 'inline'};cursor:pointer">
<img id="hide-left-frame" src="<spring:theme code="viewAsListImage"/>" onclick="hideLeftFrame()" alt="" style="display:${model.showSideBar ? 'inline' : 'none'};cursor:pointer">
<img id="show-left-frame" src="<spring:theme code="viewAsListImageLight"/>" onclick="showLeftFrame()" alt="" style="display:${model.showSideBar ? 'none' : 'inline'};cursor:pointer">
<img id="hide-left-frame" src="<spring:theme code="viewAsListImageLight"/>" onclick="hideLeftFrame()" alt="" style="display:${model.showSideBar ? 'inline' : 'none'};cursor:pointer">
</td>
<td style="min-width:4em;padding-right:2em;text-align: center">
<a href="home.view?" target="main"><img src="<spring:theme code="homeImage"/>" title="${home}" alt="${home}"></a>
<a href="home.view?" target="main"><img src="<spring:theme code="homeImageLight"/>" title="${home}" alt="${home}"></a>
<div class="topHeader"><a href="home.view?" target="main">${home}</a></div>
</td>
<td style="min-width:4em;padding-right:2em;text-align: center">
<a href="nowPlaying.view?" target="main"><img src="<spring:theme code="nowPlayingImage"/>" title="${nowPlaying}" alt="${nowPlaying}"></a>
<a href="nowPlaying.view?" target="main"><img src="<spring:theme code="nowPlayingImageLight"/>" title="${nowPlaying}" alt="${nowPlaying}"></a>
<div class="topHeader"><a href="nowPlaying.view?" target="main">${nowPlaying}</a></div>
</td>
<td style="min-width:4em;padding-right:2em;text-align: center">
<a href="starred.view?" target="main"><img src="<spring:theme code="starredImage"/>" title="${starred}" alt="${starred}"></a>
<a href="starred.view?" target="main"><img src="<spring:theme code="starredImageLight"/>" title="${starred}" alt="${starred}"></a>
<div class="topHeader"><a href="starred.view?" target="main">${starred}</a></div>
</td>
<td style="min-width:4em;padding-right:2em;text-align: center">
<a href="playlists.view?" target="main"><img src="<spring:theme code="playlistImage"/>" title="${playlists}" alt="${playlists}"></a>
<a href="playlists.view?" target="main"><img src="<spring:theme code="playlistImageLight"/>" title="${playlists}" alt="${playlists}"></a>
<div class="topHeader"><a href="playlists.view?" target="main">${playlists}</a></div>
</td>
<td style="min-width:4em;padding-right:2em;text-align: center">
<a href="podcastChannels.view?" target="main"><img src="<spring:theme code="podcastLargeImage"/>" title="${podcast}" alt="${podcast}"></a>
<a href="podcastChannels.view?" target="main"><img src="<spring:theme code="podcastLargeImageLight"/>" title="${podcast}" alt="${podcast}"></a>
<div class="topHeader"><a href="podcastChannels.view?" target="main">${podcast}</a></div>
</td>
<c:if test="${model.user.settingsRole}">
<td style="min-width:4em;padding-right:2em;text-align: center">
<a href="settings.view?" target="main"><img src="<spring:theme code="settingsImage"/>" title="${settings}" alt="${settings}"></a>
<a href="settings.view?" target="main"><img src="<spring:theme code="settingsImageLight"/>" title="${settings}" alt="${settings}"></a>
<div class="topHeader"><a href="settings.view?" target="main">${settings}</a></div>
</td>
</c:if>
<td style="min-width:4em;padding-right:2em;text-align: center">
<a href="more.view?" target="main"><img src="<spring:theme code="moreImage"/>" title="${more}" alt="${more}"></a>
<a href="more.view?" target="main"><img src="<spring:theme code="moreImageLight"/>" title="${more}" alt="${more}"></a>
<div class="topHeader"><a href="more.view?" target="main">${more}</a></div>
</td>
<td style="min-width:4em;padding-right:2em;text-align: center">
<a href="help.view?" target="main"><img src="<spring:theme code="helpImage"/>" title="${help}" alt="${help}"></a>
<a href="help.view?" target="main"><img src="<spring:theme code="helpImageLight"/>" title="${help}" alt="${help}"></a>
<div class="topHeader"><a href="help.view?" target="main">${help}</a></div>
</td>

<td style="padding-left:1em">
<form method="post" action="search.view" target="main" name="searchForm">
<td><input type="text" name="query" id="query" size="28" placeholder="${search}" onclick="select();"
onkeyup="triggerInstantSearch();"></td>
<td><a href="javascript:document.searchForm.submit()"><img src="<spring:theme code="searchImage"/>" alt="${search}" title="${search}"></a></td>
<td><a href="javascript:document.searchForm.submit()"><img src="<spring:theme code="searchImageLight"/>" alt="${search}" title="${search}"></a></td>
</form>
</td>

Expand Down
Binary file added subsonic-main/src/main/webapp/icons/default_light/back_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/forward_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/help_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/home_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/more_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/now_playing_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/play_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/playlist_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/podcast_large_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/search_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/settings_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/starred_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/subsonic_logo_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/view_as_grid_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added subsonic-main/src/main/webapp/icons/default_light/view_as_list_light.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 34 additions & 13 deletions subsonic-main/src/main/webapp/style/default.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,26 @@
*/

/* The primary background color (light gray). */
.bgcolor1, table.music tr:nth-of-type(even) {
background-color: #F9F9F9;
.bgcolor1{
background-color: #bad7e3;
}

table.music tr:nth-of-type(even) {
background-color: #ccc;
}
table.music tr:nth-of-type(odd) {
background-color: #4aacd4;
}
/* The secondary background color (darker gray). */
.bgcolor2, .ruleTableHeader, .log, table.music tr:nth-of-type(odd) {
background-color: #F1F1F1
.bgcolor2{
background-color: #3284a8;
}
.ruleTableHeader, .log{
background-color: #ccc;
}

.headerSelected {
border-bottom: 3px solid darkorange;
border-bottom: 3px solid #3284a8;
}

/* Put stuff here if you need to customize any of the frames. */
Expand Down Expand Up @@ -60,15 +69,20 @@ b, tr {
color: #333333;
}

a:link, a:active, a:visited, a:link *, a:active *, a:visited *, td .forward a{
color: #666;
}
/* Link color */
a:link, a:active, a:visited, a:link *, a:active *, a:visited * {
color: #006699
.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{
color: #bad7e3;
}
.bgcolor1 a {
color: #666;
}

/* Link hover color */
a:hover, a:hover * {
text-decoration: underline;
color: #DD6900
//color: #DD6900
}

/* Color for warning messages. */
Expand Down Expand Up @@ -243,12 +257,19 @@ img {
.coverart {
background-color: white;
color: #323232;
border-radius:2px;
border-radius:10px;
}

.coverart div a img{
.albumThumb .coverart div a img{
width:160px;
height:160px;
border-top-left-radius:10px;
border-top-right-radius:10px;
}

.fit .albumThumb .coverart div a img{
width:300px;
height:300px;
}

.coverart .caption1 {
Expand Down Expand Up @@ -292,7 +313,7 @@ img {
}

::-webkit-scrollbar-thumb {
background: rgba(128, 128, 128, 0.5);
background: rgba(18, 92, 124, 1);
border-radius: 6px;
}

Expand Down Expand Up @@ -337,7 +358,7 @@ img {
}

.forward {
background-image:url("../icons/default_light/forward.png");
background-image:url("../icons/default_light/forward_light.png");
}

.albumComment {
Expand Down

0 comments on commit 8d1c8fc

Please sign in to comment.