accurator/commit

Removed redundant topic page.

author	Chris Dijkshoorn
	Tue Apr 19 20:23:55 2016 +0200
committer	Chris Dijkshoorn
	Tue Apr 19 20:23:55 2016 +0200
commit	b9ed77cb46471921c27ee41fd225da724bf339e8
tree	b5bd8fd5b210eb8c812705d6c9b79588a8114342
parent	8b7527949a556f97ecb553da7e92eb0e95904929
Diff style: patch stat
diff --git a/rdf/ui/labels.ttl b/rdf/ui/labels.ttl
index 2771274..49f5edc 100644
--- a/rdf/ui/labels.ttl
+++ b/rdf/ui/labels.ttl
@@ -57,16 +57,6 @@ aui:domainHdr rdfs:subPropertyOf auis:uiLabel .
 aui:domainHdrSub rdfs:subPropertyOf auis:uiLabel .
 aui:domainTxtAllObjects rdfs:subPropertyOf auis:uiLabel .
 
-##### Topic Screen #####
-
-aui:topic a auis:UI ;
-	dcterms:title "Accurator topic UI"@en ;
-	aui:topicPageTitle "Select the topic"@en ;
-	aui:topicTxtTitle "Choose the topic of the artworks you want to tag."@en .
-
-aui:topicPageTitle rdfs:subPropertyOf auis:uiLabel .
-aui:topicTxtTitle rdfs:subPropertyOf auis:uiLabel .
-
 ##### Item Screen #####
 
 aui:item a auis:UI ;
@@ -191,20 +181,6 @@ aui:resultsBtnChangeExpertise rdfs:subPropertyOf auis:uiLabel .
 aui:resultsLblCluster rdfs:subPropertyOf auis:uiLabel .
 aui:resultsLblList rdfs:subPropertyOf auis:uiLabel .
 
-###### End Screen #####
-
-aui:end a auis:UI ;
-	dcterms:title "Accurator end UI"@en ;
-	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 #####
 
 aui:registerModal a auis:UI ;
@@ -261,7 +237,7 @@ aui:navbarLnkLogout rdfs:subPropertyOf auis:uiLabel .
 aui:navbarLnkAbout rdfs:subPropertyOf auis:uiLabel .
 aui:navbarLblProfile rdfs:subPropertyOf auis:uiLabel .
 
-##### Form Screen #####
+##### Form #####
 
 aui:form a auis:UI ;
 	dcterms:title "Accurator additional info UI"@en  ;
diff --git a/rdf/ui/labels_nl.ttl b/rdf/ui/labels_nl.ttl
index 12e7c83..2713e90 100644
--- a/rdf/ui/labels_nl.ttl
+++ b/rdf/ui/labels_nl.ttl
@@ -34,12 +34,6 @@ aui:domain a auis:UI ;
 	aui:domainHdrSub "Is er een specifiek subdomein waaraan u informatie wilt bijdragen?"@nl ;
 	aui:domainTxtAllObjects "Alle werken in  "@nl .
 
-##### Topic Screen #####
-
-aui:topic a auis:UI ;
-	aui:topicPageTitle "Selecteer Onderwerp"@nl ;
-	aui:topicTxtTitle "Kies het onderwerp van de kunstwerken waaraan u informatie wilt bijdragen."@nl .
-
 ##### Item Screen #####
 
 aui:item a auis:UI ;
@@ -109,14 +103,6 @@ aui:results a auis:UI ;
 	aui:resultsLblCluster "Cluster weergave"@nl ;
 	aui:resultsLblList "Lijst weergave"@nl .
 
-###### End Screen #####
-
-aui:end a auis:UI ;
-	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 #####
 
 aui:registerModal a auis:UI ;
@@ -149,7 +135,7 @@ aui:userDropdown a auis:UI ;
 	aui:navbarLnkAbout "Over Accurator"@nl ;
 	aui:navbarLblProfile "Profiel"@nl .
 
-##### Form Screen #####
+##### Form #####
 
 aui:form a auis:UI ;
 	aui:formPageTitle "Informatie"@nl ;
