[dss-commits] r8870 - in dss/trunk: data/webroot/js websrc/dss-setup-interface/dSS websrc/dss-setup-interface/dSS/data

dss-commits at forum.digitalstrom.org dss-commits at forum.digitalstrom.org
Thu Oct 29 10:06:32 CET 2009


Author: mfernandez
Date: 2009-10-29 10:06:32 +0100 (Thu, 29 Oct 2009)
New Revision: 8870

Modified:
   dss/trunk/data/webroot/js/dss-setup-interface.js
   dss/trunk/websrc/dss-setup-interface/dSS/ZoneBrowser.js
   dss/trunk/websrc/dss-setup-interface/dSS/ZoneView.js
   dss/trunk/websrc/dss-setup-interface/dSS/data/ZoneStore.js
Log:
Primary zones are visualy marked as requested in feature issue #120

Modified: dss/trunk/data/webroot/js/dss-setup-interface.js
===================================================================
--- dss/trunk/data/webroot/js/dss-setup-interface.js	2009-10-29 09:06:28 UTC (rev 8869)
+++ dss/trunk/data/webroot/js/dss-setup-interface.js	2009-10-29 09:06:32 UTC (rev 8870)
@@ -4,7 +4,8 @@
 	constructor: function(config) {
 		var zoneRecord = Ext.data.Record.create([
 			{name:"name"},
-			{name:"id"}
+			{name:"id"},
+			{name:"primary"}
 		]);
 
 		var zoneReader = new Ext.data.JsonReader(
@@ -27,7 +28,12 @@
 		var zoneTemplate = new Ext.XTemplate(
 			'<tpl for=".">',
 				'<div class="zone-wrap {css}" id="zone-{id}">',
-					'<span>{name}</span>',
+					'<span>',
+						'{name}',
+						'<tpl if="primary === true">',
+							' *',
+						'</tpl>',
+					'</span>',
 				'</div>',
 			'</tpl>',
 			'<div class="x-clear"></div>'
@@ -395,6 +401,7 @@
 			zones.push({
 				id: zone.id,
 				name: zone.name ? zone.name : 'No name'
+				primary: zone['firstZoneOnModulator'] !== undefined ? true : false
 			});
 			Ext.each(zone.devices, function(device) {
 				for(var i = 0; i < devices.length; i++) {

Modified: dss/trunk/websrc/dss-setup-interface/dSS/ZoneBrowser.js
===================================================================
--- dss/trunk/websrc/dss-setup-interface/dSS/ZoneBrowser.js	2009-10-29 09:06:28 UTC (rev 8869)
+++ dss/trunk/websrc/dss-setup-interface/dSS/ZoneBrowser.js	2009-10-29 09:06:32 UTC (rev 8870)
@@ -60,6 +60,7 @@
 			zones.push({
 				id: zone.id,
 				name: zone.name ? zone.name : 'No name'
+				primary: zone['firstZoneOnModulator'] !== undefined ? true : false
 			});
 			Ext.each(zone.devices, function(device) {
 				for(var i = 0; i < devices.length; i++) {

Modified: dss/trunk/websrc/dss-setup-interface/dSS/ZoneView.js
===================================================================
--- dss/trunk/websrc/dss-setup-interface/dSS/ZoneView.js	2009-10-29 09:06:28 UTC (rev 8869)
+++ dss/trunk/websrc/dss-setup-interface/dSS/ZoneView.js	2009-10-29 09:06:32 UTC (rev 8870)
@@ -8,7 +8,12 @@
 		var zoneTemplate = new Ext.XTemplate(
 			'<tpl for=".">',
 				'<div class="zone-wrap {css}" id="zone-{id}">',
-					'<span>{name}</span>',
+					'<span>',
+						'{name}',
+						'<tpl if="primary === true">',
+							' *',
+						'</tpl>',
+					'</span>',
 				'</div>',
 			'</tpl>',
 			'<div class="x-clear"></div>'

Modified: dss/trunk/websrc/dss-setup-interface/dSS/data/ZoneStore.js
===================================================================
--- dss/trunk/websrc/dss-setup-interface/dSS/data/ZoneStore.js	2009-10-29 09:06:28 UTC (rev 8869)
+++ dss/trunk/websrc/dss-setup-interface/dSS/data/ZoneStore.js	2009-10-29 09:06:32 UTC (rev 8870)
@@ -5,7 +5,8 @@
 		// create a record constructor for zone records
 		var zoneRecord = Ext.data.Record.create([
 			{name:"name"},
-			{name:"id"}
+			{name:"id"},
+			{name:"primary"}
 		]);
 		
 		// a json reader to read the zone data



More information about the dss-commits mailing list