# HG changeset patch
# User dwinter
# Date 1348673452 -7200
# Node ID 54a4a96ad0c3b533d6daa7cb30fb32b821f3cad6
# Parent  c6cab006f799f49bf2b357d8cc10e06ada5b50e1# Parent  707902d468f60d69b1e30291506a04900dc8fe36
Merge with 52a5fba5312904a89ee737b5ba455f85381b384d

diff -r 707902d468f6 -r 54a4a96ad0c3 src/main/webapp/annotationBrowser/js/annotation-core.js
--- a/src/main/webapp/annotationBrowser/js/annotation-core.js	Wed Sep 26 17:28:31 2012 +0200
+++ b/src/main/webapp/annotationBrowser/js/annotation-core.js	Wed Sep 26 17:30:52 2012 +0200
@@ -33,7 +33,7 @@
 	var md = dcDataPath+docUri+"/index.meta";
 	
 	 $('<div/>', {
-		    'class': 'annotatonMetaData',
+		    'class': 'annotationMetaData',
 		  }).load(md, function (){
 			 $(this).children().children().addClass('dcMetaData');
 		  }).appendTo(obj);
diff -r 707902d468f6 -r 54a4a96ad0c3 src/main/webapp/annotationBrowser/js/resource.js
--- a/src/main/webapp/annotationBrowser/js/resource.js	Wed Sep 26 17:28:31 2012 +0200
+++ b/src/main/webapp/annotationBrowser/js/resource.js	Wed Sep 26 17:30:52 2012 +0200
@@ -9,7 +9,7 @@
 	var headers = {'x-annotator-auth-token':token};
 	
 	$.ajax({
-		  url: annotServer+'ressources/'+ressourceId+'/annotations?sortBy=uri',
+		  url: annotServer+'resources/'+ressourceId+'/annotations?sortBy=uri',
 		  dataType: 'json',
 		  headers:headers,
 		  success: function(data) {
@@ -30,7 +30,7 @@
 				
 			  $('#annotations').append(ret);
 			  //items.push(ret);
-			  getDCdata(rows[i]['uri'],$('#an_'+i));
+			  //getDCdata(rows[i]['uri'],$('#an_'+i));
 		  }
 		  //$('#annotations').html(items.join(''));
 		 
@@ -42,19 +42,37 @@
 $(document).ready(function(){
 	
 	getToken(tokenGenerator,username);
-	$.getJSON(annotServer+'ressources', function(data) {
+	$.getJSON(annotServer+'resources', function(data) {
 		  var items = [];
 		  var rows = data["rows"];
 		 
+		  
+		  $('#tagList').html("");
 		  for (var i=0;i<rows.length;i++){
-			  	 val=rows[i]['name'];
-				 items.push('<div class="tagLink" onclick="javascript: annotations(\''+rows[i]["id"]+'\');">'+val+'</div>');
-			
+			  	 val=rows[i]['uri'];
+				 ret='<div  id="res_'+i+'" class="tagLink" onclick="javascript: annotations(\''+rows[i]["id"]+'\');"></div>';
+				 $('#tagList').append(ret);
+				 
+				 var splitted = val.split("?");
+				 var docUri=splitted[0];
+					
+				docUri = docUri.replace(docNamespace,textPath);
+				var md = dcDataPath+docUri+"/index.meta";
+					
+				$('<div/>', {
+						    'class': 'annotationMetaData',
+						  }).load(md, function (){
+							 $(this).children().children().addClass('dcMetaData');
+						  }).appendTo("#res_"+i);
+					
+				 
+				 
+				 
 		  }
 		  
 		
-		  $('#tagList').html(items.join(''));
-		  annotations();		 
+		  //$('#tagList').html(items.join(''));
+		 
 		});