accurator/commit

Removed dependencies on image_annotation cpack.

diff --git a/api/accurator.pl b/api/accurator.pl
index eeb7908..e698a53 100644
--- a/api/accurator.pl
+++ b/api/accurator.pl
@@ -22,13 +22,15 @@
 :- use_module(library(accurator/annotation)).
 :- use_module(library(accurator/subset_selection)).
 :- use_module(library(accurator/concept_scheme_selection)).
-:- use_module(api(cluster_search)).
 :- use_module(library(http/http_dispatch)).
 :- use_module(library(http/http_server_files)).
 :- use_module(library(http/http_json)).
 :- use_module(library(http/http_parameters)).
 :- use_module(library(http/html_write)).
 :- use_module(user(user_db)).
+% load other cpacks
+:- use_module(api(cluster_search)).
+:- use_module(api(annotation)).    % needed for http api handlers
 :- use_module(library(thumbnail)).
 
 
diff --git a/web/css/annotorious.css b/web/css/annotorious.css
index d4eba46..26adff3 100644
--- a/web/css/annotorious.css
+++ b/web/css/annotorious.css
@@ -43,7 +43,7 @@
   position:absolute;
   top:6px;
   left: 5px;
-  background:url('feather_icon.png');
+  background:url(../img/annotorious/feather_icon.png);
   background-repeat:no-repeat;
   width:19px;
   height:22px;
@@ -66,9 +66,9 @@
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   -khtml-border-radius: 3px;
-  -moz-box-shadow:0px 5px 15px #111;  
-  -webkit-box-shadow:0px 5px 15px #111;  
-  box-shadow:0px 5px 15px #111;  
+  -moz-box-shadow:0px 5px 15px #111;
+  -webkit-box-shadow:0px 5px 15px #111;
+  box-shadow:0px 5px 15px #111;
 
   -moz-transition-property: opacity;
   -moz-transition-duration: 0.5s;
@@ -93,7 +93,7 @@
   float:right;
   margin:0px 0px 1px 10px;
   height:16px;
-  
+
   -moz-transition-property: opacity;
   -moz-transition-duration: 1s;
   -moz-transition-delay: 0s;
@@ -105,7 +105,7 @@
   -o-transition-delay: 0s;
   transition-property: opacity;
   transition-duration: 1s;
-  transition-delay: 0s; 
+  transition-delay: 0s;
 }
 
 .annotorious-popup-button {
@@ -116,7 +116,7 @@
   font-weight:bold;
   margin-left:5px;
   opacity:0.4;
-  
+
   -moz-transition-property: opacity;
   -moz-transition-duration: 0.5s;
   -moz-transition-delay: 0s;
@@ -128,7 +128,7 @@
   -o-transition-delay: 0s;
   transition-property: opacity;
   transition-duration: 0.5s;
-  transition-delay: 0s; 
+  transition-delay: 0s;
 }
 
 .annotorious-popup-button:hover {
@@ -140,7 +140,7 @@
 }
 
 .annotorious-popup-button-edit {
-  background:url(pencil.png);
+  background:url(../img/annotorious/pencil.png);
   width:16px;
   height:16px;
   text-indent:100px;
@@ -148,7 +148,7 @@
 }
 
 .annotorious-popup-button-delete {
-  background:url(delete.png);
+  background:url(../img/annotorious/delete.png);
   width:16px;
   height:16px;
   text-indent:100px;
@@ -175,9 +175,9 @@
   -moz-border-radius: 3px;
   -webkit-border-radius: 3px;
   -khtml-border-radius: 3px;
-  -moz-box-shadow:0px 5px 15px #111;  
-  -webkit-box-shadow:0px 5px 15px #111;  
-  box-shadow:0px 5px 15px #111;  
+  -moz-box-shadow:0px 5px 15px #111;
+  -webkit-box-shadow:0px 5px 15px #111;
+  box-shadow:0px 5px 15px #111;
 }
 
 .annotorious-editor-text {
@@ -192,7 +192,7 @@
   font-family:Verdana, Arial;
   font-size:11px;
   padding:4px;
-  margin:0px;  
+  margin:0px;
   color:#000;
   text-shadow:none;
   overflow-y:auto;
@@ -210,7 +210,7 @@
   text-align:center;
   text-decoration:none;
   font-family:Verdana, Arial;
-  font-size:10px;	
+  font-size:10px;
   border:1px solid #777;
   color:#ddd;
   padding:3px 8px;
@@ -236,7 +236,7 @@
   background-color:#fff;
   padding:3px;
   font-family:Verdana, Arial;
-  font-size:12px;	
+  font-size:12px;
 }
 
 /** OpenLayers module **/
@@ -278,8 +278,8 @@ canvas.hidden {
   z-index: -1;
   visibility: hidden;
 }
-  
-html.hasTouch .annotator-viewer li .annotator-controls, 
+
+html.hasTouch .annotator-viewer li .annotator-controls,
 html.hasTouch .annotator-viewer li .annotator-controls {
   opacity: 1;
-}
\ No newline at end of file
+}
diff --git a/web/img/annotorious/delete.png b/web/img/annotorious/delete.png
new file mode 100644
index 0000000..aaea64d
Binary files /dev/null and b/web/img/annotorious/delete.png differ
diff --git a/web/img/annotorious/feather_icon.png b/web/img/annotorious/feather_icon.png
new file mode 100644
index 0000000..bb8ae28
Binary files /dev/null and b/web/img/annotorious/feather_icon.png differ
diff --git a/web/img/annotorious/pencil.png b/web/img/annotorious/pencil.png
new file mode 100644
index 0000000..c8529af
Binary files /dev/null and b/web/img/annotorious/pencil.png differ