diff options
Diffstat (limited to 'modules-available/usblockoff/templates')
3 files changed, 37 insertions, 6 deletions
diff --git a/modules-available/usblockoff/templates/usb-configuration-table.html b/modules-available/usblockoff/templates/usb-configuration-table.html index 45d0c229..35eede5a 100644 --- a/modules-available/usblockoff/templates/usb-configuration-table.html +++ b/modules-available/usblockoff/templates/usb-configuration-table.html @@ -66,8 +66,8 @@ <thead> <tr> <th style="width: 5%" data-sort="int">ID</th> - <th style="width: 40%" data-sort="string">{{lang_configName}}</th> - <th style="width: 35%">{{lang_ruleInfoTODO}}</th> + <th style="width: 35%" data-sort="string">{{lang_configName}}</th> + <th style="width: 40%">{{lang_description}}</th> <th style="width: 10%">{{lang_edit}}</th> <th style="width: 10%">{{lang_delete}}</th> </tr> @@ -77,7 +77,7 @@ <tr> <td>{{config_id}}</td> <td data-sort-value="{{config_name}}">{{config_name}}</td> - <td>TODO: Show Rule information here</td> + <td>{{config_desc}}</td> <td> <a class="btn btn-xs btn-info" href="?do=usblockoff&show=edit-config&configid={{config_id}}"> <span class="glyphicon glyphicon-edit"></span> diff --git a/modules-available/usblockoff/templates/usb-edit-config.html b/modules-available/usblockoff/templates/usb-edit-config.html index 51166138..1cd24ce7 100644 --- a/modules-available/usblockoff/templates/usb-edit-config.html +++ b/modules-available/usblockoff/templates/usb-edit-config.html @@ -14,7 +14,7 @@ <label for="configName">{{lang_configName}}</label> </div> <div class="col-sm-7"> - <input required class="form-control" name="configName" id="configName" value="{{configName}}"> + <input type="text" class="form-control" name="configName" id="configName" value="{{configName}}"> </div> <div class="col-sm-2"> <a class="btn btn-default" title="{{lang_configName_helptext}}"> @@ -22,6 +22,20 @@ </a> </div> </div> + <br> + <div class="row"> + <div class="col-sm-3"> + <label for="configDesc">{{lang_description}}</label> + </div> + <div class="col-sm-7"> + <input class="form-control" name="configDesc" id="configDesc" value="{{configDesc}}"> + </div> + <div class="col-sm-2"> + <a class="btn btn-default" title="{{lang_configDesc_helptext}}"> + <span class="glyphicon glyphicon-question-sign"></span> + </a> + </div> + </div> </div> </div> @@ -54,3 +68,20 @@ </div> </form> + + + +<script type="application/javascript"> + document.addEventListener("DOMContentLoaded", function () { + $('form').submit(function () { + var input = $("#configName"); + var name = $.trim(input.val()); + if (!name) { + input.addClass("missingInput"); + return false; + } + }); + }); +</script> + + diff --git a/modules-available/usblockoff/templates/usb-rules-config.html b/modules-available/usblockoff/templates/usb-rules-config.html index 6aed254d..8cb63d88 100644 --- a/modules-available/usblockoff/templates/usb-rules-config.html +++ b/modules-available/usblockoff/templates/usb-rules-config.html @@ -1,9 +1,9 @@ <div class="panel panel-default"> <div class="panel-heading"> + rules.conf <a class="btn btn-default" title="{{lang_firstMatchingRuleCounts}}"> <span class="glyphicon glyphicon-question-sign"></span> </a> - rules.conf </div> <div class="panel-body" id="casualRules"> @@ -14,7 +14,7 @@ <thead> <tr> <th data-sort="string" width="20"><span class="glyphicon glyphicon-th-list"></span></th> - <th width="120">{{lang_target}}</th> + <th width="120">{{lang_action}}</th> <th>{{lang_attributes}}</th> <th>{{lang_edit}}</th> <th>{{lang_delete}}</th> |