From 92655c7fd96fc5a356631a1924ce8a7faf88215b Mon Sep 17 00:00:00 2001 From: Michael Peter Christen Date: Tue, 18 Mar 2014 13:42:31 +0100 Subject: [PATCH] - added bootstrap css framework - adopted all YaCy administration pages to new framework - created new search page layout (working, but still work in progress) - old skin files are fully appliable! (and looking good) - target is a new style based on bootstrap examples, see /test.html - icons in YaCy may be replaced by glyphicons (to be done) --- htroot/AugmentedBrowsing_p.html | 8 +- htroot/Bookmarks.html | 33 +- htroot/ConfigHeuristics_p.html | 8 +- htroot/ConfigSearchPage_p.html | 14 +- htroot/CrawlCheck_p.html | 2 - htroot/CrawlStartExpert_p.html | 27 +- htroot/CrawlStartScanner_p.html | 4 +- htroot/CrawlStartSite_p.html | 6 +- htroot/Crawler_p.html | 15 +- htroot/HostBrowser.html | 6 + htroot/HostBrowser.java | 10 +- htroot/IndexControlURLs_p.html | 38 +- htroot/IndexCreateQueues_p.html | 9 +- htroot/IndexDeletion_p.html | 8 +- htroot/IndexFederated_p.html | 4 +- htroot/IndexSchema_p.html | 6 +- htroot/Load_RSS_p.html | 6 +- htroot/Network.html | 21 +- htroot/RemoteCrawl_p.html | 8 +- htroot/Status_p.inc | 2 +- htroot/Table_API_p.html | 20 +- htroot/Table_RobotsTxt_p.html | 8 +- htroot/Tables_p.html | 2 +- htroot/ViewFile.html | 13 +- htroot/ViewLog_p.html | 2 +- htroot/ViewProfile.html | 6 + htroot/ViewProfile.java | 10 + htroot/Vocabulary_p.html | 5 +- htroot/WatchWebStructure_p.html | 2 +- htroot/YMarks.html | 5 +- htroot/env/base.css | 39 +- htroot/env/bootstrap-base.css | 88 + htroot/env/bootstrap/css/bootstrap-rtl.css | 7487 +++++++++++++++++ .../env/bootstrap/css/bootstrap-rtl.min.css | 5 + htroot/env/bootstrap/css/bootstrap-theme.css | 407 + .../env/bootstrap/css/bootstrap-theme.css.map | 1 + .../env/bootstrap/css/bootstrap-theme.min.css | 5 + htroot/env/bootstrap/css/bootstrap.css | 6080 +++++++++++++ htroot/env/bootstrap/css/bootstrap.css.map | 1 + htroot/env/bootstrap/css/bootstrap.min.css | 5 + .../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20335 bytes .../fonts/glyphicons-halflings-regular.svg | 229 + .../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41280 bytes .../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23320 bytes htroot/env/bootstrap/js/bootstrap.js | 1974 +++++ htroot/env/bootstrap/js/bootstrap.min.js | 6 + htroot/env/bootstrap/js/docs.min.js | 16 + htroot/env/bootstrap/js/html5shiv.js | 8 + htroot/env/bootstrap/js/respond.min.js | 5 + htroot/env/grafics/external.png | Bin 165 -> 229 bytes htroot/env/templates/footer.template | 6 + htroot/env/templates/header.template | 90 +- htroot/env/templates/metas.template | 24 +- htroot/env/templates/portalinput.template | 25 +- htroot/env/templates/simpleheader.template | 39 +- .../env/templates/submenuIndexCreate.template | 22 +- htroot/index.html | 11 +- htroot/index.java | 2 + htroot/test.html | 243 + htroot/yacyinteractive.html | 21 +- htroot/yacyinteractive.java | 6 +- htroot/yacysearch.html | 85 +- htroot/yacysearch.java | 6 +- htroot/yacysearch_location.html | 4 +- htroot/yacysearchtrailer.html | 103 +- skins/27c3.css | 6 - skins/28c3.css | 6 - skins/generic_pd.css | 6 - skins/pdblue.css | 7 - 69 files changed, 16990 insertions(+), 386 deletions(-) create mode 100644 htroot/env/bootstrap-base.css create mode 100644 htroot/env/bootstrap/css/bootstrap-rtl.css create mode 100644 htroot/env/bootstrap/css/bootstrap-rtl.min.css create mode 100644 htroot/env/bootstrap/css/bootstrap-theme.css create mode 100644 htroot/env/bootstrap/css/bootstrap-theme.css.map create mode 100644 htroot/env/bootstrap/css/bootstrap-theme.min.css create mode 100644 htroot/env/bootstrap/css/bootstrap.css create mode 100644 htroot/env/bootstrap/css/bootstrap.css.map create mode 100644 htroot/env/bootstrap/css/bootstrap.min.css create mode 100644 htroot/env/bootstrap/fonts/glyphicons-halflings-regular.eot create mode 100644 htroot/env/bootstrap/fonts/glyphicons-halflings-regular.svg create mode 100644 htroot/env/bootstrap/fonts/glyphicons-halflings-regular.ttf create mode 100644 htroot/env/bootstrap/fonts/glyphicons-halflings-regular.woff create mode 100644 htroot/env/bootstrap/js/bootstrap.js create mode 100644 htroot/env/bootstrap/js/bootstrap.min.js create mode 100644 htroot/env/bootstrap/js/docs.min.js create mode 100644 htroot/env/bootstrap/js/html5shiv.js create mode 100644 htroot/env/bootstrap/js/respond.min.js create mode 100644 htroot/test.html diff --git a/htroot/AugmentedBrowsing_p.html b/htroot/AugmentedBrowsing_p.html index b830c2027..367418ae7 100644 --- a/htroot/AugmentedBrowsing_p.html +++ b/htroot/AugmentedBrowsing_p.html @@ -18,7 +18,7 @@
-
+
URL proxy:
Enabled

