accurator/commit

variable renaming expertise page

diff --git a/rdf/domain/bible/ui/labels.ttl b/rdf/domain/bible/ui/labels.ttl
index f7e4df2..2b7b7c4 100644
--- a/rdf/domain/bible/ui/labels.ttl
+++ b/rdf/domain/bible/ui/labels.ttl
@@ -34,9 +34,9 @@ abibui:register a aui:UI ;
 
 abibui:expertise a auis:UI ;
 	rdfs:subClassOf aui:expertise ;
-	aui:txtSubHeader "tell us which of these biblical themes you know much about, so we can recommend interesting works to add information to"@en .
+	aui:expertiseTxtSubHeader "tell us which of these biblical themes you know much about, so we can recommend interesting works to add information to"@en .
 
-abibui:txtSubHeader a auis:UILabel .
+abibui:expertiseTxtSubHeader rdfs:subPropertyOf auis:uiLabel .
 
 ##### Bible Profile Screen #####
 
diff --git a/rdf/domain/bible/ui/labels_nl.ttl b/rdf/domain/bible/ui/labels_nl.ttl
index b19f8cb..2996671 100644
--- a/rdf/domain/bible/ui/labels_nl.ttl
+++ b/rdf/domain/bible/ui/labels_nl.ttl
@@ -14,4 +14,4 @@ abibui:intro a auis:UI ;
 ##### Bible Expertise Screen #####
 
 abibui:expertise a auis:UI ;
-	aui:txtSubHeader "vertel ons over welke bijbelse thema's u veel weet, hierop basseren we de werken die we aanraden om informatie aan toe te voegen"@nl .
+	aui:expertiseTxtSubHeader "vertel ons over welke bijbelse thema's u veel weet, hierop basseren we de werken die we aanraden om informatie aan toe te voegen"@nl .
diff --git a/rdf/domain/bird/ui/labels.ttl b/rdf/domain/bird/ui/labels.ttl
index a83130d..d34b44e 100644
--- a/rdf/domain/bird/ui/labels.ttl
+++ b/rdf/domain/bird/ui/labels.ttl
@@ -34,9 +34,9 @@ abirui:register a aui:UI ;
 
 abirui:expertise a auis:UI ;
 	rdfs:subClassOf aui:expertise ;
-	aui:txtSubHeader "tell us which of these bird species you know much about, so we can recommend interesting works to add information to"@en .
+	aui:expertiseTxtSubHeader "tell us which of these bird species you know much about, so we can recommend interesting works to add information to"@en .
 
-abirui:txtSubHeader a auis:UILabel .
+abirui:expertiseTxtSubHeader erdf:subPropertyOf auis:uiLabel .
 
 ##### Bird Profile Screen #####
 
diff --git a/rdf/domain/bird/ui/labels_nl.ttl b/rdf/domain/bird/ui/labels_nl.ttl
index 9d1eead..106685a 100644
--- a/rdf/domain/bird/ui/labels_nl.ttl
+++ b/rdf/domain/bird/ui/labels_nl.ttl
@@ -14,4 +14,4 @@ abirui:intro a auis:UI ;
 ##### Bird Expertise Screen #####
 
 abirui:expertise a auis:UI ;
-	aui:txtSubHeader "vertel ons over welke vogelsoorten u veel weet, dan baseren wij de werken die we aanraden hierop"@nl .
+	aui:expertiseTxtSubHeader "vertel ons over welke vogelsoorten u veel weet, dan baseren wij de werken die we aanraden hierop"@nl .
diff --git a/rdf/ui/labels.ttl b/rdf/ui/labels.ttl
index 3b5f430..851fb68 100644
--- a/rdf/ui/labels.ttl
+++ b/rdf/ui/labels.ttl
@@ -76,22 +76,25 @@ aui:vntFirstText a auis:UILabel .
 
 aui:expertise a auis:UI ;
 	dcterms:title "Accurator expertise form UI"@en ;
