- added basic functionallity to add bookmark(s) from search results
- re-design of sidebar search form
- replaced classic search with compare search 

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5194 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
apfelmaennchen 16 years ago
parent 1198eeecc7
commit 1d9f0234c8

@ -4,57 +4,48 @@ div.main {
float:left;
margin-top:1.5em;
width:75%;
height:100%;
height:100%;
}
/* Searchbox */
.searchbox {
float:left;
width:800px;
}
.searchbox .boxed h3 {
font-family: Helvetica,Arial,sans-serif;
display:block;
padding:5px 15px;
margin-top: 0;
margin-bottom: 0px;
text-decoration: none;
font-weight: bold;
font-size: 14px;
color: black;
border-top: 1px solid #FFFFFF;
border-bottom: 1px solid #999;
background: url(../img/box800.png) no-repeat;
}
table.contentdom {
width:100%;
text-align:center;
margin:8px 0px 6px 0px;
border:1px solid #CCCCCC;
}
div.ys {
clear: inherit;
float:left;
}
#searchbutton {
width: 100px;
margin-top: 1em;
margin-bottom: .5em;
padding: 2px 5px;
border: 1px solid #CCCCCC;
width: 95px;
padding: 12px 0px 12px 0px; /* top right bottom left */
margin: 20px 0px 0px 8px;
/* border: 1px solid #CCCCCC; */
font: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif;
font-size: 12px;
color: #999999;
/* color: #999999; */
}
.filter {
width: 190px;
margin-bottom: .5em;
padding: 2px 5px;
padding: 2px 0px 2px 0px /* top right bottom left */
border: 1px solid #CCCCCC;
font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif;
font-size: 12px;
color: #999999;
/* color: #999999; */
}
.selector {
width: 120px;
margin-bottom: .5em;
padding: 2px 5px;
padding: 2px 0px 2px 0px; /* top right bottom left */
border: 1px solid #CCCCCC;
font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif;
font-size: 12px;
color: #999999;
/* color: #999999; */
}
.small {
font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif;
@ -84,36 +75,13 @@ div.sidebar {
padding: 2px 16px 2px 8px;
vertical-align: middle;
}
img {
vertical-align: top;
}
.sidebar .boxed h3 {
-family: Helvetica,Arial,sans-serif;
display:block;
padding:5px 15px;
margin-top: 0;
margin-bottom: 0px;
text-decoration: none;
weight: bold;
size: 14px;
color: black;
background: url(../img/box250.png) no-repeat;
border-top: 1px solid #FFFFFF;
border-bottom: 1px solid #999;
}
/* Boxed Style */
.boxed{
margin-top: 1em;
margin-bottom: 1em;
}
.boxed .content {
font-family: Helvetica,Arial,sans-serif;
border: 1px solid #000000;
padding: 5px 0 0 10px;
img.help {
vertical-align: middle;
padding-bottom:5px;
padding-left: 6px;
}
/* YaCy Flexigrid ---------------------------*/
@ -168,7 +136,7 @@ h3.linktitle {
margin-bottom:-1em;
}
/* YaCy Search ---------------------------*/
/* YaCy Search Results ---------------------------*/
div.searchresults {
width:100%;
@ -242,7 +210,7 @@ dl.pairs dt {
font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif;
width: 250px;
}
.basic div {
.basic div.yform, .basic div.menu {
background-color: white;
margin-bottom : 10px;
border: none;

@ -49,7 +49,7 @@
});
/* save search options from form to tab attributes*/
var search = $("input[@name='search']").getValue();
var contentdom = $("select[@name='contentdom']").getValue();
var contentdom = $("input[@name='contentdom']").getValue();
var count = $("select[@name='itemsPerPage']").getValue();
var offset = 0;
var resource = $("select[@name='resource']").getValue();
@ -71,6 +71,7 @@
tabid = '#' + ui.panel.id;
if (tabid == "#Bookmarks") {
$("select[@name='resource']").setValue('ymarks');
$("input[@name='contentdom']").setValue('text');
$("input[@name='search']").setValue(qtag);
} else {
/* set query string */
@ -93,7 +94,7 @@
+"&urlmaskfilter="+urlmaskfilter;
$("input[@name='search']").setValue(search);
$("select[@name='itemsPerPage']").setValue(count);
$("select[@name='contentdom']").setValue(contentdom);
$("input[@name='contentdom']").setValue(contentdom);
$("select[@name='constraint']").setValue(constraint);
$("input[@name='prefermaskfilter']").setValue(prefermaskfilter);
$("input[@name='urlmaskfilter']").setValue(urlmaskfilter);
@ -123,7 +124,7 @@
<!-- initial tabs only, dynamic tabs are loaded via jQuery -->
<li><a href="yacyui-welcome.html" title="Welcome"><span>Welcome</span></a></li>
<li><a href="yacyui-admin.html" title="Admin Console"><span>Admin Console</span></a></li>
<li><a href="yacyui-classic.html" title="Classic Search"><span>Classic Search</span></a></li>
<li><a href="yacyui-compare.html" title="Compare Search"><span>Compare Search</span></a></li>
<li><a href="yacyui-bookmarks.html" title="Bookmarks"><span>Bookmarks</span></a></li>
</ul>
</div>

@ -50,14 +50,52 @@
</script>
<h3>YaCy P2P Websearch</h3><!-- 0 -->
<div class="menu">
<div class="yform">
<form id="searchbox" class="small" method="get" accept-charset="UTF-8" action="">
<p>
<label for="search">Search term:</label>
<br />
<input id="searchtext" name="search" class="filter" type="text" size="20" maxlength="80" value=""/>
<input id="searchtext" name="search" class="filter" type="text" size="20" maxlength="80" value=""/>
<img src="img-2/question_blue.png" class="help" alt="help" title="help" />
<br />
<div class="ys">
<label for="resource">Resource/Network:</label>
<br />
<select name="resource" class="selector">
<option value="/yacysearch.rss?resource=global&verify=true" selected="selected">freeworld</option>
<option value="/yacysearch.rss?resource=local&verify=true" >local peer</option>
<option value="ymarks" >bookmarks</option>
<option value="/xml/util/ynetSearch.xml?login=&url=http://sciencenet.fzk.de:8080/yacysearch.rss?resource=global&verify=true" >sciencenet</option>
</select>
<br />
<label for="resource">Language:</label>
<br />
<select disabled class="selector" id="language" name="language">
<option value="any" selected="selected">any language</option>
<option value="ger" >German</option>
<option value="eng" >English</option>
</select>
</div>
<input id="searchbutton" type="submit" name="Enter" value="Search" />
<table class="contentdom">
<tr>
<td width="20%"><input type="radio" id="text" name="contentdom" value="text" checked="checked" /></td>
<td width="20%"><input disabled type="radio" id="images" name="contentdom" value="image" /></td>
<td width="20%"><input disabled type="radio" id="audio" name="contentdom" value="audio" /></td>
<td width="20%"><input disabled type="radio" id="video" name="contentdom" value="video" /></td>
<td width="20%"><input disabled type="radio" id="appl" name="contentdom" value="app" /></td>
</tr>
<tr>
<td><label for="text">Text</label></td>
<td><label for="images">Images</label></td>
<td><label for="audio">Audio</label></td>
<td><label for="video">Video</label></td>
<td><label for="appl">Applications</label></td>
</tr>
</table>
<!--
<br />
<label for="ontentdom">Content domain:</label>
<label for="contentdom">Content domain:</label>
<br />
<select name="contentdom" class="selector">
<option selected="selected" value="text">text</option>
@ -66,17 +104,7 @@
<option value="video">video</option>
<option value="app">application</option>
</select>
<br />
<label for="resource">Resource/Network:</label>
<br />
<select name="resource" class="selector">
<option value="/yacysearch.rss?resource=global&verify=true" selected="selected">freeworld</option>
<option value="/yacysearch.rss?resource=local&verify=true" >local peer</option>
<option value="ymarks" >bookmarks</option>
<option value="/xml/util/ynetSearch.xml?login=&url=http://sciencenet.fzk.de:8080/yacysearch.rss?resource=global&verify=true" >sciencenet</option>
</select>
<br />
<input id="searchbutton" type="submit" name="Enter" value="Search" />
-->
</p>
</form>
</div>

@ -42,7 +42,7 @@
</script>
<h3>Search Options</h3> <!-- 0 -->
<div>
<div class="yform">
<form id="yoptions" class="small" method="get" action="" accept-charset="UTF-8">
<p>
<label for="itemsPerPage">Items per page: </label>
@ -64,20 +64,12 @@
<label for="urlmaskfilter">URL mask:</label>
<br />
<input class="filter" name="urlmaskfilter" value=".*" type="text" size="12" maxlength="80" />
<img src="img-2/question_blue.png" alt="help" title="help" />
<img src="img-2/question_blue.png" class="help" alt="help" title="help" />
<br />
<label for="prefermaskfilter">Prefer mask:</label>
<br />
<input class="filter" name="prefermaskfilter" value="&nbsp;" type="text" size="12" maxlength="80" />
<img src="img-2/question_blue.png" alt="help" title="help" />
<br />
<label for="resource">Language:</label>
<br />
<select class="selector" id="language" name="language">
<option value="any" selected="selected">any language</option>
<option value="ger" >German</option>
<option value="eng" >English</option>
</select>
<img src="img-2/question_blue.png" class="help" alt="help" title="help" />
</p>
</form>
</div>

@ -11,7 +11,7 @@
<iframe
id="yclassic"
name="yclassic"
src="../../yacysearch.html?display=2"
src="../../compare_yacy.html?display=2"
onload="resize_iframe()"
width="100%"
scrolling="auto"

@ -1,6 +1,6 @@
<script type="application/javascript">
//<![CDATA[
$(function() {
$(document).ready(function() {
$("#side3").accordion("activate", 0);
$.ajax({
type: "GET",
@ -59,7 +59,30 @@
});
*/
function test() { alert("Test!"); }
function test(com, grid) {
if (com == 'Bookmark') {
confirm('Add' + $('.trSelected',grid).length + ' bookmark(s)?')
$('.trSelected',grid).each(function(){
var url = $(this).find('.url').text();
var title = $(this).find('.linktitle').text();
var desc = $(this).find('.desc').text();
var tags = $(tabid).attr('search');
var path = "/searchResults";
var pub = "private";
var query = "&url="+url+"&title="+title+"&description="+desc+"&tags="+tags+"&path="+path+"&public="+pub+"&add=create";
$.ajax({
type: "POST",
url: "/xml/bookmarks/posts/add_p.xml?login="+query,
dataType: "xml",
success: function(xml) {
alert("Posted bookmark for: "+url);
}
});
});
} else {
alert("Test!");
}
}
function load(com, grid) {
var $tabs = $('#container ul');

@ -7,6 +7,11 @@
apfelmaennchen
<h3>Change Log</h3>
<ul>
<li>21-09-2008: Added basic functionallity to add bookmark(s) from search results</li>
<li>21-09-2008: Re-design of sidebar search form</li>
<li>21-09-2008: Replaced classic search with compare search</li>
<li>20-09-2008: Search Results are now shown as flexigrid (same as bookmarks)<li>
<li>20-09-2008: Improved add bookmark dialog</li>
<li>14-09-2008: Added yacysearch.htm via iframe as 'Classic Search'</li>
<li>14-09-2008: Major rework and redesign of YaCy-UI</li>
<li>24-08-2008: Updated to jQuery-ui 1.6b</li>
@ -23,8 +28,8 @@ apfelmaennchen
<h3>Bug Tracker</h3>
<ul>
<li>Please report bugs in the official <a href="http://forum.yacy-websuche.de/">YaCy-Forum</a> - thanks!</li>
<li>15-09-2008: there seems to be a bug with the German translation: the link yacyui-bookmarks.html gets translated into yacyui-Lesezeichen.html :-(
<li>12-05-2008: if you click a tag in the tagcloud, the bookmarks table doesn't update properly and JavaScript returns a 'tabs is undefined' error...</li>
<li>15-09-2008: <strike>there seems to be a bug with the German translation: the link yacyui-bookmarks.html gets translated into yacyui-Lesezeichen.html :-(</strike></li>
<li>12-05-2008: <strike>if you click a tag in the tagcloud, the bookmarks table doesn't update properly and JavaScript returns a 'tabs is undefined' error...<strike></li>
<li>10-05-2008: <strike>there is an issue with Firefox 3.0b5 and the jQuery XML parsing of the search result (one symptom is the broken pagination)</strike></li>
<li>19-04-2008: <strike>if you open more than one search tab in Firefox 2.x or Safari, only the first result item is shown. I would be greatful for any hint...</strike></li>
<li>19-04-2008: <strike>resource types 'sciencenet' and 'bookmarks' doen't work yet. For 'sciencenet' we have to solve the Ajax cross domain restriction.</strike></li>

Loading…
Cancel
Save