Web v6.6 (#3808)

Author: PromoFaux

.github/workflows/codeql.yml

@@ -26,21 +26,21 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 #v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #v7.0.0
         with:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e #v4.36.2
+        uses: github/codeql-action/init@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a #v4.36.3
         with:
           config-file: ./.github/codeql/codeql-config.yml
           languages: "javascript"
           queries: +security-and-quality
 
       - name: Autobuild
-        uses: github/codeql-action/autobuild@8aad20d150bbac5944a9f9d289da16a4b0d87c1e #v4.36.2
+        uses: github/codeql-action/autobuild@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a #v4.36.3
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e #v4.36.2
+        uses: github/codeql-action/analyze@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a #v4.36.3
         with:
           category: "/language:javascript"

.github/workflows/codespell.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 #v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #v7.0.0
         with:
           persist-credentials: false
 

.github/workflows/editorconfig-checker.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 #v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #v7.0.0
         with:
           persist-credentials: false
       - uses: editorconfig-checker/action-editorconfig-checker@840e866d93b8e032123c23bac69dece044d4d84c #v2.2.0

.github/workflows/stale.yml

@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Clone repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 #v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #v7.0.0
         with:
           persist-credentials: false
       - name: Remove 'stale' label

.github/workflows/sync-back-to-dev.yml

@@ -11,7 +11,7 @@ jobs:
     name: Syncing branches
     steps:
       - name: Clone repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 #v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #v7.0.0
         with:
           persist-credentials: false
       - name: Opening pull request

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 #v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 #v7.0.0
         with:
           persist-credentials: false
 

groups-lists.lp

@@ -47,7 +47,6 @@ mg.include('scripts/lua/header_authenticated.lp','r')
                 <ol>
                     <li>Please run <code>pihole -g</code> or update your gravity list <a href="<?=webhome?>gravity">online</a> after modifying your lists.</li>
                     <li>Multiple lists can be added by separating each <em>unique</em> URL with a space or comma</li>
-                    <li>Click on the icon in the first column to get additional information about your lists. The icons correspond to the health of the list.</li>
                 </ol>
                 <div class="btn-toolbar pull-right" role="toolbar" aria-label="Toolbar with buttons">
                     <div class="btn-group" role="group">
@@ -68,8 +67,8 @@ mg.include('scripts/lua/header_authenticated.lp','r')
                 <h3 class="box-title">
                     Subscribed lists
                 </h3>
-            </div>
-            <!-- /.box-header -->
+            </div><!-- /.box-header -->
+
             <div class="box-body">
                 <table id="listsTable" class="table table-striped table-bordered" width="100%">
                     <thead>
@@ -87,10 +86,39 @@ mg.include('scripts/lua/header_authenticated.lp','r')
                     </thead>
                 </table>
                 <button type="button" id="resetButton" class="btn btn-default btn-sm text-red hidden">Reset sorting</button>
-            </div>
-            <!-- /.box-body -->
-        </div>
-        <!-- /.box -->
+            </div><!-- /.box-body -->
+
+            <div class="box-footer clearfix">
+                <div class="row">
+                    <div class="col-xs-12">
+                        <p><strong>Hint:</strong> Click on the icons (first and second columns) to get additional information about your lists. The icons correspond to the health of the list.</p>
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-12 list-icon-legend-block">
+                        <div class="list-icon-legend">
+                            <p><strong>List Status:</strong></p>
+                            <div>
+                                <span class="fa fa-fw fa-check-circle list-status-1"></span> - List download was successful<br>
+                                <span class="fa fa-fw fa-history list-status-2"></span> - List unchanged upstream, Pi-hole used a local copy<br>
+                                <span class="fa fa-fw fa-exclamation-circle list-status-3"></span> - List unavailable, Pi-hole used a local copy<br>
+                                <span class="fa fa-fw fa-times-circle list-status-4"></span> - List unavailable and no local copy of this list is available<br>
+                                <span class="fa fa-fw fa-question-circle list-status-0"></span> - Unknown<br>
+                                <em>(The status icon turns gray when the list is disabled.)</em>
+                            </div>
+                        </div>
+                        <div class="list-icon-legend">
+                            <p><strong>List Type:</strong></p>
+                            <div>
+                                <span class="fa fa-fw fa-check text-green"></span> - Allow list<br>
+                                <span class="fa fa-fw fa-ban text-red"></span> - Block list
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div><!-- /.box-footer -->
+
+        </div><!-- /.box -->
     </div>
 </div>
 

package-lock.json

@@ -53,12 +53,12 @@
   },
   "devDependencies": {
     "autoprefixer": "^10.5.0",
-    "eslint": "^10.4.1",
+    "eslint": "^10.5.0",
     "eslint-plugin-compat": "^7.0.2",
     "globals": "^17.6.0",
     "postcss": "^8.5.15",
     "postcss-cli": "^11.0.1",
-    "prettier": "^3.8.3",
+    "prettier": "^3.8.4",
     "xo": "^2.0.1"
   },
   "browserslist": [

package.json

@@ -175,13 +175,16 @@ function testCookies() {
 }
 
 function applyCheckboxRadioStyle() {
-  // Get all radio/checkboxes for theming, with the exception of the two radio buttons on the custom disable timer,
-  // as well as every element with an id that starts with "status_"
+  // Get all radio/checkboxes for theming, with the exception of:
+  // - the two radio buttons on the custom disable timer,
+  // - radio/checkboxes elements with class "no-icheck",
+  // - every element with an id that starts with "status_"
   const sel = $("input[type='radio'],input[type='checkbox']")
     .not("#selSec")
     .not("#selMin")
     .not("#expert-settings")
     .not("#only-changed")
+    .not(".no-icheck")
     .not("[id^=status_]");
   sel.parent().removeClass();
   sel.parent().addClass("icheck-primary");