-	aui:title "Expertise"@en ;
-	aui:txtHeader "Expertise"@en ;
-	aui:txtSubHeader "tell us which of these topics you know much about, so we can recommend interesting works to add information to"@en ;
-	aui:btnSkip "or skip this step"@en ;
-	aui:btnSubmit "Submit"@en ;
-	aui:sldALot "a lot"@en ;
-	aui:sldNothing "nothing"@en ;
-	aui:txtChangeAll "Change all values at once"@en ;
-	aui:lblDomain "domain"@en .
-
-aui:txtSubHeader a auis:UILabel .
-aui:btnSubmit a auis:UILabel .
-aui:sldALot a auis:UILabel .
-aui:sldNothing a auis:UILabel .
-aui:txtChangeAll a auis:UILabel .
-aui:lblDomain a auis:UILabel .
+	aui:expertisePageTitle "Expertise"@en ;
+	aui:expertiseTxtHeader "Expertise"@en ;
+	aui:expertiseTxtSubHeader "tell us which of these topics you know much about, so we can recommend interesting works to add information to"@en ;
+	aui:expertiseBtnSkip "or skip this step"@en ;
+	aui:expertiseBtnSubmit "Submit"@en ;
+	aui:expertiseSldALot "a lot"@en ;
+	aui:expertiseSldNothing "nothing"@en ;
+	aui:expertiseTxtChangeAll "Change all values at once"@en ;
+	aui:expertiseLblDomain "domain"@en .
+
+aui:expertisePageTitle rdfs:subPropertyOf auis:uiLabel .
+aui:expertiseTxtHeader rdfs:subPropertyOf auis:uiLabel .
+aui:expertiseTxtSubHeader rdfs:subPropertyOf auis:uiLabel .
+aui:expertiseBtnSkip rdfs:subPropertyOf auis:uiLabel .
+aui:expertiseBtnSubmit rdfs:subPropertyOf auis:uiLabel .
+aui:expertiseSldALot rdfs:subPropertyOf auis:uiLabel .
+aui:expertiseSldNothing  rdfs:subPropertyOf auis:uiLabel .
+aui:expertiseTxtChangeAll rdfs:subPropertyOf auis:uiLabel .
+aui:expertiseLblDomain rdfs:subPropertyOf auis:uiLabel .
 
 ##### Profile Screen #####
 
diff --git a/rdf/ui/labels_nl.ttl b/rdf/ui/labels_nl.ttl
index 050b692..7992c8d 100644
--- a/rdf/ui/labels_nl.ttl
+++ b/rdf/ui/labels_nl.ttl
@@ -46,15 +46,15 @@ aui:annotate a auis:UI ;
 ##### Expertise Screen #####
 
 aui:expertise a auis:UI ;
-	aui:title "Expertise"@nl ;
-	aui:txtHeader "Expertise"@nl ;
-	aui:txtSubHeader "vertel ons over welke onderwerpen u veel weet, hierop basseren we de werken die we aanraden om informatie aan toe te voegen"@nl ;
-	aui:btnSkip "of sla deze stap over"@nl ;
-	aui:btnSubmit "Bevestig"@nl ;
-	aui:sldALot "veel"@nl ;
-	aui:sldNothing "weinig"@nl ;
-	aui:txtChangeAll "Verander alle waardes tegelijk"@nl ;
-	aui:lblDomain "domein"@nl .
+	aui:expertisePageTitle "Expertise"@nl ;
+	aui:expertiseTxtHeader "Expertise"@nl ;
+	aui:expertiseTxtSubHeader "vertel ons over welke onderwerpen u veel weet, hierop basseren we de werken die we aanraden om informatie aan toe te voegen"@nl ;
+	aui:expertiseBtnSkip "of sla deze stap over"@nl ;
+	aui:expertiseBtnSubmit "Bevestig"@nl ;
+	aui:expertiseSldALot "veel"@nl ;
+	aui:expertiseSldNothing "weinig"@nl ;
+	aui:expertiseTxtChangeAll "Verander alle waardes tegelijk"@nl ;
+	aui:expertiseLblDomain "domein"@nl .
 
 ##### Profile Screen #####
 
