accurator/commit

checked variable names and changed all according to the new naming schema + tested the page - for Form page (previous additional_info.html)

diff --git a/rdf/domain/bible/ui/labels.ttl b/rdf/domain/bible/ui/labels.ttl
index 2b7b7c4..020ebf3 100644
--- a/rdf/domain/bible/ui/labels.ttl
+++ b/rdf/domain/bible/ui/labels.ttl
@@ -53,10 +53,10 @@ abibui:results a aui:UI ;
 abibui:annotate a aui:UI ;
 	rdfs:subClassOf aui:annotate .
 
-##### Bible Additional Info Screen #####
+##### Bible Form Screen #####
 
-abibui:additional_info a auis:UI ;
-	rdfs:subClassOf aui:additional_info .
+abibui:form a auis:UI ;
+	rdfs:subClassOf aui:form .
 
 ##### Bible Login Modal #####
 
diff --git a/rdf/domain/bird/ui/labels.ttl b/rdf/domain/bird/ui/labels.ttl
index 267f300..4d5aa0b 100644
--- a/rdf/domain/bird/ui/labels.ttl
+++ b/rdf/domain/bird/ui/labels.ttl
@@ -58,10 +58,10 @@ abirui:annotate a aui:UI ;
 abirui:end a auis:UI ;
 	rdfs:subClassOf aui:end .
 
-##### Bird Additional Info Screen #####
+##### Bird Form Screen #####
 
-abirui:additional_info a auis:UI ;
-	rdfs:subClassOf aui:additional_info .
+abirui:form a auis:UI ;
+	rdfs:subClassOf aui:form .
 
 ##### Bird Login Modal #####
 
diff --git a/rdf/ui/labels.ttl b/rdf/ui/labels.ttl
index b6cc5fd..01924d6 100644
--- a/rdf/ui/labels.ttl
+++ b/rdf/ui/labels.ttl
@@ -217,8 +217,8 @@ aui:form a auis:UI ;
 	aui:formPageTitle "Info"@en ;
 	aui:formHdrInternetUsage "Internet usage"@en ;
 	aui:formHdrPersonalInfo "Personal info"@en ;
-	aui:formHdrInfo "Tell us about yourself"@en ;
-	aui:formHdrInfoSub "it would help us a lot if you would provide us with the following information"@en ;
+	aui:formHdrSlogan "Tell us about yourself"@en ;
+	aui:formHdrSubSlogan "it would help us a lot if you would provide us with the following information"@en ;
 	aui:formBtnAdd "Add Additional Info"@en ;
 	aui:formBtnSkip "or skip this step"@en ;
 	aui:formLblBirthDate "Date of birth"@en ;
@@ -234,7 +234,7 @@ aui:form a auis:UI ;
 	aui:formLblEducation "What is the highest level of education you have recieved?"@en ;
 	auis:hasSelect aui:formOptsEducation ;
 	aui:formLblMail "Email"@en ;
-	aui:formLblMailCheck "Keep me posted about Accurator"@en ;
+	aui:formLblEmailCheck "Keep me posted about Accurator"@en ;
 	aui:formLblSocialNetwork "On which social network sites are you active?"@en  ;
 	aui:formChkFacebook "Facebook"@en ;
 	aui:formChkLinkedIn "LinkedIn"@en ;
@@ -265,8 +265,8 @@ aui:formPageTitle rdfs:subPropertyOf auis:uiLabel .
 aui:formHdrInternetUsage rdfs:subPropertyOf auis:uiLabel .
 aui:formHdrInternetUsage a auis:UILabel .
 aui:formHdrPersonalInfo rdfs:subPropertyOf auis:uiLabel .
-aui:formHdrInfo rdfs:subPropertyOf auis:uiLabel .
-aui:formHdrInfoSub rdfs:subPropertyOf auis:uiLabel .
+aui:formHdrSlogan rdfs:subPropertyOf auis:uiLabel .
+aui:formHdrSubSlogan rdfs:subPropertyOf auis:uiLabel .
 aui:formBtnAdd rdfs:subPropertyOf auis:uiLabel .
 aui:formBtnSkip rdfs:subPropertyOf auis:uiLabel .
 aui:formLblBirthDate rdfs:subPropertyOf auis:uiLabel .
