From fa27ec21c184f318ac44c2484da013e1923d1589 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <info@steffenvogel.de>
Date: Thu, 30 Jun 2011 22:04:33 +0200
Subject: [PATCH] fixed #86

---
 htdocs/frontend/index.html            | 20 ++++++++++----------
 htdocs/frontend/javascripts/entity.js |  3 +++
 htdocs/frontend/javascripts/wui.js    | 22 +++++++++++++++-------
 3 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/htdocs/frontend/index.html b/htdocs/frontend/index.html
index 903011f..64559dd 100644
--- a/htdocs/frontend/index.html
+++ b/htdocs/frontend/index.html
@@ -128,31 +128,31 @@
 	<div class="tabs">
 		<ul>
 			<li><a href="#entity-subscribe">Kanal abonnieren</a></li>
-			<li><a href="#entity-subscribe-public">&ouml;ffentliche Kan&auml;le</a></li>
+			<li><a href="#entity-public">&ouml;ffentliche Kan&auml;le</a></li>
 			<li><a href="#entity-create">Kanal erstellen</a></li>
 		</ul>
 		<div id="entity-subscribe">
 			<p>Hier k&ouml;nnen Sie einen existierenden Kanal über seine UUID hinzuf&uuml;gen</p>
 			<table>
-				<tr><td><label for="middleware">Middleware:</label></td><td><input id="middleware" type="text" size="36" /></td></tr>
-				<tr><td><label for="uuid">UUID:</label></td><td><input id="uuid" type="text" size="36" maxlength="36" /></td></tr>
+				<tr><td><label for="entity-subscribe-middleware">Middleware:</label></td><td><input id="entity-subscribe-middleware" type="text" size="36" /></td></tr>
+				<tr><td><label for="entity-subscribe-uuid">UUID:</label></td><td><input id="entity-subscribe-uuid" type="text" size="36" maxlength="36" /></td></tr>
 			</table>
-			<p><input type="button" value="Abonnieren" /> <label for="cookie">Cookie:</label> <input class="cookie" type="checkbox" /></p>
+			<p><input type="button" value="Abonnieren" /> <label for="entity-subscribe-cookie">Cookie:</label> <input id="entity-subscribe-cookie" type="checkbox" /></p>
 		</div>
-		<div id="entity-subscribe-public">
+		<div id="entity-public">
 			<p>Hier k&ouml;nnen Sie &ouml;ffentliche Kan&auml;le abonnieren.</p>
 			<table>
-				<tr><td><label for="middleware">Middleware:</label></td><td><select id="middleware"><option value="../middleware.php">default (local)</option></select></td></tr>
-				<tr><td><label for="uuid">Kanal:</label></td><td><select id="public" size="1"></select></td></tr>
+				<tr><td><label for="entity-public-middleware">Middleware:</label></td><td><select id="entity-public-middleware"></select></td></tr>
+				<tr><td><label for="entity-public-entity">Kanal:</label></td><td><select id="entity-public-entity" size="1"></select></td></tr>
 			</table>
-			<p><input type="button" value="Abonnieren" /> <label for="cookie">Cookie:</label> <input class="cookie" type="checkbox" /></p>
+			<p><input type="button" value="Abonnieren" /> <label for="entity-public-cookie">Cookie:</label> <input id="entity-public-cookie" type="checkbox" /></p>
 		</div>
 		<div id="entity-create">
 			<form method="get" target="_blank">
 				<table>
 					<tr class="property"><th>Eigenschaft</th><th>Wert</th></tr>
