diff --git a/htroot/Bookmarks.html b/htroot/Bookmarks.html index 4de857e45..122e6b3c1 100644 --- a/htroot/Bookmarks.html +++ b/htroot/Bookmarks.html @@ -2,46 +2,48 @@ YaCy '#[clientname]#': Bookmarks - #%env/templates/metas.template%# + #%env/templates/metas.template%# - #(display)# + #(display)# - - :: + + :: #(/display)# - -#(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%# -
-

Bookmarks

+
+

Bookmarks

#(mode)#

@@ -49,8 +51,8 @@ To see a list of all APIs, please visit the

  • Add Bookmark
  • Import Bookmarks
    • -
  • Bookmarks (XBEL)
    • -
  • Bookmarks (XML)
    • +
  • Bookmarks (XBEL)
    • +
  • Bookmarks (XML)
  • Bookmarks (RSS)

    • @@ -169,8 +171,8 @@ To see a list of all APIs, please visit the @@ -191,16 +193,14 @@ To see a list of all APIs, please visit the - - - -

    +
    + + +

    #{taglist}##[name]# #{/taglist}# @@ -225,8 +225,8 @@ To see a list of all APIs, please visit the Edit / - Delete - / + Delete + / Info

    @@ -246,8 +246,8 @@ To see a list of all APIs, please visit the 100 Bookmarks per page.

    -
    - :: + + :: #(/display)# #%env/templates/footer.template%# diff --git a/htroot/CrawlProfileEditor_p.html b/htroot/CrawlProfileEditor_p.html index 0c83b5688..df04fae36 100644 --- a/htroot/CrawlProfileEditor_p.html +++ b/htroot/CrawlProfileEditor_p.html @@ -15,7 +15,7 @@
    Crawl Profile List - +
    @@ -62,26 +62,26 @@ #{/crawlProfiles}#
    #(remoteIndexing)#no::yes#(/remoteIndexing)# #(terminateButton)#::
    Running
    -
    +
    - +
    #(/terminateButton)# #(deleteButton)#:: Finished -
    +
    - +
    #(/deleteButton)#
    #(existPassiveCrawls)#:: -
    +
    - +
    #(/existPassiveCrawls)#
    diff --git a/htroot/CrawlResults.html b/htroot/CrawlResults.html index 21d28b82e..09c857123 100644 --- a/htroot/CrawlResults.html +++ b/htroot/CrawlResults.html @@ -76,7 +76,7 @@ #(table)#

    The stack is empty.

    :: -

    Statistics about #[domains]# domains in this stack: +

    Statistics about #[domains]# domains in this stack:

    @@ -95,11 +95,11 @@ - + #{/domains}# -
    #[domain]##[domain]# #[count]#

    +

    #(size)# diff --git a/htroot/CrawlStart_p.html b/htroot/CrawlStart_p.html index 3e41b26a1..2bfaff649 100644 --- a/htroot/CrawlStart_p.html +++ b/htroot/CrawlStart_p.html @@ -10,6 +10,11 @@ document.getElementById(key).checked = 'checked'; } + #%env/templates/header.template%# @@ -21,7 +26,7 @@ You can define URLs as start points for Web page crawling and start crawling here. "Crawling" means that YaCy will download the given website, extract all links in it and then download the content behind these links. This is repeated as long as specified under "Crawling Depth".

    -
    + @@ -33,21 +38,21 @@ - + - + @@ -134,7 +136,7 @@ To see a list of all APIs, please visit the +
    Attribut - + - + - + @@ -55,7 +60,7 @@
    ::
    ::
    ::

    - empty + empty
    diff --git a/htroot/Network.html b/htroot/Network.html index 2de247df1..326fb3aa8 100644 --- a/htroot/Network.html +++ b/htroot/Network.html @@ -4,7 +4,7 @@ YaCy '#[clientname]#': YaCy Network #%env/templates/metas.template%# @@ -13,9 +13,11 @@
    - +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. @@ -62,14 +64,14 @@ To see a list of all APIs, please visit the
    		send Message/
    show Profile/
    edit Wiki
         		 Name
         		Info
         		Info
         		 Release/
    SVN
         		 PPM
         		 QPH
         		 Last
    Seen
      < >    		 UTC
    Offset
         		 Location

         		Uptime
      < >    		Uptime
      < >    		 Links
      < >    		 RWIs
      < >    		 URLs for
    Remote
    Crawl
     
    @@ -168,20 +170,20 @@ To see a list of all APIs, please visit the +
    • Indexing Speed: #[gppm]# Pages Per Minute (PPM)
    • Query Frequency: #[gqph]# Queries Per Hour (QPH)
    -
    Branch
    @@ -215,7 +217,7 @@ To see a list of all APIs, please visit the +

    Your Peer:

     
    diff --git a/htroot/Surftips.html b/htroot/Surftips.html index 51e866712..50679d420 100644 --- a/htroot/Surftips.html +++ b/htroot/Surftips.html @@ -38,7 +38,7 @@ :: - Give positive vote + Give positive voteGive negative vote #(/recommend)# @@ -55,9 +55,10 @@

    - ...provided by YaCy peers using public bookmarks, link votes and crawl start points
    + ...provided by YaCy peers using public bookmarks, link votes and crawl start points +

    - +
    - -

    +
    diff --git a/htroot/WatchCrawler_p.html b/htroot/WatchCrawler_p.html index 736957a3c..90024cd98 100644 --- a/htroot/WatchCrawler_p.html +++ b/htroot/WatchCrawler_p.html @@ -12,8 +12,8 @@ #%env/templates/header.template%# #%env/templates/submenuIndexCreate.template%#

    Crawler Queues

    -

    Next update in seconds. empty -

    + +

    Next update in seconds. empty

    @@ -67,8 +67,8 @@
    +
    - @@ -79,8 +79,8 @@ -
    Speed
    + diff --git a/htroot/Wiki.html b/htroot/Wiki.html index fa3125e4d..643381e69 100644 --- a/htroot/Wiki.html +++ b/htroot/Wiki.html @@ -31,11 +31,11 @@ Start Page - Index - Versions - - - - #(access)#::#(/access)# -

    +
    + + #(access)#::#(/access)# +
    :: diff --git a/htroot/compare_yacy.html b/htroot/compare_yacy.html index 008034766..87d0ff38b 100755 --- a/htroot/compare_yacy.html +++ b/htroot/compare_yacy.html @@ -29,7 +29,7 @@ #{/searchengines}#   Query - +

    @@ -38,8 +38,8 @@ ::
    Search Result - - + +
    #(/search)# #%env/templates/footer.template%# diff --git a/htroot/terminal_p.html b/htroot/terminal_p.html index ae02f0382..3441ef5c9 100755 --- a/htroot/terminal_p.html +++ b/htroot/terminal_p.html @@ -9,19 +9,20 @@ @@ -38,7 +40,7 @@ function init() {
    -YaCy     +YaCy     <Search Form>     <Crawl Start>     <Status Page>         @@ -52,17 +54,13 @@ function init() {
    Event Terminal
    - +

    Image Terminal

    - +
    @@ -80,7 +78,7 @@ function init() { width="660" height="400" standby="Loading Processing software..." > - + @@ -99,7 +97,7 @@ function init() { standby="Loading Processing software..." > - + @@ -129,13 +127,13 @@ function init() {

    Resource Monitor

    -PerformanceGraph -WebStructurePicture +PerformanceGraph +WebStructurePicture

    Network Monitor

    -The yacy Network - +The yacy Network +
    diff --git a/htroot/yacy/ui/index.html b/htroot/yacy/ui/index.html index 63aa5aec6..a609d7d5f 100644 --- a/htroot/yacy/ui/index.html +++ b/htroot/yacy/ui/index.html @@ -246,8 +246,8 @@
    -
    - +
    +

    @@ -275,31 +275,31 @@ - +

    This dialog lets you rename (edit) tag names. You can also add a new tag to all bookmarks tagged with old tag.

    -
    - +
    +

    - +

    - +

    This dialog lets you add tags or folders to the selected bookmarks.

    -
    - +
    +
    - +
    diff --git a/htroot/yacyinteractive.html b/htroot/yacyinteractive.html index ecfa6ad24..77755912d 100644 --- a/htroot/yacyinteractive.html +++ b/htroot/yacyinteractive.html @@ -3,7 +3,8 @@ YaCy Interactive Search #%env/templates/metas.template%# - #(display)# #%env/templates/simpleheader.template%# :: -
    +
    API This page uses the JSON search API to display search results as you type. Click the API icon to see an example call to the native API. To see a list of all APIs, please visit the API wiki page. @@ -86,10 +90,10 @@ To see a list of all APIs, please visit the +

    #[promoteSearchPageGreeting]#
    diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html index 4acb84359..33ab560b2 100644 --- a/htroot/yacysearch.html +++ b/htroot/yacysearch.html @@ -19,9 +19,11 @@ ::
    - +API 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. @@ -57,7 +59,7 @@ To see a list of all APIs, please visit the

    #[promoteSearchPageGreeting]#

    -     +
    @@ -133,5 +135,6 @@ var progressbar = new Progressbar(#[results]#, document.getElementById("results" +
    diff --git a/htroot/yacysearchitem.html b/htroot/yacysearchitem.html index a80a886f2..e0094d28d 100644 --- a/htroot/yacysearchitem.html +++ b/htroot/yacysearchitem.html @@ -1,14 +1,14 @@ #(content)#::

    - - #[title]#

    + favicon + #[title]# #(authorized)#::
    bookmark #(recommend)# - - + recommend + delete :: recommend delete @@ -16,14 +16,14 @@
    #(/authorized)#

    #[description]#

    -

    #[urlname]#

    +

    #[urlname]#

    #[date]# | YBR-#[ybr]# | Info | Pictures

    :: #{items}#
    - #[name]# + #[name]#
    #[name]#
    #[sourcedom]#
    #[name]#
    #[attr]#