created new main menu entry 'Customization and Integration'

- moved some already existing servlets to this menu
- renamed the skin servlet to appearance
- added a set-to-default-button to the search page appearance setting
- removed the peer profile servlet which is now replaced by a field in the new appearance servlet

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4980 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
orbiter 17 years ago
parent 5488543b8f
commit f7aaeb3fad

@ -6,13 +6,17 @@
</head>
<body id="ConfigSkins">
#%env/templates/header.template%#
#%env/templates/submenuConfig.template%#
<h2>Skin Selection</h2>
#%env/templates/submenuCustomizationIntegration.template%#
<h2>Appearance and Integration</h2>
<p>
You can change the appearance of YaCy with skins. Select one of the default skins, download new skins, or create your own skin.
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.
</p>
<form action="ConfigSkins_p.html">
<h3>Skin Selection</h3>
<p>
Select one of the default skins, download new skins, or create your own skin.
</p><form action="ConfigAppearance_p.html">
<fieldset>
<dl>
<dt><label for="cur_skin">Current skin</label>:</dt>
@ -32,7 +36,7 @@
</fieldset>
</form>
<form action="ConfigSkins_p.html">
<form action="ConfigAppearance_p.html">
<fieldset>
<dl>
<dt><label for="url">Install new skin from URL</label>:</dt>
@ -50,11 +54,13 @@
::<p><strong>Error saving the skin.</strong></p>
#(/status)#
<h3>Search Page Integration</h3>
<p>
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.
</p>
<form action="ConfigSkins_p.html">
<form action="ConfigAppearance_p.html">
<fieldset>
<dl>
<dt>Greeting Line</dt>
@ -69,7 +75,10 @@
<dt>URL of a Large Corporate Image</dt>
<dd><input type="text" name="promoteSearchPageGreeting.largeImage" value="#[promoteSearchPageGreeting.largeImage]#" size="60" /></dd>
<dd><input type="submit" name="searchpage_button" value="Change Search Page" /></dd>
<dd>
<input type="submit" name="searchpage_set" value="Change Search Page" />&nbsp;&nbsp;
<input type="submit" name="searchpage_default" value="Set to Default Values" />
</dd>
</dl>
</fieldset>
</form>