@@ -26,7 +26,7 @@

-
+
Show search results via URL proxy:
Enabled

@@ -34,14 +34,14 @@

-
+
Restrict URL proxy use:


Define client filter. Default: 127.0.0.1,0:0:0:0:0:0:0:1.

-
+
URL substitution:


diff --git a/htroot/Bookmarks.html b/htroot/Bookmarks.html index 10ad2400c..8da791b93 100644 --- a/htroot/Bookmarks.html +++ b/htroot/Bookmarks.html @@ -18,22 +18,7 @@ #(/display)# > -#(display)# -

- -API -The bookmarks list can also be retrieved as RSS feed. This can also be done when you select a specific tag. -Click the API icon to load the RSS from the current selection. -To see a list of all APIs, please visit the API wiki page. -
-:: -#(/display)# - - #%env/templates/header.template%# + #%env/templates/header.template%# +:: +#(/display)# + #(display)#
diff --git a/htroot/ConfigHeuristics_p.html b/htroot/ConfigHeuristics_p.html index 5d127c80b..e14894b3e 100644 --- a/htroot/ConfigHeuristics_p.html +++ b/htroot/ConfigHeuristics_p.html @@ -34,7 +34,7 @@
- + 'site'-operator: instant shallow crawl

When a search is made using a 'site'-operator (like: 'download site:yacy.net') then the host of the site-operator is instantly crawled with a host-restricted depth-1 crawl. @@ -51,13 +51,13 @@ - + search-result: shallow crawl on all displayed search results - + add as global crawl job @@ -75,7 +75,7 @@

- + opensearch load external search result list from active systems below

