diff options
Diffstat (limited to 'modules-available')
6 files changed, 24 insertions, 10 deletions
diff --git a/modules-available/usblockoff/lang/de/messages.json b/modules-available/usblockoff/lang/de/messages.json index 4ff7bf68..fa78c288 100644 --- a/modules-available/usblockoff/lang/de/messages.json +++ b/modules-available/usblockoff/lang/de/messages.json @@ -1,5 +1,6 @@ { "config-deleted": "Konfiguration erfolgreich gelöscht.", "config-saved": "Konfiguration erfolgreich gespeichert.", - "rule-deleted": "Regel erfolgreich gelöscht." + "rule-deleted": "Regel erfolgreich gelöscht.", + "invalid-rule-id": "Ungültige regel ID." }
\ No newline at end of file diff --git a/modules-available/usblockoff/lang/en/messages.json b/modules-available/usblockoff/lang/en/messages.json index c23afd78..500e5e7e 100644 --- a/modules-available/usblockoff/lang/en/messages.json +++ b/modules-available/usblockoff/lang/en/messages.json @@ -1,5 +1,6 @@ { "config-deleted": "Config successfully deleted.", "config-saved": "Config successfully saved.", - "rule-deleted": "Rule successfully deleted." + "rule-deleted": "Rule successfully deleted.", + "invalid-rule-id": "Invalid rule ID." }
\ No newline at end of file diff --git a/modules-available/usblockoff/page.inc.php b/modules-available/usblockoff/page.inc.php index 13414d8d..8c32a699 100644 --- a/modules-available/usblockoff/page.inc.php +++ b/modules-available/usblockoff/page.inc.php @@ -54,6 +54,16 @@ class Page_usblockoff extends Page $this->deviceList(); } else if ($show === "add-generic-rule") { $this->addGenericRule(); + } else if ($show === "edit-rule") { + $ruleid = Request::get("ruleid", 0, "int"); + if ($ruleid === 0) { + Message::addError('invalid-rule-id'); + return; + } + + // TODO: Use another html page where stuff can be configured. + // WiP + } } diff --git a/modules-available/usblockoff/templates/usb-add-generic-rule.html b/modules-available/usblockoff/templates/usb-add-generic-rule.html index 2d579244..61e38ebc 100644 --- a/modules-available/usblockoff/templates/usb-add-generic-rule.html +++ b/modules-available/usblockoff/templates/usb-add-generic-rule.html @@ -33,7 +33,7 @@ <div class="list-group-item"> <div class="row"> - <div class="col-md-3"><label>{{lang_deviceClasses}}</label></div> + <div class="col-md-3"><label for="casual_selected">{{lang_deviceClasses}}</label></div> <div class="col-md-7"> <select class="form-control" id="casual_selected"> <option value="08:*:*" selected>{{lang_mass-storage}}</option> @@ -54,7 +54,7 @@ <div class="list-group-item"> <div class="row"> - <div class="col-md-3"><label>{{lang_contains}}</label></div> + <div class="col-md-3"><label for="contains">{{lang_contains}}</label></div> <div class="col-md-7"> <input class="settings-bs-switch" id="contains" type="checkbox" value="1" checked data-size="small"> @@ -153,10 +153,8 @@ </form> - - <script type="text/javascript"> - document.addEventListener("DOMContentLoaded", function(event) { + document.addEventListener("DOMContentLoaded", function() { $('a.btn[title]').tooltip({placement: "auto", html: true}); var contains = true; diff --git a/modules-available/usblockoff/templates/usb-device-list.html b/modules-available/usblockoff/templates/usb-device-list.html index b23f5d7a..2c26996b 100644 --- a/modules-available/usblockoff/templates/usb-device-list.html +++ b/modules-available/usblockoff/templates/usb-device-list.html @@ -151,7 +151,11 @@ <style type='text/css'> .selected { - background-color: #F5F5F5; + background-color: rgba(124, 252, 0, 0.152); + } + + .selected tr:hover { + background-color: rgba(124, 252, 0, 0.252) !important; } #myTable { diff --git a/modules-available/usblockoff/templates/usb-rules-config.html b/modules-available/usblockoff/templates/usb-rules-config.html index 712eb2ab..56dd1ae2 100644 --- a/modules-available/usblockoff/templates/usb-rules-config.html +++ b/modules-available/usblockoff/templates/usb-rules-config.html @@ -33,8 +33,8 @@ {{/hasoverload}} </td> <td> - <a class="btn btn-xs btn-info"> - <span class="glyphicon glyphicon-edit" onclick="alert('implement in new page');"></span> + <a class="btn btn-xs btn-info" href="?do=usblockoff&show=edit-rule&ruleid={{id}}&configid={{configid}}"> + <span class="glyphicon glyphicon-edit"></span> </a> </td> <td> |