diff options
| author | Michael Peter Christen <mc@yacy.net> | 2014-03-31 15:47:58 +0200 |
|---|---|---|
| committer | Michael Peter Christen <mc@yacy.net> | 2014-03-31 15:47:58 +0200 |
| commit | 701df02ead37cbc6047cdc221eb1f128fd0373f7 (patch) | |
| tree | 2a16674dba6df519a42e6d605790b240fe5478f3 /htroot | |
| parent | a3b7366aeed1b233646948584d70d245cde42141 (diff) | |
Complete redesign of administration top-level menu. This follows two
principles:
- provide an easy tutorial-like "what should I do first" menu
- provide all elements which are subject to most first questions to YaCy
exibition people on top level: Resource limitation, Parser and Ranking
settings
I apologize to everyone who are used to the old style and need to find
the menu items (again) after this change. I hope that this will make the
interface more usable for new users who see a web indexer/crawler the
first time.
Diffstat (limited to 'htroot')
23 files changed, 75 insertions, 68 deletions
diff --git a/htroot/ConfigAccounts_p.html b/htroot/ConfigAccounts_p.html index 92663a399..edcc19b56 100644 --- a/htroot/ConfigAccounts_p.html +++ b/htroot/ConfigAccounts_p.html @@ -6,7 +6,7 @@ </head> <body> #%env/templates/header.template%#
- #%env/templates/submenuConfig.template%# + #%env/templates/submenuUseCaseAccount.template%# <h2>User Administration</h2>
<!-- Page 1: Results -->
diff --git a/htroot/ConfigBasic.html b/htroot/ConfigBasic.html index 49c98877d..f56353e13 100644 --- a/htroot/ConfigBasic.html +++ b/htroot/ConfigBasic.html @@ -19,7 +19,7 @@ </head> <body id="ConfigBasic"> #%env/templates/header.template%# - #%env/templates/submenuConfig.template%# + #%env/templates/submenuUseCaseAccount.template%# <h2>Basic Configuration</h2> #(reconnect)#:: <p><strong>Your port has changed. Please wait 10 seconds.</strong></p> diff --git a/htroot/ConfigHTCache_p.html b/htroot/ConfigHTCache_p.html index 46f78f050..5ab2f1c3a 100644 --- a/htroot/ConfigHTCache_p.html +++ b/htroot/ConfigHTCache_p.html @@ -6,7 +6,7 @@ </head> <body id="ConfigHTCache"> #%env/templates/header.template%# - #%env/templates/submenuIndexControl.template%# + #%env/templates/submenuMaintenance.template%# <h2>Hypertext Cache Configuration</h2> <p> The HTCache stores content retrieved by the HTTP and FTP protocol. Documents from smb:// and file:// locations are not cached. diff --git a/htroot/ConfigParser.html b/htroot/ConfigParser.html index e14d67b17..21811663e 100644 --- a/htroot/ConfigParser.html +++ b/htroot/ConfigParser.html @@ -16,7 +16,7 @@ </head> <body id="Settings"> #%env/templates/header.template%# - #%env/templates/submenuIndexControl.template%# + #%env/templates/submenuCrawler.template%# <h2>Parser Configuration</h2> <form id="parsersettings" action="ConfigParser.html" method="post" enctype="multipart/form-data"> <fieldset><legend id="parser">Content Parser Settings</legend> diff --git a/htroot/ConfigRobotsTxt_p.html b/htroot/ConfigRobotsTxt_p.html index 2f0853abf..2b59f2e14 100644 --- a/htroot/ConfigRobotsTxt_p.html +++ b/htroot/ConfigRobotsTxt_p.html @@ -6,7 +6,7 @@ </head> <body id="ConfigRobotsTxt"> #%env/templates/header.template%# - #%env/templates/submenuConfig.template%# + #%env/templates/submenuPortalConfiguration.template%# <h2>Exclude Web-Spiders</h2> <p> Here you can set up a robots.txt for all webcrawlers that try to access the webinterface of your peer. diff --git a/htroot/ConfigUpdate_p.html b/htroot/ConfigUpdate_p.html index 87ed04795..fe5758c23 100644 --- a/htroot/ConfigUpdate_p.html +++ b/htroot/ConfigUpdate_p.html @@ -7,7 +7,7 @@ </head> <body style="margin:0px;"> #%env/templates/header.template%# - #%env/templates/submenuConfig.template%# + #%env/templates/submenuMaintenance.template%# <h2>System Update</h2> #(deploys)#::Release will be installed. Please wait.#(/deploys)# diff --git a/htroot/ContentIntegrationPHPBB3_p.html b/htroot/ContentIntegrationPHPBB3_p.html index 4eeb7e718..dfe74937c 100644 --- a/htroot/ContentIntegrationPHPBB3_p.html +++ b/htroot/ContentIntegrationPHPBB3_p.html @@ -6,7 +6,7 @@ </head>
<body id="ContentIntegrationPHPBB3">
#%env/templates/header.template%#
- #%env/templates/submenuIndexCreate.template%#
+ #%env/templates/submenuIndexImport.template%#
<h2>Content Integration: Retrieval from phpBB3 Databases</h2>
<p>
It is possible to extract texts directly from mySQL and postgreSQL databases.
diff --git a/htroot/CrawlStartSite_p.html b/htroot/CrawlStartSite_p.html index a9f47b7cc..3142a51d8 100644 --- a/htroot/CrawlStartSite_p.html +++ b/htroot/CrawlStartSite_p.html @@ -19,7 +19,7 @@ <body id="IndexCreate">
#%env/templates/header.template%#
- #%env/templates/submenuIndexCreate.template%#
+ #%env/templates/submenuCrawler.template%#
<h2>Site Crawling</h2>
<p id="startCrawling">
diff --git a/htroot/IndexImportMediawiki_p.html b/htroot/IndexImportMediawiki_p.html index b084bf7f6..f106e278d 100644 --- a/htroot/IndexImportMediawiki_p.html +++ b/htroot/IndexImportMediawiki_p.html @@ -7,7 +7,7 @@ </head> <body id="IndexImportMediawiki"> #%env/templates/header.template%# - #%env/templates/submenuIndexCreate.template%# + #%env/templates/submenuIndexImport.template%# <h2>MediaWiki Dump Import</h2> #(import)# diff --git a/htroot/IndexImportOAIPMH_p.html b/htroot/IndexImportOAIPMH_p.html index c5fb963f4..757645fe6 100644 --- a/htroot/IndexImportOAIPMH_p.html +++ b/htroot/IndexImportOAIPMH_p.html @@ -8,7 +8,7 @@ </head>
<body id="IndexImportOAIPMH">
#%env/templates/header.template%#
- #%env/templates/submenuIndexCreate.template%#
+ #%env/templates/submenuIndexImport.template%#
<h2>OAI-PMH Import</h2>
<p>Results from the import can be monitored in the <a href="CrawlResults.html?process=7">indexing results for surrogates</a></p>
diff --git a/htroot/Load_RSS_p.html b/htroot/Load_RSS_p.html index 55defa87c..e207630a4 100644 --- a/htroot/Load_RSS_p.html +++ b/htroot/Load_RSS_p.html @@ -19,7 +19,7 @@ </head> <body id="IndexCreate"> #%env/templates/header.template%# - #%env/templates/submenuIndexCreate.template%# + #%env/templates/submenuIndexImport.template%# <h2>Loading of RSS Feeds</h2> <p> RSS feeds can be loaded into the YaCy search index. diff --git a/htroot/Performance_p.html b/htroot/Performance_p.html index d0473782a..68980fa3f 100644 --- a/htroot/Performance_p.html +++ b/htroot/Performance_p.html @@ -15,7 +15,7 @@ window.setInterval("reloadGraph()", 1000);
//--></script>
#%env/templates/header.template%#
- #%env/templates/submenuConfig.template%#
+ #%env/templates/submenuMaintenance.template%#
<h2>Performance Settings</h2>
<p><img src="PerformanceGraph.png?nopeers=" id="graph" alt="PerformanceGraph" width="660" height="240"/></p>
diff --git a/htroot/Status.html b/htroot/Status.html index d66cbd88a..18a14e694 100644 --- a/htroot/Status.html +++ b/htroot/Status.html @@ -27,7 +27,7 @@ </head>
<body onload="init();">
#%env/templates/header.template%#
- #%env/templates/submenuConfig.template%#
+ #%env/templates/submenuComputation.template%#
<a href="https://gitorious.org/yacy/rc1" target="_blank" class="forceNoExternalIcon"><img src="env/grafics/forkme.png" style="position:absolute;top:0px;right:0px;z-index: 100;"/></a>
#(showPrivateTable)#
diff --git a/htroot/Threaddump_p.html b/htroot/Threaddump_p.html index 9f05579ad..80e75ba49 100644 --- a/htroot/Threaddump_p.html +++ b/htroot/Threaddump_p.html @@ -7,7 +7,7 @@ </head>
<body id="Threaddump">
#%env/templates/header.template%# - #%env/templates/submenuConfig.template%#
+ #%env/templates/submenuComputation.template%#
<h2>Threaddump</h2>
<table border="0" cellpadding="0" cellspacing="0"><tr>
<td><form action="Threaddump_p.html" method="get" accept-charset="UTF-8">
diff --git a/htroot/env/templates/SubmenuMaintenance.template b/htroot/env/templates/SubmenuMaintenance.template new file mode 100644 index 000000000..df7813161 --- /dev/null +++ b/htroot/env/templates/SubmenuMaintenance.template @@ -0,0 +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> + </ul> +</div>
\ No newline at end of file diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index ca0712237..b9d8ad68b 100644 --- a/htroot/env/templates/header.template +++ b/htroot/env/templates/header.template @@ -66,35 +66,42 @@ <div class="col-sm-3 col-md-2 sidebar">
<ul class="nav nav-sidebar menugroup">
- <li><h3>Peer Control</h3></li>
- <li><a href="Status.html?noforward=" class="MenuItemLink">Admin Console</a></li>
- </ul>
-
- <ul class="nav nav-sidebar menugroup">
- <li><h3>Index Production</h3></li>
- <li><a href="CrawlStartSite_p.html" class="MenuItemLink lock">Crawler / Harvester</a></li>
- <li><a href="Crawler_p.html" class="MenuItemLink lock">Crawler Monitor</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="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><h3>First Steps</h3></li>
+ <li><a href="ConfigBasic.html" class="MenuItemLink">Use Case & Account</a></li>
+ <li><a href="CrawlStartSite_p.html" class="MenuItemLink lock">Load Web Pages (Crawler)</a></li>
+ <li><a href="Performance_p.html" class="MenuItemLink lock">RAM/Disk Usage & Updates</a></li>
</ul>
<ul class="nav nav-sidebar menugroup">
<li><h3>Monitoring</h3></li>
- <li><a href="Network.html" accesskey="w" class="MenuItemLink">YaCy Network</a></li>
+ <li><a href="Status.html" class="MenuItemLink">System Status</a></li>
+ <li><a href="Network.html" accesskey="w" class="MenuItemLink">YaCy Peer-to-Peer Network</a></li>
+ <li><a href="Crawler_p.html" class="MenuItemLink lock">Crawler Monitor</a></li>
<li><a href="WatchWebStructure_p.html?host=auto&depth=3&time=1000" class="MenuItemLink lock">Web Visualization</a></li>
<li><a href="AccessGrid_p.html" class="MenuItemLink lock">Network Access</a></li>
- <li><a href="ViewLog_p.html" class="MenuItemLink lock">Computation</a></li>
<!-- <li><a href="terminal_p.html" accesskey="t" class="MenuItemLink lock">Terminal</a></li> -->
</ul>
<ul class="nav nav-sidebar menugroup">
- <li><h3>Search Integration</h3></li>
- <li><a href="ConfigSearchBox.html" class="MenuItemLink">Portal Configuration</a></li>
- <li><a href="ConfigAppearance_p.html" class="MenuItemLink">Design</a></li>
- <li><a href="RankingSolr_p.html" class="MenuItemLink">Ranking and Heuristics</a></li>
+ <li><h3>Production</h3></li>
+ <li><a href="CrawlStartExpert_p.html" class="MenuItemLink lock">Advanced Crawler</a></li>
+ <li><a href="Load_RSS_p.html" class="MenuItemLink lock">Content Importer</a></li>
+ <li><a href="Table_API_p.html" class="MenuItemLink lock">Process Scheduler</a></li>
+ <li><a href="Tables_p.html?table=robots&count=100" class="MenuItemLink lock">Target Analysis</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>
+ </ul>
+ <ul class="nav nav-sidebar menugroup">
+ <li><h3>Search Portal Integration</h3></li>
+ <li><a href="ConfigSearchBox.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>
</ul>
</div>
diff --git a/htroot/env/templates/submenuComputation.template b/htroot/env/templates/submenuComputation.template index 269f3c8a4..e0d11215c 100644 --- a/htroot/env/templates/submenuComputation.template +++ b/htroot/env/templates/submenuComputation.template @@ -1,10 +1,17 @@ <div class="SubMenu"> - <h3>Computation Monitor</h3> + <h3>Application Status</h3> </div> <div class="SubMenu"> <div class="SubMenugroup"> + <h3>System</h3> + <ul class="SubMenu"> + <li><a href="Status.html" class="MenuItemLink">Status</a></li> + </ul> + </div> + <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> diff --git a/htroot/env/templates/submenuConfig.template b/htroot/env/templates/submenuConfig.template index d7b80205c..8121c086d 100644 --- a/htroot/env/templates/submenuConfig.template +++ b/htroot/env/templates/submenuConfig.template @@ -1,19 +1,8 @@ <div class="SubMenu"> - <h3>Peer Administration Console</h3> + <h3>System Administration</h3> <ul class="SubMenu"> - <li><a href="Status.html" class="MenuItemLink">Status</a></li> - <li><a href="ConfigBasic.html" class="MenuItemLink lock">Basic Configuration</a></li> - <li><a href="ConfigAccounts_p.html" class="MenuItemLink lock">Accounts</a></li> - <li><a href="ConfigNetwork_p.html" class="MenuItemLink lock">Network Configuration</a></li> - <li><a href="ConfigUpdate_p.html" class="MenuItemLink lock">Download System Update</a></li> - </ul> -</div> -<div class="SubMenu"> - <ul class="SubMenu"> - <li><a href="Performance_p.html" class="MenuItemLink lock">Performance</a></li> <li><a href="Settings_p.html" class="MenuItemLink lock">Advanced Settings</a></li> - <li><a href="ConfigRobotsTxt_p.html" class="MenuItemLink lock">Local robots.txt</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="Threaddump_p.html" class="MenuItemLink lock">Thread Dump</a></li> </ul> </div>
\ No newline at end of file diff --git a/htroot/env/templates/submenuCrawler.template b/htroot/env/templates/submenuCrawler.template new file mode 100644 index 000000000..4a36952b2 --- /dev/null +++ b/htroot/env/templates/submenuCrawler.template @@ -0,0 +1,7 @@ +<div class="SubMenu"> + <h3>Use Case & Accounts</h3> + <ul class="SubMenu"> + <li><a href="CrawlStartSite_p.html" class="MenuItemLink lock">Site Crawling</a></li> + <li><a href="ConfigParser.html" class="MenuItemLink lock">Parser Configuration</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 01fd86e41..c0d9782a2 100644 --- a/htroot/env/templates/submenuIndexControl.template +++ b/htroot/env/templates/submenuIndexControl.template @@ -7,9 +7,6 @@ <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>
#(p2p)#::<li><a href="IndexControlRWIs_p.html" class="MenuItemLink lock">Reverse Word Index</a></li>#(/p2p)#
- <!--<li><a href="IndexControlCleaner_p.html" class="MenuItemLink lock">Index Cleaner</a></li>-->
- <!--<li><a href="ContentAnalysis_p.html" class="MenuItemLink lock">Content Analysis</a></li>-->
- <li><a href="ConfigHTCache_p.html" class="MenuItemLink lock">Web Cache</a></li>
- <li><a href="ConfigParser.html" class="MenuItemLink lock">Parser Configuration</a></li>
+ <li><a href="ContentAnalysis_p.html" class="MenuItemLink lock">Content Analysis</a></li>
</ul>
</div>
diff --git a/htroot/env/templates/submenuIndexCreate.template b/htroot/env/templates/submenuIndexCreate.template index eccc1157f..e9217f7bf 100644 --- a/htroot/env/templates/submenuIndexCreate.template +++ b/htroot/env/templates/submenuIndexCreate.template @@ -1,11 +1,10 @@ <div class="SubMenu">
- <h3>Index Creation</h3>
+ <h3>Advanced Crawler</h3>
</div>
<div class="SubMenu">
<div class="SubMenugroup">
<h3>Crawler/Spider</h3>
<ul class="SubMenu">
- <li><a href="CrawlStartSite_p.html" class="MenuItemLink lock">Full Site Crawl/ Sitemap Loader</a></li>
<li><a href="CrawlStartExpert_p.html" class="MenuItemLink lock">Crawl Start (Expert)</a></li>
<li><a href="CrawlStartScanner_p.html" class="MenuItemLink lock">Network Scanner</a></li>
<li><a href="Load_MediawikiWiki.html" class="MenuItemLink">Crawling of MediaWikis</a></li>
@@ -14,14 +13,6 @@ </div>
<div class="SubMenugroup">
- <h3>Content Import</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>
- </ul>
- </div>
-
- <div class="SubMenugroup">
<h3>Network Harvesting</h3>
<ul class="SubMenu">
<li><a href="RemoteCrawl_p.html" class="MenuItemLink lock">Remote Crawling</a></li>
@@ -29,11 +20,4 @@ </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>
- </ul>
- </div>
</div>
\ No newline at end of file diff --git a/htroot/env/templates/submenuPortalConfiguration.template b/htroot/env/templates/submenuPortalConfiguration.template index eac339c21..b582406c9 100644 --- a/htroot/env/templates/submenuPortalConfiguration.template +++ b/htroot/env/templates/submenuPortalConfiguration.template @@ -4,5 +4,6 @@ <li><a href="ConfigSearchBox.html" class="MenuItemLink">Search Box Anywhere</a></li>
<li><a href="ConfigPortal.html" class="MenuItemLink">Generic Search Portal</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>
</ul>
</div>
\ No newline at end of file diff --git a/htroot/env/templates/submenuUseCaseAccount.template b/htroot/env/templates/submenuUseCaseAccount.template new file mode 100644 index 000000000..89107e815 --- /dev/null +++ b/htroot/env/templates/submenuUseCaseAccount.template @@ -0,0 +1,7 @@ +<div class="SubMenu"> + <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> + </ul> +</div>
\ No newline at end of file |