From 3d5f2ff544fa7380ca06d86b0a098bae579b9bb3 Mon Sep 17 00:00:00 2001 From: orbiter Date: Fri, 29 May 2009 14:16:03 +0000 Subject: [PATCH] - added new servlets to support search portal administrators for the integration of yacy search fields in their web pages - moved some servlets from here to there.. - changed menu structure - removed yacyui-portaltest.html which contained an example for the live search which is now integrated on all pages in yacy. The code snippet example from that page is integrated into the ConfigLiveSearch.html servlet git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5994 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- htroot/ConfigAppearance_p.html | 116 +---------- htroot/ConfigAppearance_p.java | 55 +---- htroot/ConfigLanguage_p.html | 2 +- ...-portaltest.html => ConfigLiveSearch.html} | 192 ++++++++---------- htroot/ConfigLiveSearch.java | 40 ++++ htroot/ConfigPHPBB3Search.html | 0 htroot/ConfigPortal.html | 119 +++++++++++ htroot/ConfigPortal.java | 95 +++++++++ htroot/ConfigProfile_p.html | 2 +- htroot/ConfigRobotsTxt_p.html | 2 +- htroot/ConfigWikiSearch.html | 0 htroot/env/templates/footer.template | 2 +- htroot/env/templates/header.template | 8 +- htroot/env/templates/submenuConfig.template | 1 + ...template => submenuCustomization.template} | 4 +- .../env/templates/submenuIntegration.template | 9 + source/de/anomic/yacy/yacySeed.java | 14 +- 17 files changed, 379 insertions(+), 282 deletions(-) rename htroot/{yacy/ui/yacyui-portaltest.html => ConfigLiveSearch.html} (58%) create mode 100644 htroot/ConfigLiveSearch.java create mode 100644 htroot/ConfigPHPBB3Search.html create mode 100644 htroot/ConfigPortal.html create mode 100644 htroot/ConfigPortal.java create mode 100644 htroot/ConfigWikiSearch.html rename htroot/env/templates/{submenuCustomizationIntegration.template => submenuCustomization.template} (56%) create mode 100644 htroot/env/templates/submenuIntegration.template diff --git a/htroot/ConfigAppearance_p.html b/htroot/ConfigAppearance_p.html index da658fafa..c7d5c995d 100644 --- a/htroot/ConfigAppearance_p.html +++ b/htroot/ConfigAppearance_p.html @@ -6,11 +6,13 @@ #%env/templates/header.template%# - #%env/templates/submenuCustomizationIntegration.template%# + #%env/templates/submenuCustomization.template%#

Appearance and Integration

- You can change the appearance of YaCy with skins - and the default icons and links on the search page can be replaced with you own. + You can change the appearance of the YaCy interface with skins. + The selected skin and language also affects the appearance of the search page. + If you create a search portal with YaCy then you can + change the appearance of the search page here.

Skin Selection

@@ -53,113 +55,7 @@ ::

Unable to get URL: #[url]#

::

Error saving the skin.

#(/status)# - - -

Search Page Integration

-

- The search page may be customized. You can change the 'corporate identity'-images, the greeting line - and a link to a home page that is reached when the 'corporate identity'-images are clicked. -

-
-
-
-
Greeting Line
-
- -
URL of Home Page
-
- -
URL of a Small Corporate Image
-
- -
URL of a Large Corporate Image
-
- -
Default Pop-Up Page
-
- Status Page  - Search Front Page  - Search Page (small header)  - Interactive Search Page  -
- -
-    - -
-
-
-
- -

- The search page can be integrated in your own web pages with an iframe. Simply use the following code: -

- 
-      <iframe name="target"
-       src="http://#[myaddress]#/index.html?display=2&resource=local"
-       width="100%"
-       height="560"
-       frameborder="0"
-       scrolling="auto"
-       id="target"> 
-      </iframe>  
-
- This would look like: - - -

