diff options
26 files changed, 116 insertions, 104 deletions
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 @@ <!-- SubMenu (mode=0) -->
<ul class="SubMenu">
<li><a href="Bookmarks.html?login=true" class="MenuItemLink">Login</a></li>
- <li><a href="Bookmarks.html" class="MenuItemLink lock">List Bookmarks</a></li>
- <li><a href="Bookmarks.html?login=true&mode=add" class="MenuItemLink lock">Add Bookmark</a></li>
- <li><a href="Bookmarks.html?login=true&mode=importxml" class="MenuItemLink lock">Import Bookmarks</a></li>
- <li><a href="api/bookmarks/xbel/xbel.xml" class="MenuItemLink lock">Bookmarks (XBEL)</a></li>
- <li><a href="api/bookmarks/posts/all.xml" class="MenuItemLink lock">Bookmarks (XML)</a></li>
- <li><a href="Bookmarks.rss" class="MenuItemLink lock">Bookmarks (RSS)</a></li>
+ <li><a href="Bookmarks.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">List Bookmarks</a></li>
+ <li><a href="Bookmarks.html?login=true&mode=add" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Add Bookmark</a></li>
+ <li><a href="Bookmarks.html?login=true&mode=importxml" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Import Bookmarks</a></li>
+ <li><a href="api/bookmarks/xbel/xbel.xml" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Bookmarks (XBEL)</a></li>
+ <li><a href="api/bookmarks/posts/all.xml" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Bookmarks (XML)</a></li>
+ <li><a href="Bookmarks.rss" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Bookmarks (RSS)</a></li>
</ul>
<p/>
:: <!-- Submenu isAdmin (mode=1) -->
<ul class="SubMenu">
- <li><a href="Bookmarks.html" class="MenuItemLink lock">List Bookmarks</a></li>
- <li><a href="Bookmarks.html?mode=add" class="MenuItemLink lock">Add Bookmark</a></li>
- <li><a href="Bookmarks.html?mode=importxml" class="MenuItemLink lock">Import Bookmarks</a></li>
- <li><a href="api/bookmarks/xbel/xbel.xml" class="MenuItemLink lock">Bookmarks (XBEL)</a></li>
- <li><a href="api/bookmarks/posts/all.xml" class="MenuItemLink lock">Bookmarks (XML)</a></li>
- <li><a href="Bookmarks.rss" class="MenuItemLink lock">Bookmarks (RSS)</a></li>
+ <li><a href="Bookmarks.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">List Bookmarks</a></li>
+ <li><a href="Bookmarks.html?mode=add" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Add Bookmark</a></li>
+ <li><a href="Bookmarks.html?mode=importxml" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Import Bookmarks</a></li>
+ <li><a href="api/bookmarks/xbel/xbel.xml" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Bookmarks (XBEL)</a></li>
+ <li><a href="api/bookmarks/posts/all.xml" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Bookmarks (XML)</a></li>
+ <li><a href="Bookmarks.rss" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Bookmarks (RSS)</a></li>
</ul>
<p/>
:: <!-- add or edit Bookmark (mode=2) -->
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)#
<div class="SubMenu">
<ul class="SubMenu">
- <li><a href="Status.html?login=" class="MenuItemLink lock">Log-in as administrator to see full status</a></li>
+ <li><a href="Status.html?login=" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Log-in as administrator to see full status</a></li>
</ul>
</div>
::
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 <a href="http://www.yacy-websuche.de <!-- <ul class="SubMenu"> #(login)#<li><a href="YMarks.html" class="MenuItemLink">Login</a></li>::#(/login)# - <li><a href="api/ymarks/test_treeview.html" class="MenuItemLink lock">TreeView</a></li> - <li><a href="api/ymarks/test_import.html" class="MenuItemLink lock">Import Bookmarks</a></li> - <li><a href="api/ymarks/get_xbel.xml" class="MenuItemLink lock">Bookmarks (XBEL)</a></li> + <li><a href="api/ymarks/test_treeview.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">TreeView</a></li> + <li><a href="api/ymarks/test_import.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Import Bookmarks</a></li> + <li><a href="api/ymarks/get_xbel.xml" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Bookmarks (XBEL)</a></li> </ul> <p/> --> 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 Binary files differnew file mode 100644 index 000000000..0c1613a71 --- /dev/null +++ b/htroot/env/grafics/lockopen.gif 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 @@ <li><h3>First Steps</h3></li>
<li><a href="ConfigBasic.html" class="MenuItemLink">Use Case & Account</a></li>
<li><a href="CrawlStartSite.html" class="MenuItemLink">Load Web Pages, Crawler</a></li>
- <li><a href="Performance_p.html" class="MenuItemLink lock">RAM/Disk Usage & Updates</a></li>
+ <li><a href="Performance_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">RAM/Disk Usage & Updates</a></li>
</ul>
#(navigation-advanced)#<script>$("#first-steps").popover();</script>::#(/navigation-advanced)#
@@ -84,10 +84,10 @@ <li><h3>Monitoring</h3></li>
<li><a href="Status.html?noforward=" class="MenuItemLink">System Status</a></li>
#(navigation-p2p)#::<li><a href="Network.html" accesskey="w" class="MenuItemLink">Peer-to-Peer Network</a></li>#(/navigation-p2p)#
- <li><a href="AccessGrid_p.html" class="MenuItemLink lock">Network Access</a></li>
+ <li><a href="AccessGrid_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Network Access</a></li>
#(navigation-crawlmonitor)#::<li><a href="HostBrowser.html?admin=true&hosts=" class="MenuItemLink">Web Visualization</a></li>#(/navigation-crawlmonitor)#
- #(navigation-crawlmonitor)#::<li><a href="Crawler_p.html" class="MenuItemLink lock">Crawler Monitor</a></li>#(/navigation-crawlmonitor)#
- <!-- <li><a href="terminal_p.html" accesskey="t" class="MenuItemLink lock">Terminal</a></li> -->
+ #(navigation-crawlmonitor)#::<li><a href="Crawler_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Crawler Monitor</a></li>#(/navigation-crawlmonitor)#
+ <!-- <li><a href="terminal_p.html" accesskey="t" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Terminal</a></li> -->
</ul>
#(navigation-crawlmonitor)#<script>$("#monitoring").popover();</script>::#(/navigation-crawlmonitor)#
@@ -95,22 +95,22 @@ <ul class="nav nav-sidebar menugroup">
<li><h3>Production</h3></li>
<li><a href="CrawlStartExpert.html" class="MenuItemLink">Advanced Crawler</a></li>
- <li><a href="Load_RSS_p.html" class="MenuItemLink lock">Content Importer</a></li>
- <li><a href="Tables_p.html?table=robots&count=100" class="MenuItemLink lock">Target Analysis</a></li>
- <li><a href="Table_API_p.html" class="MenuItemLink lock">Process Scheduler</a></li>
+ <li><a href="Load_RSS_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Content Importer</a></li>
+ <li><a href="Tables_p.html?table=robots&count=100" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Target Analysis</a></li>
+ <li><a href="Table_API_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Process Scheduler</a></li>
</ul>
<ul class="nav nav-sidebar menugroup">
<li><h3>Administration</h3></li>
- <li><a href="Settings_p.html" class="MenuItemLink lock">System Administration</a></li>
- <li><a href="IndexControlURLs_p.html" class="MenuItemLink lock">Index Administration</a></li>
- <li><a href="Blacklist_p.html" class="MenuItemLink lock">Filter & Blacklists</a></li>
- <li><a href="Vocabulary_p.html" class="MenuItemLink lock">Content Semantic</a></li>
+ <li><a href="Settings_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">System Administration</a></li>
+ <li><a href="IndexControlURLs_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Index Administration</a></li>
+ <li><a href="Blacklist_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Filter & Blacklists</a></li>
+ <li><a href="Vocabulary_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Content Semantic</a></li>
</ul>
<ul class="nav nav-sidebar menugroup">
<li><h3>Search Portal Integration</h3></li>
<li><a href="ConfigPortal.html" class="MenuItemLink">Configuration</a></li>
- <li><a href="ConfigAppearance_p.html" class="MenuItemLink lock">Design</a></li>
- <li><a href="RankingSolr_p.html" class="MenuItemLink lock">Ranking and Heuristics</a></li>
+ <li><a href="ConfigAppearance_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Design</a></li>
+ <li><a href="RankingSolr_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Ranking and Heuristics</a></li>
</ul>
#(/navigation-advanced)#
</div>
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 @@ <div class="SubMenugroup"> <h3>Server Access</h3> <ul class="SubMenu"> - <li><a href="AccessGrid_p.html" class="MenuItemLink lock">Access Grid</a></li> - <li><a href="AccessTracker_p.html?page=0" class="MenuItemLink lock">Incoming Requests Overview</a></li> - <li><a href="AccessTracker_p.html?page=1" class="MenuItemLink lock">Incoming Requests Details</a></li> - <li><a href="Connections_p.html" class="MenuItemLink lock">All Connections</a></li> + <li><a href="AccessGrid_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Access Grid</a></li> + <li><a href="AccessTracker_p.html?page=0" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Incoming Requests Overview</a></li> + <li><a href="AccessTracker_p.html?page=1" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Incoming Requests Details</a></li> + <li><a href="Connections_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">All Connections</a></li> </ul> </div> <div class="SubMenugroup"> <h3>Local Search</h3> <ul class="SubMenu"> - <li><a href="AccessTracker_p.html?page=2" class="MenuItemLink lock">Log</a></li> - <li><a href="AccessTracker_p.html?page=3" class="MenuItemLink lock">Host Tracker</a></li> + <li><a href="AccessTracker_p.html?page=2" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Log</a></li> + <li><a href="AccessTracker_p.html?page=3" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Host Tracker</a></li> </ul> </div> #(navigation-p2p)#:: <div class="SubMenugroup"> <h3>Remote Search</h3> <ul class="SubMenu"> - <li><a href="AccessTracker_p.html?page=4" class="MenuItemLink lock">Log</a></li> - <li><a href="AccessTracker_p.html?page=5" class="MenuItemLink lock">Host Tracker</a></li> + <li><a href="AccessTracker_p.html?page=4" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Log</a></li> + <li><a href="AccessTracker_p.html?page=5" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Host Tracker</a></li> </ul> </div> #(/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 @@ <div class="SubMenu"> <h3>Filter & Blacklists</h3> <ul class="SubMenu"> - <li><a href="Blacklist_p.html" class="MenuItemLink lock">Blacklist Administration</a></li> - <li><a href="BlacklistCleaner_p.html" class="MenuItemLink lock">Blacklist Cleaner</a></li> - <li><a href="BlacklistTest_p.html" class="MenuItemLink lock">Blacklist Test</a></li> - <li><a href="BlacklistImpExp_p.html" class="MenuItemLink lock">Import/Export</a></li> - <li><a href="ContentControl_p.html" class="MenuItemLink lock">Content Control</a></li> + <li><a href="Blacklist_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Blacklist Administration</a></li> + <li><a href="BlacklistCleaner_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Blacklist Cleaner</a></li> + <li><a href="BlacklistTest_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Blacklist Test</a></li> + <li><a href="BlacklistImpExp_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Import/Export</a></li> + <li><a href="ContentControl_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Content Control</a></li> </ul> </div>
\ 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 @@ <div class="SubMenugroup"> <h3>Processes</h3> <ul class="SubMenu"> - <li><a href="Threaddump_p.html" class="MenuItemLink lock">Thread Dump</a></li> - <li><a href="ViewLog_p.html" class="MenuItemLink lock">Server Log</a></li> - <li><a href="PerformanceConcurrency_p.html" class="MenuItemLink lock">Concurrent Indexing</a></li> - <li><a href="PerformanceMemory_p.html" class="MenuItemLink lock">Memory Usage</a></li> - <li><a href="PerformanceSearch_p.html" class="MenuItemLink lock">Search Sequence</a></li> + <li><a href="Threaddump_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Thread Dump</a></li> + <li><a href="ViewLog_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Server Log</a></li> + <li><a href="PerformanceConcurrency_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Concurrent Indexing</a></li> + <li><a href="PerformanceMemory_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Memory Usage</a></li> + <li><a href="PerformanceSearch_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Search Sequence</a></li> </ul> </div> <div class="SubMenugroup"> 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 @@ <div class="SubMenu"> <h3>System Administration</h3> <ul class="SubMenu"> - <li><a href="Settings_p.html" class="MenuItemLink lock">Advanced Settings</a></li> - <li><a href="ConfigNetwork_p.html" class="MenuItemLink lock">Network Configuration</a></li> - <li><a href="ConfigProperties_p.html" class="MenuItemLink lock">Advanced Properties</a></li> + <li><a href="Settings_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Advanced Settings</a></li> + <li><a href="ConfigNetwork_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Network Configuration</a></li> + <li><a href="ConfigProperties_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Advanced Properties</a></li> </ul> </div>
\ 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 @@ <div class="SubMenu">
<h3>Cookie Menu</h3>
<ul class="SubMenu">
- <li><a href="CookieMonitorIncoming_p.html" class="MenuItemLink lock">Incoming Cookies</a></li>
- <li><a href="CookieMonitorOutgoing_p.html" class="MenuItemLink lock">Outgoing Cookies</a></li>
+ <li><a href="CookieMonitorIncoming_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Incoming Cookies</a></li>
+ <li><a href="CookieMonitorOutgoing_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Outgoing Cookies</a></li>
</ul>
</div>
\ 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 @@ <div class="SubMenugroup"> <h3>Processing Monitor</h3> <ul class="SubMenu"> - <li><a href="Crawler_p.html" class="MenuItemLink lock">Crawler</a></li> - <li><a href="IndexCreateLoaderQueue_p.html" class="MenuItemLink lock">Loader</a></li> - <li><a href="IndexCreateParserErrors_p.html" class="MenuItemLink lock">Rejected URLs</a></li> + <li><a href="Crawler_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Crawler</a></li> + <li><a href="IndexCreateLoaderQueue_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Loader</a></li> + <li><a href="IndexCreateParserErrors_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Rejected URLs</a></li> </ul> </div> <div class="SubMenugroup"> <h3>Queues</h3> <ul class="SubMenu"> - <li><a href="IndexCreateQueues_p.html?stack=LOCAL" class="MenuItemLink lock">Local</a></li> - #(navigation-p2p)#::<li><a href="IndexCreateQueues_p.html?stack=GLOBAL" class="MenuItemLink lock">Global</a></li>#(/navigation-p2p)# - #(navigation-p2p)#::<li><a href="IndexCreateQueues_p.html?stack=REMOTE" class="MenuItemLink lock">Remote</a></li>#(/navigation-p2p)# - <li><a href="IndexCreateQueues_p.html?stack=NOLOAD" class="MenuItemLink lock">No-Load</a></li> + <li><a href="IndexCreateQueues_p.html?stack=LOCAL" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Local</a></li> + #(navigation-p2p)#::<li><a href="IndexCreateQueues_p.html?stack=GLOBAL" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Global</a></li>#(/navigation-p2p)# + #(navigation-p2p)#::<li><a href="IndexCreateQueues_p.html?stack=REMOTE" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Remote</a></li>#(/navigation-p2p)# + <li><a href="IndexCreateQueues_p.html?stack=NOLOAD" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">No-Load</a></li> </ul> </div> <div class="SubMenugroup"> <h3>Crawler Steering</h3> <ul class="SubMenu"> - <li><a href="CrawlProfileEditor_p.html" class="MenuItemLink lock">Scheduler and Profile Editor</a></li> - <li><a href="Table_RobotsTxt_p.html" class="MenuItemLink lock">robots.txt Monitor</a></li> + <li><a href="CrawlProfileEditor_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Scheduler and Profile Editor</a></li> + <li><a href="Table_RobotsTxt_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">robots.txt Monitor</a></li> </ul> </div> @@ -39,13 +39,13 @@ <div class="SubMenugroup"> <ul class="SubMenu"> <li><a href="CrawlResults.html" class="MenuItemLink">Overview</a></li> - #(navigation-p2p)#::<li><a href="CrawlResults.html?process=1" class="MenuItemLink lock">(1) Receipts</a></li>#(/navigation-p2p)# - <li><a href="CrawlResults.html?process=2" class="MenuItemLink lock">(2) Queries</a></li> - #(navigation-p2p)#::<li><a href="CrawlResults.html?process=3" class="MenuItemLink lock">(3) DHT Transfer</a></li>#(/navigation-p2p)# - <li><a href="CrawlResults.html?process=4" class="MenuItemLink lock">(4) Proxy Use</a></li> - <li><a href="CrawlResults.html?process=5" class="MenuItemLink lock">(5) Local Crawling</a></li> + #(navigation-p2p)#::<li><a href="CrawlResults.html?process=1" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">(1) Receipts</a></li>#(/navigation-p2p)# + <li><a href="CrawlResults.html?process=2" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">(2) Queries</a></li> + #(navigation-p2p)#::<li><a href="CrawlResults.html?process=3" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">(3) DHT Transfer</a></li>#(/navigation-p2p)# + <li><a href="CrawlResults.html?process=4" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">(4) Proxy Use</a></li> + <li><a href="CrawlResults.html?process=5" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">(5) Local Crawling</a></li> #(navigation-p2p)#::<li><a href="CrawlResults.html?process=6" class="MenuItemLink">(6) Global Crawling</a></li>#(/navigation-p2p)# - <li><a href="CrawlResults.html?process=7" class="MenuItemLink lock">(7) Surrogate Import</a></li> + <li><a href="CrawlResults.html?process=7" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">(7) Surrogate Import</a></li> </ul> </div> </div>
\ 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 @@ <h3>Use Case & Accounts</h3> <ul class="SubMenu"> <li><a href="CrawlStartSite.html" class="MenuItemLink">Site Crawling</a></li> - <li><a href="ConfigParser.html" class="MenuItemLink lock">Parser Configuration</a></li> + <li><a href="ConfigParser.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Parser Configuration</a></li> </ul> </div>
\ 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 @@ <div class="SubMenu"> <h3>Design</h3> <ul class="SubMenu"> - <li><a href="ConfigAppearance_p.html" class="MenuItemLink lock">Appearance</a></li> - <li><a href="ConfigLanguage_p.html" class="MenuItemLink lock">Language</a></li> - <li><a href="ConfigSearchPage_p.html" class="MenuItemLink lock">Search Page Layout</a></li> + <li><a href="ConfigAppearance_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Appearance</a></li> + <li><a href="ConfigLanguage_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Language</a></li> + <li><a href="ConfigSearchPage_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Search Page Layout</a></li> </ul> </div>
\ 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 @@ <div class="SubMenu">
<h3>Index Administration</h3>
<ul class="SubMenu">
- <li><a href="IndexControlURLs_p.html" class="MenuItemLink lock">URL Database Administration</a></li>
- <li><a href="IndexDeletion_p.html" class="MenuItemLink lock">Index Deletion</a></li>
- <li><a href="IndexFederated_p.html" class="MenuItemLink lock">Index Sources & Targets</a></li>
- <li><a href="IndexSchema_p.html" class="MenuItemLink lock">Solr Schema Editor</a></li>
- <li><a href="IndexReIndexMonitor_p.html" class="MenuItemLink lock">Field Re-Indexing</a></li>
- #(navigation-p2p)#::<li><a href="IndexControlRWIs_p.html" class="MenuItemLink lock">Reverse Word Index</a></li>#(/navigation-p2p)#
- <li><a href="ContentAnalysis_p.html" class="MenuItemLink lock">Content Analysis</a></li>
+ <li><a href="IndexControlURLs_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">URL Database Administration</a></li>
+ <li><a href="IndexDeletion_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Index Deletion</a></li>
+ <li><a href="IndexFederated_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Index Sources & Targets</a></li>
+ <li><a href="IndexSchema_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Solr Schema Editor</a></li>
+ <li><a href="IndexReIndexMonitor_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Field Re-Indexing</a></li>
+ #(navigation-p2p)#::<li><a href="IndexControlRWIs_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Reverse Word Index</a></li>#(/navigation-p2p)#
+ <li><a href="ContentAnalysis_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Content Analysis</a></li>
</ul>
</div>
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 @@ <div class="SubMenugroup">
<h3>Network Harvesting</h3>
<ul class="SubMenu">
- <li><a href="CrawlStartScanner_p.html" class="MenuItemLink lock">Network Scanner</a></li>
- <li><a href="RemoteCrawl_p.html" class="MenuItemLink lock">Remote Crawling</a></li>
- <li><a href="ProxyIndexingMonitor_p.html" class="MenuItemLink lock">Scraping Proxy</a></li>
+ <li><a href="CrawlStartScanner_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Network Scanner</a></li>
+ <li><a href="RemoteCrawl_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Remote Crawling</a></li>
+ <li><a href="ProxyIndexingMonitor_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Scraping Proxy</a></li>
</ul>
</div>
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 @@ <div class="SubMenugroup"> <h3>External Datasets</h3> <ul class="SubMenu"> - <li><a href="Load_RSS_p.html" class="MenuItemLink lock">RSS Feed Importer</a></li> - <li><a href="IndexImportOAIPMH_p.html" class="MenuItemLink lock">OAI-PMH Importer</a></li> + <li><a href="Load_RSS_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">RSS Feed Importer</a></li> + <li><a href="IndexImportOAIPMH_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">OAI-PMH Importer</a></li> </ul> </div> <div class="SubMenugroup"> <h3>Database Reader</h3> <ul class="SubMenu"> - <li><a href="ContentIntegrationPHPBB3_p.html" class="MenuItemLink lock">Database Reader for phpBB3 Forums</a></li> - <li><a href="IndexImportMediawiki_p.html" class="MenuItemLink lock">Dump Reader for MediaWiki dumps</a></li> + <li><a href="ContentIntegrationPHPBB3_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Database Reader for phpBB3 Forums</a></li> + <li><a href="IndexImportMediawiki_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Dump Reader for MediaWiki dumps</a></li> </ul> </div> </div>
\ 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 @@ <div class="SubMenu"> <h3>RAM/Disk Usage & Updates</h3> <ul class="SubMenu"> - <li><a href="Performance_p.html" class="MenuItemLink lock">Performance</a></li> - <li><a href="ConfigHTCache_p.html" class="MenuItemLink lock">Web Cache</a></li> - <li><a href="ConfigUpdate_p.html" class="MenuItemLink lock">Download System Update</a></li> + <li><a href="Performance_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Performance</a></li> + <li><a href="ConfigHTCache_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Web Cache</a></li> + <li><a href="ConfigUpdate_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Download System Update</a></li> </ul> </div>
\ 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 @@ <ul class="SubMenu">
<li><a href="ConfigPortal.html" class="MenuItemLink">Generic Search Portal</a></li>
<li><a href="ConfigSearchBox.html" class="MenuItemLink">Search Box Anywhere</a></li>
- <li><a href="ConfigProfile_p.html" class="MenuItemLink lock">User Profile</a></li>
- <li><a href="ConfigRobotsTxt_p.html" class="MenuItemLink lock">Local robots.txt</a></li>
+ <li><a href="ConfigProfile_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">User Profile</a></li>
+ <li><a href="ConfigRobotsTxt_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Local robots.txt</a></li>
</ul>
</div>
\ 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 @@ <div class="SubMenu"> <h3>Publication</h3> <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="repository/" class="MenuItemLink lock">File Hosting</a></li> + <li><a href="Wiki.html?display=1" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Wiki</a></li> + <li><a href="Blog.html?display=1" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Blog</a></li> + <li><a href="repository/" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">File Hosting</a></li> </ul> </div> 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 @@ <div class="SubMenu"> <h3>Ranking and Heuristics</h3> <ul class="SubMenu"> - <li><a href="RankingSolr_p.html" class="MenuItemLink lock">Solr Ranking Config</a></li> - <li><a href="RankingRWI_p.html" class="MenuItemLink lock">RWI Ranking Config</a></li> - <li><a href="ConfigHeuristics_p.html" class="MenuItemLink lock">Heuristics</a></li> + <li><a href="RankingSolr_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Solr Ranking Config</a></li> + <li><a href="RankingRWI_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">RWI Ranking Config</a></li> + <li><a href="ConfigHeuristics_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Heuristics</a></li> </ul> </div>
\ 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 @@ <div class="SubMenugroup"> <h3>Automated Annotation</h3> <ul class="SubMenu"> - <li><a href="Vocabulary_p.html" class="MenuItemLink lock">Auto-Annotation Vocabulary Editor</a></li> - <li><a href="DictionaryLoader_p.html" class="MenuItemLink lock">Knowledge Loader</a></li> + <li><a href="Vocabulary_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Auto-Annotation Vocabulary Editor</a></li> + <li><a href="DictionaryLoader_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Knowledge Loader</a></li> </ul> </div> <div class="SubMenugroup"> <h3>Augmented Content</h3> <ul class="SubMenu"> - <li><a href="AugmentedBrowsing_p.html" class="MenuItemLink lock">Augmented Browsing</a></li> - <li><a href="AugmentedParsing_p.html" class="MenuItemLink lock">Augmented Parsing</a></li> + <li><a href="AugmentedBrowsing_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Augmented Browsing</a></li> + <li><a href="AugmentedParsing_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Augmented Parsing</a></li> </ul> </div> </div>
\ 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 @@ <div class="SubMenu"> <h3>Target Analysis</h3> <ul class="SubMenu"> - <li><a href="Tables_p.html?table=robots&count=100" class="MenuItemLink lock">Robots.txt Database</a></li> - <li><a href="CrawlCheck_p.html" class="MenuItemLink lock">Mass Crawl Check</a></li> + <li><a href="Tables_p.html?table=robots&count=100" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Robots.txt Database</a></li> + <li><a href="CrawlCheck_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Mass Crawl Check</a></li> <li><a href="RegexTest.html" class="MenuItemLink">Regex Test</a></li> </ul> </div> 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 @@ <h3>Use Case & Accounts</h3> <ul class="SubMenu"> <li><a href="ConfigBasic.html" class="MenuItemLink">Basic Configuration</a></li> - <li><a href="ConfigAccounts_p.html" class="MenuItemLink lock">Accounts</a></li> + <li><a href="ConfigAccounts_p.html" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Accounts</a></li> </ul> </div>
\ 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 @@ <h3>Web Visualization</h3> <ul class="SubMenu"> <li><a href="HostBrowser.html?admin=true" class="MenuItemLink">Host Browser</a></li> - <li><a href="WatchWebStructure_p.html?host=auto&depth=3&time=1000" class="MenuItemLink lock">Web Structure</a></li> + <li><a href="WatchWebStructure_p.html?host=auto&depth=3&time=1000" class="MenuItemLink #(authorized)#lock::unlock#(/authorized)#">Web Structure</a></li> <li><a href="Collage.html" class="MenuItemLink">Image Collage</a></li> </ul> </div>
\ 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, ""));
|
