Styled accordions, sorted coloured dots with filter tags

src/app.css

@@ -10,7 +10,7 @@ body {
 	min-height: 100%;
 	padding: 1em;
 	width: 100%;
-	font-size: 1.3em;
+	font-size: 1.2em;
 	border: double 3px #ddd;
 	border-top: none;
 	border-bottom: none;
@@ -30,3 +30,10 @@ a:hover {
 a:visited {
 	color: #437fad;
 }
+.y-accordions,
+.y-accordion-header-button {
+	background-color: #ddd;
+}
+.yaccordion .y-accordians .y-accordion-header-button {
+	background-color: #eee;
+}

src/lib/components/Filterable.svelte

@@ -7,8 +7,9 @@
 	export let context = 'none';
 	export let filterValues;
 	export let histogram; // an array with key = filter value, val = number of technologies
-	export const colours = []; // an array of colour values with
+	export let colours = false; // an array of colour values with
 	//console.log('Filterable contextFilter: ', filterValues);
+	export let colour_type = 'circle';
 	let activeFiltersString = 'None';
 
 	//
@@ -74,6 +75,7 @@
 		isActive = getActive($filterValues);
 		activeFiltersString = joinActive(isActive);
 		filterText = filterVerbage(isActive);
+		//if (colours) { console.log('we have colours! ', colours); }
 	}
 
 	//console.log('histogram: ', histogram);
@@ -92,7 +94,8 @@
 	<span class="filter {context}" class:active={filter.active}
 		on:click="{() => { filter.active = !filter.active; updateFilterValues(filter);}}"
 		on:keypress="{() => {filter.active = !filter.active; updateFilterValues(filter);}}"
-		name="{filter.id}" role="button" tabindex={tabindex + filter.id}>{filter.name}{#if (histogram[filter.name] > 1) } <span class='histogram' title="There are {histogram[filter.name]} webservices in this category">&nbsp;({histogram[filter.name]})</span>{/if}</span><wbr/>
+		name="{filter.id}" role="button" tabindex={tabindex + filter.id}>{filter.name}{#if (histogram[filter.name] > 1) }<span class='histogram' title="There are {histogram[filter.name]} webservices in this category">&nbsp;({histogram[filter.name]})</span>{/if}{#if
+		(colours && colour_type == 'circle')}<span class='circle' style="background-color: {colours[filter.name].colour}"></span>{/if}</span><wbr/>
 {/each}
 </div>
 
@@ -157,7 +160,7 @@
 		white-space: nowrap;
 		word-break: normal;
 		box-shadow: 3px 3px 3px #6a6d6a;
-		color: #222;
+		color: #888;
 	}
 	.filter:hover { box-shadow: 6px 6px 5px #aaa; color: #000; }
 	.filter:active { box-shadow: 0px 0px 3px #727372; color: #fff;}
@@ -188,4 +191,18 @@
 	.filter .histogram {
 		color: #aaa;
 	}
+	.circle {
+		vertical-align: middle;
+		margin-left: 4px;
+		height: 20px;
+		width: 20px;
+		background-color: #555;
+		border: 1px solid #555;
+		border-radius: 50%;
+		display: inline-block;
+		opacity: .2;
+	}
+	.active .circle {
+		opacity: 1;
+	}
 </style>

src/lib/components/TechnologyTile.svelte

@@ -34,9 +34,43 @@
 		) return true;
 		return false;
 	}
+
+	function handleClick() {
+		console.log('clicked!');
+	}
+
+	/*document.addEventListener('keydown', (event) => {
+		const { activeElement } = document;
+		const hasButtonRole = activeElement?.getAttribute('role') === 'button';
+
+		if (hasButtonRole) {
+			// prevent default behaviour, including scrolling on spacebar
+			if (['Spacebar', ' ', 'Enter'].includes(event.key)) {
+				event.preventDefault();
+			}
+
+			if (event.key === 'Enter') {
+				activeElement.click();
+			}
+		}
+	});
+
+	document.addEventListener('keyup', (event) => {
+		const { activeElement } = document;
+		const hasButtonRole = activeElement?.getAttribute('role') === 'button';
+
+		if (hasButtonRole && ['Spacebar', ' '].includes(event.key)) {
+			event.preventDefault();
+			activeElement.click();
+		}
+	});*/
+
+	//onclick="handleClick()"
 </script>
 
-<div on:click={() => (showModal = !showModal)} class="tile technology">
+<!-- making a dive act like a button: https://kvack.dev/blog/make-that-div-behave-like-a-button -->
+
+<div on:click={() => (showModal = !showModal)} onclick="handleClick()" role="button" tabindex=0 class="tile technology">
     <div class="links">
 		<span class="website"><a href="{technology.website}" title="Project site for {technology.name}">P</a></span>
         {#if technology.repository}<span class="repository"><a
@@ -49,11 +83,11 @@
     <p class="description">{technology.description}{#if technology.extended_description}<span
         title={technology.extended_description}>i</span>{/if}
     </p>
-    {#if technology.categories}<p class="categories">{pluraliser('Category',
+    {#if technology.categories}<p class="property categories">{pluraliser('Category',
 		'Categories', technology.categories.length)}: <span class="value">{toOxfordCommaString(technology.categories)}</span></p>{/if}
-    {#if technology.analogues}<p class="analogues">Alternative to <span
+    {#if technology.analogues}<p class="property analogues">Alternative to <span
 		class="value">{toOxfordCommaString(technology.analogues)}</span></p>{/if}
-    {#if technology.license}<p class="license"
+    {#if technology.license}<p class="property license"
         title="The libre license for this project is {technology.license}">License: <span
 		class="value">{technology.license}</span></p>{/if}
     {#if hasInstances(technology)}
@@ -110,10 +144,6 @@
 		box-shadow: 0 0 0;
 		border-color: #000;
 	}
-	.tile p.description {
-	    height: 200px;
-	    overflow: scroll;
-	}
 	.tile .links h2 a {
 		color: #e6c4fc;
 	}
@@ -140,22 +170,29 @@
 		color: #fff;
 	}
 	.tile .description {
-		height: 260px;
+		height: 200px;
 		text-overflow: ellipsis;
 		overflow: hidden;
+		padding-top: 0.5em;
 	}
 	.tile p {
-		padding: 0 1em 0.2em 1em;
+		padding: 0 0.7em 0.2em 0.7em;
 		font-size: 80%;
 		color: #555;
 	}
+	.tile p.property {
+		padding: 0.2em 0.7em;
+		margin: 0;
+	}
 	.instances {
 		background-color: #ddd;
 		position: absolute;
 		bottom: 0;
-		height: 3em;
+		height: 2.5em;
 		width: 100%;
+		vertical-align: middle;
 	}
+	.instances p { padding-top: 0.7em; vertical-align: middle; }
 	.instances .marker {
 		margin-right: 3px;
 	}
@@ -170,15 +207,19 @@
 		vertical-align: middle;
 	}
 	.circle {
-		height: 26px;
+		height: 20px;
-		width: 26px;
+		width: 20px;
 		background-color: #555;
 		border-radius: 50%;
 		display: inline-block;
+		border: 1px solid #777;
+	}
+	.circle:hover {
+		border: 1px solid #000;
 	}
 	.square {
-		height: 26px;
+		height: 20px;
-		width: 26px;
+		width: 20px;
 		background-color: #555;
 		display: inline-block;
 	}

src/routes/+layout.svelte

@@ -1,7 +1,7 @@
 <script>
-    import '../app.css';
    	import tabler from 'yesvelte/css/tabler.min.css?url';
 	import daisyui from 'yesvelte/css/daisyui.min.css?url';
+    import '../app.css';
 
     	// you can change theme of your project from here.
 	let theme = 'tabler';

src/routes/+page.svelte

@@ -16,122 +16,171 @@
 
 	let tabindex = 0; // a counter which facilitates keyboard navigation.
 
-    //
-    // digest and return useful info from the Webservices JSON feed
-    function processData(webservices) {
-        let stats = { 'instances': 0, 'technologies': 0, 'licenses': 0,'weak': 0, 'copyleft': 0 };
-        let all = []; // all services
-        let current = []; // those with active instances
-        let future = []; // those that are planned
-        // properties of technologies
-        let category_list = [];
-        let analogue_list = [];
-        let license_list = [];
-        // properties of instances
-        let status_list = [];
-        let affiliate_list = [];
-        let host_list = [];
 
-        // actual objects
+	// return the % a is of b
-        let hosts = [];
+	function percent(a, b) {
-        let affiliates = [];
+		return new Intl.NumberFormat('en', { style: "percent" }).format(a/b);
+	}
 
-        //
+	//
-        // just a trivial reassignment
+	// digest and return useful info from the Webservices JSON feed
-        //let hosts = webservices.hosts;
+	function processData(webservices) {
-        //
+		let stats = { instances: 0, technologies: 0, licenses: 0, weak: 0, copyleft: 0 };
-        // pull out relevant info in useful chunks.
+		let all = []; // all services
-        for (let key in webservices.technologies) {
+		let current = []; // those with active instances
-            let tech = webservices.technologies[key];
+		let future = []; // those that are planned
-            tech['name'] = key;
+		// properties of technologies
-            console.log('tech '+key+' ('+tech.categories.length+'):', tech.categories);
+		let category_list = [];
-            if (tech.hasOwnProperty('categories') && tech.categories.constructor === Array) {
+		let analogue_list = [];
-                //console.log('tech '+key+' ('+tech.categories.length+'):', tech.categories);
+		let license_list = [];
-                tech.categories.forEach(function (category, index) {
+		// properties of instances
-                    if (category_list.hasOwnProperty(category)) category_list[category]++;
+		let status_list = [];
-                    else category_list[category] = 1;
+		let affiliate_list = [];
-                });
+		let host_list = [];
-            }
-            if (tech.hasOwnProperty('analogues') && tech.analogues.constructor === Array) {
-                tech.analogues.forEach(function (analogue, index) {
-                    if (analogue_list.hasOwnProperty(analogue)) analogue_list[analogue]++;
-                    else analogue_list[analogue] = 1;
-                });
-            }
-            if (tech.hasOwnProperty('license')) {
-                let license = tech.license;
-                if (license_list.hasOwnProperty(license)) license_list[license]++;
-                else license_list[license] = 1;
-            }
-            if (hasInstances(tech)) {
-                current.push(tech);
-                //console.log(tech.name + ': ' + tech.instances.length + ' instances...');
-                tech.instances.forEach(function (instance, i) {
-					stats.instances++;
-                    if (instance.hasOwnProperty('status')) {
-                        let tag = instance.status;
-                        if (status_list.hasOwnProperty(tag)) status_list[tag]++;
-                        else status_list[tag] = 1;
-                    }
-                    if (instance.hasOwnProperty('affiliation')) {
-                        let tag = instance.affiliation;
 
-                        if (affiliate_list.hasOwnProperty(tag)) affiliate_list[tag]++;
+		// actual objects
-                        else affiliate_list[tag] = 1;
+		let hosts = [];
-                    }
+		let affiliates = [];
-                    if (instance.hasOwnProperty('host')) {
+
-                        let tag = instance.host;
+		//
-                        if (host_list.hasOwnProperty(tag)) host_list[tag]++;
+		// just a trivial reassignment
-                        else host_list[tag] = 1;
+		//let hosts = webservices.hosts;
-                    }
+		//
-                });
+		// pull out relevant info in useful chunks.
-            } else {
+		for (let key in webservices.technologies) {
-                future[key] = tech;
+			let tech = webservices.technologies[key];
-            }
+			console.log('considering ' + countArray(webservices.technologies) + ' technologies at the start.');
-            all[key] = tech;
+			tech['name'] = key;
-        }
+			//console.log('tech '+key+' ('+tech.categories.length+'):', tech.categories);
-        for (let key in webservices.hosts) {
+			if (tech.hasOwnProperty('categories') && tech.categories.constructor === Array) {
-            //console.log('key: ', key);
+				//console.log('tech '+key+' ('+tech.categories.length+'):', tech.categories);
-            let host = webservices.hosts[key];
+				tech.categories.forEach(function (category, index) {
-            host['name'] = key;
+					if (category_list.hasOwnProperty(category)) category_list[category]++;
-            //console.log('host: ', host);
+					else category_list[category] = 1;
-            if (
+				});
-                host.hasOwnProperty('domain') &&
+			}
-                !(host.hasOwnProperty('status') && host.status == 'retired')
+			if (tech.hasOwnProperty('analogues') && tech.analogues.constructor === Array) {
-            ) {
+				tech.analogues.forEach(function (analogue, index) {
-                hosts[key] = host;
+					if (analogue_list.hasOwnProperty(analogue)) analogue_list[analogue]++;
-            }
+					else analogue_list[analogue] = 1;
-        }
+				});
-        for (let key in webservices.affiliates) {
+			}
-            let affiliate = webservices.affiliates[key];
+			if (tech.hasOwnProperty('license')) {
-            affiliates[key] = affiliate;
+				let license = tech.license;
-        }
+				if (license_list.hasOwnProperty(license)) license_list[license]++;
+				else license_list[license] = 1;
+			}
+			if (hasInstances(tech) || tech.instances == 'all') {
+				if (tech.instances != 'all') {
+					current.push(tech);
+					//console.log(tech.name + ': ' + tech.instances.length + ' instances...');
+					tech.instances.forEach(function (instance, i) {
+						stats.instances++;
+						if (instance.hasOwnProperty('status')) {
+							let tag = instance.status;
+							if (status_list.hasOwnProperty(tag)) status_list[tag]++;
+							else status_list[tag] = 1;
+						}
+						if (instance.hasOwnProperty('affiliation')) {
+							let tag = instance.affiliation;
+
+							if (affiliate_list.hasOwnProperty(tag)) affiliate_list[tag]++;
+							else affiliate_list[tag] = 1;
+						}
+						if (instance.hasOwnProperty('host')) {
+							let tag = instance.host;
+							if (host_list.hasOwnProperty(tag)) host_list[tag]++;
+							else host_list[tag] = 1;
+						}
+					});
+				} else {
+					console.log('tech ' + tech.name + ' applies to *all* instances');
+				}
+			} else {
+				future[key] = tech;
+			}
+			all[key] = tech;
+		}
+		for (let key in webservices.hosts) {
+			//console.log('key: ', key);
+			let host = webservices.hosts[key];
+			host['name'] = key;
+			//console.log('host: ', host);
+			if (
+				host.hasOwnProperty('domain') &&
+				!(host.hasOwnProperty('status') && host.status == 'retired')
+			) {
+				hosts[key] = host;
+			}
+		}
+		for (let key in webservices.affiliates) {
+			let affiliate = webservices.affiliates[key];
+			affiliates[key] = affiliate;
+		}
 
 		// assign stats based on gathered data...
 		stats.current = current.length;
-		stats.future = future.length;
+		console.log('future technologies: ', future);
+		stats.future = countArray(future);
 		console.log('license_list: ', license_list);
-		stats.licenses = license_list.length;
+		stats.licenses = countArray(license_list);
+		stats.licensed_technologies = numLicensedTechnologies(license_list);
+		stats.strong = numCopyleft(license_list, references.copyleft_list);
+		stats.weak = stats.licensed_technologies - stats.strong;
+		console.log('host_list: ', host_list);
+		console.log('number of hosts: ', countArray(host_list));
+		stats.hosts = countArray(host_list);
+		console.log('stats: ', stats);
 
-        return {
+		return {
-            stats: stats,
+			stats: stats,
-            all_services: all,
+			all_services: all,
-            active_services: current,
+			active_services: current,
-            candidate_services: future,
+			candidate_services: future,
-            tech_lists: {
+			tech_lists: {
-                category_list: category_list,
+				category_list: category_list,
-                analogue_list: analogue_list,
+				analogue_list: analogue_list,
-                license_list: license_list
+				license_list: license_list
-            },
+			},
-            instance_lists: {
+			instance_lists: {
-                status_list: status_list,
+				status_list: status_list,
-                affiliate_list: affiliate_list,
+				affiliate_list: affiliate_list,
-                host_list: host_list
+				host_list: host_list
-            },
+			},
-            hosts: hosts,
+			hosts: hosts,
-            affiliates: affiliates
+			affiliates: affiliates
-        };
+		};
-    }
+	}
+
+	// when compound arrays don't have a valid .length key, use this
+	function countArray(arr) {
+		var count = 0;
+		for (var k in arr) {
+			if (arr.hasOwnProperty(k)) {
+				count++;
+			}
+		}
+		return count;
+	}
+
+	// count copyleft licenses, by only checking the copyleft totals
+	function numCopyleft(list, copyleft) {
+		var count = 0;
+		copyleft.forEach(function (license) {
+			//console.log('found ' + list[license] + ' technologies using ' + license);
+			count += list[license];
+		});
+		return count;
+	}
+
+	function numLicensedTechnologies(list) {
+		var count = 0;
+		for (var key in list) {
+			//console.log('found ' + list[key] + ' apps for license ' + key);
+			count += list[key];
+		}
+		return count;
+	}
 
 	// return an object with ob's keys ordered alphabetically, with an id from an object
 	function getSortedFilter(ob) {
@@ -145,23 +194,22 @@
 		// sort the array alphabetically
 		keys.sort();
 		// then create a dictionary of them
-		keys.forEach(function(name) {
+		keys.forEach(function (name) {
-			key_array.push({ "id": i++, "name": name, "active": true });
+			key_array.push({ id: i++, name: name, active: true });
 		});
 		return key_array;
 	}
 
 	// return true if a tech object includes valid instances
 	function hasInstances(tech) {
-		if (
+		if (tech.hasOwnProperty('instances') &&
-			tech.hasOwnProperty('instances') &&
 			tech.instances.constructor === Array &&
-			tech.instances.length
+			tech.instances.length) {
-		) return true;
+			return true;
+		}
 		return false;
 	}
 
-
 	// get intersection: ref https://bobbyhadz.com/blog/javascript-get-intersection-of-two-arrays
 	function getIntersection(a, b) {
 		const set1 = new Set(a);
@@ -172,7 +220,6 @@
 		return intersection;
 	}
 
-
 	// assign colours from a set of differentiated colours to a list of tags...
 	// this one is for 'hosts'
 	//
@@ -187,7 +234,10 @@
 		for (let index in host_list) {
 			console.log(host_list[index]);
 			let hostname = host_list[index].name;
-			if (hosts[hostname].hasOwnProperty('domain') && hosts[hostname].hasOwnProperty('affiliation')) {
+			if (
+				hosts[hostname].hasOwnProperty('domain') &&
+				hosts[hostname].hasOwnProperty('affiliation')
+			) {
 				host_array[hostname] = {
 					colour: colours[i++],
 					domain: hosts[hostname].domain,
@@ -208,8 +258,8 @@
 		//console.log('affiliate_list:', affiliate_list);
 
 		for (let index in affiliate_list) {
-			//console.log('affiliate:', affiliate);
 			let affiliate = affiliate_list[index].name;
+			//console.log('affiliate:', affiliate);
 			if (
 				affiliates[affiliate].hasOwnProperty('name') &&
 				affiliates[affiliate].hasOwnProperty('website')
@@ -243,9 +293,11 @@
 	// converts a filter with id, name, and active fields into an array of names
 	function flattenFilter(filter) {
 		let flat = [];
-	    if (filter.constructor === Array) {
+		if (filter.constructor === Array) {
-			filter.forEach(function(e) { if (e.active) flat.push(e.name) });
+			filter.forEach(function (e) {
-	    }
+				if (e.active) flat.push(e.name);
+			});
+		}
 		return flat;
 	}
 
@@ -253,15 +305,23 @@
 	function filterTechnologiesByArray(technologies, field, list) {
 		const included = [];
 		technologies.forEach(function (tech) {
-			if (hasInstances(tech)) {
+			if (hasInstances(tech) || tech.instances == 'all') {
-			    let arr = tech[field]
+				if (typeof tech[field] != 'undefined') {
-				const intersection = inCommon(arr, list);
+					let arr = tech[field];
-				if (intersection && intersection.constructor === Array) {
+					//if (field == 'analogues') console.log('tech['+field+'] = ', tech[field]);
-					//console.log('intersection length: ', intersection.length);
+					const intersection = inCommon(arr, list);
-					if (intersection.length > 0) {
+					if (intersection && intersection.constructor === Array) {
-						included.push(tech);
+						//console.log('intersection length: ', intersection.length);
+						if (intersection.length > 0) {
+							included.push(tech);
+						}
 					}
+					// this tech doesn't define that field, so don't eliminate it from the list
+				} else {
+					included.push(tech);
 				}
+			} else {
+				console.log('not including tech ', tech.name);
 			}
 		});
 		//console.log('found ' + included.length + ' technologies.');
@@ -272,16 +332,55 @@
 	function filterTechnologiesByValue(technologies, field, list) {
 		const included = [];
 		technologies.forEach(function (tech) {
+			if (hasInstances(tech) || tech.instances == 'all') {
+				if (typeof tech[field] != 'undefined') {
+					let arr = [tech[field]];
+					const intersection = inCommon(arr, list);
+					if (intersection && intersection.constructor === Array) {
+						//console.log('intersection length: ', intersection.length);
+						if (intersection.length > 0) {
+							included.push(tech);
+						}
+					}
+				} else {
+					included.push(tech);
+				}
+			}
+		});
+		//console.log('found ' + included.length + ' technologies.');
+		return included;
+	}
+
+	function filterTechnologiesByInstanceValue(technologies, field, list) {
+		const included = [];
+		technologies.forEach(function (tech) {
+			var to_include = false;
 			if (hasInstances(tech)) {
-				let arr = [tech[field]];
+				console.log('instances: ', tech.instances);
-				const intersection = inCommon(arr, list);
+				for (let instance in tech.instances) {
-				if (intersection && intersection.constructor === Array) {
+					console.log('instance = ', instance);
-					//console.log('intersection length: ', intersection.length);
+					if (instance.hasOwnProperty(field)) {
-					if (intersection.length > 0) {
+						const intersection = inCommon([instance[field]], list);
-						included.push(tech);
+						if (intersection && intersection.constructor === Array) {
+							console.log('intersection length: ', intersection.length);
+							// if any one instance belonging to the tech is in the set, add the tech.
+							if (intersection.length > 0) {
+								console.log('setting to include ',instance.domain);
+								to_include = true;
+							} else {
+								// if an instance doesn't belong in the set, remove it.
+								tech.instances[instance.domain].pop();
+							}
+						}
+					} else {
+						console.log('instance missing field ', field);
 					}
 				}
 			}
+			if (to_include) {
+				console.log('including ', tech.name);
+				included.push(tech);
+			}
 		});
 		//console.log('found ' + included.length + ' technologies.');
 		return included;
@@ -323,30 +422,73 @@
 	const affiliates = results.affiliates;
 	//console.log('affiliate_data: ', results.affiliates);
 	const host_colours = hostColours($hostFilter, colours, hosts);
-	 //console.log('host_colours:', host_colours);
+	console.log('host_colours:', host_colours);
 	colours.sort();
 	const affiliate_colours = affiliateColours($affiliateFilter, colours, affiliates);
-	//console.log('affiliate_colours:',affiliate_colours);
+	console.log('affiliate_colours:',affiliate_colours);
 
 	let filteredTechnologies;
 	let technologies;
 
 	// reactive stuff...
 	$: {
-		console.log('about to filterTechnologiesByCategoryList');
+		console.log(
+			'about to filter technologies by categories - starting with ' +
+				results.active_services.length +
+				' technologies...'
+		);
 		// filter by categories
-		filteredTechnologies = filterTechnologiesByArray(results.active_services, 'categories',
+		filteredTechnologies = filterTechnologiesByArray(
-			flattenFilter($categoryFilter));
+			results.active_services,
+			'categories',
+			flattenFilter($categoryFilter)
+		);
+		console.log(
+			'about to filter technologies by analogues - starting with ' +
+				filteredTechnologies.length +
+				' technologies...'
+		);
 		// filter by analogues
-		filteredTechnologies = filterTechnologiesByArray(filteredTechnologies, 'analogues',
+		filteredTechnologies = filterTechnologiesByArray(
-			flattenFilter($analogueFilter));
+			filteredTechnologies,
-		filteredTechnologies = filterTechnologiesByValue(filteredTechnologies, 'license',
+			'analogues',
-			flattenFilter($licenseFilter));
+			flattenFilter($analogueFilter)
+		);
+		/*console.log(
+			'about to filter technologies by license - starting with ' +
+				filteredTechnologies.length +
+				' technologies...'
+		);*/
+		filteredTechnologies = filterTechnologiesByValue(
+			filteredTechnologies,
+			'license',
+			flattenFilter($licenseFilter)
+		);
+		/*console.log(
+			'about to sort technologies alphabetically - starting with ' +
+				filteredTechnologies.length +
+				' technologies...'
+		);*/
+		/*filteredTechnologies = filterTechnologiesByInstanceValue(
+			filteredTechnologies,
+			'status',
+			flattenFilter($statusFilter)
+		)*/
+		/*filteredTechnologies = filterTechnologiesByInstanceValue(
+			filteredTechnologies,
+			'affiliate',
+			flattenFilter($affiliateFilter)
+		)
+		filteredTechnologies = filterTechnologiesByInstanceValue(
+			filteredTechnologies,
+			'host',
+			flattenFilter($hostFilter)
+		)*/
 
 		//filteredTechnologies = filterTechnologiesByCategoryList(results.all_services, flattenFilter($categoryFilter));
 		const technologies = sortTechnologies(filteredTechnologies);
+		console.log('finally have ' + technologies.length + ' technologies left to show...');
 	}
-
 </script>
 
 <div class="webservices">
@@ -355,41 +497,108 @@
 			<div class="summary">
 				<h2>Statistics</h2>
 				<ul>
-					<li><span class="label">Number of individual services: <span class="number">{results.stats.instances}</span></li>
+					<li>
-					<li><span class="label">Number of individual technologies: <span class="number">{results.stats.current}</span></li>
+						<span class="label">Current web service instances:
-					<li><span class="label">Number of new technologies to be added: <span class="number">{results.stats.future}</span></li>
+							<span class="number">{results.stats.instances}</span>
-					<li><span class="label">Number of libre licenses used by these technologies: <span class="number">{results.stats.licenses}</span>
+						</span>
-					<ul>
+					</li>
-						<li><span class="label">'weak' corporate-exploitation-friendly open source licenses : <span class="number">{results.stats.weak}</span></li>
+					<li>
-						<li><span class="label">'strong' user-protecting copyleft licenses: <span class="number">{results.stats.copyleft}</span></li>
+						<span class="label">Active web service technologies:
-					</ul>
+							<span class="number">{results.stats.current}</span>
+						</span>
+					</li>
+					<li>
+						<span class="label">New technologies to be added:
+							<span class="number">{results.stats.future}</span>
+						</span>
+					</li>
+					<li>
+						<span class="label">Licenses used by these
+							<span class="number">{results.stats.licensed_technologies}</span>
+							technologies:
+							<span class="number">{results.stats.licenses}</span>
+							<ul>
+								<li>
+									<span class="label">'strong' copyleft licenses:
+										<span class="number">{results.stats.strong}</span>
+										(<span class="number">{percent(results.stats.strong, results.stats.licensed_technologies)}</span>)
+									</span>
+								</li>
+								<li>
+									<span class="label">'weak' open source licenses :
+										<span class="number">{results.stats.weak}</span>
+										(<span class="number">{percent(results.stats.weak, results.stats.licensed_technologies)}</span>)
+									</span>
+								</li>
+							</ul>
+						</span>
 					</li>
 
-					<li><span class="label">Total number of services: <span class="number">{results.stats.instances}</span></li>
+					<li>
+						<span class="label">Number of hosts:
+							<span class="number">{results.stats.hosts}</span>
+						</span>
+					</li>
 				</ul>
 			</div>
 		</div>
 		<h1>Web Services</h1>
-		<p>This sites exists to provide an 'always-up-to-date', in-depth description of the
+		<p>
+			This sites exists to provide an 'always-up-to-date', in-depth description of the
 			<a href="https://tech.oeru.org/foss-libresoftware-its-about-clarity-and-values"
-			title="What do I mean by 'libre' software?">libre software</a> web services I (<a href="https://davelane.nz" title="Who is this Dave Lane character?">Dave Lane</a>) have set up and maintain.
+				title="What do I mean by 'libre' software?">libre software</a>
+			web services I (<a href="https://davelane.nz"
+			title="Who is this Dave Lane character?">Dave Lane</a>) have set up and maintain.
 		</p>
-		<p>These services are run primarily on commodity Linux Virtual Private Servers, aka 'hosts', which I also maintain. Some systems are also run on real physical hosts either in my home hosting facility or in commercial hosting facilities. These hosts are based in Aotearoa NZ, Singapore, the US, and in Germany. Almost all run an LTS (Long Term Support) version of Ubuntu Linux although a few hosts run Debian Linux.</p>
+		<p>
-		<p>Almost all the hosts are <a href="https://tech.oeru.org/creating-your-own-oer-foundation-style-libre-self-hosting-infrastructure-docker-compose-and-ubuntu">configured in a particular way</a> which allows multiple services to run harmoniously on the same host. I use a set of somewhere between one and twenty-one Docker containers (which I run via Docker Compose) for each service, to keep different services, each of which has different software dependencies, from interfering with one another. Each service is made available to the Internet via a 'reverse proxy' (for which I use Nginx) and user interactions with them are secured (encrypted) with Let's Encrypt SSL certificates (which renew automatically).
+			These services are run primarily on commodity Linux Virtual Private Servers, aka 'hosts',
+			which I also maintain. Some systems are also run on real physical hosts either in my home
+			hosting facility or in commercial hosting facilities. These hosts are based in Aotearoa NZ,
+			Singapore, the US, and in Germany. Almost all run an LTS (Long Term Support) version of Ubuntu
+			Linux although a few hosts run Debian Linux.
+		</p>
+		<p>
+			Almost all the hosts are <a href="https://tech.oeru.org/creating-your-own-oer-foundation-style-libre-self-hosting-infrastructure-docker-compose-and-ubuntu">configured in a particular way</a> which allows multiple services to run harmoniously on the same host. I use a set of somewhere
+			between one and twenty-one Docker containers (which I run via Docker Compose) for each service,
+			to keep different services, each of which has different software dependencies, from interfering
+			with one another. Each service is made available to the Internet via a 'reverse proxy' (for which
+			I use Nginx) and user interactions with them are secured (encrypted) with Let's Encrypt SSL certificates (which renew automatically).
+		</p>
+		<p>
+			To manage the servers and keep them up-to-date, I use SSH to establish secure encrypted
+			connections to them (via key-based authentication). I run updates of the hosts manually, and
+			update individual services when required (urgently if updates are security-related). Some of
+			the Docker containers I run I have built myself, in other cases I use those supplied by the
+			communities developing the service.
+		</p>
+		<p>
+			One huge advantage of the Docker Compose pattern is that I can rapidly move services between
+			different hosts, or even replicate services very rapidly for development or staging purposes.
+			Using them has revolutionised my hosting processes.
 		</p>
-		<p>To manage the servers and keep them up-to-date, I use SSH to establish secure encrypted connections to them (via key-based authentication). I run updates of the hosts manually, and update individual services when required (urgently if updates are security-related). Some of the Docker containers I run I have built myself, in other cases I use those supplied by the communities developing the service.</p>
-		<p>One huge advantage of the Docker Compose pattern is that I can rapidly move services between different hosts, or even replicate services very rapidly for development or staging purposes. Using them has revolutionised my hosting processes.</p>
 	</div>
 	<Accordions>
 		<Accordion title="Filters">
 			<AccordionBody>
+				<p>
+					You can filter the software services listed below by the following filtering dimensions.
+					Click a tag to remove or re-add it or select all or none, or invert your selection if it's
+					more useful.
+				</p>
 				<Accordions>
 					<Accordion title="Software Catergory Filter">
 						<AccordionBody>
 							<div class="filter-group categories">
-								<Filterable filterValues={categoryFilter}
+								<Filterable
-									histogram={results.tech_lists.category_list} context={'categories'}>
+									filterValues={categoryFilter}
+									histogram={results.tech_lists.category_list}
+									context={'categories'}>
 									<h2 slot="title">Categories</h2>
+									<p slot="description">
+										You can These are general categories of software which help you understand the
+										sort of software you're looking at, as well as identifying functionally similar
+										software for comparison.
+									</p>
 								</Filterable>
 							</div>
 						</AccordionBody>
@@ -397,10 +606,21 @@
 					<Accordion title="Software Analogue Filter">
 						<AccordionBody>
 							<div class="filter-group analogues">
-								<Filterable filterValues={analogueFilter}
+								<Filterable
-									tabindex={tabindex}
+									filterValues={analogueFilter}
-									histogram={results.tech_lists.analogue_list} context={'analogues'}>
+									{tabindex}
+									histogram={results.tech_lists.analogue_list}
+									context={'analogues'}>
 									<h2 slot="title">Analogues</h2>
+									<p slot="description">
+										Because all the software listed here is '<a
+											href="https://tech.oeru.org/foss-libresoftware-its-about-clarity-and-values"
+											>libre</a
+										>', I've included the names of functionally similar but heavily marketed
+										<a href="https://davelane.nz/proprietary">proprietary</a> software that is therefore
+										better known to the general population, also for the purposes of understanding the
+										use of the software shown and to what it can be compared.
+									</p>
 								</Filterable>
 							</div>
 						</AccordionBody>
@@ -408,10 +628,18 @@
 					<Accordion title="License Filter">
 						<AccordionBody>
 							<div class="filter-group licenses">
-								<Filterable filterValues={licenseFilter}
+								<Filterable
-									tabindex={tabindex}
+									filterValues={licenseFilter}
-									histogram={results.tech_lists.license_list} context={'licenses'}>
+									{tabindex}
+									histogram={results.tech_lists.license_list}
+									context={'licenses'}
+								>
 									<h2 slot="title">Open Source & Copyleft Licenses</h2>
+									<p slot="description">
+										These are the various '<a href="https://opensource.org/licenses">open source</a
+										>' and '<a href="https://copyleft.org">copyleft</a>' licenses that apply to the
+										software listed. You can chose
+									</p>
 								</Filterable>
 							</div>
 						</AccordionBody>
@@ -419,10 +647,14 @@
 					<Accordion title="Service Status Filter">
 						<AccordionBody>
 							<div class="filter-group statuses">
-								<Filterable filterValues={statusFilter}
+								<Filterable
-									tabindex={tabindex}
+									filterValues={statusFilter}
-									histogram={results.instance_lists.status_list} context={'statuses'}>
+									{tabindex}
+									histogram={results.instance_lists.status_list}
+									context={'statuses'}
+								>
 									<h2 slot="title">Statuses</h2>
+									<p slot="description"></p>
 								</Filterable>
 							</div>
 						</AccordionBody>
@@ -431,9 +663,10 @@
 						<AccordionBody>
 							<div class="filter-group affilates">
 								<Filterable filterValues={affiliateFilter}
-									tabindex={tabindex}
+									{tabindex} 								histogram={results.instance_lists.affiliate_list}
-									histogram={results.instance_lists.affiliate_list}
+									context={'affiliates'}
-									context={'affiliates'}><h2 slot="title">Affiliates</h2>
+									colours={affiliate_colours}><h2 slot="title">Affiliates</h2>
+									<p slot="description"></p>
 								</Filterable>
 							</div>
 						</AccordionBody>
@@ -441,10 +674,12 @@
 					<Accordion title="Service Host Filter">
 						<AccordionBody>
 							<div class="filter-group hosts">
-								<Filterable filterValues={hostFilter}
+								<Filterable	filterValues={hostFilter}
-									tabindex={tabindex}
+									{tabindex}
-									histogram={results.instance_lists.host_list} context={'hosts'}>
+									histogram={results.instance_lists.host_list}
-									<h2 slot="title">Hosts</h2>
+									context={'hosts'}
+									colours={host_colours}><h2 slot="title">Hosts</h2>
+									<p slot="description"></p>
 								</Filterable>
 							</div>
 						</AccordionBody>
@@ -453,9 +688,10 @@
 			</AccordionBody>
 		</Accordion>
 	</Accordions>
+	<p>Showing {filteredTechnologies.length} technology tiles.</p>
 	<div class="tiles">
 		{#each filteredTechnologies as technology}
-		<TechnologyTile technology={technology} affiliate_colours={affiliate_colours} />
+			<TechnologyTile {technology} {affiliate_colours} />
 		{/each}
 	</div>
 </div>
@@ -468,7 +704,7 @@
 		position: relative;
 	}
 	.introduction {
-	    width: 100%;
+		width: 100%;
 	}
 	.summary-wrapper {
 		content: '';
@@ -479,33 +715,24 @@
 	}
 	.summary {
 		border-radius: 15px;
-	    float: right;
+		float: right;
-	    clear: both;
+		clear: both;
-	    /*display: block;*/
+		/*display: block;*/
-	    background-color: #ccc;
+		background-color: #ccc;
-	    /*display: block;*/
+		/*display: block;*/
-	    max-width: 30%;
+		max-width: 30%;
-	    min-width: 30em;
+		min-width: 30em;
-	    border: 2px #aaa solid;
+		border: 2px #aaa solid;
-	    margin: 0 15px 20px 6px;
+		margin: 0 15px 20px 6px;
-	    padding: 0 20px;
+		padding: 0 20px;
-	    box-shadow: 6px 6px 20px #999;
+		box-shadow: 6px 6px 20px #999;
 	}
-	.summary .label { color: #666; }
+	.summary .label {
-	.summary .number { color: #000; }
+		color: #666;
-/*	.accordion-item {
-	    width: 30em;
-	    display: flex;
-	    text-align: left;
 	}
-	.accordion-item h2 {
+	.summary .number {
-	    display: inline;
+		color: #000;
 	}
-	.accordion-item svg {
-		width: 12px;
-		display: block;
-		vertical-align: middle;
-	}*/
 	@media screen and (max-width: 600px) {
 		.summary {
 			float: none;