-					<tr class="property"><td>Middleware:</td><td><input type="text" id="entity-create-middlware" value="../middleware.php" /></td></tr>
-					<tr class="property"><td>Typ:</td><td><select name="type" size="1"></select></td></tr>
+					<tr class="property"><td>Middleware:></td><td><input type="text" id="entity-create-middleware" /></td></tr>
+					<tr class="property"><td>Typ:</td><td><select id="enti"name="type" size="1"></select></td></tr>
 					<tr class="property"><td>&Ouml;ffentlich:</td><td><input type="radio" name="public" value="1"> ja&nbsp;&nbsp;<input type="radio" name="public" value="0"> nein</td></tr>
 					<tr class="property"><td>Titel:</td><td><input type="text" name="title" value="K&uuml;hlschrank" /></td></tr>
 					<tr class="property"><td>Aufl&ouml;sung:</td><td><input type="text" name="resolution" value="1000" /></td></tr>
diff --git a/htdocs/frontend/javascripts/entity.js b/htdocs/frontend/javascripts/entity.js
index b8c342a..0d1578a 100644
--- a/htdocs/frontend/javascripts/entity.js
+++ b/htdocs/frontend/javascripts/entity.js
@@ -214,6 +214,9 @@ Entity.prototype.getDOMRow = function(parent) {
 				.bind('change', this, function(event) {
 					var state = $(this).attr('checked');
 					
+					event.data.active = state;
+					$('#entity-' + event.data.uuid + ((parent) ? '.child-of-entity-' + parent.uuid : '') + ' input[type=checkbox]');
+					
 					event.data.each(function(entity, parent) {
 						$('#entity-' + entity.uuid + ((parent) ? '.child-of-entity-' + parent.uuid : '') + ' input[type=checkbox]')
 						.attr('checked', state);
diff --git a/htdocs/frontend/javascripts/wui.js b/htdocs/frontend/javascripts/wui.js
index 578dd87..4f93ca4 100644
--- a/htdocs/frontend/javascripts/wui.js
+++ b/htdocs/frontend/javascripts/wui.js
@@ -92,7 +92,7 @@ vz.wui.dialogs.init = function() {
 			if (json.entities.length > 0) {
 				json.entities.each(function(index, json) {
 					var entity = new Entity(json);
-					$('#entity-subscribe-public select#public').append(
+					$('#entity-public-entity').append(
 						$('<option>').html(entity.title).data('entity', entity)
 					);
 				});
@@ -108,17 +108,26 @@ vz.wui.dialogs.init = function() {
 	});
 	$('#entity-create option[value=power]').attr('selected', 'selected');
 
+	// set defaults
+	$('#entity-subscribe-middleware').val(vz.middleware[0].url);
+	$('#entity-public-middleware').append($('<option>').val(vz.middleware[0].url).text('Local (default)'));
 	$('#entity-create-middleware').val(vz.middleware[0].url);
+	$('#entity-subscribe-cookie').attr('checked', 'checked');
+	$('#entity-public-cookie').attr('checked', 'checked');
+
 	
 	// actions
 	$('#entity-subscribe input[type=button]').click(function() {
 		try {
 			var entity = new Entity({
-				uuid: $('#entity-subscribe input#uuid').val(),
-				middleware: $('#entity-subscribe input#middleware').val(),
-				cookie: Boolean($('#entity-subscribe input.cookie').attr('checked'))
+				uuid: $('#entity-subscribe-uuid').val(),
+				cookie: Boolean($('#entity-subscribe-cookie').attr('checked'))
 			});
 			
+			if (middleware = $('#entity-subscribe-middleware').val()) {
+				entity.middleware = middleware;
+			}
+			
 			entity.loadDetails().done(function() {
 				vz.entities.push(entity);
 				vz.entities.saveCookie();
@@ -135,11 +144,10 @@ vz.wui.dialogs.init = function() {
 	});
 	
 	$('#entity-subscribe-public input[type=button]').click(function() {
-		var entity = $('#entity-subscribe-public select#public option:selected').data('entity');
+		var entity = $('#entity-public-entity:selected').data('entity');
 	
 		try {
-			entity.cookie = Boolean($('#entity-subscribe-public input.cookie').attr('checked'));
-			entity.middleware = vz.middleware[0].url;
+			entity.cookie = Boolean($('#entity-public-cookie').attr('checked'));
 			
 			vz.entities.push(entity);
 			vz.entities.saveCookie();