When using this heuristic, then every search request line is used for a call to listed opensearch systems until enough results to fill the current search page are available. diff --git a/htroot/ConfigSearchPage_p.html b/htroot/ConfigSearchPage_p.html index 3e5906c44..8e65f1c0d 100644 --- a/htroot/ConfigSearchPage_p.html +++ b/htroot/ConfigSearchPage_p.html @@ -122,43 +122,43 @@ $(function() {

-

Protocol Navigator

+

Protocol Facet

-

Filetype Navigator

+

Filetype Facet

-

Domain Navigator

+

Domain Facet

-

Wiki Name Space Navigator

+

Wiki Name Space Facet

-

Language Navigator

+

Language Facet

-

Author Navigator

+

Author Facet

-

Vocabulary Navigator

+

Vocabulary Facet

diff --git a/htroot/CrawlCheck_p.html b/htroot/CrawlCheck_p.html index dd1a51c5e..8424afe6e 100644 --- a/htroot/CrawlCheck_p.html +++ b/htroot/CrawlCheck_p.html @@ -18,8 +18,6 @@ -
- #%env/templates/header.template%# #%env/templates/submenuTargetAnalysis.template%#

Crawl Check

diff --git a/htroot/CrawlStartExpert_p.html b/htroot/CrawlStartExpert_p.html index 3bb9ea316..93848813a 100644 --- a/htroot/CrawlStartExpert_p.html +++ b/htroot/CrawlStartExpert_p.html @@ -200,13 +200,14 @@ + #%env/templates/header.template%# + #%env/templates/submenuIndexCreate.template%# +
API Click on this API button to see a documentation of the POST request parameter for crawl starts.
- - #%env/templates/header.template%# - #%env/templates/submenuIndexCreate.template%# +

Expert Crawl Start

@@ -219,12 +220,10 @@

- - - + Crawl Job

A Crawl Job consist of one or more start point, crawl limitations and document freshness rules.

- + Start Point
One Start URL or a list of URLs:
(must start with http:// https:// ftp:// smb:// file://)
@@ -259,7 +258,7 @@
- + Crawler Filter

These are limitations on the crawl stacker. The filters will be applied before a web page is loaded.

Crawling Depth
@@ -338,7 +337,7 @@
- + Document Filter

These are limitations on index feeder. The filters will be applied after a web page was loaded.

Filter on URLs
@@ -362,7 +361,7 @@
- + Clean-Up before Crawl Start
No Deletion
info @@ -388,7 +387,7 @@
- + Double-Check Rules
No Doubles
info @@ -412,7 +411,7 @@
- + Document Cache
info @@ -439,7 +438,7 @@
#(agentSelect)#::
- + Robot Behaviour
@@ -459,7 +458,7 @@
#(/agentSelect)#
- + Index Administration
Do Local Indexing
diff --git a/htroot/CrawlStartScanner_p.html b/htroot/CrawlStartScanner_p.html index 330385eda..c01c6a6b6 100644 --- a/htroot/CrawlStartScanner_p.html +++ b/htroot/CrawlStartScanner_p.html @@ -36,9 +36,7 @@
- - - + Scan the network
Scan Range
diff --git a/htroot/CrawlStartSite_p.html b/htroot/CrawlStartSite_p.html index 2a8f4b39a..375dc6beb 100644 --- a/htroot/CrawlStartSite_p.html +++ b/htroot/CrawlStartSite_p.html @@ -18,8 +18,6 @@ -
- #%env/templates/header.template%# #%env/templates/submenuIndexCreate.template%#

Site Crawling

@@ -30,9 +28,7 @@

- - - + Site Crawl Start
diff --git a/htroot/Crawler_p.html b/htroot/Crawler_p.html index a82a2c390..c370fcbbd 100644 --- a/htroot/Crawler_p.html +++ b/htroot/Crawler_p.html @@ -12,13 +12,14 @@ +#%env/templates/header.template%# +#%env/templates/submenuCrawlMonitor.template%# +
API Click on this API button to see an XML with information about the crawler status
-#%env/templates/header.template%# -#%env/templates/submenuCrawlMonitor.template%#

Crawler

@@ -161,13 +162,13 @@

#(info)# diff --git a/htroot/HostBrowser.html b/htroot/HostBrowser.html index 81b7b6daa..2ce261f5e 100644 --- a/htroot/HostBrowser.html +++ b/htroot/HostBrowser.html @@ -68,6 +68,12 @@ function updatepage(str) { #%env/templates/embeddedheader.template%# :: #%env/templates/simpleheader.template%# + #(/topmenu)#

Host Browser

Browse the index of #[ucount]# documents. Enter a host or an URL for a file list or view a list of all hosts, only hosts with urls pending in the crawler or only with load errors.

diff --git a/htroot/HostBrowser.java b/htroot/HostBrowser.java index 8e1f21d7e..f7cb97073 100644 --- a/htroot/HostBrowser.java +++ b/htroot/HostBrowser.java @@ -54,6 +54,7 @@ import net.yacy.crawler.retrieval.Request; import net.yacy.kelondro.data.meta.URIMetadataNode; import net.yacy.peers.graphics.WebStructureGraph.StructureEntry; import net.yacy.search.Switchboard; +import net.yacy.search.SwitchboardConstants; import net.yacy.search.index.Fulltext; import net.yacy.search.index.Segment.ReferenceReport; import net.yacy.search.index.Segment.ReferenceReportCache; @@ -96,7 +97,14 @@ public class HostBrowser { } else { // for other respect setting in Search Design Configuration prop.put("topmenu", sb.getConfigBool("publicTopmenu", true) ? 1 : 0); } - + final String promoteSearchPageGreeting = + (env.getConfigBool(SwitchboardConstants.GREETING_NETWORK_NAME, false)) ? + env.getConfig("network.unit.description", "") : + env.getConfig(SwitchboardConstants.GREETING, ""); + prop.put("topmenu_promoteSearchPageGreeting", promoteSearchPageGreeting); + prop.put("topmenu_promoteSearchPageGreeting.homepage", sb.getConfig(SwitchboardConstants.GREETING_HOMEPAGE, "")); + prop.put("topmenu_promoteSearchPageGreeting.smallImage", sb.getConfig(SwitchboardConstants.GREETING_SMALL_IMAGE, "")); + if (!searchAllowed) { prop.put("result", "You are not allowed to use this page. Please ask an administrator for permission."); prop.putNum("ucount", 0); diff --git a/htroot/IndexControlURLs_p.html b/htroot/IndexControlURLs_p.html index d522bd461..d578c4296 100644 --- a/htroot/IndexControlURLs_p.html +++ b/htroot/IndexControlURLs_p.html @@ -62,6 +62,17 @@ function updatepage(str) { #%env/templates/header.template%# #%env/templates/submenuIndexControl.template%# +
+ + API + These document details can be retrieved as XHTML+RDFa + document containg RDF annotations in Dublin Core vocabulary. + The XHTML+RDFa data format is both a XML content format and a HTML display format and is considered as an important Semantic Web content format. + The same content can also be retrieved as pure XML metadata with DC tag name vocabulary. + Click the API icon to see an example call to the search rss API. + To see a list of all APIs, please visit the API wiki page. +
+

URL Database Administration

The local index currently contains #[ucount]# URL references

@@ -89,14 +100,14 @@ function updatepage(str) {
Index Deletion

- #(solr)#::
#(/solr)# - #(rwi)#::
#(/rwi)# - #(citation)#::
#(/citation)# -
-
-
-

+ /> Delete local search index (embedded Solr and old Metadata)
+ #(solr)#:: Delete remote solr index
#(/solr)# + #(rwi)#:: Delete RWI Index (DHT transmission words)
#(/rwi)# + #(citation)#:: Delete Citation Index (linking between URLs)
#(/citation)# + Delete HTTP & FTP Cache
+ Stop Crawler and delete Crawl Queues
+ Delete robots.txt Cache
+ Delete cached snippet-fetching failures during search

@@ -229,16 +240,7 @@ function updatepage(str) { #(genUrlProfile)# ::No entry found for URL-hash #[urlhash]# ::
-
- - API - These document details can be retrieved as XHTML+RDFa - document containg RDF annotations in Dublin Core vocabulary. - The XHTML+RDFa data format is both a XML content format and a HTML display format and is considered as an important Semantic Web content format. - The same content can also be retrieved as pure XML metadata with DC tag name vocabulary. - Click the API icon to see an example call to the search rss API. - To see a list of all APIs, please visit the API wiki page. -
+ diff --git a/htroot/IndexCreateQueues_p.html b/htroot/IndexCreateQueues_p.html index 11c74b1e1..d6032c9cf 100644 --- a/htroot/IndexCreateQueues_p.html +++ b/htroot/IndexCreateQueues_p.html @@ -5,11 +5,6 @@ #%env/templates/metas.template%# - -
-API -Click on this API button to see an XML with information about the crawler latency and other statistics. -
#(embed)# @@ -17,6 +12,10 @@ #%env/templates/submenuCrawlMonitor.template%#

'#[queuename]#' Crawl Queue

::#(/embed)# +
+API +Click on this API button to see an XML with information about the crawler latency and other statistics. +
#(crawler)#

This crawler queue is empty

diff --git a/htroot/IndexDeletion_p.html b/htroot/IndexDeletion_p.html index 2fdcd172e..2dceb9d75 100644 --- a/htroot/IndexDeletion_p.html +++ b/htroot/IndexDeletion_p.html @@ -12,7 +12,7 @@

The search index contains #[doccount]# documents. You can delete them here. Deletions are made concurrently which can cause that recently deleted documents are not yet reflected in the document count.

- + Delete by URL Matching

Delete all documents within a sub-path of the given urls. That means all documents must start with one of the url stubs as given here.

One URL stub, a list of URL stubs
or a regular expression
@@ -33,7 +33,7 @@
- + Delete by Age

Delete all documents which are older than a given time period.

Time Period
@@ -80,7 +80,7 @@
- + Delete Collections

Delete all documents which are inside specific collections.

Not Assigned
@@ -105,7 +105,7 @@
- + Delete by Solr Query

This is the most generic option: select a set of documents using a solr query.

q=
diff --git a/htroot/IndexFederated_p.html b/htroot/IndexFederated_p.html index 0a8233b56..72bb2655e 100644 --- a/htroot/IndexFederated_p.html +++ b/htroot/IndexFederated_p.html @@ -15,9 +15,7 @@
- - - + Solr Search Index Solr stores the main search index. It is the home of two cores, the default 'collection1' core for documents and the 'webgraph' core for a web structure graph. Detailed information about the used Solr fields can be edited in the Schema Editor.
diff --git a/htroot/IndexSchema_p.html b/htroot/IndexSchema_p.html index bc6391d4d..c9b767931 100644 --- a/htroot/IndexSchema_p.html +++ b/htroot/IndexSchema_p.html @@ -5,13 +5,15 @@ #%env/templates/metas.template%# + + #%env/templates/header.template%# + #%env/templates/submenuIndexControl.template%# +
API The solr schema can also be retrieved as xml here. Click the API icon to see the xml. Just copy this xml to solr/conf/schema.xml to configure solr.
- #%env/templates/header.template%# - #%env/templates/submenuIndexControl.template%#

Solr Schema Editor

If you use a custom Solr schema you may enter a different field name in the column 'Custom Solr Field Name' of the YaCy default attribute name

diff --git a/htroot/Load_RSS_p.html b/htroot/Load_RSS_p.html index 2e10448c2..63d9a8284 100644 --- a/htroot/Load_RSS_p.html +++ b/htroot/Load_RSS_p.html @@ -66,7 +66,7 @@ #(showscheduledfeeds)#::
- + List of Scheduled RSS Feed Load Targets @@ -103,7 +103,7 @@ #(shownewfeeds)#::
- + Available RSS Feed List
@@ -131,7 +131,7 @@ #(showitems)#::
- + RSS Feed of #[rss]#
Title
#[title]#
Author
#[author]#
diff --git a/htroot/Network.html b/htroot/Network.html index 64e298b61..d6a101132 100644 --- a/htroot/Network.html +++ b/htroot/Network.html @@ -49,18 +49,6 @@ -
-API - -The information that is presented on this page can also be retrieved as XML -Click the API icon to see the XML. -To see a list of all APIs, please visit the API wiki page. -
- #(menu)# #%env/templates/embeddedheader.template%# :: @@ -78,6 +66,15 @@ To see a list of all APIs, please visit the API +The information that is presented on this page can also be retrieved as XML +Click the API icon to see the XML. +To see a list of all APIs, please visit the API wiki page. + + + #(page)#

YaCy Search Network '#[networkName]#'

:: diff --git a/htroot/RemoteCrawl_p.html b/htroot/RemoteCrawl_p.html index 70e32c903..46bac3f90 100644 --- a/htroot/RemoteCrawl_p.html +++ b/htroot/RemoteCrawl_p.html @@ -12,9 +12,7 @@ Peers offer remote-crawl urls if the flag 'Do Remote Indexing' is switched on when a crawl is started.
- - - + Remote Crawler Configuration
#(disabled)#::
Your peer cannot accept remote crawls because you need senior or principal peer status for that!
#(/disabled)# @@ -35,9 +33,7 @@
- - - + Peers offering remote crawl URLs If the remote crawl option is switched on, then this peer will load URLs from the following remote peers:
diff --git a/htroot/Status_p.inc b/htroot/Status_p.inc index 8001f3985..f11a543ad 100644 --- a/htroot/Status_p.inc +++ b/htroot/Status_p.inc @@ -1,4 +1,4 @@ -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#HeaderHeaderHeaderHeader
1,001Loremipsumdolorsit
1,002ametconsecteturadipiscingelit
1,003IntegernecodioPraesent
1,003liberoSedcursusante
1,004dapibusdiamSednisi
1,005Nullaquissemat
1,006nibhelementumimperdietDuis
1,007sagittisipsumPraesentmauris
1,008Fuscenectellussed
1,009auguesemperportaMauris
1,010massaVestibulumlaciniaarcu
1,011egetnullaClassaptent
1,012tacitisociosquadlitora
1,013torquentperconubianostra
1,014perinceptoshimenaeosCurabitur
1,015sodalesligulainlibero
+
+
+ + + + + + + + diff --git a/htroot/yacyinteractive.html b/htroot/yacyinteractive.html index 9f9b3c2f2..8b3b8004d 100644 --- a/htroot/yacyinteractive.html +++ b/htroot/yacyinteractive.html @@ -33,31 +33,32 @@ #(topmenu)# #%env/templates/embeddedheader.template%# :: +#%env/templates/simpleheader.template%# + +#(/topmenu)# +
This search result can also be retrieved as RSS/opensearch output. The query format is similar to SRU. Click the API icon to see an example call to the search rss API. To see a list of all APIs, please visit the API wiki page.
-#%env/templates/simpleheader.template%# -#(/topmenu)# +
+ +