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

htroot/Bookmarks.html

@@ -92,17 +92,18 @@
 						<label for="feed">Bookmark is a newsfeed</label>
 					</dt>
 				</dl>
+                                <p style="text-align: center">
 				#(edit)#
-				<p><input type="submit" name="add" value="create" /></p>
+				<input type="submit" class="btn btn-primary" name="add" value="create" />
 				::
-				<p><input type="submit" name="add" value="edit" /></p>
+				<input type="submit" class="btn btn-primary" name="add" value="Save" />
 				#(/edit)#
+                                </p>
 				<img src="env/grafics/empty.gif" name="ajax" />
 			</fieldset>
 		</form>
 		:: <!-- import XML Bookmarks (mode=3) -->		
 		<form action="Bookmarks.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
-			<div class="BookmarksFieldset">
 			<fieldset>
 				<legend>Import XML Bookmarks</legend>
 				<dl>
@@ -122,9 +123,8 @@
 						</select>
 					</dd>
 				</dl>
-				<input type="submit" name="importxml" value="import" />
+				<input type="submit" class="btn btn-primary" name="importxml" value="import" />
 			</fieldset>
-			</div>
 		</form>
 		<!-- import Netscape Bookmarks -->
 		<form action="Bookmarks.html" method="post" enctype="multipart/form-data" accept-charset="UTF-8">
@@ -153,7 +153,7 @@
 						</select>
 					</dd>
 				</dl>
-				<input type="submit" name="importbookmarks" value="import" />
+				<input type="submit" class="btn btn-primary" name="importbookmarks" value="import" />
 			</fieldset>
 		</form>
 		:: 

htroot/ConfigSearchPage_p.html

@@ -90,8 +90,12 @@ $(function() {
           </table>
           <div style="width: 550px; float: left;">
             <fieldset class="yacys">
-              <input id="search" class="searchinput" name="query" type="text" size="40" maxlength="80" value="search words" />
+              <div class="input-group">
-              <input id="Enter" type="button" name="Enter" value="Search" onclick="var w = window.open('yacysearch.html','LayoutTest'); w.focus();" />
+                <input type="text" class="form-control searchinput typeahead" size="40" maxlength="80" placeholder="Web Search by the People, for the People" name="query"  />
+                <div class="input-group-btn">
+                  <button id="Enter" class="btn btn-default" type="submit">search</button>
+                </div>
+              </div>
               <div class="yacysearch">
                 <input type="checkbox" id="text" name="search.text" value="true" #(search.text)#::checked="checked" #(/search.text)# /><label for="text">Text</label>
                 &nbsp;&nbsp;<input type="checkbox" id="image" name="search.image" value="true" #(search.image)#::checked="checked" #(/search.image)# /><label for="image">Images</label>

htroot/api/blacklists/add_entry_p.java

@@ -14,7 +14,7 @@ public class add_entry_p {
     private static final String RESULT_SUCCESS = "1";
     private static final String XML_ITEM_STATUS = "status";
     private static final String KEY_NEW_ENTRY = "entry";
-    private static final String KEY_CURRENT_BLACKLIST = "blacklist";
+    private static final String KEY_CURRENT_BLACKLIST = "list";
 
     public static serverObjects respond(final RequestHeader header, final serverObjects post, @SuppressWarnings("unused") final serverSwitch env) {
 

htroot/api/blacklists/delete_entry_p.java

@@ -14,7 +14,7 @@ public class delete_entry_p {
     private static final String RESULT_SUCCESS = "1";
     private static final String XML_ITEM_STATUS = "status";
     private static final String KEY_NEW_ENTRY = "entry";
-    private static final String KEY_CURRENT_BLACKLIST = "blacklist";
+    private static final String KEY_CURRENT_BLACKLIST = "list";
 
     public static serverObjects respond(final RequestHeader header, final serverObjects post, @SuppressWarnings("unused") final serverSwitch env) {
 

htroot/api/blacklists/get_list_p.java

@@ -13,6 +13,7 @@ import net.yacy.server.serverSwitch;
 
 public class get_list_p {
 
+    private static final String KEY_CURRENT_BLACKLIST = "list";
     private static final String ITEMS = "items";
     private static final String POSTFIX_ITEM = "_item";
     private static final String PREFIX_ITEMS = "items_";
@@ -31,7 +32,7 @@ public class get_list_p {
 
         final Collection<String> dirlist = FileUtils.getDirListing(ListManager.listsPath, Blacklist.BLACKLIST_FILENAME_FILTER);
 
-        final String blackListName = (post == null) ? "" : post.get("name", "");
+        final String blackListName = (post == null) ? "" : post.get(KEY_CURRENT_BLACKLIST, "");
 
         int count;
         if (dirlist != null) {