From 701df02ead37cbc6047cdc221eb1f128fd0373f7 Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Mon, 31 Mar 2014 15:47:58 +0200 Subject: [PATCH] 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. --- htroot/ConfigAccounts_p.html | 2 +- htroot/ConfigBasic.html | 2 +- htroot/ConfigHTCache_p.html | 2 +- htroot/ConfigParser.html | 2 +- htroot/ConfigRobotsTxt_p.html | 2 +- htroot/ConfigUpdate_p.html | 2 +- htroot/ContentIntegrationPHPBB3_p.html | 2 +- htroot/CrawlStartSite_p.html | 2 +- htroot/IndexImportMediawiki_p.html | 2 +- htroot/IndexImportOAIPMH_p.html | 2 +- htroot/Load_RSS_p.html | 2 +- htroot/Performance_p.html | 2 +- htroot/Status.html | 2 +- htroot/Threaddump_p.html | 2 +- .../env/templates/SubmenuMaintenance.template | 8 ++++ htroot/env/templates/header.template | 45 +++++++++++-------- .../env/templates/submenuComputation.template | 9 +++- htroot/env/templates/submenuConfig.template | 15 +------ htroot/env/templates/submenuCrawler.template | 7 +++ .../templates/submenuIndexControl.template | 5 +-- .../env/templates/submenuIndexCreate.template | 18 +------- .../submenuPortalConfiguration.template | 1 + .../templates/submenuUseCaseAccount.template | 7 +++ 23 files changed, 75 insertions(+), 68 deletions(-) create mode 100644 htroot/env/templates/SubmenuMaintenance.template create mode 100644 htroot/env/templates/submenuCrawler.template create mode 100644 htroot/env/templates/submenuUseCaseAccount.template 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 @@ #%env/templates/header.template%# - #%env/templates/submenuConfig.template%# + #%env/templates/submenuUseCaseAccount.template%#

User Administration

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 @@ #%env/templates/header.template%# - #%env/templates/submenuConfig.template%# + #%env/templates/submenuUseCaseAccount.template%#

Basic Configuration

#(reconnect)#::

Your port has changed. Please wait 10 seconds.

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 @@ #%env/templates/header.template%# - #%env/templates/submenuIndexControl.template%# + #%env/templates/submenuMaintenance.template%#

Hypertext Cache Configuration

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 @@ #%env/templates/header.template%# - #%env/templates/submenuIndexControl.template%# + #%env/templates/submenuCrawler.template%#

Parser Configuration

Content Parser Settings 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 @@ #%env/templates/header.template%# - #%env/templates/submenuConfig.template%# + #%env/templates/submenuPortalConfiguration.template%#

Exclude Web-Spiders

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 @@ #%env/templates/header.template%# - #%env/templates/submenuConfig.template%# + #%env/templates/submenuMaintenance.template%#

System Update

#(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 @@ #%env/templates/header.template%# - #%env/templates/submenuIndexCreate.template%# + #%env/templates/submenuIndexImport.template%#

Content Integration: Retrieval from phpBB3 Databases

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 @@ #%env/templates/header.template%# - #%env/templates/submenuIndexCreate.template%# + #%env/templates/submenuCrawler.template%#

Site Crawling

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 @@ #%env/templates/header.template%# - #%env/templates/submenuIndexCreate.template%# + #%env/templates/submenuIndexImport.template%#

MediaWiki Dump Import

#(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 @@ #%env/templates/header.template%# - #%env/templates/submenuIndexCreate.template%# + #%env/templates/submenuIndexImport.template%#

OAI-PMH Import

Results from the import can be monitored in the indexing results for surrogates

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 @@ #%env/templates/header.template%# - #%env/templates/submenuIndexCreate.template%# + #%env/templates/submenuIndexImport.template%#

Loading of RSS Feeds

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); //--> #%env/templates/header.template%# - #%env/templates/submenuConfig.template%# + #%env/templates/submenuMaintenance.template%#

Performance Settings

PerformanceGraph

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 @@ #%env/templates/header.template%# - #%env/templates/submenuConfig.template%# + #%env/templates/submenuComputation.template%# #(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 @@ #%env/templates/header.template%# - #%env/templates/submenuConfig.template%# + #%env/templates/submenuComputation.template%#

Threaddump

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 @@ +
+

RAM/Disk Usage & Updates

+ +
\ 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 @@
- - + + +
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 @@
-

Computation Monitor

+

Application Status

+
+

System

+ +

Processes

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 @@
-

Index Creation

+

Advanced Crawler

Crawler/Spider

-
-

Content Import

- -
-

Network Harvesting

    @@ -29,11 +20,4 @@
-
-

Database Reader

- -
\ 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 @@
  • Search Box Anywhere
  • Generic Search Portal
  • User Profile
    • +
  • Local robots.txt
    • \ 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 @@ +
    +

    Use Case & Accounts

    + +
    \ No newline at end of file