@@ -281,7 +281,7 @@ aui:formRbtnRural rdfs:subPropertyOf auis:uiLabel .
 aui:formLblLanguage rdfs:subPropertyOf auis:uiLabel .
 aui:formLblEducation rdfs:subPropertyOf auis:uiLabel .
 aui:formLblMail rdfs:subPropertyOf auis:uiLabel .
-aui:formLblMailCheck rdfs:subPropertyOf auis:uiLabel .
+aui:formLblEmailCheck rdfs:subPropertyOf auis:uiLabel .
 aui:formLblSocialNetwork rdfs:subPropertyOf auis:uiLabel .
 aui:formChkFacebook rdfs:subPropertyOf auis:uiLabel .
 aui:formChkLinkedIn rdfs:subPropertyOf auis:uiLabel .
diff --git a/rdf/ui/labels_nl.ttl b/rdf/ui/labels_nl.ttl
index d91c9a5..6f7de9f 100644
--- a/rdf/ui/labels_nl.ttl
+++ b/rdf/ui/labels_nl.ttl
@@ -126,8 +126,8 @@ aui:form a auis:UI ;
 	aui:formPageTitle "Informatie"@nl ;
 	aui:formHdrInternetUsage "Internet gebruik"@nl ;
 	aui:formHdrPersonalInfo "Persoonlijke informatie"@nl ;
-	aui:formHdrInfo "Vertel iets over uzelf"@nl ;
-	aui:formHdrInfoSub "het zou ons veel helpen als u de volgende informatie verstrekt"@nl ;
+	aui:formHdrSlogan "Vertel iets over uzelf"@nl ;
+	aui:formHdrSubSlogan "het zou ons veel helpen als u de volgende informatie verstrekt"@nl ;
 	aui:formBtnAdd "Bevestig"@nl ;
 	aui:formBtnSkip "of sla deze stap over"@nl ;
 	aui:formLblBirthDate "Geboortedatum"@nl ;
@@ -142,7 +142,7 @@ aui:form a auis:UI ;
 	aui:formLblLanguage "Welke taal beheerst u het beste?"@nl ;
 	aui:formLblEducation "Wat is de hoogste vorm van onderwijs die u heeft genoten?"@nl ;
 	aui:formLblMail "E-mail"@nl ;
-	aui:formLblMailCheck "Hou me op de hoogte over ontikkelingen omtrent Accurator"@nl ;
+	aui:formLblEmailCheck "Hou me op de hoogte over ontikkelingen omtrent Accurator"@nl ;
 	aui:formLblSocialNetwork "Op welke sociale media bent u actief?"@nl ;
 	aui:formChkFacebook "Facebook"@nl ;
 	aui:formChkLinkedIn "LinkedIn"@nl ;
diff --git a/web/css/accurator.css b/web/css/accurator.css
index e30e525..0a22f78 100644
--- a/web/css/accurator.css
+++ b/web/css/accurator.css
@@ -94,7 +94,7 @@ Intro
 /*******************************************************************************
 Form page
 *******************************************************************************/
-#chkEmail {
+#formChkEmail {
 	margin-top: 10px;
 }
 
diff --git a/web/html/form.html b/web/html/form.html
index 093eb3d..b163ac8 100644
--- a/web/html/form.html
+++ b/web/html/form.html
@@ -34,8 +34,8 @@
 		<!-- Header -->
 		<div class="row">
 			<div class="col-md-10 col-md-offset-1">
-				<h2 id="formHdrInfo">
-					<small id="txtHeaderSub">
+				<h2 id="formHdrSlogan">
+					<small id="formHdrSubSlogan">
 					</small>
 				</h2>
 			</div>
@@ -43,7 +43,7 @@
 
 			<!-- Events -->
 		<div class="row">
-			<div id="formDivEvents" class="col-md-10 col-md-offset-1">
+			<div id="eventsDiv" class="col-md-10 col-md-offset-1">
 			</div>
 		</div>
 
