Add note for scenenzbs, fix font loading

theotherp · Aug 17, 2024 · e5e0c7e · e5e0c7e
1 parent a11fba8
commit e5e0c7e
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 5 deletions.
diff --git a/core/gulpfile.js b/core/gulpfile.js
@@ -173,6 +173,10 @@ gulp.task('copy-assets', function () {
         .pipe(cached("fonts2"))
         .pipe(gulp.dest(fontDest));
 
+    var fonts3 = gulp.src("bower_components/bootstrap-less/fonts/*")
+        .pipe(cached("fonts3"))
+        .pipe(gulp.dest(fontDest));
+
     var imgDest = staticFolder + '/img';
     var img = gulp.src(uiSrcFolder + "/img/**/*")
         .pipe(cached("images"))
@@ -182,7 +186,7 @@ gulp.task('copy-assets', function () {
         .pipe(cached("favicon"))
         .pipe(gulp.dest(staticFolder));
 
-    return merge(img, fonts1, fonts2, favIcon);
+    return merge(img, fonts1, fonts2, fonts3, favIcon);
 });
 
 

diff --git a/core/src/main/java/org/nzbhydra/web/WebConfiguration.java b/core/src/main/java/org/nzbhydra/web/WebConfiguration.java
@@ -83,10 +83,13 @@ public void addResourceHandlers(ResourceHandlerRegistry registry) {
                 // Must match the dependency for swagger-ui
                 .addResourceLocations("classpath:/META-INF/resources/webjars/swagger-ui/4.10.3/");
 
+        registry.addResourceHandler("/bower_components/bootstrap-less/fonts/**")
+                .addResourceLocations("classpath:/static/fonts/");
 
         registry.setOrder(0);
     }
 
+
     @Override
     protected void configurePathMatch(PathMatchConfigurer configurer) {
         configurer.setUseTrailingSlashMatch(true);

diff --git a/core/src/main/resources/changelog.yaml b/core/src/main/resources/changelog.yaml
@@ -6,10 +6,14 @@
           text: "Filter NZBKing results for query words to get rid of some of the trash. See #960"
       -   type: "feature"
           text: "Added SceneNZBs.com to indexer templates. If you want german or spanish results make sure to add the newznab IDs in the categories config. For example for german UHD movies add 2145. You can find out the IDs by browsing the categories on the indexer website."
+      -   type: "feature"
+          text: "The config box shown when you add an indexer can now show additional information about an indexer. In this first instance you'll find the note about SceneNZBs. If you can think of stuff which should be shown for individual indexers please let me know."
       -   type: "Fix"
           text: "Daniel Kastner fixed API access to NZBKing. See #965"
       -   type: "Fix"
           text: "Improved title detection for NZBKing."
+      -   type: "Fix"
+          text: "Some fonts could not be loaded since the UI rewrite."
     final: true
 -   version: "v7.4.0"
     date: "2024-08-10"

diff --git a/core/src/main/resources/static/js/nzbhydra.js b/core/src/main/resources/static/js/nzbhydra.js
@@ -4170,6 +4170,10 @@ function _showBox(indexerModel, parentModel, isInitial, $uibModal, CategoriesSer
             parentModel: function () {
                 return parentModel;
             }
+            ,
+            info: function () {
+                return indexerModel.info;
+            }
         }
     });
 
@@ -4429,7 +4433,8 @@ angular.module('nzbhydraApp').controller('IndexerConfigSelectionBoxInstanceContr
         },
         {
             name: "SceneNZBs",
-            host: "https://scenenzbs.com"
+            host: "https://scenenzbs.com",
+            info: "If you want german or spanish results make sure to add the newznab IDs in the categories config.<br>For example for german UHD movies add 2145.<br>You can find out the IDs by browsing the categories on the indexer website."
         },
         {
             name: "spotweb.com",

diff --git a/core/src/main/resources/static/js/nzbhydra.js.map b/core/src/main/resources/static/js/nzbhydra.js.map
diff --git a/core/src/main/resources/static/js/templates.js b/core/src/main/resources/static/js/templates.js
diff --git a/core/ui-src/html/config/indexer-config-box.html b/core/ui-src/html/config/indexer-config-box.html
@@ -22,6 +22,11 @@ <h3 class="modal-title">
         </h3>
     </div>
     <div class="modal-body">
+        <div class="panel panel-default" ng-if="model.info">
+            <div class="panel-body ">
+                <span ng-bind-html="model.info | unsafe"></span>
+            </div>
+        </div>
         <formly-form fields="fields"
                      model="model"
                      form="form"

diff --git a/core/ui-src/js/config/formly-indexers.js b/core/ui-src/js/config/formly-indexers.js
@@ -604,6 +604,10 @@ function _showBox(indexerModel, parentModel, isInitial, $uibModal, CategoriesSer
             parentModel: function () {
                 return parentModel;
             }
+            ,
+            info: function () {
+                return indexerModel.info;
+            }
         }
     });
 
@@ -863,7 +867,8 @@ angular.module('nzbhydraApp').controller('IndexerConfigSelectionBoxInstanceContr
         },
         {
             name: "SceneNZBs",
-            host: "https://scenenzbs.com"
+            host: "https://scenenzbs.com",
+            info: "If you want german or spanish results make sure to add the newznab IDs in the categories config.<br>For example for german UHD movies add 2145.<br>You can find out the IDs by browsing the categories on the indexer website."
         },
         {
             name: "spotweb.com",