annotation_dashboard/commit

ADDED: use image_annotation hooks to recreate original dashboard functionality

authorJacco van Ossenbruggen
Sun Sep 21 20:20:10 2014 +0200
committerJacco van Ossenbruggen
Sun Sep 21 20:20:10 2014 +0200
commitca554011aec6de1af3383e104d9ecb2fe371c8b8
tree6f55cade8f2cf0db379ac4183cf13410ac97bc44
parent65619dcd0329946d8d3cce8e275ea210409690e5
Diff style: patch stat
diff --git a/components/dashboard/show_objects.pl b/components/dashboard/show_objects.pl
index f5028a5..020d237 100644
--- a/components/dashboard/show_objects.pl
+++ b/components/dashboard/show_objects.pl
@@ -27,44 +27,32 @@ show_objects(Targets,Options) -->
 	},
 	html(
 	    [div([class(row)],
-		 [div([class('col-xs-6')],
-		      [\annotation_page_body([targets(Targets)|NewOptions])
+		 [div([],
+		      [\annotation_page_body([targets(Targets), media_class('col-xs-6')|NewOptions])
 		      ])
 		 ])
 	    ]).
-
 match_target(T,A) :-
 	rdf_get_annotation_target(A,T).
 
-show_object_old(O, Options) -->
-	{ option(annotations(A), Options, []),
-	  include(match_target(O), A, Annotations),
-	  (   ( option(metadata_fields(_), Options),
-		option(ui(_), Options),
-		option(annotation_fields(_), Options))
-	  ->  NewOptions = Options
-	  ;   ( option(task(Task), Options)
-	      ->  true
-	      ;	  member(First, A),
-		  guess_task(First, Task-First)
-	      ),
-	      rdf_has(Task, ann_ui:taskUI, UI),
-	      get_metafields(UI, [], MetadataFields),
-	      get_anfields(UI, [], [], AnnotationFields),
-	      NewOptions = [
-		  ui(UI),
-		  metadata_fields(MetadataFields),
-		  annotation_fields(AnnotationFields) |
-		  Options
-	      ]
-	  )
+image_annotation:html_application_target_info(Options) -->
+	{ option(task(Task), Options),
+	  rdf_has(Task, ann_ui:taskUI, UI),
+	  get_metafields(UI, [], MetadataFields),
+	  get_anfields(UI, [], [], AnnotationFields),
+	  NewOptions = [
+	      ui(UI),
+	      metadata_fields(MetadataFields),
+	      annotation_fields(AnnotationFields) |
+	      Options
+	  ],
+	  option(target(Target), Options),
+	  option(annotations(A), Options, []),
+	  include(match_target(Target), A, Annotations)
 	},
 	html(
-	    [div([class(row)],
-		 [div([class('col-xs-6')],
-		      [\annotation_page_body([target(O)|NewOptions])
-		      ]),
-		  div([class('col-xs-6 table-responsive')],
+	    [div([class(dashboard)],
+		  [ div([class('col-xs-6 table-responsive')],
 		      [ table([class('table table-striped')], [
 				  \show_annotations(Annotations, NewOptions)
 			      ])