@@ -56,8 +56,8 @@
 					<div class="panel-body">
 						<form class="form-horizontal">
 							<!-- Activity on social networking sites -->
-							<div class="form-group" id="frmGroupSocialNetwork">
-								<label for="addSocialNetwork" id="formLblSocialNetwork" class="col-sm-5 control-label">
+							<div class="form-group" id="formDivSocialNetwork">
+								<label id="formLblSocialNetwork" class="col-sm-5 control-label">
 								</label>
 								<div class="col-sm-5">
 									<label class="checkbox-inline">
@@ -79,7 +79,7 @@
 							</div>
 							<!-- Internet usage -->
 		 					<div class="form-group">
-								<label for="addInternetUsage" id="formLblInternetUsage" class="col-sm-5 control-label">
+								<label id="formLblInternetUsage" class="col-sm-5 control-label">
 								</label>
 								<div class="col-sm-5">
 									<select class="form-control" id="formSltInternet">
@@ -87,8 +87,8 @@
 								</div>
 							</div>
 							<!-- Tagging sites -->
-		 					<div class="form-group" id="frmGroupTaggingSite">
-								<label for="addTagSites" id="formLblTagSite" class="col-sm-5 control-label">
+		 					<div class="form-group" id="formDivTaggingSite">
+								<label id="formLblTagSite" class="col-sm-5 control-label">
 								</label>
 								<div class="col-sm-5">
 									<label class="checkbox-inline">
@@ -110,37 +110,37 @@
 							</div>
 							<!-- Level of tagging experience -->
 		 					<div class="form-group">
-								<label for="addTaggingExperienceLevel" id="formLblTaggingExperience" class="col-sm-5 control-label">
+								<label id="formLblTaggingExperience" class="col-sm-5 control-label">
 								</label>
 								<div class="col-sm-5">
 									<label class="radio-inline">
-										<input type="radio" name="taggingExperienceLevelRadio" id="formRbtnNone" value="none">
+										<input type="radio" name="formRbtnsTaggingExperience" id="formRbtnNone" value="none">
 									</label>
 									<label class="radio-inline">
-										<input type="radio" name="taggingExperienceLevelRadio" id="formRbtnNovice" value="novice">
+										<input type="radio" name="formRbtnsTaggingExperience" id="formRbtnNovice" value="novice">
 									</label>
 									<label class="radio-inline">
-										<input type="radio" name="taggingExperienceLevelRadio" id="formRbtnIntermediate" value="intermediate">
+										<input type="radio" name="formRbtnsTaggingExperience" id="formRbtnIntermediate" value="intermediate">
 									</label>
 									<label class="radio-inline">
-										<input type="radio" name="taggingExperienceLevelRadio" id="formRbtnExpert" value="expert">
+										<input type="radio" name="formRbtnsTaggingExperience" id="formRbtnExpert" value="expert">
 									</label>
 								</div>
 							</div>
 							<!-- Email -->
 		 					<div class="form-group">
-								<label for="addMail" id="formLblMail" class="col-sm-5 control-label">
+								<label for="formInpAddMail" id="formLblMail" class="col-sm-5 control-label">
 								</label>
 								<div class="col-sm-5">
-									<input type="email" id="addMail" class="form-control">
+									<input type="email" id="formInpAddMail" class="form-control">
 								</div>
 							</div>
 							<!-- Email check -->
 							<div class="form-group">
-								<label for="addMailCheck" id="formLblMailCheck" class="col-sm-5 control-label">
+								<label id="formLblEmailCheck" class="col-sm-5 control-label">
 								</label>
 								<div class="col-sm-5">
-										<input type="checkbox" id="chkEmail">
+									<input type="checkbox" id="formChkEmail">
 								</div>
 							</div>
 						</form>
@@ -154,10 +154,10 @@
 						<form class="form-horizontal">
 							<!-- Museum visits -->
 		 					<div class="form-group">
-								<label for="addMuseumVisits" id="formLblMuseumVisits" class="col-sm-5 control-label">
+								<label for="formInpAddMuseumVisits" id="formLblMuseumVisits" class="col-sm-5 control-label">
 								</label>
 								<div class="col-sm-2">
