From da917cf4b107af53673f45d6b49a38c1d0f0c7e3 Mon Sep 17 00:00:00 2001 From: danielr Date: Mon, 30 Jun 2008 07:11:13 +0000 Subject: [PATCH] undo reduced menu git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@4960 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- defaults/yacy.init | 3 --- htroot/ConfigBasic.html | 7 ------- htroot/ConfigBasic.java | 5 ----- htroot/PerformanceQueues_p.html | 14 +------------- htroot/env/templates/header.template | 13 +++++-------- htroot/env/templates/submenuConfig.template | 10 ++-------- source/de/anomic/http/httpdFileHandler.java | 1 - source/de/anomic/server/servletProperties.java | 2 -- 8 files changed, 8 insertions(+), 47 deletions(-) diff --git a/defaults/yacy.init b/defaults/yacy.init index 8dffb0f13..3ca445d26 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -860,6 +860,3 @@ routing.deleteOldSeeds.permission__pro = true routing.deleteOldSeeds.time = 7 routing.deleteOldSeeds.time__pro = 30 -# show simple menu (1) or all possible entries (0)? -menuSimple = 1 - diff --git a/htroot/ConfigBasic.html b/htroot/ConfigBasic.html index 23fd46f68..1f1a403fb 100644 --- a/htroot/ConfigBasic.html +++ b/htroot/ConfigBasic.html @@ -89,13 +89,6 @@ -
  • - (optional) How many options do you wish to see? -
    -   - -
    -
    •     
    diff --git a/htroot/ConfigBasic.java b/htroot/ConfigBasic.java index ad5527379..cfce71d13 100644 --- a/htroot/ConfigBasic.java +++ b/htroot/ConfigBasic.java @@ -226,11 +226,6 @@ public class ConfigBasic { } - if (post != null && post.containsKey(servletProperties.MENU_SIMPLE)) { - sb.setConfig(servletProperties.MENU_SIMPLE, post.get(servletProperties.MENU_SIMPLE, "1")); - } - prop.put(servletProperties.MENU_SIMPLE, sb.getConfig(servletProperties.MENU_SIMPLE, "1")); - // set default values prop.put("defaultName", env.getConfig("peerName", "")); prop.put("defaultPort", env.getConfig("port", "8080")); diff --git a/htroot/PerformanceQueues_p.html b/htroot/PerformanceQueues_p.html index 91dd50efa..3ea43e196 100644 --- a/htroot/PerformanceQueues_p.html +++ b/htroot/PerformanceQueues_p.html @@ -9,15 +9,11 @@ #%env/templates/submenuConfig.template%#

    Performance Settings of Queues and Processes

    - #(menuSimple)#

    Scheduled tasks overview and waiting time settings:

    - :: - #(/menuSimple)#
    - #(menuSimple)# @@ -59,11 +55,9 @@ #{/table}# - :: - #(/menuSimple)#
    Thread Queue Size#[longdescr]##(recommendation)#::
    recommended: #[value]# kbytes#(/recommendation)#
    - #(menuSimple)#   ::#(/menuSimple)# +     Changes take effect immediately
    - #(menuSimple)#

    Thread pool settings:

    @@ -190,8 +183,6 @@ - :: - #(/menuSimple)#
    YaCy Priority Settings @@ -208,7 +199,6 @@
    - #(menuSimple)#
    Proxy Performance Settings

    @@ -230,8 +220,6 @@

    - :: - #(/menuSimple)# #%env/templates/footer.template%# diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index 1fc658ccc..b48da02b0 100644 --- a/htroot/env/templates/header.template +++ b/htroot/env/templates/header.template @@ -8,7 +8,7 @@
  • Search Page (standard)
  • Search Page (alternative)
  • Search Page (Rich Client)
    • - #(menuSimple)#
  • Ranking Config
    • ::#(/menuSimple)# +
  • Ranking Config
  • Surftips
  • Publication
  • Bookmarks
    • @@ -20,12 +20,11 @@ - #(menuSimple)# - :: - #(/menuSimple)#
  • Basic Configuration
  • Accounts
  • User Profile
    • - #(menuSimple)#
  • Peer Appearance Profile
    • ::#(/menuSimple)# - #(menuSimple)#
  • Language
    • ::#(/menuSimple)# +
  • Peer Appearance Profile
    • +
  • Language
  • Skins
    • \ No newline at end of file diff --git a/source/de/anomic/http/httpdFileHandler.java b/source/de/anomic/http/httpdFileHandler.java index 2da005e04..514dbb829 100644 --- a/source/de/anomic/http/httpdFileHandler.java +++ b/source/de/anomic/http/httpdFileHandler.java @@ -671,7 +671,6 @@ public final class httpdFileHandler { tp.put(servletProperties.PEER_STAT_UPTIME, ((System.currentTimeMillis() - serverCore.startupTime) / 1000) / 60); // uptime in minutes tp.putHTML(servletProperties.PEER_STAT_CLIENTNAME, switchboard.getConfig("peerName", "anomic")); tp.put(servletProperties.PEER_STAT_MYTIME, serverDate.formatShortSecond()); - tp.put(servletProperties.MENU_SIMPLE, sb.getConfig(servletProperties.MENU_SIMPLE, "1")); //System.out.println("respond props: " + ((tp == null) ? "null" : tp.toString())); // debug } catch (InvocationTargetException e) { if (e.getCause() instanceof InterruptedException) { diff --git a/source/de/anomic/server/servletProperties.java b/source/de/anomic/server/servletProperties.java index dcea80b12..850b9520f 100644 --- a/source/de/anomic/server/servletProperties.java +++ b/source/de/anomic/server/servletProperties.java @@ -35,8 +35,6 @@ public class servletProperties extends serverObjects { public static final String PEER_STAT_MYTIME = "mytime"; public static final String PEER_STAT_CLIENTNAME = "clientname"; - public static final String MENU_SIMPLE = "menuSimple"; - private String prefix=""; private httpHeader outgoingHeader;