diff options
| author | Michael Peter Christen <mc@yacy.net> | 2014-03-31 03:18:38 +0200 |
|---|---|---|
| committer | Michael Peter Christen <mc@yacy.net> | 2014-03-31 03:18:38 +0200 |
| commit | 6b66bb7109aab2b07feb3db24f1f4fee695157fe (patch) | |
| tree | 27232c9a149e9f64a9e60fa2b1327241dcb363fd /htroot | |
| parent | 656e2ce62ac0667e700dab8cb12fbe476ce2c7b7 (diff) | |
redesign of search page integration menu structure
Diffstat (limited to 'htroot')
| -rw-r--r-- | htroot/ConfigAppearance_p.html | 2 | ||||
| -rw-r--r-- | htroot/ConfigHeuristics_p.html | 2 | ||||
| -rw-r--r-- | htroot/ConfigLanguage_p.html | 2 | ||||
| -rw-r--r-- | htroot/ConfigLiveSearch.html | 134 | ||||
| -rw-r--r-- | htroot/ConfigLiveSearch.java | 44 | ||||
| -rw-r--r-- | htroot/ConfigPortal.html | 2 | ||||
| -rw-r--r-- | htroot/ConfigProfile_p.html | 2 | ||||
| -rw-r--r-- | htroot/ConfigSearchBox.html | 6 | ||||
| -rw-r--r-- | htroot/ConfigSearchPage_p.html | 4 | ||||
| -rw-r--r-- | htroot/RankingRWI_p.html | 2 | ||||
| -rw-r--r-- | htroot/RankingSolr_p.html | 2 | ||||
| -rw-r--r-- | htroot/env/templates/header.template | 7 | ||||
| -rw-r--r-- | htroot/env/templates/submenuDesign.template | 8 | ||||
| -rw-r--r-- | htroot/env/templates/submenuPortalConfiguration.template | 8 | ||||
| -rw-r--r-- | htroot/env/templates/submenuRanking.template | 8 | ||||
| -rw-r--r-- | htroot/env/templates/submenuSearchConfiguration.template | 13 | ||||
| -rw-r--r-- | htroot/env/templates/submenuSearchIntegration.template | 7 |
17 files changed, 40 insertions, 213 deletions
diff --git a/htroot/ConfigAppearance_p.html b/htroot/ConfigAppearance_p.html index 0577bfbec..c61a27c5f 100644 --- a/htroot/ConfigAppearance_p.html +++ b/htroot/ConfigAppearance_p.html @@ -7,7 +7,7 @@ </head>
<body id="ConfigSkins">
#%env/templates/header.template%#
- #%env/templates/submenuSearchConfiguration.template%#
+ #%env/templates/submenuDesign.template%#
<script type="text/javascript" src="yacy/ui/js/jquery.colorpicker.js"></script>
<script type="text/javascript">
diff --git a/htroot/ConfigHeuristics_p.html b/htroot/ConfigHeuristics_p.html index b52afd206..28e6299d0 100644 --- a/htroot/ConfigHeuristics_p.html +++ b/htroot/ConfigHeuristics_p.html @@ -6,7 +6,7 @@ </head> <body id="ConfigNetwork"> #%env/templates/header.template%# - #%env/templates/submenuSearchConfiguration.template%# + #%env/templates/submenuRanking.template%# <h2>Heuristics Configuration</h2> <p> A <a href="http://en.wikipedia.org/wiki/Heuristic" target="_blank">heuristic</a> is an 'experience-based technique that help in problem solving, learning and discovery' (wikipedia). The search heuristics that can be switched on here are techniques that help the discovery of possible search results based on link guessing, in-search crawling and requests to other search engines. diff --git a/htroot/ConfigLanguage_p.html b/htroot/ConfigLanguage_p.html index 3f0ee0c3d..9a2b27f53 100644 --- a/htroot/ConfigLanguage_p.html +++ b/htroot/ConfigLanguage_p.html @@ -6,7 +6,7 @@ </head>
<body id="ConfigLanguage">
#%env/templates/header.template%#
- #%env/templates/submenuSearchConfiguration.template%#
+ #%env/templates/submenuDesign.template%#
<h2>Language selection</h2>
<p>
You can change the language of the YaCy-webinterface with translation files.
diff --git a/htroot/ConfigLiveSearch.html b/htroot/ConfigLiveSearch.html deleted file mode 100644 index a618b53a5..000000000 --- a/htroot/ConfigLiveSearch.html +++ /dev/null @@ -1,134 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd">
-<!-- This page is only XHTML 1.0 Transitional and not Strict because the target attribute for a links are being used -->
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>YaCy '#[clientname]#': Integration of a Search Field for Live Search</title>
- #%env/templates/metas.template%#
- </head>
- <body id="ConfigSkins">
- #%env/templates/header.template%#
- #%env/templates/submenuSearchIntegration.template%#
- <h2>Integration of Live Search with YaCy Search Widget</h2>
- <p>
- A 'Live-Search' input field that reacts as search-as-you-type in a pop-up window can easily be integrated in any web page.
- This is the same function as can be seen on all pages of the YaCy online-interface (look at the window in the upper right corner).
- </p>
- <p>
- There are basically two methods for integrating the YaCy Search Widget with your web site.
- <ol>
- <li>Static hosting of widget on own HTTP server</li>
- <li>Remote access through selected YaCy Peer</li>
- </ol>
- </p>
-
-<h4>Static hosting of widget on own HTTP server</h4>
-Advantages:
-<ul>
-<li>faster connection speed</li>
-<li>possibility for local adaptions</li>
-</ul>
-Disadvantages:
-<ul>
-<li>No automatic update to future releases of YaCy Search Widget</li>
-<li>Ajax/JSONP cross domain requests needed to query remote YaCy Peer</li>
-</ul>
-Installing:
-<ul>
-<li>download yacy-portalsearch.tar.gz from <a href="http://yacy.net/" target="_blank">http://yacy.net</a> </li>
-<li>unpack within your HTTP servers path</li>
-<li>use ./yacy/portalsearch/yacy-portalsearch.html as reference for integration with your own portal page</li>
-</ul>
-<h4>Remote access through selected YaCy Peer</h4>
-Advantages:
-<ul>
-<li>Always latest version of YaCy Search Widget</li>
-<li>No Ajax/JSONP cross domain requests, as Search Widget and YaCy Peer are hosted on the same domain.</li>
-</ul>
-Disadvantages:
-<ul>
-<li>Under certain cirumstances slower than static hosting</li>
-</ul>
-Installing:
-<ul>
-<li>Just use the code snippet below and paste it any place in your own portal page</li>
-<li>Please check if '#[ip]#:#[port]#' is appropriate or replace it with address of the YaCy Peer holding your index</li>
-</ul>
-
-<pre>
-<script src="http://#[ip]#:#[port]#/jquery/js/jquery-1.7.min.js" type="text/javascript" type="text/javascript"></script>
-<script>
- $(document).ready(function() {
- yconf = {
- url : 'http://#[ip]#:#[port]#',
- title : 'YaCy Search Widget',
- logo : '/yacy/ui/img/yacy-logo.png',
- link : 'http://www.yacy.net',
- global : false,
- width : 500,
- height : 600,
- position : ['top',30],
- theme : 'start'
- };
- $.getScript(yconf.url+'/portalsearch/yacy-portalsearch.js', function(){});
- });
-</script>
-<div id="yacylivesearch">
- <form id="ysearch" method="get" accept-charset="UTF-8" action="http://#[ip]#:#[port]#/yacysearch.html">
- Live Search <input name="query" id="yquery" class="fancy" type="text" size="15" maxlength="80" value=""/>
- <input type="hidden" name="verify" value="cacheonly" />
- <input type="hidden" name="maximumRecords" value="20" />
- <input type="hidden" name="resource" value="local" />
- <input type="hidden" name="urlmaskfilter" value=".*" />
- <input type="hidden" name="prefermaskfilter" value="" />
- <input type="hidden" name="display" value="2" />
- <input type="hidden" name="nav" value="all" />
- <input type="submit" name="Enter" value="Search" />
- </form>
-</div>
-</pre>
-<h4>Configuration options and defaults for 'yconf':</h4>
-<h5>Defaults</h5>
-<form action=""><dl>
-<dt>url</dt><dd>http://localhost:8090</dd>
-<dt>global</dt><dd>false</dd>
-<dt>theme</dt><dd>'start'</dd>
-<dt>title</dt><dd>'YaCy Search Widget'</dd>
-<dt>logo</dt><dd>'/yacy/ui/img/yacy-logo.png'</dd>
-<dt>link</dt><dd>'http://www.yacy.net'</dd>
-<dt>width</dt><dd>640</dd>
-<dt>height</dt><dd>640</dd>
-<dt>position</dt><dd>[150,50]</dd>
-<dt>modal</dt><dd>false</dd>
-<dt>resizable</dt><dd>true</dd>
-<dt>show</dt><dd>''</dd>
-<dt>hide</dt><dd>''</dd> -<dt>load_js</dt><dd>true</dd> -<dt>load_css</dt><dd>true</dd>
-</dl></form>
-<h5>Size and position (width | height | position)</h5>
-Specifies where the dialog should be displayed. Possible values for position: 'center', 'left', 'right', 'top', 'bottom', or an array containing a coordinate pair (in pixel offset from top left of viewport) or the possible string values (e.g. ['right','top'] for top right corner).
-<h5>Animation effects (show | hide)</h5>
-The effect to be used. Possible values: 'blind', 'clip', 'drop', 'explode', 'fold', 'puff', 'slide', 'scale', 'size', 'pulsate'.
-<h5>Interaction (modal | resizable)</h5>
-If modal is set to true, the dialog will have modal behavior; other items on the page will be disabled (i.e. cannot be interacted with). Modal dialogs create an overlay below the dialog but above other page elements.
-<p>
-If resizable is set to true, the dialog will be resizeable.
-</p>
-<h5>Load JavaScript load_js (true | false)</h5> -<p> -This parameter is used for static hosting only. -</p> -<h5>Load Stylesheets load_css (true | false)</h5> -<p> -This parameter is used for static hosting only. -</p> -<h5>Themes</h5>
-<p>You can download standard jquery-ui themes or create your own custom themes on
-<a href="http://jqueryui.com/" target="_blank">
-http://jqueryui.com/</a>
-<br/>Themes are installed in ./yacy/jquery/themes/ (static hosting) or in DATA/HTDOCS/jquery/themes/ on remote YaCy Peer.
-YaCy ships with 'start' and 'smoothness' themes pre-installed.</p>
-
- #%env/templates/footer.template%#
- </body>
-</html>
diff --git a/htroot/ConfigLiveSearch.java b/htroot/ConfigLiveSearch.java deleted file mode 100644 index 3a3c61fac..000000000 --- a/htroot/ConfigLiveSearch.java +++ /dev/null @@ -1,44 +0,0 @@ -// ConfigLiveSearch.java
-// -----------------------
-// part of YaCy
-// (C) by Michael Peter Christen; mc@yacy.net
-// first published on http://yacy.net
-// Frankfurt, Germany, 29.5.2009
-//
-//$LastChangedDate$
-//$LastChangedRevision$
-//$LastChangedBy$
-//
-// LICENSE
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-import net.yacy.cora.protocol.RequestHeader;
-import net.yacy.search.Switchboard;
-import net.yacy.server.serverObjects;
-import net.yacy.server.serverSwitch;
-
-public class ConfigLiveSearch {
-
- public static serverObjects respond(@SuppressWarnings("unused") final RequestHeader header, @SuppressWarnings("unused") final serverObjects post, final serverSwitch env) {
- final serverObjects prop = new serverObjects();
- final Switchboard sb = (Switchboard) env;
-
- prop.putHTML("ip", sb.peers.mySeed().getIP());
- prop.putHTML("port", sb.getConfig("port", "8090"));
- return prop;
- }
-
-}
\ No newline at end of file diff --git a/htroot/ConfigPortal.html b/htroot/ConfigPortal.html index f884418f8..b537f29a4 100644 --- a/htroot/ConfigPortal.html +++ b/htroot/ConfigPortal.html @@ -7,7 +7,7 @@ </head> <body id="ConfigSkins"> #%env/templates/header.template%# - #%env/templates/submenuSearchConfiguration.template%# + #%env/templates/submenuPortalConfiguration.template%# <h2>Integration of a Search Portal</h2> <p> If you like to integrate YaCy as portal for your web pages, you may want to change icons and messages on the search page. diff --git a/htroot/ConfigProfile_p.html b/htroot/ConfigProfile_p.html index 32f725ba5..c08bb85f0 100644 --- a/htroot/ConfigProfile_p.html +++ b/htroot/ConfigProfile_p.html @@ -6,7 +6,7 @@ </head>
<body id="ConfigProfile">
#%env/templates/header.template%#
- #%env/templates/submenuSearchConfiguration.template%#
+ #%env/templates/submenuPortalConfiguration.template%#
<h2>Your Personal Profile</h2>
<p>
You can create a personal profile here, which can be seen by other YaCy-members
diff --git a/htroot/ConfigSearchBox.html b/htroot/ConfigSearchBox.html index 97687b9f5..19dfc9fda 100644 --- a/htroot/ConfigSearchBox.html +++ b/htroot/ConfigSearchBox.html @@ -6,7 +6,7 @@ </head>
<body id="ConfigSkins">
#%env/templates/header.template%#
- #%env/templates/submenuSearchIntegration.template%#
+ #%env/templates/submenuPortalConfiguration.template%#
<h2>Integration of a Search Box</h2>
<p>
We give information how to integrate a search box on any web page that
@@ -32,7 +32,7 @@ <input type="hidden" name="prefermaskfilter" value="" />
<input type="hidden" name="display" value="2" />
<input type="hidden" name="nav" value="all" />
- <div style="font-size:16px; display:block; float:right; padding-top:1px;">
+ <div style="font-size:18px; display:block; float:right; padding-top:1px;">
<input type="submit" name="Enter" value="Search" />
</div>
</div>
@@ -56,7 +56,7 @@ <input type="hidden" name="prefermaskfilter" value="" />
<input type="hidden" name="display" value="2" />
<input type="hidden" name="nav" value="all" />
- <div style="font-size:16px; display:block; float:right; padding-top:1px;">
+ <div style="font-size:18px; display:block; float:right; padding-top:1px;">
<input type="submit" name="Enter" value="Search" />
</div>
</div>
diff --git a/htroot/ConfigSearchPage_p.html b/htroot/ConfigSearchPage_p.html index 2790af26e..c42ab92de 100644 --- a/htroot/ConfigSearchPage_p.html +++ b/htroot/ConfigSearchPage_p.html @@ -17,7 +17,7 @@ <body id="ConfigSearchPage" > #%env/templates/header.template%# -#%env/templates/submenuSearchConfiguration.template%# +#%env/templates/submenuDesign.template%# <script type="text/javascript"> //<![CDATA[ $(function() { @@ -31,7 +31,7 @@ $(function() { $("#sidebarDomains").accordion({}); $("#sidebarProtocols").accordion({}); $("#sidebarFiletypes").accordion({}); - $("#sidebarLanguages").accordion({}); + $("#sidebarLanguages").accordion({}); $("#sidebarAuthors").accordion({}); $("#sidebarNameSpace").accordion({}); $("#sidebarTopics").tagcloud({type:"sphere",power:.25,seed:0,sizemin:10,sizemax:20,height:80,colormin:"682",colormax:"20C"}).find("li").tsort(); diff --git a/htroot/RankingRWI_p.html b/htroot/RankingRWI_p.html index e74a40c86..b2a631b82 100644 --- a/htroot/RankingRWI_p.html +++ b/htroot/RankingRWI_p.html @@ -26,7 +26,7 @@ </head> <body id="RankingRWI_p"> #%env/templates/header.template%# - #%env/templates/submenuSearchConfiguration.template%# + #%env/templates/submenuRanking.template%# <h2>RWI Ranking Configuration</h2> <p>The document ranking influences the order of the search result entities. A ranking is computed using a number of attributes from the documents that match with the search word. diff --git a/htroot/RankingSolr_p.html b/htroot/RankingSolr_p.html index 2a2308d52..9fab3980b 100644 --- a/htroot/RankingSolr_p.html +++ b/htroot/RankingSolr_p.html @@ -6,7 +6,7 @@ </head> <body id="RankingSolr_p"> #%env/templates/header.template%# - #%env/templates/submenuSearchConfiguration.template%# + #%env/templates/submenuRanking.template%# <h2>Solr Ranking Configuration</h2> <p>These are ranking attributes for Solr. This ranking applies for internal and remote (P2P or shard) Solr access.</p> diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index 4255eccb4..ca0712237 100644 --- a/htroot/env/templates/header.template +++ b/htroot/env/templates/header.template @@ -91,9 +91,10 @@ </ul>
<ul class="nav nav-sidebar menugroup">
- <li><h3>Search Design</h3></li>
- <li><a href="ConfigLiveSearch.html" class="MenuItemLink">Search Integration into External Sites</a></li>
- <li><a href="ConfigPortal.html" class="MenuItemLink">Integrated Search Configuration</a></li>
+ <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>
</ul>
</div>
diff --git a/htroot/env/templates/submenuDesign.template b/htroot/env/templates/submenuDesign.template new file mode 100644 index 000000000..ddeb82e76 --- /dev/null +++ b/htroot/env/templates/submenuDesign.template @@ -0,0 +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> + </ul> +</div>
\ No newline at end of file diff --git a/htroot/env/templates/submenuPortalConfiguration.template b/htroot/env/templates/submenuPortalConfiguration.template new file mode 100644 index 000000000..eac339c21 --- /dev/null +++ b/htroot/env/templates/submenuPortalConfiguration.template @@ -0,0 +1,8 @@ +<div class="SubMenu">
+ <h3>Portal Configuration</h3>
+ <ul class="SubMenu">
+ <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>
+ </ul>
+</div>
\ No newline at end of file diff --git a/htroot/env/templates/submenuRanking.template b/htroot/env/templates/submenuRanking.template new file mode 100644 index 000000000..b32f34adb --- /dev/null +++ b/htroot/env/templates/submenuRanking.template @@ -0,0 +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> + </ul> +</div>
\ No newline at end of file diff --git a/htroot/env/templates/submenuSearchConfiguration.template b/htroot/env/templates/submenuSearchConfiguration.template deleted file mode 100644 index 55a002943..000000000 --- a/htroot/env/templates/submenuSearchConfiguration.template +++ /dev/null @@ -1,13 +0,0 @@ -<div class="SubMenu"> - <h3>Integrated Search Configuration</h3> - <ul class="SubMenu"> - <li><a href="ConfigPortal.html" class="MenuItemLink">Generic Search Portal</a></li> - <li><a href="ConfigSearchPage_p.html" class="MenuItemLink lock">Search Page Layout</a></li> - <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="ConfigProfile_p.html" class="MenuItemLink lock">User Profile</a></li> - <li><a href="ConfigHeuristics_p.html" class="MenuItemLink lock">Heuristics</a></li> - <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> - </ul> -</div>
\ No newline at end of file diff --git a/htroot/env/templates/submenuSearchIntegration.template b/htroot/env/templates/submenuSearchIntegration.template deleted file mode 100644 index 95d7bb8a2..000000000 --- a/htroot/env/templates/submenuSearchIntegration.template +++ /dev/null @@ -1,7 +0,0 @@ -<div class="SubMenu">
- <h3>Search Integration into External Sites</h3>
- <ul class="SubMenu">
- <li><a href="ConfigLiveSearch.html" class="MenuItemLink">Live Search Anywhere</a></li>
- <li><a href="ConfigSearchBox.html" class="MenuItemLink">Search Box Anywhere</a></li>
- </ul>
-</div>
\ No newline at end of file |