- For a search page with a small header, use this code: -

- 
-      <iframe name="target"
-       src="http://#[myaddress]#/yacysearch.html?display=2&resource=local"
-       width="100%"
-       height="560"
-       frameborder="0"
-       scrolling="auto"
-       id="target"> 
-      </iframe>  
-
- This would look like: - - -

- A third option is the interactive search. Use this code: -

- 
-      <iframe name="target"
-       src="http://#[myaddress]#/yacyinteractive.html?display=2"
-       width="100%"
-       height="560"
-       frameborder="0"
-       scrolling="auto"
-       id="target"> 
-      </iframe>  
-
- This would look like: - - + #%env/templates/footer.template%# diff --git a/htroot/ConfigAppearance_p.java b/htroot/ConfigAppearance_p.java index 6467c1e73..540842abf 100644 --- a/htroot/ConfigAppearance_p.java +++ b/htroot/ConfigAppearance_p.java @@ -1,6 +1,6 @@ -// ConfigSkins_p.java +// ConfigAppearance_p.java // ----------------------- -// part of YACY +// part of YaCy // (C) by Michael Peter Christen; mc@yacy.net // first published on http://www.anomic.de // Frankfurt, Germany, 2004 @@ -40,7 +40,6 @@ import de.anomic.http.httpClient; import de.anomic.http.httpRequestHeader; import de.anomic.kelondro.util.FileUtils; import de.anomic.plasma.plasmaSwitchboard; -import de.anomic.plasma.plasmaSwitchboardConstants; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; import de.anomic.yacy.yacyURL; @@ -115,31 +114,6 @@ public class ConfigAppearance_p { changeSkin(sb, skinPath, url.substring(url.lastIndexOf("/"), url.length())); } } - if (post.containsKey("searchpage_set")) { - sb.setConfig(plasmaSwitchboardConstants.GREETING, post.get(plasmaSwitchboardConstants.GREETING, "")); - sb.setConfig(plasmaSwitchboardConstants.GREETING_HOMEPAGE, post.get(plasmaSwitchboardConstants.GREETING_HOMEPAGE, "")); - sb.setConfig(plasmaSwitchboardConstants.GREETING_LARGE_IMAGE, post.get(plasmaSwitchboardConstants.GREETING_LARGE_IMAGE, "")); - sb.setConfig(plasmaSwitchboardConstants.GREETING_SMALL_IMAGE, post.get(plasmaSwitchboardConstants.GREETING_SMALL_IMAGE, "")); - } - if (post.containsKey("searchpage_default")) { - sb.setConfig(plasmaSwitchboardConstants.GREETING, "P2P Web Search"); - sb.setConfig(plasmaSwitchboardConstants.GREETING_HOMEPAGE, "http://yacy.net"); - sb.setConfig(plasmaSwitchboardConstants.GREETING_LARGE_IMAGE, "/env/grafics/YaCyLogo_120ppi.png"); - sb.setConfig(plasmaSwitchboardConstants.GREETING_SMALL_IMAGE, "/env/grafics/YaCyLogo_60ppi.png"); - } - - if (post.containsKey("popup")) { - String popup = post.get("popup", "status"); - if (popup.equals("front")) { - sb.setConfig(plasmaSwitchboardConstants.BROWSER_POP_UP_PAGE, "index.html?display=2"); - } else if (popup.equals("search")) { - sb.setConfig(plasmaSwitchboardConstants.BROWSER_POP_UP_PAGE, "yacysearch.html?display=2"); - } else if (popup.equals("interactive")) { - sb.setConfig(plasmaSwitchboardConstants.BROWSER_POP_UP_PAGE, "yacyinteractive.html?display=2"); - } else { - sb.setConfig(plasmaSwitchboardConstants.BROWSER_POP_UP_PAGE, "Status.html"); - } - } } @@ -154,32 +128,7 @@ public class ConfigAppearance_p { } } prop.put("skinlist", count); - prop.putHTML("currentskin", env.getConfig("currentSkin", "default")); - - prop.putHTML(plasmaSwitchboardConstants.GREETING, sb.getConfig(plasmaSwitchboardConstants.GREETING, "")); - prop.putHTML(plasmaSwitchboardConstants.GREETING_HOMEPAGE, sb.getConfig(plasmaSwitchboardConstants.GREETING_HOMEPAGE, "")); - prop.putHTML(plasmaSwitchboardConstants.GREETING_LARGE_IMAGE, sb.getConfig(plasmaSwitchboardConstants.GREETING_LARGE_IMAGE, "")); - prop.putHTML(plasmaSwitchboardConstants.GREETING_SMALL_IMAGE, sb.getConfig(plasmaSwitchboardConstants.GREETING_SMALL_IMAGE, "")); - - final String browserPopUpPage = sb.getConfig(plasmaSwitchboardConstants.BROWSER_POP_UP_PAGE, "ConfigBasic.html"); - prop.put("popupFront", 0); - prop.put("popupSearch", 0); - prop.put("popupInteractive", 0); - prop.put("popupStatus", 0); - if (browserPopUpPage.startsWith("index")) { - prop.put("popupFront", 1); - } else if (browserPopUpPage.startsWith("yacysearch")) { - prop.put("popupSearch", 1); - } else if (browserPopUpPage.startsWith("yacyinteractive")) { - prop.put("popupInteractive", 1); - } else { - prop.put("popupStatus", 1); - } - - String myaddress = sb.peers.mySeed().getPublicAddress(); - if (myaddress == null) myaddress = "localhost:" + sb.getConfig("port", "8080"); - prop.put("myaddress", myaddress); return prop; } diff --git a/htroot/ConfigLanguage_p.html b/htroot/ConfigLanguage_p.html index e305b289b..4f2aa39c7 100644 --- a/htroot/ConfigLanguage_p.html +++ b/htroot/ConfigLanguage_p.html @@ -6,7 +6,7 @@ #%env/templates/header.template%# - #%env/templates/submenuCustomizationIntegration.template%# + #%env/templates/submenuCustomization.template%#

