diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index 322f6641d..969c66a0e 100644 --- a/htroot/env/templates/header.template +++ b/htroot/env/templates/header.template @@ -72,7 +72,7 @@ >

  • First Steps

  • Use Case & Account
    • -
  • Load Web Pages (Crawler)
    • +
  • Load Web Pages, Crawler
  • RAM/Disk Usage & Updates
    • #(navigation-advanced)#::#(/navigation-advanced)# @@ -83,9 +83,9 @@ data-content="You do not see all monitoring options here, because some belong to crawl result monitoring. Start a web crawl to see that!" >

  • Monitoring

    • -
  • System Status
    • +
  • System Status
    • #(navigation-p2p)#::
  • Peer-to-Peer Network
    • #(/navigation-p2p)# - #(navigation-advanced)#::
  • Network Access
    • #(/navigation-advanced)# +
  • Network Access
    • #(navigation-crawlmonitor)#::
  • Web Visualization
    • #(/navigation-crawlmonitor)# #(navigation-crawlmonitor)#::
  • Crawler Monitor
    • #(/navigation-crawlmonitor)# diff --git a/locales/de.lng b/locales/de.lng index 04f508b1d..136bb2b58 100644 --- a/locales/de.lng +++ b/locales/de.lng @@ -3857,64 +3857,46 @@ English, Englisch==German, Deutsch #File: env/templates/header.template #--------------------------- #YaCy - Distributed Search Engine==YaCy - Verteilte Suchmaschine -### SEARCH INTERFACES ### -Search Interfaces==Suchschnittstellen -Web Search==Web-Suche -File Search==Datei-Suche -Host Browser==Host-Browser -# Location Search is currently commented out -Location Search==Ortssuche -#Embedded Solr API==Embedded Solr API -#Embedded GSA API==Embedded GSA API -# Rich Client Search is currently commented out -Rich Client Search==Rich Client Suche -Compare Search==Vergleichs-Suche -URL Viewer==URL Betrachter -### SEARCH DESIGN ### -Search Integration==Suchmaskenintegration -Portal Configuration==Portal-Konfiguration -Design==Design -Ranking and Heuristics==Ranking und Heuristiken -### INDEX CONTROL ### -Index Production==Indexerzeugung -#Crawler / Harvester==Crawler / Harvester +### FIRST STEPS ### +First Steps==Erste Schritte +Use Case & Account==Anwendungsfall & Zugangsdaten +Load Web Pages, Crawler==Webseiten laden mit Crawler +RAM\/Disk Usage & Updates="RAM+Disk Belegung & Updates +You just started a YaCy peer!==Sie haben gerade begonnen YaCy zu nutzen! +As a first-time-user you see only basic functions. Set a use case or name your peer to see more options. Start a first web crawl to see all monitoring options.==Als Anfänger sehen Sie hier zunächst nur einfache Funktionen. Wählen Sie einen Anwendungsfall, benennen Sie Ihren Peer oder starten Sie einen Webcrawl, dann sehen Sie alle Optionen. +You did not yet start a web crawl!==Sie haben bislang keinen Webcrawl gestartet! +You do not see all monitoring options here, because some belong to crawl result monitoring. Start a web crawl to see that!==Sie sehen hier nicht alle Monitoring-Optionen weil diese zur Darstellung von Webcrawls dienen. Starten Sie einen! +### MONITORING ### +Monitoring==Überwachung +System Status==Systemstatus +Peer-to-Peer Network==Peer-to-Peer Netzwerk +Network Access==Netzwerkzugriff +Web Visualization==Internet Visualisierung Crawler Monitor==Crawler Überwachung +### PRODUCTION ### +Production==Produktion +Advanced Crawler==Experten Crawl Start +Content Importer==Importfunktionen +Target Analysis==Ziel Analyse +Process Scheduler==Prozess Planer +### ADMINISTRATION ### +System Admiistration==Systemverwaltung Index Administration==Indexverwaltung Filter & Blacklists==Filter & Sperrlisten Content Semantic==Inhalt Semantik -Target Analysis==Ziel Analyse -Process Scheduler==Prozess Planer -### MONITORING ### -Monitoring==Überwachung -YaCy Network==YaCy Netzwerk -Web Visualization==Internet Visualisierung -Network Access==Netzwerkzugriff -Computation==Server Log -#>Terminal==>Terminal ->Bookmarks==>Lesezeichen -### PEER CONTROL ### -Peer Control==Peer Kontrolle -Admin Console==Admin Konsole -Confirm Restart==Bestätige Neustart -Re-Start==Neustarten -Confirm Shutdown==Bestätige Herunterfahren ->Shutdown==>Herunterfahren -### THE YACY PROJECT ### -The YaCy Project==Das YaCy Projekt -Project Home==Projektseite -#Tutorials<==Tutorials< -Forum/Discussion<==Forum/Diskussion< -#Project Wiki<==Project Wiki< -#Git Repository==Git Repository -#Bugtracker<==Bugtracker< -Peer Statistics::YaCy Statistics==Peer Statistiken::YaCy Statistiken +### SEARCH PORTAL INTEGRATION ### +Search Portal Integration==Suchmaskenintegration +Configuration==Konfiguration +Design==Design +Ranking and Heuristics==Ranking und Heuristiken #----------------------------- #File: env/templates/simpleheader.template #--------------------------- #Administration<==Administration< ->Web Search<==>Web Suche< ->File Search<==>Datei Suche< +>Web Search<==>Web-Suche< +>File Search<==>Datei-Suche< +>Compare Search<==>Vergleichssuche< >Host Browser<==>Host Browser< >About Us<==>Impressum dieses Peers< Help / YaCy Wiki==Hilfe / YaCy Wiki diff --git a/source/net/yacy/http/servlets/YaCyDefaultServlet.java b/source/net/yacy/http/servlets/YaCyDefaultServlet.java index 4741d8097..65a81a811 100644 --- a/source/net/yacy/http/servlets/YaCyDefaultServlet.java +++ b/source/net/yacy/http/servlets/YaCyDefaultServlet.java @@ -879,7 +879,9 @@ public class YaCyDefaultServlet extends HttpServlet { if (targetFile.exists() && targetFile.isFile() && targetFile.canRead()) { sb.setConfig("server.servlets.called", appendPath(sb.getConfig("server.servlets.called", ""), target)); - if (args != null && args.size() > 0) sb.setConfig("server.servlets.submitted", appendPath(sb.getConfig("server.servlets.submitted", ""), target)); + if (args != null && !args.isEmpty()) { + sb.setConfig("server.servlets.submitted", appendPath(sb.getConfig("server.servlets.submitted", ""), target)); + } // add the application version, the uptime and the client name to every rewrite table templatePatterns.put(servletProperties.PEER_STAT_VERSION, yacyBuildProperties.getVersion()); @@ -891,8 +893,9 @@ public class YaCyDefaultServlet extends HttpServlet { templatePatterns.put("newpeer", myPeer.getAge() >= 1 ? 0 : 1); templatePatterns.putHTML("newpeer_peerhash", myPeer.hash); templatePatterns.put("navigation-p2p", sb.getConfigBool(SwitchboardConstants.DHT_ENABLED, true) || !sb.isRobinsonMode() ? 1 : 0); - templatePatterns.put("navigation-crawlmonitor", sb.getConfig("server.servlets.submitted", "").indexOf("Crawler_p") >= 0); - templatePatterns.put("navigation-advanced", sb.getConfig("server.servlets.submitted", "").indexOf("ConfigBasic") >= 0 || sb.getConfig("server.servlets.submitted", "").indexOf("CrawlStart") >= 0); + String submitted = sb.getConfig("server.servlets.submitted", ""); + templatePatterns.put("navigation-crawlmonitor", submitted.indexOf("Crawler_p") >= 0); + templatePatterns.put("navigation-advanced", submitted.indexOf("ConfigBasic") >= 0 || submitted.indexOf("CrawlStart") >= 0); templatePatterns.put(SwitchboardConstants.GREETING_HOMEPAGE, sb.getConfig(SwitchboardConstants.GREETING_HOMEPAGE, "")); templatePatterns.put(SwitchboardConstants.GREETING_SMALL_IMAGE, sb.getConfig(SwitchboardConstants.GREETING_SMALL_IMAGE, ""));