accurator/commit

Showing UI elements based on user specifying domain.

authorChris Dijkshoorn
Tue Feb 10 20:18:36 2015 +0000
committerChris Dijkshoorn
Tue Feb 10 20:18:36 2015 +0000
commitc6d768db68fbcd5503ce112a1b63cfea3b812777
treea552a7e86ca87cfc03667a2dccb78777e2b5695c
parent46892da2eb2fbfadb9b46a7b03f50d4ae96b7e42
Diff style: patch stat
diff --git a/config-available/accurator.pl b/config-available/accurator.pl
index 5869500..d610b36 100644
--- a/config-available/accurator.pl
+++ b/config-available/accurator.pl
@@ -7,6 +7,7 @@
 
 % Load ui rdf
 :- rdf_attach_library(accurator(rdf)).
-:- rdf_load_library('accurator-bird-ui').
+:- rdf_load_library('accurator-bird-domain').
+:- rdf_load_library('accurator-bible-domain').
 
 :- use_module(api(accurator)).
\ No newline at end of file
diff --git a/rdf/accurator_ui_bible.ttl b/rdf/accurator_ui_bible.ttl
new file mode 100644
index 0000000..a1cf5e2
--- /dev/null
+++ b/rdf/accurator_ui_bible.ttl
@@ -0,0 +1,50 @@
+@prefix auis:   <http://accurator.nl/ui/schema#> .
+@prefix aui:    <http://accurator.nl/ui/generic#> .
+@prefix abibui: <http://accurator.nl/ui/bible#> .
+@prefix rdf:    <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:   <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix dcterms:<http://purl.org/dc/terms/> .
+@prefix skos:   <http://www.w3.org/2004/02/skos/core#> .
+
+###### Bible Intro Screen #####
+
+abibui:intro a auis:UI ;
+	rdfs:subClassOf aui:intro;
+	aui:txtSubSlogan "Help us add information to artworks with biblical scenes"@en ;
+	aui:txtSubSlogan "Help ons met het toevoegen van informatie aan kunstwerken met bijbelse themas"@nl .
+
+abibui:txtSubSlogan a auis:UILabel .
+
+###### Bible About Screen #####
+
+abibui:about a auis:UI ;
+	rdfs:subClassOf aui:about .
+
+##### Bible Register Screen #####
+
+abibui:register a aui:UI ;
+	rdfs:subClassOf aui:register .
+
+##### Bible Expertise Screen #####
+
+abibui:expertise a auis:UI ;
+	rdfs:subClassOf aui:expertise ;
+	aui:txtSubHeader "how much do you know about the following biblical themes?"@en ;
+	aui:txtSubHeader "hoeveel weet u af van de volgende bijbelse themas?"@nl .
+
+abibui:txtSubHeader a auis:UILabel .
+
+##### Bible Profile Screen #####
+
+abibui:profile a aui:UI ;
+	rdfs:subClassOf aui:profile .
+
+##### Bible Additional Info Screen #####
+
+abibui:additional_info a auis:UI ;
+	rdfs:subClassOf aui:additional_info .
+
+##### Bible Login Modal #####
+
+abibui:login_modal a auis:UI ;
+	rdfs:subClassOf aui:login_modal .
diff --git a/rdf/accurator_bird_ui.ttl b/rdf/accurator_ui_bird.ttl
similarity index 92%
rename from rdf/accurator_bird_ui.ttl
rename to rdf/accurator_ui_bird.ttl
index b22cb9b..5f7eab6 100644
--- a/rdf/accurator_bird_ui.ttl
+++ b/rdf/accurator_ui_bird.ttl
@@ -34,17 +34,17 @@ abui:expertise a auis:UI ;
 
 abui:txtSubHeader a auis:UILabel .
 
-##### Profile Screen #####
+##### Bird Profile Screen #####
 
 abui:profile a aui:UI ;
 	rdfs:subClassOf aui:profile .
 
-##### Additional Info Screen #####
+##### Bird Additional Info Screen #####
 
 abui:additional_info a auis:UI ;
 	rdfs:subClassOf aui:additional_info .
 
-##### Login Modal #####
+##### Bird Login Modal #####
 
 abui:login_modal a auis:UI ;
 	rdfs:subClassOf aui:login_modal .