-									<input type="number" id="addMuseumVisits" class="form-control" min="0" max="9999">
+									<input type="number" id="formInpAddMuseumVisits" class="form-control" min="0" max="9999">
 								</div>
 							</div>
 							<!-- Country -->
@@ -180,17 +180,17 @@
 							</div>
 							<!-- Community -->
 							<div class="form-group">
-								<label for="addCommunity" id="formLblCommunity" class="col-sm-5 control-label">
+								<label id="formLblCommunity" class="col-sm-5 control-label">
 								</label>
 								<div class="col-sm-5">
 									<label class="radio-inline">
-										<input type="radio" name="communityRadio" id="formRbtnUrban" value="urban">
+										<input type="radio" name="formRbtnsCommunity" id="formRbtnUrban" value="urban">
 									</label>
 									<label class="radio-inline">
-										<input type="radio" name="communityRadio" id="formRbtnSubUrban" value="sub urban">
+										<input type="radio" name="formRbtnsCommunity" id="formRbtnSubUrban" value="sub urban">
 									</label>
 									<label class="radio-inline">
-										<input type="radio" name="communityRadio" id="formRbtnRural" value="rural">
+										<input type="radio" name="formRbtnsCommunity" id="formRbtnRural" value="rural">
 									</label>
 								</div>
 							</div>
@@ -205,23 +205,23 @@
 							</div>
 							<!-- Gender -->
 							<div class="form-group">
-								<label for="addGender" id="formLblGender" class="col-sm-5 control-label">
+								<label id="formLblGender" class="col-sm-5 control-label">
 								</label>
 								<div class="col-sm-5">
 									<label class="radio-inline">
-										<input type="radio" name="genderRadio" id="formRbtnMale" value="male">
+										<input type="radio" name="formRbtnsGender" id="formRbtnMale" value="male">
 									</label>
 									<label class="radio-inline">
-										<input type="radio" name="genderRadio" id="formRbtnFemale" value="female">
+										<input type="radio" name="formRbtnsGender" id="formRbtnFemale" value="female">
 									</label>
 								</div>
 							</div>
 							<!-- Age -->
 							<div class="form-group">
-								<label for="addAge" id="formLblBirthDate" class="col-sm-5 control-label">
+								<label for="formInpAddAge" id="formLblBirthDate" class="col-sm-5 control-label">
 								</label>
 								<div class="col-sm-3">
-									<input type="date" id="addAge" class="form-control">
+									<input type="date" id="formInpAddAge" class="form-control">
 								</div>
 							</div>
 						</form>
