accurator/commit

Added choice of topdomain to subdomain page.

diff --git a/rdf/ui/labels.ttl b/rdf/ui/labels.ttl
index bd6ef58..f75f487 100644
--- a/rdf/ui/labels.ttl
+++ b/rdf/ui/labels.ttl
@@ -50,7 +50,7 @@ aui:domain a auis:UI ;
 	aui:domainPageTitle "Select the domain"@en ;
 	aui:domainHdr "In which domain do you want to start tagging?"@en ;
 	aui:domainHdrSub "Is there a subdomain in which you want to tag?"@en ;
-	aui:domainTxtAllObjects "All artworks in "@en .
+	aui:domainTxtAllObjects "All works in "@en .
 
 aui:domainPageTitle rdfs:subPropertyOf auis:uiLabel .
 aui:domainHdr rdfs:subPropertyOf auis:uiLabel .
diff --git a/rdf/ui/labels_nl.ttl b/rdf/ui/labels_nl.ttl
index 434b5f9..dd5161e 100644
--- a/rdf/ui/labels_nl.ttl
+++ b/rdf/ui/labels_nl.ttl
@@ -30,9 +30,9 @@ aui:about a auis:UI ;
 
 aui:domain a auis:UI ;
 	aui:domainPageTitle "Selecteer Domein"@nl ;
-	aui:domainTxtTitle "Aan welk domein wilt u informatie bijdragen?"@nl ;
+	aui:domainHdr "Aan welk domein wilt u informatie bijdragen?"@nl ;
 	aui:domainHdrSub "Is er een specifiek subdomein waaraan u informatie wilt bijdragen?"@nl ;
-	aui:domainTxtAllObjects "Alle kunstwerken in het "@nl .
+	aui:domainTxtAllObjects "Alle werken in  "@nl .
 
 ##### Topic Screen #####
 
diff --git a/web/js/domain.js b/web/js/domain.js
index 57f8553..b6d0ad6 100644
--- a/web/js/domain.js
+++ b/web/js/domain.js
@@ -30,8 +30,8 @@ function domainInit() {
 		populateNavbar(userName, [{link:"profile.html", name:"Profile"}], locale);
 
 		getLabels(locale, ui)
-		.then(function(labels) {
-			labels = initLabels(labels, domain)
+		.then(function(labelData) {
+			labels = initLabels(labelData, domain)
 			return getDomains(domain);
 		})
 		.then(function(domains) {
@@ -51,7 +51,7 @@ function initLabels(labels, domain) {
 		$("#domainTxtTitle").append(labels.domainHdrSub);
 	}
 
-	return {'domainTxtAllObjects':labels.domainTxtAllObjects}
+	return {'domainTxtAllObjects':labels.domainTxtAllObjects};
 }
 
 function getDomains(domain) {
@@ -72,16 +72,19 @@ function getDomains(domain) {
 	}
 }
 
-function populateDomains(domainLabels, rootDomainLabel, labels, locale) {
+function populateDomains(domains, domain, labels, locale) {
 	var row;
 
-	// remove generic from the domains (does not work on ie 7 and 8..)
-	if (domainLabels.indexOf("generic") >= 0) {
-		domainLabels.splice(domainLabels.indexOf("generic"), 1);
+	// remove generic from the domains if showing top domains (does not work on ie 7 and 8..)
+	if (domain === "generic") {
+		domains.splice(domains.indexOf("generic"), 1);
+	} else {
+		// add root domain as option to select in list of subdomains
+		domains.push(domain);
 	}
 
 	// get domain settings for all the domains
-	for (var i=0; i<domainLabels.length; i++) {
+	for (var i=0; i<domains.length; i++) {
 		// add a new row for every two domains
 		if (i%2 === 0) {
 			row = parseInt(i/2);
@@ -91,17 +94,24 @@ function populateDomains(domainLabels, rootDomainLabel, labels, locale) {
 			);
 		}
 
-		$.getJSON("domains", {domain:domainLabels[i]})
-		.then(addDomain(row, locale)); //TODO: Check if this can be coded cleaner
+		$.getJSON("domains", {domain:domains[i]})
+		.then(addDomain(row, locale, labels, domain));
 	}
 }
 
-function addDomain(row, locale) {
+function addDomain(row, locale, pageLabels, rootDomain) {
 	return function(domainData) {
 		return getLabels(locale, domainData.hasLabel)
-		.then(function(labels) {
+		.then(function(domainLabel) {
 			var topics = null;
-			var subDomains;
+			var subDomains, domainLabel;
+
+			// set domain label for root domain if matched
+			if (rootDomain === domainData.domain) {
+				domainLabel = pageLabels.domainTxtAllObjects + domainLabel.textLabel;
+			} else {
+				domainLabel = domainLabel.textLabel;
+			}
 
 			// see if there are subdomains
 			domainData.subDomains ?
@@ -121,7 +131,7 @@ function addDomain(row, locale) {
 			// domainData
 			var domain = new Domain (
 				domainData.domain,
-				labels.textLabel,
+				domainLabel,
 				domainData.image,
 				domainData.imageBrightness,
 				subDomains,