Fixed: NFO display was broken with last version. Also adapted NFO and…

… log colors to grey theme.
theotherp · Feb 11, 2017 · 8aa9f7d · 8aa9f7d
1 parent 75a91c1
commit 8aa9f7d
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 16 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,6 +1,9 @@
 # NZB Hydra changelog
 
 ----------
+### 0.2.199
+Fixed: NFO display was broken with last version. Also adapted NFO and log colors to grey theme.
+
 ### 0.2.198
 Added: Download limit for indexers. When the download limit is reached for an indexer it will not be picked for searching. Please note that Hydra
 will never prevent downloads from happening even when the download limit is reached. This is to make sure that external tools do not disable Hydra

diff --git a/static/css/grey.css b/static/css/grey.css
diff --git a/static/css/grey.css.map b/static/css/grey.css.map
diff --git a/static/js/nzbhydra.js b/static/js/nzbhydra.js
diff --git a/static/js/nzbhydra.js.map b/static/js/nzbhydra.js.map
diff --git a/ui-src/js/directives/search-result-non-title-columns.js b/ui-src/js/directives/search-result-non-title-columns.js
@@ -45,7 +45,7 @@ function otherColumns($http, $templateCache, $compile, $window) {
         function openModal(size, nfo) {
             var modalInstance = $uibModal.open({
                 template: '<pre class="nfo"><span ng-bind-html="nfo"></span></pre>',
-                controller: 'NfoModalInstanceCtrl',
+                controller: NfoModalInstanceCtrl,
                 size: size,
                 resolve: {
                     nfo: function () {
@@ -80,15 +80,15 @@ angular
     .module('nzbhydraApp')
     .controller('NfoModalInstanceCtrl', NfoModalInstanceCtrl);
 
-function NfoModalInstanceCtrl($scope, $modalInstance, nfo) {
+function NfoModalInstanceCtrl($scope, $uibModalInstance, nfo) {
 
     $scope.nfo = nfo;
 
     $scope.ok = function () {
-        $modalInstance.close($scope.selected.item);
+        $uibModalInstance.close($scope.selected.item);
     };
 
     $scope.cancel = function () {
-        $modalInstance.dismiss();
+        $uibModalInstance.dismiss();
     };
 }
diff --git a/ui-src/less/grey.less b/ui-src/less/grey.less
@@ -243,10 +243,12 @@
 @code-bg: rgb(249, 242, 244);
 @kbd-color: rgb(255, 255, 255);
 @kbd-bg: rgb(51, 51, 51);
-@pre-bg: rgb(245, 245, 245);
-@pre-color: @gray-dark;
+@pre-bg: @gray-dark;
+@pre-color: rgb(245, 245, 245);
 @pre-border-color: rgb(204, 204, 204);
 
+
+
 @modal-content-bg: lighten(@body-bg, 3%);
 @modal-content-border-color: rgba(0, 0, 0, 0.2);
 @modal-content-fallback-border-color: rgb(153, 153, 153);

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.2.198
+0.2.199