Skip to content

Commit

Permalink
YaCy-UI: enabled edit bookmarks in toolbar
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5215 6c8d7289-2bf4-0310-a012-ef5d649a1542
  • Loading branch information
apfelmaennchen committed Sep 27, 2008
1 parent 00c843f commit cc9f1e9
Show file tree
Hide file tree
Showing 7 changed files with 174 additions and 116 deletions.
18 changes: 15 additions & 3 deletions htroot/yacy/ui/css/base.css
View file
Expand Up @@ -87,11 +87,23 @@ img.help {
}

/* YaCy Flexigrid ---------------------------*/
.flexigrid div.fbutton .add {
background: url(../img/add.png) no-repeat center left;
.flexigrid div.fbutton .help {
background: url(../img-2/question_blue.png) no-repeat center left;
}
.flexigrid div.fbutton .delete {
background: url(../img/close.png) no-repeat center left;
background: url(../img-2/cancel.png) no-repeat center left;
}
.flexigrid div.fbutton .edit {
background: url(../img-2/pencil.png) no-repeat center left;
}
.flexigrid div.fbutton .import {
background: url(../img-2/download.png) no-repeat center left;
}
.flexigrid div.fbutton .rss {
background: url(../img-2/rss_round.png) no-repeat center left;
}
.flexigrid div.fbutton .xml {
background: url(../img-2/code.png) no-repeat center left;
}
.flexigrid div.fbutton .bookmark {
background: url(../img/bookmark.png) no-repeat center left;
Expand Down
2 changes: 1 addition & 1 deletion htroot/yacy/ui/css/jquery.dialog.css
View file
Expand Up @@ -25,7 +25,7 @@
.bmdialog.ui-dialog .ui-dialog-titlebar-close {
width: 16px;
height: 16px;
background: url(../img-2/cancel.png) no-repeat;
background: url(../img/cancel.png) no-repeat;
position:absolute;
top: 8px;
right: 7px;
Expand Down
71 changes: 68 additions & 3 deletions htroot/yacy/ui/index.html
View file
Expand Up @@ -112,13 +112,45 @@
$('#yoptions').trigger('update');
}
}
});

});
/* Initialize Bookmark Dialog */
$("#bmadd").dialog({
autoOpen: false,
height: 400,
width: 250,
resizable: false,
buttons: {
OK: bookmark,
Cancel: function() { $("#bmadd").dialog("close"); }
}
});
/* Load Sidebar */
$("#side1").load("sidebar/sidebar_1.html");
$("#side2").load("sidebar/sidebar_2.html");
});
//]]>
//]]>
function bookmark() {
var url = $("input[@name='bm_url']").getValue();
var title = $("textarea[@name='bm_title']").getValue();
var desc = $("textarea[@name='bm_desc']").getValue();
var tags = $("input[@name='bm_tags']").getValue()
var path = $("input[@name='bm_path']").getValue();
var pub = $("select[@name='bm_public']").getValue();
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) {
$('#bmaddform').resetForm();
$("#bm_url").unbind('blur');
$("#bmadd").dialog("close");
loadFolders();
loadTagCloud();
$tabs.tabs("load", 3);
}
});
}
</script>
</head>

Expand All @@ -138,6 +170,39 @@
<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>
<!-- Bookmarks Edit Dialog -->
<div id="bmadd" class="bmdialog" title="YaCy Bookmarks">
<form id="bmaddform" class="small" method="get" accept-charset="UTF-8" action="">
<label for="url">URL:</label>
<br />
<input type="text" name="bm_url" id="bm_url" class="filter" size="80" />
<br />
<label for="bm_title">Title:</label>
<br />
<textarea name="bm_title" id="bm_title" class="filter" rows="1" cols="20">
</textarea>
<br />
<label for="bm_desc">Description:</label>
<br />
<textarea name="bm_desc" id="bm_desc" class="filter" rows="3" cols="20">
</textarea>
<br />
<label for="bm_path">Folder (/folder/subfolder):</label>
<br />
<input type="text" name="bm_path" id="bm_path" class="filter" size="80" />
<br />
<label for="bm_tags">Tags (comma separated):</label>
<br />
<input type="text" name="bm_tags" id="bm_tags" class="filter" size="80" />
<br />
<label for="bm_public">Public:</label>
<br />
<select name="bm_public" id="bm_public" class="selector">
<option value="public">yes</option>
<option value="private">no</option>
</select>
</form>
</div>
</body>
</html>
Expand Down
5 changes: 3 additions & 2 deletions htroot/yacy/ui/sidebar/sidebar_1.html
View file
Expand Up @@ -23,8 +23,9 @@
});

$("#shutdown").click(function() {
confirm("Shutdown YaCy-Peer?");
$("body").load("../../Steering.html?shutdown=");
if ( confirm("Shutdown YaCy-Peer?") ) {
$("body").load("../../Steering.html?shutdown=");
}
});

