[usb-lock-off] Big rework. Moved from client side (modal) stuff to server side (new page) system. Removed the rules.conf textfield and added an UI prototype for the rules creation.

1 files changed, 32 insertions, 29 deletions

diff --git a/modules-available/usblockoff/templates/usb-add-generic-rule.html b/modules-available/usblockoff/templates/usb-add-generic-rule.html
index 07729db4..77b5f13e 100644
--- a/modules-available/usblockoff/templates/usb-add-generic-rule.html
+++ b/modules-available/usblockoff/templates/usb-add-generic-rule.html
@@ -18,8 +18,10 @@
 
 		<div class="panel panel-default">
 			<div class="panel-heading">{{lang_modeOptions}}
+				<!--
 				<input class="settings-bs-switch" id="expert_Switch" type="checkbox" name="expert_Switch"
 				data-on-text="Expert" data-off-text="Casual" data-size="small">
+				-->
 			</div>
 			<div class="panel-body">
 				<div class="list-group">
@@ -64,6 +66,7 @@
 
 					</div>
 
+					<!--
 					<div id="expertMode" style="display: none;">
 
 						<div class="list-group-item">
@@ -132,7 +135,7 @@
 						</div>
 
 					</div>
-
+-->
 				</div>
 			</div>
 		</div>
@@ -140,16 +143,26 @@
 	</form>
 </div>
 
-<script type="text/javascript">
-	$('a.btn[title]').tooltip({placement: "auto", html: true});
+<div class="pull-right">
+	<a href="?do=usblockoff&show=edit-config&configid={{configid}}" class="btn btn-default">Cancel</a>
+	<button type="submit" class="btn btn-primary">
+		<span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}
+	</button>
+</div>
 
-	var contains = true;
-	var c = $('#contains');
-	c.bootstrapSwitch();
-	c.on('switchChange.bootstrapSwitch', function(event, state) {
-		contains = state;
+<script type="text/javascript">
+	document.addEventListener("DOMContentLoaded", function(event) {
+		$('a.btn[title]').tooltip({placement: "auto", html: true});
+
+		var contains = true;
+		var c = $('#contains');
+		c.bootstrapSwitch();
+		c.on('switchChange.bootstrapSwitch', function(event, state) {
+			contains = state;
+		});
 	});
 
+	/*
 	var s = $('#expert_Switch');
 	var mode = "casual";
 	s.bootstrapSwitch();
@@ -169,27 +182,17 @@
 			mode = "casual";
 		}
 	});
-
-	// Add handler to the modal Button.
-	$('#myModalAddButton').unbind().click(addRule);
-	$('#myModalAddButtonText').text('{{lang_addRule}}');
-
+	*/
 	function addRule() {
-		if ($('#rules').val() != "") {
-			$('#rules').val($('#rules').val() + "\r\n");
-		}
-		if (mode == "casual") {
-			if (contains) {
-				$('#rules').val($('#rules').val() + $('#prop-action').val() + ' with-interface one-of' + ' { ' +
-					$('#casual_selected option:selected').val() + ' }');
-			} else {
-				$('#rules').val($('#rules').val() + $('#prop-action').val() + ' with-interface ' + $('#casual_selected option:selected').val());
-			}
-		} else {
-			$('#rules').val($('#rules').val() + $('#prop-action').val() + ' with-interface ' + $('#expert_selected option:selected').val()
-				+ ' { ' + $("#input_deviceClass").val() + ":" + $("#input_deviceSubClass").val() + ":"
-				+ $('#input_deviceProtocol').val() + ' }');
-		}
-		$('#myModal').modal('hide');
+      var rule = {};
+		rule['target'] = $('#prop-action').val();
+		rule['id'] = 0;
+		var attribute = {};
+		attribute['prop'] = 'with-interface';
+		attribute['value'] = $('#casual_selected option:selected').val();
+		rule['attributes'] = [];
+		rule['attributes'].push(attribute);
+
+		// TODO: SEND RULE TO PHO
 	}
 </script>
\ No newline at end of file