Slightly changed search results layout

theotherp · Nov 20, 2023 · b4116f0 · b4116f0
1 parent 5fac09c
commit b4116f0
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 16 deletions.
diff --git a/core/src/main/resources/changelog.yaml b/core/src/main/resources/changelog.yaml
@@ -2,6 +2,8 @@
 -   version: "v5.3.2"
     date: "2023-11-18"
     changes:
+        -   type: "feature"
+            text: "Slightly changed the search results layout: Increased table width, increased title space, reduced row height. Let me know what you think."
         -   type: "fix"
             text: "Windows release of 5.3.1 crashed on startup. I didn't catch that because my build pipeline only runs the linux executable and *usually* they behave the same. See #889"
         -   type: "fix"

diff --git a/core/src/main/resources/static/css/bright.css b/core/src/main/resources/static/css/bright.css
diff --git a/core/src/main/resources/static/css/bright.css.map b/core/src/main/resources/static/css/bright.css.map
diff --git a/core/src/main/resources/static/css/dark.css b/core/src/main/resources/static/css/dark.css
diff --git a/core/src/main/resources/static/css/dark.css.map b/core/src/main/resources/static/css/dark.css.map
diff --git a/core/src/main/resources/static/css/grey.css b/core/src/main/resources/static/css/grey.css
diff --git a/core/src/main/resources/static/css/grey.css.map b/core/src/main/resources/static/css/grey.css.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/src/main/resources/templates/index.html b/core/src/main/resources/templates/index.html
@@ -23,8 +23,8 @@
 <div id="wrap" ng-cloak="">
 
     <div ui-view="header"></div>
-
-    <div style="margin: auto; max-width: 1400px;">
+    
+    <div style="margin: auto; max-width: 1700px;">
         <div id="banner"></div>
         <div class="container-fluid"  ui-view="container"  th:classappend="${session.disableBlockUi} ? '' : 'block-ui-main'">
         </div>

diff --git a/core/ui-src/html/directives/search-result.html b/core/ui-src/html/directives/search-result.html
@@ -1,6 +1,6 @@
 <tr ng-class="{'duplicate' : result.duplicateGroupIndex > 0, 'title-group-expanded': result.titleGroupIndex > 0} "
     style="margin:0; border-width: 0; padding: 0" ng-if="resultDisplayed" class="search-result-row">
-  <td class="col-md-12 search-results-cell result-title" style="margin:0;">
+  <td class="col-md-13 search-results-cell result-title" style="margin:0;">
     <input type="checkbox"
            ng-model="foo.selected"
            ng-click="clickCheckbox($event, result)" data-checkbox-index="0" class="result-checkbox"/>
@@ -60,7 +60,7 @@
           tooltip-placement="top"
           tooltip-trigger="mouseenter">{{ ::result.age }}</span>
   </td>
-  <td class="col-md-3 search-results-cell result-links">
+  <td class="col-md-2 search-results-cell result-links">
     <a href ng-click="showNfo(result)" ng-class="::{'no-nfo': result.hasNfo === 'NO'}"
        class="no-underline result-show-nfo-link"
        uib-tooltip="{{ ::getNfoTooltip() }}"

diff --git a/core/ui-src/html/states/search-results.html b/core/ui-src/html/states/search-results.html
@@ -257,7 +257,7 @@ <h2 ng-if="!anyResultsRejected && anyIndexersSearchedSuccessfully">No results we
     <table class="search-results-table table">
         <thead class="search-results-header">
         <tr class="search-results-header-row">
-            <th class="col-md-12 cursor-default search-results-cell result-title">
+            <th class="col-md-13 cursor-default search-results-cell result-title">
                 <column-sortable column="title" reversed="false" start-mode="1">Title
                 </column-sortable>
                 <column-filter-wrapper inline="true">
@@ -299,6 +299,7 @@ <h2 ng-if="!anyResultsRejected && anyIndexersSearchedSuccessfully">No results we
                 tooltip-placement="top"
                 tooltip-trigger="mouseenter"
             >
+
                 <column-sortable column="grabs" reversed="false" start-mode="2">Details
                 </column-sortable>
                 <column-filter-wrapper>
@@ -313,7 +314,7 @@ <h2 ng-if="!anyResultsRejected && anyIndexersSearchedSuccessfully">No results we
                     <number-range-filter column="epoch" addon="days" id="age-filter" tooltip="Suffix with h or m to filter by hours or minutes, respectively"/>
                 </column-filter-wrapper>
             </th>
-            <th class="col-md-3 search-results-cell result-links" style="vertical-align: top">
+            <th class="col-md-2 search-results-cell result-links" style="vertical-align: top">
                 Links
             </th>
         </tr>

diff --git a/core/ui-src/less/nzbhydra.less b/core/ui-src/less/nzbhydra.less
@@ -493,6 +493,11 @@ a.disabled:hover {
   border-top-width: 0 !important;
 }
 
+.search-results-table > tbody > tr > td {
+  padding-top: 6px !important;
+  padding-bottom: 6px !important;
+}
+
 .odd {
   background-color: darken(@table-bg, 5%);
 }
@@ -514,7 +519,7 @@ a.disabled:hover {
 
 .result-title {
   font-size: @font-size-result-title;
-  width: 47.5%;
+  width: 60%;
 }
 
 .result-indexer {

diff --git a/other/mockserver/src/main/java/org/nzbhydra/mockserver/MockNewznab.java b/other/mockserver/src/main/java/org/nzbhydra/mockserver/MockNewznab.java
@@ -150,7 +150,7 @@ public ResponseEntity<? extends Object> api(NewznabParameters params, HttpServle
             return new ResponseEntity<Object>(rssRoot, HttpStatus.OK);
         }
 
-        boolean doGenerateDuplicates = "duplicates".equals(params.getQ());
+        boolean doGenerateDuplicates = params.getQ() != null && params.getQ().startsWith("duplicates");
         if (params.getQ() != null && params.getQ().equals("offsettest")) {
             NewznabXmlRoot rssRoot = new NewznabXmlRoot();
             rssRoot.getRssChannel().setNewznabResponse(new NewznabXmlResponse(0, 0));