diff --git a/rdf/void.ttl b/rdf/void.ttl
index 925dafb..9a187ae 100644
--- a/rdf/void.ttl
+++ b/rdf/void.ttl
@@ -44,12 +44,20 @@ vann:preferredNamespaceUri "http://www.geonames.org/ontology#"
 	dcterms:title "File with language names";
 	void:dataDump <languages.ttl> .
 
-<accurator-bird-ui>
+<accurator-bird-domain>
 	a void:Dataset ;
 	void:subset <accurator-ui-schema> ;
 	void:subset <accurator-ui> ;
 	void:subset <accurator-ui-countries> ;
 	void:subset <accurator-ui-languages> ;
 	dcterms:title "Accurator UI configuration instance for Bird domain";
-	void:dataDump <accurator_bird_ui.ttl> .
+	void:dataDump <accurator_ui_bird.ttl> .
 
+<accurator-bible-domain>
+	a void:Dataset ;
+	void:subset <accurator-ui-schema> ;
+	void:subset <accurator-ui> ;
+	void:subset <accurator-ui-countries> ;
+	void:subset <accurator-ui-languages> ;
+	dcterms:title "Accurator UI configuration instance for Bird domain";
+	void:dataDump <accurator_ui_bible.ttl> .
diff --git a/web/js/accurator_about.js b/web/js/accurator_about.js
index a2b6903..ff1a03f 100644
--- a/web/js/accurator_about.js
+++ b/web/js/accurator_about.js
@@ -1,11 +1,11 @@
 /* Accurator About
 */
-var locale;
-var ui = "http://accurator.nl/ui/bird#about";
-
+var locale, ui;
 
 function aboutInit() {
 	locale = getLocale();
+	ui = getUiUri(domain, "about");
+	
 	onSuccess = function(data){
 		setLinkLogo("profile");
 		populateUI();
@@ -21,7 +21,11 @@ function aboutInit() {
 function populateUI() {
 	$.getJSON("ui_elements", {locale:locale, ui:ui, type:"labels"})
 		.done(function(data){
-			initLabels(data);});
+			initLabels(data);})
+		.fail(function(data, textStatus){
+			//Use generic ui elements
+			populateUI(getGenericUiUri("about"));
+	});
 }
 
 function initLabels(data) {
diff --git a/web/js/accurator_intro.js b/web/js/accurator_intro.js
index f71ef4f..8f9a149 100644
--- a/web/js/accurator_intro.js
+++ b/web/js/accurator_intro.js
@@ -24,20 +24,27 @@ function setBackground() {
 	backgroundDarkUrl = "img/background/" + domain + "-dark.jpg";
 	backgroundGeneric = "img/background/generic.jpg";
 	
+	if(domain === "") {
+		$(".backgroundImage").attr("src", backgroundGeneric);
+		return;
+	}
+	
 	$.ajax({url:backgroundUrl,
 		    type:'HEAD',
 		    success: function() {
 				$(".backgroundImage").attr("src", backgroundUrl);
-		    }
-	});
-	$.ajax({url:backgroundDarkUrl,
-		    type:'HEAD',
-		    success: function() {
-				$(".backgroundImage").attr("src", backgroundDarkUrl);
-				lightFontColor();
 		    },
-		    fail: function() {
-				$(".backgroundImage").attr("src", backgroundDarkUrl);
+		    error: function() {
+		        $.ajax({url:backgroundDarkUrl,
+					   type:'HEAD',
+					   success: function() {
+						   $(".backgroundImage").attr("src", backgroundDarkUrl);
+						   lightFontColor();
+					   },
+					   error: function() {
+					       $(".backgroundImage").attr("src", backgroundGeneric);
+					   }
+				});
 		    }
 	});
 }
diff --git a/web/js/accurator_utilities.js b/web/js/accurator_utilities.js
index 86b40c6..0b3c7d5 100644
--- a/web/js/accurator_utilities.js
+++ b/web/js/accurator_utilities.js
@@ -4,7 +4,11 @@ var loginWarning, loginIncomplete;
 
 //UI
 function getUiUri(domain, page) {
-	return "http://accurator.nl/ui/" + domain + "#" + page;
+	if(domain === "") {
+		return getGenericUiUri(page);
+	} else {
+		return "http://accurator.nl/ui/" + domain + "#" + page;
+	}
 }
 
 function getGenericUiUri(page) {