Language selection

You can change the language of the YaCy-webinterface with translation files. diff --git a/htroot/yacy/ui/yacyui-portaltest.html b/htroot/ConfigLiveSearch.html similarity index 58% rename from htroot/yacy/ui/yacyui-portaltest.html rename to htroot/ConfigLiveSearch.html index d9374e2b6..35ab092c1 100644 --- a/htroot/yacy/ui/yacyui-portaltest.html +++ b/htroot/ConfigLiveSearch.html @@ -1,105 +1,87 @@ - - - - - - - - -

-

YaCy Portal Search:

-
- Live Search - - - - - - - - -
-
-

Code Snippet:

-
-<script src="http://localhost:8080/yacy/ui/js/jquery-1.3.1.min.js" type="text/javascript"></script>
-<script>			
-	$(document).ready(function() {
-		yconf = {
-			url    : 'http://localhost:8080',
-			logo   : '/yacy/ui/img/yacy-logo.png',
-			link   : 'http://www.yacy.net',
-			global : false,
-			width  : 500,
-			height : 620,
-			position : ['top',30],
-			theme  : 'start',
-			title  : 'YaCy Portal Search'
-		};
-		$.getScript(yconf.url+'/yacy/ui/js/yacyui-portalsearch.js', function(){});
-	});
-</script>
-<div id="yacylivesearch">
-	<form id="ysearch" method="get" accept-charset="UTF-8" action="http://localhost:8080/yacysearch.html">
-		Live Search <input name="query" id="yquery" class="fancy" type="text" size="15" maxlength="80" value=""/>
-		<input type="hidden" name="verify" value="false" />
-		<input type="hidden" name="maximumRecords" value="10" />
-		<input type="hidden" name="resource" value="local" />
-		<input type="hidden" name="urlmaskfilter" value=".*" />
-		<input type="hidden" name="prefermaskfilter" value="" />
-		<input type="hidden" name="former" value="" />
-		<input type="hidden" name="display" value="2" />
-		<input type="submit" name="Enter" value="Search" />
-	</form>
-</div>
-
-