diff --git a/web/css/accurator.css b/web/css/accurator.css
index 497123e..42204c7 100644
--- a/web/css/accurator.css
+++ b/web/css/accurator.css
@@ -163,25 +163,27 @@ Profile page
 	cursor: pointer;
 }
 
-/* Expertise page */
-.rowExpertise {
+/*******************************************************************************
+Expertise page
+*******************************************************************************/
+.expertiseDiv {
 	margin-top: 10px;
 	margin-bottom: 10px;
 }
 
-#rowButtonsExpertise {
+#expertiseDivButtonsExpertise {
 	margin-top: 10px;
 }
 
-#expertiseLabel {
+#expertiseLblExpertise {
 	line-height: 150%;
 }
 
-#masterLabelLeft {
+#expertiseLblMasterLeft {
 	 padding-right: 10px;
 }
 
-#masterLabelRight {
+#expertiseMasterLabelRight {
 	 padding-left: 10px;
 }
 
diff --git a/web/html/expertise.html b/web/html/expertise.html
index 902f135..5bd8b8d 100644
--- a/web/html/expertise.html
+++ b/web/html/expertise.html
@@ -34,31 +34,31 @@
 		<!-- Header -->
 		<div class="row">
 			<div class="col-md-11 col-md-offset-1">
-				<h2 id="txtHeader">
-					<small id ="txtSubHeader">
+				<h2 id="expertiseTxtHeader">
+					<small id ="expertiseTxtSubHeader">
 					</small>
 				</h2>
 			</div>
 		</div>
 
 		<!-- Expertise Form -->
-		<div class="row" class="rowExpertise">
-			<div class="col-md-6 col-md-offset-3" id="frmExpertiseMaster">
+		<div class="row" class="expertiseDiv">
+			<div class="col-md-6 col-md-offset-3" id="expertiseDivExpertiseMaster">
 			</div>
 		</div>
-		<div class="row" class="rowExpertise">
-			<div class="col-md-6" id="frmExpertiseLeft">
+		<div class="row" class="expertiseDiv">
+			<div class="col-md-6" id="expertiseDivExpertiseLeft">
 			</div>
-			<div class="col-md-6" id="frmExpertiseRight">
+			<div class="col-md-6" id="expertiseDivExpertiseRight">
 			</div>
 		</div>
 
 		<!-- Buttons -->
-		<div class="row bottomButtons" id="rowButtonsExpertise">
+		<div class="row bottomButtons" id="expertiseDivButtonsExpertise">
 			<div class="col-md-4 col-md-offset-1">
-				<button class="btn btn-primary" id="btnSubmit">
+				<button class="btn btn-primary" id="expertiseBtnSubmit">
 				</button>
-				<button class="btn btn-link" id="btnSkip">
+				<button class="btn btn-link" id="expertiseBtnSkip">
 				</button>
 			</div>
 		</div>
