From d6e6f7715b67813f4c1a1d93fa7322131507c842 Mon Sep 17 00:00:00 2001
From: Michael Christen <mc@yacy.net>
Date: Sat, 10 Dec 2011 02:04:36 +0100
Subject: [PATCH] added "about" box configuration

---
 htroot/ConfigPortal.html |  5 +++++
 htroot/ConfigPortal.java | 14 +++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/htroot/ConfigPortal.html b/htroot/ConfigPortal.html
index 4fdebd010..369a19766 100644
--- a/htroot/ConfigPortal.html
+++ b/htroot/ConfigPortal.html
@@ -109,6 +109,11 @@
           </select>
           </dd>
           
+          <dt>'About' Column<br/>(shown in a column alongside<br/>with the search result page)</dt>
+          <dd><input type="text" name="about.headline" value="#[about.headline]#" size="60" />(Headline)</br>
+          <textarea name="about.body" cols="60" rows="8">#[about.body]#</textarea>(Content)
+          </dd>
+          
           <dt>&nbsp;</dt>
           <dd>
             <input type="submit" name="searchpage_set" value="Change Search Page" />&nbsp;&nbsp;
diff --git a/htroot/ConfigPortal.java b/htroot/ConfigPortal.java
index 4417c6b9d..7e6379833 100644
--- a/htroot/ConfigPortal.java
+++ b/htroot/ConfigPortal.java
@@ -86,17 +86,20 @@ public class ConfigPortal {
                 sb.setConfig("search.result.show.metadata", post.getBoolean("search.result.show.metadata", false));
                 sb.setConfig("search.result.show.parser", post.getBoolean("search.result.show.parser", false));
                 sb.setConfig("search.result.show.pictures", post.getBoolean("search.result.show.pictures", false));
-
+                    
                 sb.setConfig(SwitchboardConstants.SEARCH_VERIFY, post.get("search.verify", "ifexist"));
                 sb.setConfig(SwitchboardConstants.SEARCH_VERIFY_DELETE, post.getBoolean("search.verify.delete", false));
+
+                sb.setConfig("about.headline", post.get("about.headline", ""));
+                sb.setConfig("about.body", post.get("about.body", ""));
+                
                 // construct navigation String
                 String nav = "";
                 if (post.getBoolean("search.navigation.hosts", false)) nav += "hosts,";
                 if (post.getBoolean("search.navigation.authors", false)) nav += "authors,";
                 if (post.getBoolean("search.navigation.namespace", false)) nav += "namespace,";
                 if (post.getBoolean("search.navigation.topics", false)) nav += "topics,";
-                if (nav.endsWith(",")) nav = nav.substring(0, nav.length() - 1);
-                 sb.setConfig("search.navigation", nav);
+                if (nav.endsWith(",")) nav = nav.substring(0, nav.length() - 1); sb.setConfig("search.navigation", nav);
             }
             if (post.containsKey("searchpage_default")) {
                 sb.setConfig(SwitchboardConstants.GREETING, "P2P Web Search");
@@ -123,6 +126,8 @@ public class ConfigPortal {
                 sb.setConfig("search.result.show.pictures", false);
                 sb.setConfig(SwitchboardConstants.SEARCH_VERIFY, "iffresh");
                 sb.setConfig(SwitchboardConstants.SEARCH_VERIFY_DELETE, "true");
+                prop.put("about.headline", "");
+                prop.put("about.body", "");
             }
         }
 
@@ -159,6 +164,9 @@ public class ConfigPortal {
         prop.put("search.verify.false", sb.getConfig("search.verify", "").equals("false") ? 1 : 0);
         prop.put("search.verify.delete", sb.getConfigBool(SwitchboardConstants.SEARCH_VERIFY_DELETE, true) ? 1 : 0);
 
+        prop.put("about.headline", sb.getConfig("about.headline", ""));
+        prop.put("about.body", sb.getConfig("about.body", ""));
+
         final String  browserPopUpPage = sb.getConfig(SwitchboardConstants.BROWSER_POP_UP_PAGE, "ConfigBasic.html");
         prop.put("popupFront", 0);
         prop.put("popupSearch", 0);