@ -44,7 +44,7 @@ import de.anomic.server.serverSwitch;
import de.anomic.tools.nxTools;
import de.anomic.yacy.yacyURL;
public class ConfigSkins_p {
public class ConfigAppearance_p {
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
serverObjects prop = new serverObjects();
@ -114,12 +114,18 @@ public class ConfigSkins_p {
changeSkin(sb, skinPath, url.substring(url.lastIndexOf("/"), url.length()));
}
}
if (post.containsKey("searchpage_button")) {
if (post.containsKey("searchpage_set")) {
sb.setConfig("promoteSearchPageGreeting", post.get("promoteSearchPageGreeting", ""));
sb.setConfig("promoteSearchPageGreeting.homepage", post.get("promoteSearchPageGreeting.homepage", ""));
sb.setConfig("promoteSearchPageGreeting.largeImage", post.get("promoteSearchPageGreeting.largeImage", ""));
sb.setConfig("promoteSearchPageGreeting.smallImage", post.get("promoteSearchPageGreeting.smallImage", ""));
}
if (post.containsKey("searchpage_default")) {
sb.setConfig("promoteSearchPageGreeting", "P2P Web Search");
sb.setConfig("promoteSearchPageGreeting.homepage", "http://yacy.net");
sb.setConfig("promoteSearchPageGreeting.largeImage", "/env/grafics/YaCyLogo_120ppi.png");
sb.setConfig("promoteSearchPageGreeting.smallImage", "/env/grafics/YaCyLogo_60ppi.png");
}
}

@ -6,7 +6,7 @@
</head>
<body id="ConfigLanguage">
#%env/templates/header.template%#
#%env/templates/submenuConfig.template%#
#%env/templates/submenuCustomizationIntegration.template%#
<h2>Language selection</h2>
<p>
You can change the language of the YaCy-webinterface with translation files.

@ -1,32 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>YaCy '#[clientname]#': Peer Profile</title>
#%env/templates/metas.template%#
</head>
<body id="ConfigProfile">
#%env/templates/header.template%#
#%env/templates/submenuConfig.template%#
<h2>Peer Profile</h2>
<p>
This defines visual attributes of the search interfaces.
</p>
<form action="ConfigPeerProfile_p.html" accept-charset="UTF-8">
<fieldset>
<dl>
<dt><label for="name">Greeting Line (<a href="index.html">visible above the search field</a>)</label></dt>
<dd>
<input type="text" name="promoteSearchPageGreeting" id="promoteSearchPageGreeting" size="80" maxlength="120" value="#[promoteSearchPageGreeting]#" />
</dd>
</dl>
<dl>
<dt>&nbsp;</dt>
<dd>
<input type="submit" name="set" value="Save" />
</dd>
</dl>
</fieldset>
</form>
#%env/templates/footer.template%#
</body>
</html>

@ -1,47 +0,0 @@
// ConfigPeerProfile_p.java
// (C) 2008 by Michael Peter Christen; mc@yacy.net, Frankfurt a. M., Germany
// first published 18.04.2008 on http://yacy.net
//
// This is a part of YaCy, a peer-to-peer based web search engine
//
// $LastChangedDate: 2006-04-02 22:40:07 +0200 (So, 02 Apr 2006) $
// $LastChangedRevision: 1986 $
// $LastChangedBy: orbiter $
//
// 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.httpHeader;
import de.anomic.plasma.plasmaSwitchboard;
import de.anomic.server.serverObjects;
import de.anomic.server.serverSwitch;
public class ConfigPeerProfile_p {
public static serverObjects respond(httpHeader header, serverObjects post, serverSwitch<?> env) {
plasmaSwitchboard sb = (plasmaSwitchboard) env;
final serverObjects prop = new serverObjects();
if (post != null && post.containsKey("set")) {
sb.setConfig("promoteSearchPageGreeting", post.get("promoteSearchPageGreeting", ""));
}
prop.putHTML("promoteSearchPageGreeting", sb.getConfig("promoteSearchPageGreeting", ""));
return prop;
}
}

@ -6,7 +6,7 @@
</head>
<body id="ConfigProfile">
#%env/templates/header.template%#
#%env/templates/submenuConfig.template%#
#%env/templates/submenuCustomizationIntegration.template%#
<h2>Your Personal Profile</h2>
<p>
You can create a personal profile here, which can be seen by other YaCy-members

@ -6,7 +6,7 @@
</head>
<body id="ConfigRobotsTxt">
#%env/templates/header.template%#
#%env/templates/submenuConfig.template%#
#%env/templates/submenuCustomizationIntegration.template%#
<h2>Exclude Web-Spiders</h2>
<p>
Here you can set up a robots.txt for all webcrawlers that try to access the webinterface of your peer.

@ -40,6 +40,7 @@
<h3>Peer Control</h3>
<ul class="menu">
<li><a href="/Status.html" class="MenuItemLink">Admin Console</a></li>
<li><a href="/ConfigAppearance_p.html" class="MenuItemLink">Customization &amp; Integration</a></li>
<li><a href="/terminal_p.html" accesskey="t" class="MenuItemLink lock">Terminal</a></li>
<li><a href="/Messages_p.html" class="MenuItemLink lock">Messages <img src="/notifier.gif" alt="New Messages" /></a></li>
<li><a href="/Steering.html?restart=" class="MenuItemLink lock" onclick="return confirm('Confirm Restart')">Re-Start</a></li>

@ -4,25 +4,20 @@
<li><a href="/Status.html" class="MenuItemLink lock">Status</a></li>
<li><a href="/ConfigBasic.html" class="MenuItemLink lock">Basic Configuration</a></li>
<li><a href="/ConfigAccounts_p.html" class="MenuItemLink lock">Accounts</a></li>
<li><a href="/ConfigProfile_p.html" class="MenuItemLink lock">User Profile</a></li>
<li><a href="/ConfigPeerProfile_p.html" class="MenuItemLink lock">Peer Appearance Profile</a></li>
<li><a href="/ConfigLanguage_p.html" class="MenuItemLink lock">Language</a></li>
<li><a href="/ConfigSkins_p.html" class="MenuItemLink lock">Skins</a></li>
<li><a href="/ConfigUpdate_p.html" class="MenuItemLink lock">System Update</a></li>
</ul>
</div>
<div class="SubMenu">
<ul class="SubMenu">
<li><a href="/ConfigNetwork_p.html" class="MenuItemLink lock">Network Configuration</a></li>
<li><a href="/ConfigRobotsTxt_p.html" class ="MenuItemLink lock">Local robots.txt</a></li>
<li><a href="/Settings_p.html" class="MenuItemLink lock">Advanced Settings</a></li>
<li><a href="/ConfigProperties_p.html" class="MenuItemLink lock">Advanced Properties</a></li>
<li><a href="/ConfigUpdate_p.html" class="MenuItemLink lock">System Update</a></li>
</ul>
</div>
<div class="SubMenu">
<ul class="SubMenu">
<li><a href="/PerformanceQueues_p.html" class="MenuItemLink lock">Queues Performance Settings</a></li>
<li><a href="/PerformanceMemory_p.html" class="MenuItemLink lock">Memory Settings for Database Caches</a></li>
<li><a href="/PerformanceSearch_p.html" class="MenuItemLink lock">Timing Settings for Search Sequence</a></li>
<li><a href="/PerformanceQueues_p.html" class="MenuItemLink lock">Queue Performance</a></li>
<li><a href="/PerformanceMemory_p.html" class="MenuItemLink lock">Memory for Database Caches</a></li>
<li><a href="/PerformanceSearch_p.html" class="MenuItemLink lock">Timing for Search Sequence</a></li>
</ul>
</div>

@ -0,0 +1,9 @@
<div class="SubMenu">
<h3>Customization &amp; Integration</h3>
<ul class="SubMenu">
<li><a href="/ConfigAppearance_p.html" class="MenuItemLink lock">Appearance</a></li>
<li><a href="/ConfigProfile_p.html" class="MenuItemLink lock">User Profile</a></li>
<li><a href="/ConfigLanguage_p.html" class="MenuItemLink lock">Language</a></li>
<li><a href="/ConfigRobotsTxt_p.html" class="MenuItemLink lock">Local robots.txt</a></li>
</ul>
</div>

@ -3,6 +3,6 @@
<ul class="SubMenu">
<li><a href="/Wiki.html?display=1" class="MenuItemLink lock">Wiki</a></li>
<li><a href="/Blog.html?display=1" class="MenuItemLink lock">Blog</a></li>
<li><a href="/share/" class="MenuItemLink lock">File Hosting</a></li>
<li><a href="/repository/" class="MenuItemLink lock">File Hosting</a></li>
</ul>
</div>

@ -445,11 +445,11 @@ public class bookmarksDB {
}
return set.iterator();
}
/*
public Iterator<Tag> getTagIterator(String tagName, boolean priv){
return getTagIterator(tagName, priv, SORT_ALPHA);
}
*/
public Iterator<Tag> getTagIterator(String tagName, boolean priv, int comp){
Comparator<Tag> c;
if (comp == SORT_SIZE) c = new tagSizeComparator();

Loading…
Cancel
Save