accurator/commit

domain and page titles for about and domains - variable naming

authorCristina-Iulia Bucur
Thu Nov 19 15:27:41 2015 +0100
committerCristina-Iulia Bucur
Thu Nov 19 15:27:41 2015 +0100
commit111c5b30f35afa16c6124e110c724c9ff94b4164
tree6da0cfacba3148b061579385024fd6827a0cd3cb
parentaa6353363dba0f29087cfc03d1204898ba8a8758
Diff style: patch stat
diff --git a/lib/accurator/annotate_page.pl b/lib/accurator/annotate_page.pl
index 94fa5c0..5a74fc0 100644
--- a/lib/accurator/annotate_page.pl
+++ b/lib/accurator/annotate_page.pl
@@ -185,7 +185,7 @@ loginModal -->
 footer  -->
     html({|html||
 		<!-- Logos -->
-		<div class="footerRelative">
+		<div class="footerDivRelative">
 			<div class="logo col-md-2 col-xs-4">
 				<a href="http://commit-nl.nl/">
 					<img src="img/logos/commit.png" class="footerImgLogo" id="footerImgCommitLogo" alt="Logo of " />
diff --git a/rdf/domain/bible/ui/labels.ttl b/rdf/domain/bible/ui/labels.ttl
index 4fb7a06..f7e4df2 100644
--- a/rdf/domain/bible/ui/labels.ttl
+++ b/rdf/domain/bible/ui/labels.ttl
@@ -53,11 +53,6 @@ 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 66fabb3..2d8021a 100644
--- a/rdf/ui/labels.ttl
+++ b/rdf/ui/labels.ttl
@@ -25,7 +25,7 @@ aui:introLnkAbout rdfs:subPropertyOf auis:uiLabel .
 
 aui:about a auis:UI ;
 	dcterms:title "Accurator about UI"@en ;
-	aui:aboutHdrTitle "About Accurator"@en ;
+	aui:aboutPageTitle "About Accurator"@en ;
 	aui:aboutHdrAccuratorSlogan "About Accurator"@en ;
 	aui:aboutBtnGoBackHome "Back"@en ;
 	aui:aboutTxtAccurator "Accurator is a platform that enables users to help museum professionals with describing museum collection items by providing expert knowledge. This could, for example, be tagging the depicted species of an animal or a plant. Apart from enhancing the descriptions of the collection items, this information can be used to facilitate searching the museum's collection."@en ;
@@ -34,7 +34,7 @@ aui:about a auis:UI ;
 	aui:aboutHdrSealincResearchSlogan "Accurator for research"@en ;
 	aui:aboutTxtSealincResearch "The research challenges of the project are: to identify the niche of relevant experts and to motivate them to contribute to the tagging of artworks; developing the personalization mechanisms to make sure that the experts are shown items that correspond	to their expertise; evaluating the quality of the tags and taggers using trust algorithms and to present all these aspects in an appropriate interface. To test our hypotheses, we continuously develop and evaluate Accurator. The code is open source and available at <a href=\"https://github.com/rasvaan/accurator\">GitHub</a>."@en .
 
-aui:aboutHdrTitle rdfs:subPropertyOf auis:uiLabel .
+aui:aboutPageTitle rdfs:subPropertyOf auis:uiLabel .
 aui:aboutHdrAccuratorSlogan rdfs:subPropertyOf auis:uiLabel .
 aui:aboutTxtAccurator rdfs:subPropertyOf auis:uiLabel .
 aui:aboutHdrSealincMediaSlogan rdfs:subPropertyOf auis:uiLabel .
@@ -47,10 +47,11 @@ aui:aboutBtnGoBackHome rdfs:subPropertyOf auis:uiLabel .
 
 aui:domain a auis:UI ;
 	dcterms:title "Accurator domain UI"@en ;
-	aui:title "Select the domain"@en ;
-	aui:txtTitle "In which domain do you want to start tagging?"@en .
+	aui:domainPageTitle "Select the domain"@en ;
+	aui:domainTxtTitle "In which domain do you want to start tagging?"@en .
 
-aui:txtTitle a auis:UILabel .
+aui:domainPageTitle rdfs:subPropertyOf auis:uiLabel .
+aui:domainTxtTitle rdfs:subPropertyOf auis:uiLabel .
 
 ##### Annotate Screen #####
 
diff --git a/rdf/ui/labels_nl.ttl b/rdf/ui/labels_nl.ttl
index 92d8657..523d020 100644
--- a/rdf/ui/labels_nl.ttl
+++ b/rdf/ui/labels_nl.ttl
@@ -17,7 +17,7 @@ aui:intro a auis:UI ;
 ###### About Screen #####
 
 aui:about a auis:UI ;
-	aui:aboutHdrTitle "Informatie over Accurator"@nl ;
+	aui:aboutPageTitle "Informatie over Accurator"@nl ;
 	aui:aboutHdrAccuratorSlogan "Over Accurator"@nl ;
 	aui:aboutBtnGoBackHome "Terug"@nl ;
 	aui:aboutTxtAccurator "Accurator is een platform dat gebruikers in staat stelt hun expertise te delen met museum professionals bij het beschrijven van museumstukken. Dit kan, bijvoorbeeld, het voorzien van informatie zijn van dieren of planten prenten. Naast het verrijken van beschrijvingen van de museumstukken helpt dit proces ook de online toegankelijkheid van de collectie."@nl ;
@@ -29,8 +29,8 @@ aui:about a auis:UI ;
 ##### Domain Screen #####
 
 aui:domain a auis:UI ;
-	aui:title "Selecteer Domein"@nl ;
-	aui:txtTitle "Aan welk domein wilt u informatie bijdragen?"@nl .
+	aui:domainPageTitle "Selecteer Domein"@nl ;
+	aui:domainTxtTitle "Aan welk domein wilt u informatie bijdragen?"@nl .
 
 ##### Annotate Screen #####
 
diff --git a/web/css/accurator.css b/web/css/accurator.css
index b83e19b..365a73a 100644
--- a/web/css/accurator.css
+++ b/web/css/accurator.css
@@ -27,7 +27,7 @@ body {
 	height: 35px;
 }
 
-.footerRelative {
+.footerDivRelative {
 	height: 35px;
 	margin-top: 20px;
 }
@@ -96,8 +96,10 @@ Intro
 	margin-top: 10px;
 }
 
-/* Domain page */
-.domainScreen {
+/*******************************************************************************
+Domain page
+*******************************************************************************/
+.domainDiv {
 	background-color: #333;
 }
 
@@ -106,7 +108,7 @@ Intro
 	cursor: pointer;
 }
 
-#txtTitle {
+#domainTxtTitle {
 	text-align: center;
 	color: #fff;
 	padding-bottom: 10px;
@@ -179,12 +181,9 @@ Intro
 	 padding-left: 10px;
 }
 
-/* About page */
-#commitLogo {
-	height: 40px;
-	text-align: right;
-}
-
+/*******************************************************************************
+About page
+*******************************************************************************/
 #aboutDivButtons {
 	margin-top: 20px;
 }