diff --git a/web/js/accurator_expertise.js b/web/js/accurator_expertise.js
index 25076d9..19ae902 100644
--- a/web/js/accurator_expertise.js
+++ b/web/js/accurator_expertise.js
@@ -49,19 +49,19 @@ function populateUI(domainData) {
 }
 
 function initLabels(data) {
-	$("#txtHeader").prepend(data.txtHeader);
-	$("#txtSubHeader").prepend(data.txtSubHeader);
-	$("#btnSubmit").append(data.btnSubmit);
-	$("#btnSkip").append(data.btnSkip);
-	sldALot = data.sldALot;
-	sldNothing = data.sldNothing;
-	lblDomain = data.lblDomain;
-	txtChangeAll = data.txtChangeAll;
+	$("#expertiseTxtHeader").prepend(data.expertiseTxtHeader);
+	$("#expertiseTxtSubHeader").prepend(data.expertiseTxtSubHeader);
+	$("#expertiseBtnSubmit").append(data.expertiseBtnSubmit);
+	$("#expertiseBtnSkip").append(data.expertiseBtnSkip);
+	sldALot = data.expertiseSldALot;
+	sldNothing = data.expertiseSldNothing;
+	lblDomain = data.expertiseLblDomain;
+	txtChangeAll = data.expertiseTxtChangeAll;
 }
 
 function registerEvents() {
-	$("#btnSubmit").click(function() {processExpertiseValues();});
-	$("#btnSkip").click(nextPage());
+	$("#expertiseBtnSubmit").click(function() {processExpertiseValues();});
+	$("#expertiseBtnSkip").click(nextPage());
 }
 
 function initExpertiseTopics(domainData) {
@@ -79,13 +79,13 @@ function initExpertiseTopics(domainData) {
 		addMasterSlider();
 
 		for(var i=0; i<halfTheTopics; i++) {
-			$("#frmExpertiseLeft").append(
+			$("#expertiseDivExpertiseLeft").append(
 				$.el.div({'class':'row'},
 					$.el.div({'class':'col-md-10 col-md-offset-1'},
-						$.el.h5({'id':'expertiseLabel'},
+						$.el.h5({'id':'expertiseLblExpertise'},
 							topics[i].label,
 							$.el.small(printArray(topics[i].childrens_labels))))));
-			$("#frmExpertiseLeft").append(
+			$("#expertiseDivExpertiseLeft").append(
 				$.el.div({'class':'row'},
 					$.el.div({'class':'col-md-10 col-md-offset-1'},
 						$.el.small({'class':'sliderLabel'}, sldNothing),
@@ -95,13 +95,13 @@ function initExpertiseTopics(domainData) {
 			sliderIds[i] = topics[i].id;
 		}
 		for(var i=halfTheTopics; i<topics.length; i++) {
-			$("#frmExpertiseRight").append(
+			$("#expertiseDivExpertiseRight").append(
 				$.el.div({'class':'row'},
 					$.el.div({'class':'col-md-10 col-md-offset-1'},
-						$.el.h5({'id':'expertiseLabel'},
+						$.el.h5({'id':'expertiseLblExpertise'},
 							topics[i].label,
 							$.el.small(printArray(topics[i].childrens_labels))))));
-			$("#frmExpertiseRight").append(
+			$("#expertiseDivExpertiseRight").append(
 				$.el.div({'class':'row'},
 					$.el.div({'class':'col-md-10 col-md-offset-1'},
 						$.el.small({'class':'sliderLabel'}, sldNothing),
@@ -182,17 +182,17 @@ function setSliderValues() {
 }
 
 function addMasterSlider() {
-	$("#frmExpertiseMaster").append(
+	$("#expertiseDivExpertiseMaster").append(
 		$.el.div({'class':'row'},
 			$.el.div({'class':'col-md-10 col-md-offset-1'},
-				$.el.h4({'id':'expertiseLabel'},
+				$.el.h4({'id':'expertiseLblExpertise'},
 					txtChangeAll))));
-	$("#frmExpertiseMaster").append(
+	$("#expertiseDivExpertiseMaster").append(
 		$.el.div({'class':'row'},
 			$.el.div({'class':'col-md-10 col-md-offset-1'},
-				$.el.span({'id':'masterLabelLeft'}, sldNothing),
+				$.el.span({'id':'expertiseLblMasterLeft'}, sldNothing),
 				expertiseSlider("master"),
-				$.el.span({'id':'masterLabelRight'}, sldALot))));
+				$.el.span({'id':'expertiseLblMasterRight'}, sldALot))));
 	$("#master").slider();
 
 	//Change all values on using master slider