diff --git a/htroot/Bookmarks.html b/htroot/Bookmarks.html index 96f258dc9..504732c83 100644 --- a/htroot/Bookmarks.html +++ b/htroot/Bookmarks.html @@ -25,22 +25,22 @@

::

:: diff --git a/htroot/Status.html b/htroot/Status.html index ae8ba87ba..40a603f1a 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -33,7 +33,7 @@ #(showPrivateTable)#

:: diff --git a/htroot/YMarks.html b/htroot/YMarks.html index 144b1e53e..f7a77b627 100644 --- a/htroot/YMarks.html +++ b/htroot/YMarks.html @@ -42,9 +42,9 @@ To see a list of all APIs, please visit the #(login)#
  • Login
    • ::#(/login)# -
  • TreeView
    • -
  • Import Bookmarks
    • -
  • Bookmarks (XBEL)
    • +
  • TreeView
    • +
  • Import Bookmarks
    • +
  • Bookmarks (XBEL)

    • --> diff --git a/htroot/env/base.css b/htroot/env/base.css index bd4b4b688..3ae9dcac8 100644 --- a/htroot/env/base.css +++ b/htroot/env/base.css @@ -535,6 +535,12 @@ a.MenuItemLink.lock{ background-repeat:no-repeat; } +a.MenuItemLink.unlock{ + background-image:url(/env/grafics/lockopen.gif); + background-position:2px center; + background-repeat:no-repeat; +} + a:hover.MenuItemLink { text-decoration:none; } diff --git a/htroot/env/grafics/lockopen.gif b/htroot/env/grafics/lockopen.gif new file mode 100644 index 000000000..0c1613a71 Binary files /dev/null and b/htroot/env/grafics/lockopen.gif differ diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index cec9ae2d6..e4130d45e 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
    • -
  • RAM/Disk Usage & Updates
    • +
  • RAM/Disk Usage & Updates
    • #(navigation-advanced)#::#(/navigation-advanced)# @@ -84,10 +84,10 @@

  • Monitoring

  • System Status
    • #(navigation-p2p)#::
  • Peer-to-Peer Network
    • #(/navigation-p2p)# -
  • Network Access
    • +
  • Network Access
    • #(navigation-crawlmonitor)#::
  • Web Visualization
    • #(/navigation-crawlmonitor)# - #(navigation-crawlmonitor)#::
  • Crawler Monitor
    • #(/navigation-crawlmonitor)# - + #(navigation-crawlmonitor)#::
  • Crawler Monitor
    • #(/navigation-crawlmonitor)# + #(navigation-crawlmonitor)#::#(/navigation-crawlmonitor)# @@ -95,22 +95,22 @@ #(/navigation-advanced)# diff --git a/htroot/env/templates/submenuAccessTracker.template b/htroot/env/templates/submenuAccessTracker.template index 78980f0c7..d19afd2cc 100644 --- a/htroot/env/templates/submenuAccessTracker.template +++ b/htroot/env/templates/submenuAccessTracker.template @@ -3,26 +3,26 @@

    Server Access

    Local Search

    #(navigation-p2p)#::

    Remote Search

    #(/navigation-p2p)# diff --git a/htroot/env/templates/submenuBlacklist.template b/htroot/env/templates/submenuBlacklist.template index 123e1665c..100b5cacb 100644 --- a/htroot/env/templates/submenuBlacklist.template +++ b/htroot/env/templates/submenuBlacklist.template @@ -1,10 +1,10 @@

    Filter & Blacklists

    \ No newline at end of file diff --git a/htroot/env/templates/submenuComputation.template b/htroot/env/templates/submenuComputation.template index e0d11215c..544271965 100644 --- a/htroot/env/templates/submenuComputation.template +++ b/htroot/env/templates/submenuComputation.template @@ -11,11 +11,11 @@

    Processes

    diff --git a/htroot/env/templates/submenuConfig.template b/htroot/env/templates/submenuConfig.template index 8121c086d..033e91da1 100644 --- a/htroot/env/templates/submenuConfig.template +++ b/htroot/env/templates/submenuConfig.template @@ -1,8 +1,8 @@

    System Administration

    \ No newline at end of file diff --git a/htroot/env/templates/submenuCookie.template b/htroot/env/templates/submenuCookie.template index 7fac0fba6..3d764b47d 100644 --- a/htroot/env/templates/submenuCookie.template +++ b/htroot/env/templates/submenuCookie.template @@ -1,7 +1,7 @@

    Cookie Menu

    \ No newline at end of file diff --git a/htroot/env/templates/submenuCrawlMonitor.template b/htroot/env/templates/submenuCrawlMonitor.template index 2046209bc..4bbcff639 100644 --- a/htroot/env/templates/submenuCrawlMonitor.template +++ b/htroot/env/templates/submenuCrawlMonitor.template @@ -5,27 +5,27 @@

    Processing Monitor

    Queues

    Crawler Steering

    @@ -39,13 +39,13 @@
    \ No newline at end of file diff --git a/htroot/env/templates/submenuCrawler.template b/htroot/env/templates/submenuCrawler.template index 13409ac21..12c46d4f7 100644 --- a/htroot/env/templates/submenuCrawler.template +++ b/htroot/env/templates/submenuCrawler.template @@ -2,6 +2,6 @@

    Use Case & Accounts

    \ No newline at end of file diff --git a/htroot/env/templates/submenuDesign.template b/htroot/env/templates/submenuDesign.template index ddeb82e76..fab996445 100644 --- a/htroot/env/templates/submenuDesign.template +++ b/htroot/env/templates/submenuDesign.template @@ -1,8 +1,8 @@

    Design

    \ No newline at end of file diff --git a/htroot/env/templates/submenuIndexControl.template b/htroot/env/templates/submenuIndexControl.template index d5ac0eca5..4f1bc1b87 100644 --- a/htroot/env/templates/submenuIndexControl.template +++ b/htroot/env/templates/submenuIndexControl.template @@ -1,12 +1,12 @@

    Index Administration

    diff --git a/htroot/env/templates/submenuIndexCreate.template b/htroot/env/templates/submenuIndexCreate.template index 982e2bc5a..8f4f7664d 100644 --- a/htroot/env/templates/submenuIndexCreate.template +++ b/htroot/env/templates/submenuIndexCreate.template @@ -14,9 +14,9 @@

    Network Harvesting

    diff --git a/htroot/env/templates/submenuIndexImport.template b/htroot/env/templates/submenuIndexImport.template index bb6141959..de4285af7 100644 --- a/htroot/env/templates/submenuIndexImport.template +++ b/htroot/env/templates/submenuIndexImport.template @@ -5,16 +5,16 @@

    External Datasets

    Database Reader

    \ No newline at end of file diff --git a/htroot/env/templates/submenuMaintenance.template b/htroot/env/templates/submenuMaintenance.template index df7813161..421e0426f 100644 --- a/htroot/env/templates/submenuMaintenance.template +++ b/htroot/env/templates/submenuMaintenance.template @@ -1,8 +1,8 @@

    RAM/Disk Usage & Updates

    \ No newline at end of file diff --git a/htroot/env/templates/submenuPortalConfiguration.template b/htroot/env/templates/submenuPortalConfiguration.template index 46de94d8a..896f9b592 100644 --- a/htroot/env/templates/submenuPortalConfiguration.template +++ b/htroot/env/templates/submenuPortalConfiguration.template @@ -3,7 +3,7 @@ \ No newline at end of file diff --git a/htroot/env/templates/submenuPublication.template b/htroot/env/templates/submenuPublication.template index a9e38c270..31c43ed3d 100644 --- a/htroot/env/templates/submenuPublication.template +++ b/htroot/env/templates/submenuPublication.template @@ -1,8 +1,8 @@

    Publication

    diff --git a/htroot/env/templates/submenuRanking.template b/htroot/env/templates/submenuRanking.template index b32f34adb..89dfbdc6a 100644 --- a/htroot/env/templates/submenuRanking.template +++ b/htroot/env/templates/submenuRanking.template @@ -1,8 +1,8 @@

    Ranking and Heuristics

    \ No newline at end of file diff --git a/htroot/env/templates/submenuSemantic.template b/htroot/env/templates/submenuSemantic.template index 8ed1cc04a..97abe40ae 100644 --- a/htroot/env/templates/submenuSemantic.template +++ b/htroot/env/templates/submenuSemantic.template @@ -5,16 +5,16 @@

    Automated Annotation

    Augmented Content

    \ No newline at end of file diff --git a/htroot/env/templates/submenuTargetAnalysis.template b/htroot/env/templates/submenuTargetAnalysis.template index 1d1b27382..a3547af26 100644 --- a/htroot/env/templates/submenuTargetAnalysis.template +++ b/htroot/env/templates/submenuTargetAnalysis.template @@ -1,8 +1,8 @@

    Target Analysis

    diff --git a/htroot/env/templates/submenuUseCaseAccount.template b/htroot/env/templates/submenuUseCaseAccount.template index 89107e815..0bf5fc9a7 100644 --- a/htroot/env/templates/submenuUseCaseAccount.template +++ b/htroot/env/templates/submenuUseCaseAccount.template @@ -2,6 +2,6 @@

    Use Case & Accounts

    \ No newline at end of file diff --git a/htroot/env/templates/submenuWebStructure.template b/htroot/env/templates/submenuWebStructure.template index 0f2363442..41661de5c 100644 --- a/htroot/env/templates/submenuWebStructure.template +++ b/htroot/env/templates/submenuWebStructure.template @@ -2,7 +2,7 @@

    Web Visualization

    \ No newline at end of file diff --git a/source/net/yacy/http/servlets/YaCyDefaultServlet.java b/source/net/yacy/http/servlets/YaCyDefaultServlet.java index 7cd2d2fb6..2cf7c73e6 100644 --- a/source/net/yacy/http/servlets/YaCyDefaultServlet.java +++ b/source/net/yacy/http/servlets/YaCyDefaultServlet.java @@ -901,12 +901,18 @@ public class YaCyDefaultServlet extends HttpServlet { Seed myPeer = sb.peers.mySeed(); templatePatterns.put("newpeer", myPeer.getAge() >= 1 ? 0 : 1); templatePatterns.putHTML("newpeer_peerhash", myPeer.hash); + boolean authorized = sb.adminAuthenticated(legacyRequestHeader) >= 2; + templatePatterns.put("authorized", authorized ? 1 : 0); + + // add navigation keys to enable or disable menu items templatePatterns.put("navigation-p2p", sb.getConfigBool(SwitchboardConstants.DHT_ENABLED, true) || !sb.isRobinsonMode() ? 1 : 0); String submitted = sb.getConfig("server.servlets.submitted", ""); boolean crawler_enabled = submitted.contains("Crawler_p"); boolean advanced_enabled = crawler_enabled || submitted.contains("ConfigBasic") || submitted.contains("CrawlStart"); templatePatterns.put("navigation-crawlmonitor", crawler_enabled); + templatePatterns.put("navigation-crawlmonitor_authorized", authorized ? 1 : 0); templatePatterns.put("navigation-advanced", advanced_enabled); + templatePatterns.put("navigation-advanced_authorized", authorized ? 1 : 0); templatePatterns.put(SwitchboardConstants.GREETING_HOMEPAGE, sb.getConfig(SwitchboardConstants.GREETING_HOMEPAGE, "")); templatePatterns.put(SwitchboardConstants.GREETING_SMALL_IMAGE, sb.getConfig(SwitchboardConstants.GREETING_SMALL_IMAGE, ""));