Configuration options and defaults for 'yconf':

-
Defaults
-
-url      : 'is a mandatory property - no default',
-global   : false,
-theme    : 'start',
-title    : 'YaCy P2P Web Search',
-logo     : '/yacy/ui/img/yacy-logo.png',
-link     : 'http://www.yacy.net',
-width    : 420,
-height   : 500,
-position : ['top',50],
-modal    : false,			
-resizable: true,
-show     : '',
-hide     : ''
-
-
Size and position (width | height | position)
-Specifies where the dialog should be displayed. Possible values for position: 'center', 'left', 'right', 'top', 'bottom', or an array containing a coordinate pair (in pixel offset from top left of viewport) or the possible string values (e.g. ['right','top'] for top right corner). -
Animation effects (show | hide)
-The effect to be used. Possible values: 'blind', 'clip', 'drop', 'explode', 'fold', 'puff', 'slide', 'scale', 'size', 'pulsate'. -
Interaction (modal | resizable)
-If modal is set to true, the dialog will have modal behavior; other items on the page will be disabled (i.e. cannot be interacted with). Modal dialogs create an overlay below the dialog but above other page elements. -

-If resizable is set to true, the dialog will be resizeable. -

Themes
-

You can -download ready made themes or create -your own custom theme.
Themes are installed into: DATA/HTDOCS/yacy/ui/css/themes/

-

Bookmarklet:

-

-YaCy -

- - + + + + YaCy '#[clientname]#': Integration of a Search Field for Live Search + #%env/templates/metas.template%# + + + #%env/templates/header.template%# + #%env/templates/submenuIntegration.template%# +

Integration of a Search Field for Live Search

+

+ A 'Live-Search' input field that reacts as search-as-you-type in a pop-up window can easily be integrated in any web page. + This is the same function as can be seen on all pages of the YaCy online-interface (look at the window in the upper right corner). + Just use the code snippet below to integrate that in your own web pages. + Please check if the address, as given in the example '#[ip]#:#[port]#' here is correct and replace it with more appropriate values if necessary. +

+ +

Code Snippet:

+
+<script src="http://#[ip]#:#[port]#/yacy/ui/js/jquery-1.3.1.min.js" type="text/javascript"></script>
+<script>			
+	$(document).ready(function() {
+		yconf = {
+			url    : 'http://#[ip]#:#[port]#',
+			logo   : '/yacy/ui/img/yacy-logo.png',
+			link   : 'http://www.yacy.net',
+			global : false,
+			width  : 500,
+			height : 620,
+			position : ['top',30],
+			theme  : 'start',
+			title  : 'YaCy Portal Search'
+		};
+		$.getScript(yconf.url+'/yacy/ui/js/yacyui-portalsearch.js', function(){});
+	});
+</script>
+<div id="yacylivesearch">
+	<form id="ysearch" method="get" accept-charset="UTF-8" action="http://#[ip]#:#[port]#/yacysearch.html">
+		Live Search <input name="query" id="yquery" class="fancy" type="text" size="15" maxlength="80" value=""/>
+		<input type="hidden" name="verify" value="false" />
+		<input type="hidden" name="maximumRecords" value="10" />
+		<input type="hidden" name="resource" value="local" />
+		<input type="hidden" name="urlmaskfilter" value=".*" />
+		<input type="hidden" name="prefermaskfilter" value="" />
+		<input type="hidden" name="former" value="" />
+		<input type="hidden" name="display" value="2" />
+		<input type="submit" name="Enter" value="Search" />
+	</form>
+</div>
+
+

