diff --git a/gulp/less.js b/gulp/less.js index 714f92661..14a57f8f4 100644 --- a/gulp/less.js +++ b/gulp/less.js @@ -18,6 +18,7 @@ gulp.task('less', function () { paths.src.root + 'Settings/settings.less', paths.src.root + 'System/Logs/logs.less', paths.src.root + 'System/Update/update.less', + paths.src.root + 'System/Info/info.less', ]) .pipe(print()) .pipe(less({ @@ -29,4 +30,4 @@ gulp.task('less', function () { })) .on('error', errorHandler.onError) .pipe(gulp.dest(paths.dest.content)); -}); \ No newline at end of file +}); diff --git a/src/NzbDrone.Core/Parser/QualityParser.cs b/src/NzbDrone.Core/Parser/QualityParser.cs index af67b3edd..5334e00ae 100644 --- a/src/NzbDrone.Core/Parser/QualityParser.cs +++ b/src/NzbDrone.Core/Parser/QualityParser.cs @@ -13,7 +13,7 @@ namespace NzbDrone.Core.Parser private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); private static readonly Regex SourceRegex = new Regex(@"\b(?: - (?BluRay|Blu-Ray|HDDVD)| + (?BluRay|Blu-Ray|HDDVD|BD)| (?WEB[-_. ]DL|WEBDL|WebRip|iTunesHD|WebHD)| (?HDTV)| (?BDRiP)| diff --git a/src/UI/System/Info/About/AboutViewTemplate.hbs b/src/UI/System/Info/About/AboutViewTemplate.hbs index 02bd9b7dd..4429d6a46 100644 --- a/src/UI/System/Info/About/AboutViewTemplate.hbs +++ b/src/UI/System/Info/About/AboutViewTemplate.hbs @@ -1,7 +1,7 @@ 
About -
+
Version
{{version}}
diff --git a/src/UI/System/Info/MoreInfo/MoreInfoView.js b/src/UI/System/Info/MoreInfo/MoreInfoView.js new file mode 100644 index 000000000..5fc70ad48 --- /dev/null +++ b/src/UI/System/Info/MoreInfo/MoreInfoView.js @@ -0,0 +1,9 @@ +'use strict'; +define( + [ + 'marionette' + ], function (Marionette) { + return Marionette.ItemView.extend({ + template: 'System/Info/MoreInfo/MoreInfoViewTemplate' + }); + }); diff --git a/src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs b/src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs new file mode 100644 index 000000000..93a48608b --- /dev/null +++ b/src/UI/System/Info/MoreInfo/MoreInfoViewTemplate.hbs @@ -0,0 +1,27 @@ +
+ More Info + +
+
Home page
+
sonarr.tv
+ +
Wiki
+
wiki.sonarr.tv
+ +
Forums
+
forums.sonarr.tv
+ +
Twitter
+
@sonarrtv
+ +
IRC
+
#sonarr on Freenode or (webchat)
+ +
Source
+
github.com/Sonarr/Sonarr
+ +
Feature Requests
+
trello.com/b/MadvFKy4/sonarr
+
+
+ diff --git a/src/UI/System/Info/SystemInfoLayout.js b/src/UI/System/Info/SystemInfoLayout.js index 33ec107b1..376027af0 100644 --- a/src/UI/System/Info/SystemInfoLayout.js +++ b/src/UI/System/Info/SystemInfoLayout.js @@ -5,25 +5,29 @@ define( 'marionette', 'System/Info/About/AboutView', 'System/Info/DiskSpace/DiskSpaceLayout', - 'System/Info/Health/HealthLayout' + 'System/Info/Health/HealthLayout', + 'System/Info/MoreInfo/MoreInfoView' ], function (Backbone, Marionette, AboutView, DiskSpaceLayout, - HealthLayout) { + HealthLayout, + MoreInfoView) { return Marionette.Layout.extend({ template: 'System/Info/SystemInfoLayoutTemplate', regions: { - about : '#about', - diskSpace: '#diskspace', - health : '#health' + about : '#about', + diskSpace : '#diskspace', + health : '#health', + moreInfo : '#more-info' }, onRender: function () { - this.about.show(new AboutView()); - this.diskSpace.show(new DiskSpaceLayout()); this.health.show(new HealthLayout()); + this.diskSpace.show(new DiskSpaceLayout()); + this.about.show(new AboutView()); + this.moreInfo.show(new MoreInfoView()); } }); }); diff --git a/src/UI/System/Info/SystemInfoLayoutTemplate.hbs b/src/UI/System/Info/SystemInfoLayoutTemplate.hbs index 2fa34bb09..a2b380576 100644 --- a/src/UI/System/Info/SystemInfoLayoutTemplate.hbs +++ b/src/UI/System/Info/SystemInfoLayoutTemplate.hbs @@ -2,10 +2,14 @@
+
+
+
+
-
-
\ No newline at end of file +
+ diff --git a/src/UI/System/Info/info.less b/src/UI/System/Info/info.less new file mode 100644 index 000000000..5c52339f5 --- /dev/null +++ b/src/UI/System/Info/info.less @@ -0,0 +1,5 @@ +dl.info { + dt, dd { + padding-bottom: 5px; + } +} \ No newline at end of file diff --git a/src/UI/index.html b/src/UI/index.html index 63852e082..5a0970c2d 100644 --- a/src/UI/index.html +++ b/src/UI/index.html @@ -22,6 +22,8 @@ + +