$("#admin").click(function() {
Expand Down
184 changes: 79 additions & 105 deletions htroot/yacy/ui/yacyui-bookmarks.html
View file
Expand Up @@ -4,73 +4,7 @@
$("#side1").accordion("activate", 0);
// $("#side2").accordion("activate", 1);
// $('#yoptions').resetForm();
$("#bmadd").dialog({
autoOpen: false,
height: 375,
width: 250,
resizable: false,
buttons: {
"Add": function() {
var url = $("input[@name='bm_url']").getValue();
var title = $("textarea[@name='bm_title']").getValue();
var desc = $("textarea[@name='bm_desc']").getValue();
var tags = $("input[@name='bm_tags']").getValue()
var path = $("input[@name='bm_path']").getValue();
var pub = $("select[@name='bm_public']").getValue();
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) {
$('#bmaddform').resetForm();
$("#bmadd").dialog("close");
loadFolders();
loadTagCloud();
$tabs.tabs("select", 3);
}
});
}
}
});
$("#bm_url").blur(function() {
var url = $("input[@name='bm_url']").getValue();
$.ajax({
type: "GET",
url: "/xml/util/getpageinfo_p.xml?url="+url,
dataType: "xml",
success: function(xml) {
var title = $(xml).find('title').text();
$("textarea[@name='bm_title']").setValue(title);
var desc = $(xml).find('desc').text();
$("textarea[@name='bm_desc']").setValue(desc);
tags = "";
$(xml).find('tag').each(function(){
tags = tags + "," + $(this).attr('name');
});
$("input[@name='bm_tags']").setValue(tags);
}
});
});
function bm_action(com,grid) {
if (com=='Delete') {
confirm('Delete ' + $('.trSelected',grid).length + ' bookmark(s)?')
$('.trSelected',grid).each(function(){
var url = "/xml/bookmarks/posts/delete_p.xml?login=&urlhash="+$(this).find('td :first').text();
$.ajax({
type: 'POST',
url: url,
dataType: 'xml'
}); // close $.ajax(
}); //close each(
loadFolders();
loadTagCloud();
$tabs.tabs("load", 3);
}
else if (com=='Add') {
$("#bmadd").dialog('open');
}
}

$.ajax({
type: "POST",
async: true,
Expand All @@ -91,12 +25,12 @@
tags ="";
}
if (pub == "true") {
icon = '<img src="img-2/world2.png" alt="public bookmark" title="public bookmark"/>'
icon = '<img src="img-2/world2.png" alt="public" title="public bookmark"/>'
} else {
var icon = '<img src="img-2/lock.png" alt="private bookmark" title="private bookmark"/>'
var icon = '<img src="img-2/lock.png" alt="private" title="private bookmark"/>'
}
$('<tr></tr')
.html('<td>' +hash+ '</td><td>' +icon+ '</td><td><h3 class="linktitle">' +HTMLenc(title)+ '</h3><p class="desc">' +HTMLenc(desc)+ '</p><p class="url"><a href="' +link+ '">' +link+ '</a></p><td>' +HTMLenc(tags)+ ' </td><td>' +date+ '</td>')
.html('<td>' +hash+ '</td><td>' +icon+ '</td><td><h3 class="linktitle">' +HTMLenc(title)+ '</h3><p class="desc">' +HTMLenc(desc)+ '</p><p class="url"><a href="' +link+ '">' +link+ '</a></p><td class="tags">' +HTMLenc(tags)+ ' </td><td class="date">' +date+ '</td>')
.appendTo('#ymarks tbody');
}); //close each(
var height=document.documentElement.clientHeight - 205;
Expand All @@ -109,9 +43,20 @@
{display: 'Date', name : 'date', width : 130, sortable : true, align: 'left'}
],
buttons: [
{name: 'Add', bclass: 'add', onpress: bm_action},
{name: 'Crawl', bclass: 'crawl', onpress: bm_action},
{separator: true},
{name: 'Bookmark', bclass: 'bookmark', onpress: bm_action},
{separator: true},
{name: 'Edit', bclass: 'edit', onpress: bm_action},
{name: 'Delete', bclass: 'delete', onpress: bm_action},
{separator: true}
{separator: true},
{name: 'RSS', bclass: 'rss', onpress: bm_action},
{name: 'XBEL', bclass: 'xml', onpress: bm_action},
{name: 'XML', bclass: 'xml', onpress: bm_action},
{separator: true},
{name: 'Import', bclass: 'import', onpress: bm_action},
{separator: true},
{name: 'Help', bclass: 'help', onpress: bm_action},
],
striped: true,
nowrap: false,
Expand All @@ -121,6 +66,67 @@
}
}); //close $.ajax(
});
function bm_action(com,grid) {
if (com=='XBEL') {
window.document.location.href = '/xml/bookmarks/xbel/xbel.xml';
}
else if (com=='RSS') {
window.document.location.href = '/Bookmarks.rss';
}
else if (com=='XML') {
window.document.location.href = '/xml/bookmarks/posts/all.xml';
}
else if (com=='Delete') {
confirm('Delete ' + $('.trSelected',grid).length + ' bookmark(s)?')
$('.trSelected',grid).each(function(){
var url = "/xml/bookmarks/posts/delete_p.xml?login=&urlhash="+$(this).find('td :first').text();
$.ajax({
type: 'POST',
url: url,
dataType: 'xml'
}); // close $.ajax(
}); //close each(
loadFolders();
loadTagCloud();
$tabs.tabs("load", 3);
}
else if (com=='Bookmark') {
$('#bmaddform').resetForm();
$("#bm_url").blur(function() {
var url = $("input[@name='bm_url']").getValue();
$.ajax({
type: "GET",
url: "/xml/util/getpageinfo_p.xml?url="+url,
dataType: "xml",
success: function(xml) {
var title = $(xml).find('title').text();
$("textarea[@name='bm_title']").setValue(title);
var desc = $(xml).find('desc').text();
$("textarea[@name='bm_desc']").setValue(desc);
tags = "";
$(xml).find('tag').each(function(){
tags = tags + "," + $(this).attr('name');
});
$("input[@name='bm_tags']").setValue(tags);
}
});
});
$("#bmadd").dialog('open');
}
else if (com=='Edit') {
if ($('.trSelected',grid).length > 1) {
alert("Edit of more than one selected bookmark is currently not supportet!");
return false;
}
$("input[@name='bm_url']").setValue($('.trSelected',grid).find('.url').text());
$("textarea[@name='bm_title']").setValue($('.trSelected',grid).find('h3.linktitle').text().replace(/^\s+/g,""));
$("textarea[@name='bm_desc']").setValue($('.trSelected',grid).find('p.desc').text().replace(/^\s+/g,""));
$("input[@name='bm_tags']").setValue($('.trSelected',grid).find('td.tags').text());
// $("input[@name='bm_path']").setValue($('.trSelected',grid).find('.path').text());
$("select[@name='bm_public']").setValue($('.trSelected',grid).find('img').attr('alt'));
$("#bmadd").dialog('open');
}
}
//]]>
</script>

