Skip to content

Commit 365898d

Browse files
committed
New: Links (forums, trello, etc) shown in System: Info
1 parent 71e83ba commit 365898d

9 files changed

+64
-12
lines changed

gulp/less.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ gulp.task('less', function () {
1818
paths.src.root + 'Settings/settings.less',
1919
paths.src.root + 'System/Logs/logs.less',
2020
paths.src.root + 'System/Update/update.less',
21+
paths.src.root + 'System/Info/info.less',
2122
])
2223
.pipe(print())
2324
.pipe(less({
@@ -29,4 +30,4 @@ gulp.task('less', function () {
2930
}))
3031
.on('error', errorHandler.onError)
3132
.pipe(gulp.dest(paths.dest.content));
32-
});
33+
});

src/NzbDrone.Core/Parser/QualityParser.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ public class QualityParser
1313
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
1414

1515
private static readonly Regex SourceRegex = new Regex(@"\b(?:
16-
(?<bluray>BluRay|Blu-Ray|HDDVD)|
16+
(?<bluray>BluRay|Blu-Ray|HDDVD|BD)|
1717
(?<webdl>WEB[-_. ]DL|WEBDL|WebRip|iTunesHD|WebHD)|
1818
(?<hdtv>HDTV)|
1919
(?<bdrip>BDRiP)|

src/UI/System/Info/About/AboutViewTemplate.hbs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<fieldset>
22
<legend>About</legend>
33

4-
<dl class="dl-horizontal">
4+
<dl class="dl-horizontal info">
55
<dt>Version</dt>
66
<dd>{{version}}</dd>
77

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
'use strict';
2+
define(
3+
[
4+
'marionette'
5+
], function (Marionette) {
6+
return Marionette.ItemView.extend({
7+
template: 'System/Info/MoreInfo/MoreInfoViewTemplate'
8+
});
9+
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<fieldset>
2+
<legend>More Info</legend>
3+
4+
<dl class="dl-horizontal info">
5+
<dt>Home page</dt>
6+
<dd><a href="https://sonarr.tv/">sonarr.tv</a></dd>
7+
8+
<dt>Wiki</dt>
9+
<dd><a href="https://wiki.sonarr.tv/">wiki.sonarr.tv</a></dd>
10+
11+
<dt>Forums</dt>
12+
<dd><a href="https://forums.sonarr.tv/">forums.sonarr.tv</a></dd>
13+
14+
<dt>Twitter</dt>
15+
<dd><a href="https://twitter.com/sonarrtv">@sonarrtv</a></dd>
16+
17+
<dt>IRC</dt>
18+
<dd><a href="irc://irc.freenode.net/#sonarr">#sonarr on Freenode</a> or (<a href="http://webchat.freenode.net/?channels=#sonarr">webchat</a>)</dd>
19+
20+
<dt>Source</dt>
21+
<dd><a href="https://github.com/Sonarr/Sonarr/">github.com/Sonarr/Sonarr</a></dd>
22+
23+
<dt>Feature Requests</dt>
24+
<dd><a href="https://trello.com/b/MadvFKy4/sonarr">trello.com/b/MadvFKy4/sonarr</a></dd>
25+
</dl>
26+
</fieldset>
27+

src/UI/System/Info/SystemInfoLayout.js

+11-7
Original file line numberDiff line numberDiff line change
@@ -5,25 +5,29 @@ define(
55
'marionette',
66
'System/Info/About/AboutView',
77
'System/Info/DiskSpace/DiskSpaceLayout',
8-
'System/Info/Health/HealthLayout'
8+
'System/Info/Health/HealthLayout',
9+
'System/Info/MoreInfo/MoreInfoView'
910
], function (Backbone,
1011
Marionette,
1112
AboutView,
1213
DiskSpaceLayout,
13-
HealthLayout) {
14+
HealthLayout,
15+
MoreInfoView) {
1416
return Marionette.Layout.extend({
1517
template: 'System/Info/SystemInfoLayoutTemplate',
1618

1719
regions: {
18-
about : '#about',
19-
diskSpace: '#diskspace',
20-
health : '#health'
20+
about : '#about',
21+
diskSpace : '#diskspace',
22+
health : '#health',
23+
moreInfo : '#more-info'
2124
},
2225

2326
onRender: function () {
24-
this.about.show(new AboutView());
25-
this.diskSpace.show(new DiskSpaceLayout());
2627
this.health.show(new HealthLayout());
28+
this.diskSpace.show(new DiskSpaceLayout());
29+
this.about.show(new AboutView());
30+
this.moreInfo.show(new MoreInfoView());
2731
}
2832
});
2933
});

src/UI/System/Info/SystemInfoLayoutTemplate.hbs

+6-2
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@
22
<div class="col-md-12" id="health"></div>
33
</div>
44

5+
<div class="row">
6+
<div class="col-md-12" id="diskspace"></div>
7+
</div>
8+
59
<div class="row">
610
<div class="col-md-12" id="about"></div>
711
</div>
812

913
<div class="row">
10-
<div class="col-md-12" id="diskspace"></div>
11-
</div>
14+
<div class="col-md-12" id="more-info"></div>
15+
</div>

src/UI/System/Info/info.less

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
dl.info {
2+
dt, dd {
3+
padding-bottom: 5px;
4+
}
5+
}

src/UI/index.html

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<link href="/Content/calendar.css" rel='stylesheet' type='text/css'/>
2323
<link href="/Content/update.css" rel='stylesheet' type='text/css'/>
2424
<link href="/Content/overrides.css" rel='stylesheet' type='text/css'/>
25+
<link href="/Content/info.css" rel='stylesheet' type='text/css'/>
26+
2527

2628
<link rel="apple-touch-icon" href="/Content/Images/touch/57.png"/>
2729
<link rel="apple-touch-icon" sizes="72x72" href="/Content/Images/touch/72.png"/>

0 commit comments

Comments
 (0)