diff --git a/web/html/topic.html b/web/html/topic.html
deleted file mode 100644
index 63a9e8a..0000000
--- a/web/html/topic.html
+++ /dev/null
@@ -1,83 +0,0 @@
-<!doctype html>
-<html>
-<head>
-	<title>Select Topic</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<link rel="shortcut icon" href="img/favicon.ico">
-	<link type="text/css" rel="stylesheet" media="screen" href="css/bootstrap.min.css" />
-	<link type="text/css" rel="stylesheet" media="screen" href="css/accurator.css" />
-</head>
-
-<body class="topic">
-	<!-- Navbar -->
-	<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
-		<div class="container-fluid">
-			<div class="navbar-header">
-				 <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbarDivMenu">
-					<span class="sr-only">Toggle navigation</span>
-					<span class="icon-bar"></span>
-				 </button>
-				 <a class="navbar-brand" href="intro.html">
-				 	<img id="navbarImgLogo" src="img/accurator.png" alt="Accurator">
-				 </a>
-			</div>
-			<div class="collapse navbar-collapse" id="navbarDivMenu">
-				<ul class="nav navbar-nav navbar-right navbarLstFlag">
-				</ul>
-				<ul class="nav navbar-nav navbar-right navbarLstUser">
-				</ul>
-			</div>
-		</div>
-	</nav>
-
-	<!-- Topics -->
-	<div class="container-fluid noGutter topicDiv">
-		<div class="row">
-			<div class="col-md-8 col-md-offset-2">
-				<h2 id="topicTxtTitle">
-				</h2>
-			</div>
-		</div>
-	</div>
-
-	<!-- Login modal -->
-	<div class="modal fade" id="loginDivLogin">
-		<div class="modal-dialog">
-			<div class="modal-content">
-				<div class="modal-header">
-					<button type="button" class="close" id="loginBtnClose">&times;</button>
-					<h4 id="loginHdrTitle">
-					</h4>
-				</div>
- 				<div class="modal-body">
-					<form role="form">
-						<div class="form-group">
-							<label id="loginLblUsername" for="loginInpUsername">
-							</label>
-							<input type="text" class="form-control" id="loginInpUsername">
-						</div>
-						<div class="form-group">
-							<label id="loginLblPassword" for="password">
-							</label>
-							<input type="password" class="form-control" id="loginInpPassword">
-						</div>
-						<p class="text-warning" id="loginTxtWarning">
-						</p>
-					</form>
-				</div>
-				<div class="modal-footer">
-					<button class="btn btn-primary" id="loginBtnLogin">
-					</button>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<script type="text/javascript" src="js/lib/jquery.min.js"></script>
-	<script type="text/javascript" src="js/lib/bootstrap.min.js"></script>
-	<script type="text/javascript" src="js/lib/laconic.js"></script>
-	<script type="text/javascript" src="js/components/utilities.js"></script>
-	<script type="text/javascript" src="js/topic.js"></script>
-	<script>topicInit()</script>
-</body>
-</html>
diff --git a/web/js/topic.js b/web/js/topic.js
deleted file mode 100644
index 1ec5c67..0000000
--- a/web/js/topic.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/*******************************************************************************
-Accurator Topic
-
-This code loads topic options into the page, where the options depend on the
-topics included in a domain the triple store.
-*******************************************************************************/
-function topicInit() {
-	var locale = getLocale();
-	var domain = getDomain();
-
-	// add language switch to navbar
-	populateFlags(locale);
-
-	userLoggedIn()
-	.then(function(userData) {
-		drawPage(userData);
-	}, function() {
-		var onDismissal = function() {document.location.href = "intro.html";};
-
-		login(drawPage, onDismissal);
-	});
-
-	function drawPage(userData) {
-		setLinkLogo("profile");
-
-		domainSettings(domain)
-		.then(function(domainSettings) {
-			var ui = getUI(domainSettings, "topic");
-
-			// draw all topics
-			populateTopics(locale, domainSettings);
-			return getLabels(locale, ui);
-		})
-		.then(function(labels) {
-			document.title = labels.topicPageTitle;
-			$("#topicTxtTitle").append(labels.topicTxtTitle);
-			var userName = getUserName(userData.user);
-			populateNavbar(userName, [{link:"profile.html", name:"Profile"}], locale);
-		});
-	}
-}
-
-function populateTopics(locale, domainSettings) {
-	// var row;
-	console.log("got the following topics ", domainSettings.subDomains);
-
-	// // get topic settings for all the topics
-	// for(var i = 0; i < domainSettings.sub_domains.length; i++) {
-	// 	if(!(i%2 === 0)) {
-	// 		row = parseInt((i/2) + 0.5);
-	// 		// Add a new row for every two domains
-	// 		$(".topicDiv").append(
-	// 			$.el.div({'class':'row',
-	// 					  'id':'topic' + row}));
-	// 	}
-	//
-	// 	// add domain specific html to rows
-	// 	$.getJSON("domains", {domain:domainSettings.sub_domains[i]})
-	// 	.then(function(topicData) {
-	// 		topicHtml(topicData, row, locale);
-	// 	});
-	// }
-}
-
-function addDomain(row, locale) {
-	return function(domainData) {
-		return getLabels(locale, domainData.hasUI + "domain")
-		.then(function(labels) {
-			var topics = null;
-			var subDomains;
-
-			// see if there are subdomains
-			domainData.subDomains ?
-				subDomains = domainData.subDomains
-				: subDomains = [];
-
-			// see if there is info about expertise topics
-			if (domainData.requires) {
-				topics = new ExpertiseTopics (
-					domainData.requires,
-					domainData.hasTopConcept,
-					domainData.hasMaximumExpertiseTopics,
-					domainData.hasMaximumChildren
-				);
-			}
-
-			// domainData
-			var domain = new Domain (
-				domainData.domain,
-				labels.domainLabel,
-				domainData.image,
-				domainData.imageBrightness,
-				subDomains,
-				topics
-			);
-
-			$("#domainDiv" + row).append(domain.node);
-		});
-	}
-}