Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

htroot/Blacklist_p.java

@@ -197,6 +197,12 @@ public class Blacklist_p {
                 blacklistToUse = post.get("currentBlacklist", "").trim();
 
                 final String[] selectedBlacklistEntries = post.getAll("selectedEntry.*");
+                
+				// store this call as api call
+				ListManager.switchboard.tables.recordAPICall(post,
+						"Blacklist_p.html",
+						WorkTables.TABLE_API_TYPE_CONFIGURATION,
+						"delete from blacklist '" + blacklistToUse + "': " + Arrays.toString(selectedBlacklistEntries));
 
                 if (selectedBlacklistEntries.length > 0) {
                     String temp = null;
@@ -221,7 +227,11 @@ public class Blacklist_p {
                 final String blentry = post.get("newEntry", "").trim();
 
                 // store this call as api call
-                ListManager.switchboard.tables.recordAPICall(post, "Blacklist_p.html", WorkTables.TABLE_API_TYPE_CONFIGURATION, "add to blacklist: " + blentry);
+                ListManager.switchboard.tables.recordAPICall(
+                		post,
+                		"Blacklist_p.html",
+                		WorkTables.TABLE_API_TYPE_CONFIGURATION,
+                		"add to blacklist '" + blacklistToUse + "': " + blentry);
 
                 final String temp = BlacklistHelper.addBlacklistEntry(blacklistToUse, blentry, header);
                 if (temp != null) {
@@ -242,6 +252,15 @@ public class Blacklist_p {
                 final String targetBlacklist = post.get("targetBlacklist");
 
                 final String[] selectedBlacklistEntries = post.getAll("selectedEntry.*");
+                
+                // store this call as api call
+                ListManager.switchboard.tables.recordAPICall(
+                		post,
+                		"Blacklist_p.html",
+                		WorkTables.TABLE_API_TYPE_CONFIGURATION,
+						"move from blacklist '" + blacklistToUse
+								+ "' to blacklist '" + targetBlacklist + "': "
+								+ Arrays.toString(selectedBlacklistEntries));
 
                 if (selectedBlacklistEntries != null &&
                         selectedBlacklistEntries.length > 0 &&

htroot/api/blacklists/add_entry_p.java

@@ -25,9 +25,12 @@ public class add_entry_p {
             final String blacklistToUse = post.get(KEY_CURRENT_BLACKLIST, "").trim();
             final String entry = post.get(KEY_NEW_ENTRY, "").trim();
 
-            // store this call as api call
-            ListManager.switchboard.tables.recordAPICall(post, "add_entry_p.xml", WorkTables.TABLE_API_TYPE_CONFIGURATION, "add to blacklist: " + entry);
-
+            ListManager.switchboard.tables.recordAPICall(
+            		post,
+            		"add_entry_p." + header.fileType().toString().toLowerCase(),
+            		WorkTables.TABLE_API_TYPE_CONFIGURATION,
+					"add to blacklist '" + blacklistToUse + "': " + entry);
+            
             if (BlacklistHelper.addBlacklistEntry(blacklistToUse, entry, header) == null) {
                 prop.put(XML_ITEM_STATUS, RESULT_SUCCESS);
 

htroot/api/blacklists/delete_entry_p.java

@@ -26,7 +26,11 @@ public class delete_entry_p {
             final String entry = post.get(KEY_NEW_ENTRY, "").trim();
 
             // store this call as api call
-            ListManager.switchboard.tables.recordAPICall(post, "add_entry_p.xml", WorkTables.TABLE_API_TYPE_CONFIGURATION, "add to blacklist: " + entry);
+            ListManager.switchboard.tables.recordAPICall(
+            		post,
+            		"delete_entry_p." + header.fileType().toString().toLowerCase(),
+            		WorkTables.TABLE_API_TYPE_CONFIGURATION,
+					"delete from blacklist '" + blacklistToUse + "': " + entry);
 
             if (BlacklistHelper.deleteBlacklistEntry(blacklistToUse, entry, header) == null) {
                 prop.put(XML_ITEM_STATUS, RESULT_SUCCESS);

htroot/yacysearch.html

@@ -187,8 +187,8 @@ document.getElementById("Enter").innerHTML = "search again";
 #(num-results)#
 	::
 	::
-	::
-	<span id="resNav" style="display: inline;"></span>
+	::        
+	<span id="resNav" class="col-sm-12  col-md-12" style="display: inline;"></span>        
 	::
 #(/num-results)#