Configuration options and defaults for 'yconf':

+
Defaults
+
+
url
is a mandatory property - no default
+
global
false
+
theme
'start'
+
title
'YaCy P2P Web Search'
+
logo
'/yacy/ui/img/yacy-logo.png'
+
link
'http://www.yacy.net'
+
width
420
+
height
500
+
position
['top',50]
+
modal
false
+
resizable
true
+
show
''
+
hide
''
+
+
Size and position (width | height | position)
+Specifies where the dialog should be displayed. Possible values for position: 'center', 'left', 'right', 'top', 'bottom', or an array containing a coordinate pair (in pixel offset from top left of viewport) or the possible string values (e.g. ['right','top'] for top right corner). +
Animation effects (show | hide)
+The effect to be used. Possible values: 'blind', 'clip', 'drop', 'explode', 'fold', 'puff', 'slide', 'scale', 'size', 'pulsate'. +
Interaction (modal | resizable)
+If modal is set to true, the dialog will have modal behavior; other items on the page will be disabled (i.e. cannot be interacted with). Modal dialogs create an overlay below the dialog but above other page elements. +

+If resizable is set to true, the dialog will be resizeable. +

Themes
+

You can +download ready made themes or create +your own custom theme.
Themes are installed into: DATA/HTDOCS/yacy/ui/css/themes/

+

Bookmarklet:

+

+YaCy +

+ + #%env/templates/footer.template%# + + diff --git a/htroot/ConfigLiveSearch.java b/htroot/ConfigLiveSearch.java new file mode 100644 index 000000000..f4c08fa27 --- /dev/null +++ b/htroot/ConfigLiveSearch.java @@ -0,0 +1,40 @@ +// ConfigLiveSearch.java +// ----------------------- +// part of YaCy +// (C) by Michael Peter Christen; mc@yacy.net +// first published on http://yacy.net +// Frankfurt, Germany, 29.5.2009 +// +// LICENSE +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +import de.anomic.http.httpRequestHeader; +import de.anomic.plasma.plasmaSwitchboard; +import de.anomic.server.serverObjects; +import de.anomic.server.serverSwitch; + +public class ConfigLiveSearch { + + public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch env) { + final serverObjects prop = new serverObjects(); + final plasmaSwitchboard sb = (plasmaSwitchboard) env; + + prop.putHTML("ip", sb.peers.mySeed().getIP()); + prop.putHTML("port", sb.getConfig("port", "8080")); + return prop; + } + +} \ No newline at end of file diff --git a/htroot/ConfigPHPBB3Search.html b/htroot/ConfigPHPBB3Search.html new file mode 100644 index 000000000..e69de29bb diff --git a/htroot/ConfigPortal.html b/htroot/ConfigPortal.html new file mode 100644 index 000000000..26c17f439 --- /dev/null +++ b/htroot/ConfigPortal.html @@ -0,0 +1,119 @@ + + + + YaCy '#[clientname]#': Integration of a Search Portal + #%env/templates/metas.template%# + + + #%env/templates/header.template%# + #%env/templates/submenuIntegration.template%# +

Integration of a Search Portal

+

+ If you like to integrate YaCy as portal for your web pages, you may want to change icons and messages on the search page. + The search page may be customized. You can change the 'corporate identity'-images, the greeting line + and a link to a home page that is reached when the 'corporate identity'-images are clicked. + To change also colours and styles use the Appearance Servlet for different skins and languages. +

+
+
+
+
Greeting Line
+
+ +
URL of Home Page
+
+ +
URL of a Small Corporate Image
+
+ +
URL of a Large Corporate Image
+
+ +
Default Pop-Up Page
+
+ Status Page  + Search Front Page  + Search Page (small header)  + Interactive Search Page  +
+ +
+    + +
+
+
+
+ +

+ The search page can be integrated in your own web pages with an iframe. Simply use the following code: +