diff --git a/web/js/accurator_form.js b/web/js/accurator_form.js
index fda24cb..8110240 100644
--- a/web/js/accurator_form.js
+++ b/web/js/accurator_form.js
@@ -66,14 +66,14 @@ function addButtonEvents() {
 }
 
 function initLabels(labels) {
-	document.title = labels.title;
+	document.title = labels.formPageTitle;
 	$("#formHdrInternetUsage").append(labels.formHdrInternetUsage);
 	$("#formHdrPersonalInfo").append(labels.formHdrPersonalInfo);
 	formLblTwitterId = labels.formLblTwitterId;
 	formLblTagSiteOpen = labels.formLblTagSiteOpen;
 	formLblSocialSiteOpen = labels.formLblSocialSiteOpen;
-	$("#formHdrInfo").prepend(labels.formHdrInfo);
-	$("#formHdrInfoSub").append(labels.formHdrInfoSub);
+	$("#formHdrSlogan").prepend(labels.formHdrSlogan);
+	$("#formHdrSubSlogan").append(labels.formHdrSubSlogan);
 	initFormQuestions(labels);
 	$("#formBtnAdd").append(labels.formBtnAdd);
 	$("#formBtnSkip").append(labels.formBtnSkip);
@@ -97,7 +97,7 @@ function initFormQuestions(data) {
 	$("#formLblLanguage").append(data.formLblLanguage);
 	$("#formLblEducation").append(data.formLblEducation);
 	$("#formLblMail").append(data.formLblMail);
-	$("#formLblMailCheck").append(data.formLblMailCheck);
+	$("#formLblEmailCheck").append(data.formLblEmailCheck);
 	$("#formLblSocialNetwork").append(data.formLblSocialNetwork);
 	$("#formLblInternetUsage").append(data.formLblInternetUsage);
 	$("#formLblMuseumVisits").append(data.formLblMuseumVisits);
@@ -133,7 +133,7 @@ function initCheckboxes(data) {
 function addFormEvents() {
 	$("#formChkOther").click(function() {
 		if(!socialFieldAdded) {
-			$("#frmGroupSocialNetwork").after(
+			$("#formDivSocialNetwork").after(
 				$.el.div({'class':'form-group'},
 						$.el.label({'for':'addSocialSite',
 									'id':'frmSocialOpen',
@@ -148,7 +148,7 @@ function addFormEvents() {
 	});
 	$("#formChkTwitter").click(function() {
 		if(!twitterFieldAdded) {
-			$("#frmGroupSocialNetwork").after(
+			$("#formDivSocialNetwork").after(
 				$.el.div({'class':'form-group'},
 						$.el.label({'for':'addTwitterId',
 									'id':'formLblTwitterId',
@@ -163,7 +163,7 @@ function addFormEvents() {
 	});
 	$("#formChkTagOther").click(function() {
 		if(!tagsiteFieldAdded) {
-			$("#frmGroupTaggingSite").after(
+			$("#formDivTaggingSite").after(
 				$.el.div({'class':'form-group'},
 					$.el.label({'for':'addTagSite',
 							    'id':'formLblTagSite',
@@ -248,21 +248,21 @@ function getInput() {
 }
 
 function getInputTextFields() {
-	if (!($("#addAge").val() === ""))
-		info.age = $("#addAge").val();
-	if (!($("#addMail").val() === ""))
-		info.mail = $("#addMail").val();
-	if (!($("#addMuseumVisits").val() === ""))
-		info.museum_visits = $("#addMuseumVisits").val();
+	if (!($("#formInpAddAge").val() === ""))
+		info.age = $("#formInpAddAge").val();
+	if (!($("#formInpAddMail").val() === ""))
+		info.mail = $("#formInpAddMail").val();
+	if (!($("#formInpAddMuseumVisits").val() === ""))
+		info.museum_visits = $("#formInpAddMuseumVisits").val();
 }
 
 function getInputRadioButtons() {
-	if(!($("input[name='genderRadio']:checked").val() === undefined))
-		info.gender = $("input[name='genderRadio']:checked").val();
+	if(!($("input[name='formRbtnsGender']:checked").val() === undefined))
+		info.gender = $("input[name='formRbtnsGender']:checked").val();
 	if(!($("input[name='communityRadio']:checked").val() === undefined))
 		info.community = $("input[name='communityRadio']:checked").val();
-	if(!($("input[name='taggingExperienceLevelRadio']:checked").val() === undefined))
-		info.tagging_experience_level = $("input[name='taggingExperienceLevelRadio']:checked").val();
+	if(!($("input[name='formRbtnsTaggingExperience']:checked").val() === undefined))
+		info.tagging_experience_level = $("input[name='formRbtnsTaggingExperience']:checked").val();
 }
 
 function getInputCheckboxes() {
@@ -326,7 +326,7 @@ function getInputTaggingSite() {
 }
 
 function getInputEmailCheck() {
-	if($("#chkEmail").is(":checked")) {
+	if($("#formChkEmail").is(":checked")) {
 		info.accurator_email = true;
 	} else {
 		info.accurator_email = false;
diff --git a/web/js/accurator_utilities.js b/web/js/accurator_utilities.js
index eef3994..d6a273d 100644
--- a/web/js/accurator_utilities.js
+++ b/web/js/accurator_utilities.js
@@ -591,7 +591,7 @@ function firstLogin(user, password) {
 				save_user_info({"locale":locale,"domain":domain}, function(){
 					// Determine which page will be shown next
 					if(experiment === "true") {
-						document.location.href="additional_info.html";
+						document.location.href="form.html";
 					} else {
 						document.location.href="domain.html";
 					}