diff --git a/defaults/yacy.init b/defaults/yacy.init index ad87dcca1..8dffb0f13 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -859,3 +859,7 @@ routing.deleteOldSeeds.permission = true 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 44bd56908..23fd46f68 100644 --- a/htroot/ConfigBasic.html +++ b/htroot/ConfigBasic.html @@ -89,6 +89,13 @@ +
  • + (optional) How many options do you wish to see? +
    +   + +
    +
    •     
    @@ -98,7 +105,7 @@

    Your basic configuration is complete! You can now (for example):

    :: diff --git a/htroot/ConfigBasic.java b/htroot/ConfigBasic.java index 5d20ae742..ad5527379 100644 --- a/htroot/ConfigBasic.java +++ b/htroot/ConfigBasic.java @@ -59,6 +59,7 @@ import de.anomic.server.serverDomains; import de.anomic.server.serverInstantBusyThread; import de.anomic.server.serverObjects; import de.anomic.server.serverSwitch; +import de.anomic.server.servletProperties; import de.anomic.yacy.yacyAccessible; import de.anomic.yacy.yacySeed; @@ -224,6 +225,12 @@ public class ConfigBasic { prop.put("nextStep", NEXTSTEP_FINISHED); } + + 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 fcccbb60b..91dd50efa 100644 --- a/htroot/PerformanceQueues_p.html +++ b/htroot/PerformanceQueues_p.html @@ -9,11 +9,15 @@ #%env/templates/submenuConfig.template%#

    Performance Settings of Queues and Processes

    + #(menuSimple)#

    Scheduled tasks overview and waiting time settings:

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

    Thread pool settings:

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

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

    + :: + #(/menuSimple)# #%env/templates/footer.template%# diff --git a/htroot/SettingsAck_p.java b/htroot/SettingsAck_p.java index 498c8d47d..7ce151380 100644 --- a/htroot/SettingsAck_p.java +++ b/htroot/SettingsAck_p.java @@ -244,6 +244,7 @@ public class SettingsAck_p { } else if (staticIP.startsWith("https://")) { if (staticIP.length() > 8) { staticIP = staticIP.substring(8); } else { staticIP = ""; } } + // TODO IPv6 support! if (staticIP.indexOf(":") > 0) { staticIP = staticIP.substring(0, staticIP.indexOf(":")); } diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index b48da02b0..1fc658ccc 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)
    • -
  • Ranking Config
    • + #(menuSimple)#
  • Ranking Config
    • ::#(/menuSimple)#
  • Surftips
  • Publication
  • Bookmarks
    • @@ -20,11 +20,12 @@ + #(menuSimple)# + :: + #(/menuSimple)#
  • Basic Configuration
  • Accounts
  • User Profile
    • -
  • Peer Appearance Profile
    • -
  • Language
    • + #(menuSimple)#
  • Peer Appearance Profile
    • ::#(/menuSimple)# + #(menuSimple)#
  • Language
    • ::#(/menuSimple)#
  • Skins
    • \ No newline at end of file diff --git a/source/de/anomic/http/httpdFileHandler.java b/source/de/anomic/http/httpdFileHandler.java index 514dbb829..2da005e04 100644 --- a/source/de/anomic/http/httpdFileHandler.java +++ b/source/de/anomic/http/httpdFileHandler.java @@ -671,6 +671,7 @@ 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/plasma/plasmaSwitchboard.java b/source/de/anomic/plasma/plasmaSwitchboard.java index d5d0b0303..b535102b9 100644 --- a/source/de/anomic/plasma/plasmaSwitchboard.java +++ b/source/de/anomic/plasma/plasmaSwitchboard.java @@ -1646,11 +1646,6 @@ public final class plasmaSwitchboard extends serverAbstractSwitch