accurator/commit

Showing subdomains in domain page, resolves #254

diff --git a/rdf/domain/fashion/fashion_domain.ttl b/rdf/domain/fashion/fashion_domain.ttl
index 9e534a9..c0cffdb 100644
--- a/rdf/domain/fashion/fashion_domain.ttl
+++ b/rdf/domain/fashion/fashion_domain.ttl
@@ -1,5 +1,7 @@
 @prefix accu:   <http://accurator.nl/schema#> .
 @prefix afas:   <http://accurator.nl/fashion#> .
+@prefix afasj:   <http://accurator.nl/fashion/jewelry#> .
+@prefix afass:   <http://accurator.nl/fashion/shoes#> .
 @prefix afasui: <http://accurator.nl/ui/fashion#> .
 @prefix aafas:  <http://accurator.nl/ui/annotation/fashion#> .
 @prefix auis:   <http://accurator.nl/ui/schema#> .
@@ -16,22 +18,25 @@ afas:domain a accu:Domain ;
 	accu:hasUI afasui: ;
 	accu:hasAnnotationUI aafas:fashionUI ;
 	accu:hasDescriptiveImage afas:dress ;
-	accu:subDomains afas:jewelry ,
-					afas:shoes .
+	accu:subDomains afasj:domain ,
+					afass:domain .
 		# afas:fans ,
 		# afas:accessories ,
 		# afas:uniforms .
 
 <http://iconclass.org/> a skos:ConceptScheme .
 
-afas:jewelry a accu:Domain ;
+afasj:domain a accu:Domain ;
 	rdfs:label "jewelry" ;
+	accu:hasTarget <http://accurator.nl/fashion/jewelry#Target> ;
+	accu:hasUI afasui: ;
 	accu:hasDescriptiveImage afas:dress ;
 	accu:hasAnnotationUI aafas:fashionUI .
 
-
-afas:shoes a accu:Domain ;
+afass:domain a accu:Domain ;
 	rdfs:label "shoes" ;
+	accu:hasTarget <http://accurator.nl/fashion/shoes#Target> ;
+	accu:hasUI afasui: ;
 	accu:hasDescriptiveImage afas:dress ;
 	accu:hasAnnotationUI aafas:fashionUI .
 
diff --git a/rdf/domain/fashion/ui/labels.ttl b/rdf/domain/fashion/ui/labels.ttl
index e77654e..0360b07 100644
--- a/rdf/domain/fashion/ui/labels.ttl
+++ b/rdf/domain/fashion/ui/labels.ttl
@@ -6,7 +6,7 @@
 @prefix dcterms:<http://purl.org/dc/terms/> .
 @prefix skos:   <http://www.w3.org/2004/02/skos/core#> .
 
-###### Fashion Domain #####
+###### Fashion (Sub)Domain(s) #####
 
 afasui:domain a auis:UI ;
 	aui:domainLabel "Fashion domain"@en .
diff --git a/rdf/domain/fashion/ui/labels_nl.ttl b/rdf/domain/fashion/ui/labels_nl.ttl
index 38329c5..5d280d2 100644
--- a/rdf/domain/fashion/ui/labels_nl.ttl
+++ b/rdf/domain/fashion/ui/labels_nl.ttl
@@ -6,6 +6,12 @@
 afasui:domain a auis:UI ;
 	aui:domainLabel "Domein mode"@nl .
 
+afasui:jewelry a auis:UI ;
+	aui:domainLabel "Domein seiraden"@nl .
+
+afasui:shoes a auis:UI ;
+	aui:domainLabel "Schoenen domein"@nl .
+
 ###### Fashion Intro Screen #####
 
 afasui:intro a auis:UI ;
diff --git a/web/js/components/utilities.js b/web/js/components/utilities.js
index 15400f5..0768863 100644
--- a/web/js/components/utilities.js
+++ b/web/js/components/utilities.js
@@ -656,3 +656,10 @@ function generateIdFromUri(uri) {
 	// remove troublesome characters
 	return pathArray[pathArray.length - 1].replace(/([ #;?%&,.+*~\':"!^$[\]()=>|\/@])/g,'');
 }
+
+function generateDomainFromUri(uri) {
+	// create a domain label from a uri
+	var pathArray = uri.split(/[/#]/);
+	// get the thing bofore #
+	return pathArray[pathArray.length - 2];
+}
diff --git a/web/js/domain.js b/web/js/domain.js
index fa6514e..d82e752 100644
--- a/web/js/domain.js
+++ b/web/js/domain.js
@@ -50,9 +50,9 @@ function getDomains(domain) {
 			var domains = [];
 
 			for (var i=0; i<data.subDomains.length; i++) {
-				domains[i] = generateIdFromUri(data.subDomains[i]);// HACK, assumes the domain uri ends at the label
+				domains[i] = generateDomainFromUri(data.subDomains[i]);
 			}
-			console.log(domains);
+
 			return domains;
 		});
 	}