accurator/commit

Updated label ids end page.

author	Chris Dijkshoorn
	Thu Nov 19 14:38:28 2015 +0100
committer	Chris Dijkshoorn
	Thu Nov 19 14:38:28 2015 +0100
commit	2a09971ba09e81be01fd3b2d241b56566048905b
tree	9e0629dd237856714d54f2a024179718bf896f66
parent	3378a87c1b17ecb3755dae1fc150b765b6e47415
Diff style: patch stat
diff --git a/rdf/domain/bible/ui/labels.ttl b/rdf/domain/bible/ui/labels.ttl
index f7e4df2..4fb7a06 100644
--- a/rdf/domain/bible/ui/labels.ttl
+++ b/rdf/domain/bible/ui/labels.ttl
@@ -53,6 +53,11 @@ abibui:results a aui:UI ;
 abibui:annotate a aui:UI ;
 	rdfs:subClassOf aui:annotate .
 
+###### Bible End Screen #####
+
+abibui:end a auis:UI ;
+	rdfs:subClassOf aui:end .
+
 ##### Bible Additional Info Screen #####
 
 abibui:additional_info a auis:UI ;
diff --git a/rdf/ui/labels.ttl b/rdf/ui/labels.ttl
index 295db78..2a28de4 100644
--- a/rdf/ui/labels.ttl
+++ b/rdf/ui/labels.ttl
@@ -135,15 +135,15 @@ aui:txtRecTitle a auis:UILabel .
 
 aui:end a auis:UI ;
 	dcterms:title "Accurator end UI"@en ;
-	aui:txtSlogan "Thank you for participating!"@en ;
-	aui:txtSubSlogan "You can now start adding information to the Rijksmuseum collection"@en ;
-	aui:btnContinue "Continue"@en ;
-	aui:navbarLnkAbout "About Accurator"@en .
-
-aui:txtSlogan a auis:UILabel .
-aui:txtSubSlogan a auis:UILabel .
-aui:btnContinue a auis:UILabel .
-aui:navbarLnkAbout a auis:UILabel .
+	aui:endTxtSlogan "Thank you for participating!"@en ;
+	aui:endTxtSubSlogan "You can now start adding information to the Rijksmuseum collection"@en ;
+	aui:endBtnContinue "Continue"@en ;
+	aui:endLnkAbout "About Accurator"@en .
+
+aui:endTxtSlogan rdfs:subPropertyOf auis:uiLabel .
+aui:endTxtSubSlogan rdfs:subPropertyOf auis:uiLabel .
+aui:endBtnContinue rdfs:subPropertyOf auis:uiLabel .
+aui:endLnkAbout rdfs:subPropertyOf auis:uiLabel .
 
 ##### Register Modal #####
 
diff --git a/rdf/ui/labels_nl.ttl b/rdf/ui/labels_nl.ttl
index be68605..a2c9def 100644
--- a/rdf/ui/labels_nl.ttl
+++ b/rdf/ui/labels_nl.ttl
@@ -84,10 +84,10 @@ aui:results a auis:UI ;
 ###### End Screen #####
 
 aui:end a auis:UI ;
-	aui:txtSlogan "Bedankt voor uw deelname!"@nl ;
-	aui:txtSubSlogan "U kunt doorgaan met het toevoegen van informatie aan de Rijksmuesum collectie"@nl ;
-	aui:btnContinue "Ga verder"@nl ;
-	aui:navbarLnkAbout "Informatie over Accurator"@nl .
+	aui:endTxtSlogan "Bedankt voor uw deelname!"@nl ;
+	aui:endTxtSubSlogan "U kunt doorgaan met het toevoegen van informatie aan de Rijksmuesum collectie"@nl ;
+	aui:endBtnContinue "Ga verder"@nl ;
+	aui:endLnkAbout "Informatie over Accurator"@nl .
 
 ##### Register Modal #####
 
diff --git a/web/css/accurator.css b/web/css/accurator.css
index ec3f0da..87dbfdc 100644
--- a/web/css/accurator.css
+++ b/web/css/accurator.css
@@ -238,7 +238,7 @@ Intro
 	background-color: #333;
 }
 
-.endText {
+.endDiv {
 	position: absolute;
 	top: 75px;
 }
diff --git a/web/html/end.html b/web/html/end.html
index 001e574..7197a50 100644
--- a/web/html/end.html
+++ b/web/html/end.html
@@ -8,7 +8,7 @@
 	<link type="text/css" rel="stylesheet" media="screen" href="css/accurator.css" />
 </head>
 
-<body class="endScreen">
+<body class="end">
 	<!-- Navbar -->
 	<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
 		<div class="container-fluid">
@@ -32,21 +32,21 @@
 	</nav>
 
 	<!-- Background -->
-	<img class="backgroundImage" src=""></img>
+	<img class="endImgBackground" src=""></img>
 
 	<!-- Text and Buttons-->
-	<div class="endText container">
+	<div class="endDiv container">
 		<div class="row">
 			<div class="col-md-8 col-md-offset-2">
-				<h2 id="txtSlogan">
-					<small id ="txtSubSlogan">
+				<h2 id="endTxtSlogan">
+					<small id ="endTxtSubSlogan">
 					</small>
 				</h2>
 			</div>
 		</div>
 		<div class="row">
 			<div class="col-md-8 col-md-offset-2">
-				<button class="btn btn-transparent" id="btnContinue">
+				<button class="btn btn-transparent" id="endBtnContinue">
 				</button>
 			</div>
 		</div>
diff --git a/web/js/accurator_end.js b/web/js/accurator_end.js
index a7bc1f3..9a4c7d6 100644
--- a/web/js/accurator_end.js
+++ b/web/js/accurator_end.js
@@ -31,12 +31,11 @@ function endInit() {
 }
 
 function setBackground(backgroundUrl, imageBrightness) {
-	$(".backgroundImage").attr("src", backgroundUrl);
+	$(".endImgBackground").attr("src", backgroundUrl);
 
 	if (imageBrightness === "dark") {
 	   // Make font lighter to make it readable
-	   $("#txtSlogan").css('color', '#FFFFFF');
-	   $("#btnLogin").css('color', '#BBBBBB');
+	   $("#endTxtSlogan").css('color', '#FFFFFF');
 	}
 }
 
@@ -49,15 +48,15 @@ function populateUI() {
 }
 
 function addButtonEvents() {
-	$("#btnContinue").click(function() {
+	$("#endBtnContinue").click(function() {
 		window.location.href="http://annotate.accurator.nl";
 	});
 }
 
 function initLabels(labels) {
 	// Add retrieved labels to html elements
-	$("#txtSlogan").prepend(labels.txtSlogan);
-	$("#txtSubSlogan").prepend(labels.txtSubSlogan);
-	$("#btnContinue").append(labels.btnContinue);
-	$("#navbarLnkAbout").append(labels.navbarLnkAbout);
+	$("#endTxtSlogan").prepend(labels.endTxtSlogan);
+	$("#endTxtSubSlogan").prepend(labels.endTxtSubSlogan);
+	$("#endBtnContinue").append(labels.endBtnContinue);
+	$("#endLnkAbout").append(labels.endLnkAbout);
 }