diff --git a/web/html/about.html b/web/html/about.html
index 78f47fb..f8cf57b 100644
--- a/web/html/about.html
+++ b/web/html/about.html
@@ -70,7 +70,7 @@
 	</div>
 
 	<!-- Logos -->
-	<div class="footerRelative container">
+	<div class="footerDivRelative container">
 		<div class="logo col-md-2 col-xs-4">
 			<a href="http://commit-nl.nl/">
 				<img src="img/logos/commit.png" class="footerImgLogo" id="footerImgCommitLogo" alt="Logo of ">
diff --git a/web/html/additional_info.html b/web/html/additional_info.html
index c0cefb6..8b21e72 100644
--- a/web/html/additional_info.html
+++ b/web/html/additional_info.html
@@ -241,7 +241,7 @@
 		</div>
 
 		<!-- Logos -->
-		<div class="footerRelative">
+		<div class="footerDivRelative">
 			<div class="logo col-md-2 col-xs-4">
 				<a href="http://commit-nl.nl/">
 					<img src="img/logos/commit.png" class="footerImgLogo" id="footerImgCommitLogo" alt="Logo of ">
diff --git a/web/html/domain.html b/web/html/domain.html
index 5906c1d..681c21c 100644
--- a/web/html/domain.html
+++ b/web/html/domain.html
@@ -8,7 +8,7 @@
 	<link type="text/css" rel="stylesheet" media="screen" href="css/accurator.css" />
 </head>
 
-<body class="domainScreen">
+<body class="domain">
 	<!-- Navbar -->
 	<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
 		<div class="container-fluid">
@@ -32,10 +32,10 @@
 
 
 	<!-- Domains -->
-	<div class="container-fluid noGutter domains">
+	<div class="container-fluid noGutter domainDiv">
 		<div class="row">
 			<div class="col-md-8 col-md-offset-2">
-				<h2 id="txtTitle">
+				<h2 id="domainTxtTitle">
 				</h2>
 			</div>
 		</div>
diff --git a/web/html/expertise.html b/web/html/expertise.html
index f3c2c1f..902f135 100644
--- a/web/html/expertise.html
+++ b/web/html/expertise.html
@@ -64,7 +64,7 @@
 		</div>
 
 		<!-- Logos -->
-		<div class="footerRelative">
+		<div class="footerDivRelative">
 			<div class="logo col-md-2 col-xs-4">
 				<a href="http://commit-nl.nl/">
 					<img src="img/logos/commit.png" class="footerImgLogo" id="footerImgCommitLogo" alt="Logo of ">
diff --git a/web/js/accurator_about.js b/web/js/accurator_about.js
index 04d5409..df0c38a 100644
--- a/web/js/accurator_about.js
+++ b/web/js/accurator_about.js
@@ -35,7 +35,7 @@ function populateUI(domainSettins) {
 }
 
 function initLabels(labels) {
-	document.title = labels.title;
+	document.title = labels.aboutPageTitle;
 	$("#aboutHdrAccuratorSlogan").append(labels.aboutHdrAccuratorSlogan);
 	$("#aboutTxtAccurator").append(labels.aboutTxtAccurator);
 	$("#aboutHdrSealincMediaSlogan").append(labels.aboutHdrSealincMediaSlogan);
diff --git a/web/js/accurator_domain.js b/web/js/accurator_domain.js
index 7b81f04..ba7f839 100644
--- a/web/js/accurator_domain.js
+++ b/web/js/accurator_domain.js
@@ -43,8 +43,8 @@ function nextPage() {
 function populateUI() {
 	$.getJSON("ui_elements", {locale:locale, ui:ui, type:"labels"})
 		.done(function(labels){
-			document.title = labels.title;
-			$("#txtTitle").append(labels.txtTitle);
+			document.title = labels.domainPageTitle;
+			$("#domainTxtTitle").append(labels.domainTxtTitle);
 		});
 }
 
@@ -56,7 +56,7 @@ function populateDomains(domainLabels) {
 		if(!(i%2===0)) {
 			row = parseInt((i/2) + 0.5);
 			// Add a new row for every two domains
-			$(".domains").append(
+			$(".domainDiv").append(
 				$.el.div({'class':'row',
 						  'id':'domain' + row}));
 		}