+ 
+      <iframe name="target"
+       src="http://#[myaddress]#/index.html?display=2&resource=local"
+       width="100%"
+       height="560"
+       frameborder="0"
+       scrolling="auto"
+       id="target"> 
+      </iframe>  
+
+ This would look like: + + +

+ For a search page with a small header, use this code: +

+ 
+      <iframe name="target"
+       src="http://#[myaddress]#/yacysearch.html?display=2&resource=local"
+       width="100%"
+       height="560"
+       frameborder="0"
+       scrolling="auto"
+       id="target"> 
+      </iframe>  
+
+ This would look like: + + +

+ A third option is the interactive search. Use this code: +

+ 
+      <iframe name="target"
+       src="http://#[myaddress]#/yacyinteractive.html?display=2"
+       width="100%"
+       height="560"
+       frameborder="0"
+       scrolling="auto"
+       id="target"> 
+      </iframe>  
+
+ This would look like: + + + #%env/templates/footer.template%# + + diff --git a/htroot/ConfigPortal.java b/htroot/ConfigPortal.java new file mode 100644 index 000000000..9e4c2b290 --- /dev/null +++ b/htroot/ConfigPortal.java @@ -0,0 +1,95 @@ +// ConfigPortal.java +// ----------------------- +// part of YaCy +// (C) by Michael Peter Christen; mc@yacy.net +// first published on http://yacy.net +// Frankfurt, Germany, 4.7.2008 +// +// LICENSE +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + +import de.anomic.http.httpRequestHeader; +import de.anomic.plasma.plasmaSwitchboard; +import de.anomic.plasma.plasmaSwitchboardConstants; +import de.anomic.server.serverObjects; +import de.anomic.server.serverSwitch; + +public class ConfigPortal { + + public static serverObjects respond(final httpRequestHeader header, final serverObjects post, final serverSwitch env) { + final serverObjects prop = new serverObjects(); + final plasmaSwitchboard sb = (plasmaSwitchboard) env; + + if (post != null) { + // AUTHENTICATE + if (!header.containsKey(httpRequestHeader.AUTHORIZATION)) { + prop.putHTML("AUTHENTICATE","log-in"); + return prop; + } + + if (post.containsKey("popup")) { + String popup = post.get("popup", "status"); + if (popup.equals("front")) { + sb.setConfig(plasmaSwitchboardConstants.BROWSER_POP_UP_PAGE, "index.html?display=2"); + } else if (popup.equals("search")) { + sb.setConfig(plasmaSwitchboardConstants.BROWSER_POP_UP_PAGE, "yacysearch.html?display=2"); + } else if (popup.equals("interactive")) { + sb.setConfig(plasmaSwitchboardConstants.BROWSER_POP_UP_PAGE, "yacyinteractive.html?display=2"); + } else { + sb.setConfig(plasmaSwitchboardConstants.BROWSER_POP_UP_PAGE, "Status.html"); + } + } + if (post.containsKey("searchpage_set")) { + sb.setConfig(plasmaSwitchboardConstants.GREETING, post.get(plasmaSwitchboardConstants.GREETING, "")); + sb.setConfig(plasmaSwitchboardConstants.GREETING_HOMEPAGE, post.get(plasmaSwitchboardConstants.GREETING_HOMEPAGE, "")); + sb.setConfig(plasmaSwitchboardConstants.GREETING_LARGE_IMAGE, post.get(plasmaSwitchboardConstants.GREETING_LARGE_IMAGE, "")); + sb.setConfig(plasmaSwitchboardConstants.GREETING_SMALL_IMAGE, post.get(plasmaSwitchboardConstants.GREETING_SMALL_IMAGE, "")); + } + if (post.containsKey("searchpage_default")) { + sb.setConfig(plasmaSwitchboardConstants.GREETING, "P2P Web Search"); + sb.setConfig(plasmaSwitchboardConstants.GREETING_HOMEPAGE, "http://yacy.net"); + sb.setConfig(plasmaSwitchboardConstants.GREETING_LARGE_IMAGE, "/env/grafics/YaCyLogo_120ppi.png"); + sb.setConfig(plasmaSwitchboardConstants.GREETING_SMALL_IMAGE, "/env/grafics/YaCyLogo_60ppi.png"); + sb.setConfig(plasmaSwitchboardConstants.BROWSER_POP_UP_PAGE, "Status.html"); + } + } + + prop.putHTML(plasmaSwitchboardConstants.GREETING, sb.getConfig(plasmaSwitchboardConstants.GREETING, "")); + prop.putHTML(plasmaSwitchboardConstants.GREETING_HOMEPAGE, sb.getConfig(plasmaSwitchboardConstants.GREETING_HOMEPAGE, "")); + prop.putHTML(plasmaSwitchboardConstants.GREETING_LARGE_IMAGE, sb.getConfig(plasmaSwitchboardConstants.GREETING_LARGE_IMAGE, "")); + prop.putHTML(plasmaSwitchboardConstants.GREETING_SMALL_IMAGE, sb.getConfig(plasmaSwitchboardConstants.GREETING_SMALL_IMAGE, "")); + + final String browserPopUpPage = sb.getConfig(plasmaSwitchboardConstants.BROWSER_POP_UP_PAGE, "ConfigBasic.html"); + prop.put("popupFront", 0); + prop.put("popupSearch", 0); + prop.put("popupInteractive", 0); + prop.put("popupStatus", 0); + if (browserPopUpPage.startsWith("index")) { + prop.put("popupFront", 1); + } else if (browserPopUpPage.startsWith("yacysearch")) { + prop.put("popupSearch", 1); + } else if (browserPopUpPage.startsWith("yacyinteractive")) { + prop.put("popupInteractive", 1); + } else { + prop.put("popupStatus", 1); + } + String myaddress = sb.peers.mySeed().getPublicAddress(); + if (myaddress == null) myaddress = "localhost:" + sb.getConfig("port", "8080"); + prop.put("myaddress", myaddress); + return prop; + } + +} diff --git a/htroot/ConfigProfile_p.html b/htroot/ConfigProfile_p.html index 76b1fa171..4510e9cf0 100644 --- a/htroot/ConfigProfile_p.html +++ b/htroot/ConfigProfile_p.html @@ -6,7 +6,7 @@ #%env/templates/header.template%# - #%env/templates/submenuCustomizationIntegration.template%# + #%env/templates/submenuCustomization.template%#