Expand All @@ -129,39 +135,7 @@
<tbody>
</tbody>
</table>
<!-- Display Bookmarks Edit Dialog -->
<div id="bmadd" class="bmdialog" title="Add bookmark">
<form id="bmaddform" class="small" method="get" accept-charset="UTF-8" action="">
<label for="url">URL:</label>
<br />
<input type="text" name="bm_url" id="bm_url" class="filter" size="80" />
<br />
<label for="bm_title">Title:</label>
<br />
<textarea name="bm_title" id="bm_title" class="filter" rows="1" cols="20">
</textarea>
<br />
<label for="bm_desc">Description:</label>
<br />
<textarea name="bm_desc" id="bm_desc" class="filter" rows="3" cols="20">
</textarea>
<br />
<label for="bm_path">Folder (/folder/subfolder):</label>
<br />
<input type="text" name="bm_path" id="bm_path" class="filter" size="80" />
<br />
<label for="bm_tags">Tags (comma separated):</label>
<br />
<input type="text" name="bm_tags" id="bm_tags" class="filter" size="80" />
<br />
<label for="bm_public">Public:</label>
<br />
<select name="bm_public" id="bm_public" class="selector">
<option value="public" selected="selected">yes</option>
<option value="private">no</option>
</select>
</form>
</div>




Expand Down
9 changes: 7 additions & 2 deletions htroot/yacy/ui/yacyui-search.html
View file
Expand Up @@ -41,14 +41,19 @@
{display: 'Date', name : 'date', width : 130, sortable : true, align: 'left'}
],
buttons: [
{name: 'Bookmark', bclass: 'bookmark', onpress: yaction},
{name: 'Crawl', bclass: 'crawl', onpress: yaction},
{separator: true},
{name: 'Bookmark', bclass: 'bookmark', onpress: yaction},
{separator: true},
{name: 'Blacklist', bclass: 'blacklist', onpress: yaction},
{separator: true},
{name: 'Refresh', bclass: 'load', onpress: yload},
{name: 'RSS', bclass: 'rss', onpress: yaction},
{separator: true},
{name: page, bclass: 'prev', onpress: yload},
{name: '&nbsp;', bclass: 'next', onpress: yload},
{separator: true}
{separator: true},
{name: 'Help', bclass: 'help', onpress:yaction},
],
striped: true,
nowrap: false,
Expand Down
1 change: 1 addition & 0 deletions htroot/yacy/ui/yacyui-welcome.html
View file
Expand Up @@ -7,6 +7,7 @@ <h3>Overview</h3>
apfelmaennchen
<h3>Change Log</h3>
<ul>
<li>27-09-2008: Enabled edit bookmark and added some more icons to toolbar</li>
<li>27-09-2008: Added scrollbar to folder widget</li>
<li>27-09-2008: Slightly improved Ajax handling for folder and tag widget</li>
<li>23-09-2008: Added bookmark folder widget to sidebar (it uses the xbel.xml with XSLT!</li>
Expand Down

0 comments on commit cc9f1e9

Please sign in to comment.