Merge pull request #46 from RRZE-Webteam/dev

Dev

Author: rvdforst

build/tos.js

@@ -254,7 +254,6 @@ protected static function setComplianceContentList(&$options)
                     $list .= '<li>' . $optionsField[$key] . '</li>';
                 }
             }
-            $options['non_accessible_content_helper'] = $contentHelper;
             $options['accessibility_non_accessible_content_list'] = $list ? '<ul>' . $list . '</ul>' : '';
         }
     }

build/tos.js.map

@@ -1,6 +1,6 @@
 {
     "name": "rrze-legal",
-    "version": "2.0.1",
+    "version": "2.0.2",
     "main": "rrze-legal.php",
     "scripts": {
         "start": "webpack --mode=development --watch",

includes/TOS/Endpoint.php

@@ -4,7 +4,7 @@
 Plugin Name:     RRZE Legal
 Plugin URI:      https://gitlab.rrze.fau.de/rrze-webteam/rrze-legal
 Description:     Legal Mandatory Information & GDPR.
-Version:         2.0.1
+Version:         2.0.2
 Author:          RRZE Webteam
 Author URI:      https://blogs.fau.de/webworking/
 License:         GNU General Public License Version 3

package.json

@@ -42,16 +42,17 @@ jQuery(document).ready(function ($) {
     }
 
     function accessibilityHelperSection() {
-        let inputHelper = `${legalSettings.optionName}[accessibility_statement_non_accessible_content_helper]`;
+        let inputName = `${legalSettings.optionName}[accessibility_statement_non_accessible_content_helper]`;
         let input = $(
-            `input[name='${inputHelper}']:checked`,
+            `input[name='${inputName}']:checked`,
             "#rrze-legal-accessibility"
         ).val();
-        let inputList = `${legalSettings.optionName}[accessibility_statement_non_accessible_content_list][]`;
+        let inputList =
+            "[id^=rrze_legal_accessibility_statement_non_accessible_content_list]";
         if ("1" === input) {
-            $(`input[name='${inputList}']`).parents("tr").hide();
+            $(`${inputList}`).parents("tr").hide();
         } else {
-            $(`input[name='${inputList}']`).parents("tr").show();
+            $(`${inputList}`).parents("tr").show();
         }
     }
 

rrze-legal.php

@@ -61,11 +61,9 @@ <h2>Bekannte Probleme bei der Barrierefreiheit</h2>
 </p>
 {{/accessibility_conformity_filled}}
 
-{{!non_accessible_content_helper}}
 <h3>Nicht barrierefrei zugängliche Inhalte</h3>
 {{=accessibility_non_accessible_content_list}}
 {{=accessibility_statement_non_accessible_content_text}}
-{{/!non_accessible_content_helper}}
 
 {{accessibility_statement_non_accessible_content_reason}}
 <h3>Begründung</h3>

src/tos/tos.js

@@ -55,11 +55,9 @@ <h2>Known accessibility issues</h2>
 </p>
 {{/accessibility_conformity_filled}}
 
-{{!non_accessible_content_helper}}
 <h3>Content that is not accessible to people with disabilities</h3>
 {{=accessibility_non_accessible_content_list}}
 {{=accessibility_statement_non_accessible_content_text}}
-{{/!non_accessible_content_helper}}
 
 {{accessibility_statement_non_accessible_content_reason}}
 <h3>Reason</h3>