Your Personal Profile

You can create a personal profile here, which can be seen by other YaCy-members diff --git a/htroot/ConfigRobotsTxt_p.html b/htroot/ConfigRobotsTxt_p.html index f871a2174..158c9564e 100644 --- a/htroot/ConfigRobotsTxt_p.html +++ b/htroot/ConfigRobotsTxt_p.html @@ -6,7 +6,7 @@ #%env/templates/header.template%# - #%env/templates/submenuCustomizationIntegration.template%# + #%env/templates/submenuConfig.template%#

Exclude Web-Spiders

Here you can set up a robots.txt for all webcrawlers that try to access the webinterface of your peer. diff --git a/htroot/ConfigWikiSearch.html b/htroot/ConfigWikiSearch.html new file mode 100644 index 000000000..e69de29bb diff --git a/htroot/env/templates/footer.template b/htroot/env/templates/footer.template index 0c2eddc2b..7f5eaa32e 100644 --- a/htroot/env/templates/footer.template +++ b/htroot/env/templates/footer.template @@ -1 +1 @@ - + \ No newline at end of file diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index 7be1de450..a9eda61a6 100644 --- a/htroot/env/templates/header.template +++ b/htroot/env/templates/header.template @@ -52,6 +52,13 @@

  • Indexing with Proxy
    • +