- added scrollbar to folder widget
- slightly improved Ajax handling for folder and tag widget

git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5214 6c8d7289-2bf4-0310-a012-ef5d649a1542
pull/1/head
apfelmaennchen 17 years ago
parent 9589dfe080
commit 00c843f7d9

@ -58,6 +58,8 @@ div.ys {
/* Sidebar */ /* Sidebar */
div.sidebar { div.sidebar {
margin-right: 1em; margin-right: 1em;
float:left; float:left;
@ -120,8 +122,8 @@ img.help {
h3.linktitle { h3.linktitle {
margin-top:2px; margin-top:2px;
margin-bottom: -0.5em; margin-bottom: -0.5em;
font-size: 1.0em; font-size: 1.0em;
line-height: 1.2em; line-height: 1.2em;
color:#239AFF; color:#239AFF;
} }
.url a { .url a {
@ -158,8 +160,8 @@ div.searchresults.hidden {
margin:2px; margin:2px;
padding-left: 20px; padding-left: 20px;
margin-bottom: -0.5em; margin-bottom: -0.5em;
font-size: 1.0em; font-size: 1.0em;
line-height: 1.2em line-height: 1.2em
} }
.snippet { .snippet {
font-style:italic; font-style:italic;
@ -215,10 +217,13 @@ dl.pairs dt {
margin-bottom : 10px; margin-bottom : 10px;
border: none; border: none;
margin: 0px; margin: 0px;
padding: 5px 10px 5px 10px; padding: 5px 10px 5px 10px; /* top right bottom left */
border: 1px solid black; border: 1px solid black;
text-decoration: none; text-decoration: none;
font-size: 14px; font-size: 14px;
max-height: 220px;
overflow-x: hidden;
overflow-y: auto;
} }
.basic p { .basic p {
@ -244,6 +249,18 @@ dl.pairs dt {
.basic h3.selected { .basic h3.selected {
} }
.basic h3 span.loading {
padding: 0px 15px 0px 10px;
margin-left: 5px;
background: url(../img/loading.gif) no-repeat 0 50%;
}
#yfolder {
font-family: "Trebuchet MS", Trebuchet, Verdana, Helvetica, Arial, sans-serif;
font-size: 12px;
color: black;
}
#tagcloud { #tagcloud {
text-align: justify; text-align: justify;
line-height: 120%; line-height: 120%;

@ -62,7 +62,7 @@
.filetree li { padding: 3px 0 2px 16px; } .filetree li { padding: 3px 0 2px 16px; }
.filetree span.folder, .filetree span.file { padding: 1px 0 1px 16px; display: block; } .filetree span.folder, .filetree span.file { padding: 1px 0px 0px 18px; display: block; }
.filetree span.folder { background: url(../img/treeview/folder.gif) 0 0 no-repeat; } .filetree span.folder { background: url(../img/treeview/folder.gif) 0 0 no-repeat; }
.filetree li.expandable span.folder { background: url(../img/treeview/folder-closed.gif) 0 0 no-repeat; } .filetree li.expandable span.folder { background: url(../img/treeview/folder-closed.gif) 0 0 no-repeat; }
.filetree span.file { background: url(../img/treeview/file.gif) 0 0 no-repeat; } .filetree span.file { background: url(../img/treeview/file.gif) 0 0 no-repeat; }

@ -15,8 +15,8 @@
<link media="screen" type="text/css" href="css/jquery.pagination.css" rel="stylesheet" /> <link media="screen" type="text/css" href="css/jquery.pagination.css" rel="stylesheet" />
<link media="screen" type="text/css" href="css/jquery.flexigrid.css" rel="stylesheet" /> <link media="screen" type="text/css" href="css/jquery.flexigrid.css" rel="stylesheet" />
<link media="screen" type="text/css" href="css/jquery.dialog.css" rel="stylesheet" /> <link media="screen" type="text/css" href="css/jquery.dialog.css" rel="stylesheet" />
<link media="screen" type="text/css" href="css/jquery.treeview.css" rel="stylesheet" /> <link media="screen" type="text/css" href="css/jquery.treeview.css" rel="stylesheet" />
<script type="text/javascript" src="js/sarissa.js"></script> <script type="text/javascript" src="js/sarissa.js"></script>
<script type="text/javascript" src="js/sarissa_ieemu_xpath.js"></script> <script type="text/javascript" src="js/sarissa_ieemu_xpath.js"></script>
@ -34,7 +34,7 @@
<script src="js/jquery-flexigrid.js" type="text/javascript"></script> <script src="js/jquery-flexigrid.js" type="text/javascript"></script>
<script src="js/jquery.treeview.min.js" type="text/javascript"></script> <script src="js/jquery.treeview.min.js" type="text/javascript"></script>
<script src="js/jquery.xslTransform.js" type="text/javascript"></script> <script src="js/jquery.xslTransform.js" type="text/javascript"></script>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[

@ -20,9 +20,16 @@
// alert("Login"); // alert("Login");
} }
}); });
}); });
$("#shutdown").click(function() {
confirm("Shutdown YaCy-Peer?");
$("body").load("../../Steering.html?shutdown=");
});
$("#admin").click(function() { $tabs.tabs('select',1); }); $("#admin").click(function() {
$tabs.tabs('select',1);
});
$("#searchtext").click(function () { $("#searchtext").click(function () {
$("#side2").accordion("activate", 0); $("#side2").accordion("activate", 0);
@ -226,19 +233,7 @@
<td><label for="video">Video</label></td> <td><label for="video">Video</label></td>
<td><label for="appl">Applications</label></td> <td><label for="appl">Applications</label></td>
</tr> </tr>
</table> </table>
<!--
<br />
<label for="contentdom">Content domain:</label>
<br />
<select name="contentdom" class="selector">
<option selected="selected" value="text">text</option>
<option value="image">image</option>
<option value="audio">audio</option>
<option value="video">video</option>
<option value="app">application</option>
</select>
-->
</p> </p>
</form> </form>
</div> </div>
@ -262,7 +257,7 @@
<img alt="Re-Start" title="Re-Start" src="img-1/Backup%20Green%20Button.png" /> <img alt="Re-Start" title="Re-Start" src="img-1/Backup%20Green%20Button.png" />
<a href="../../Steering.html?restart=">Re-Start</a><br /> <a href="../../Steering.html?restart=">Re-Start</a><br />
<img alt="Shutdown" title="Shutdown" src="img-1/Stop%20Red%20Button.png" /> <img alt="Shutdown" title="Shutdown" src="img-1/Stop%20Red%20Button.png" />
<a href="../../Steering.html?shutdown=">Shutdown</a><br /> <a id="shutdown" href="#Shutdown">Shutdown</a><br />
</div> </div>

@ -1,21 +1,43 @@
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
$(document).ready(function() { $(document).ready(function() {
/* Init Sidebar_2 */ /* Init Sidebar_2 */
$("#side2").accordion({ $("#side2").accordion({
autoHeight: false, autoHeight: false,
fillSpace: true, clearStyle: true,
header: "h3" header: "h3"
}); });
$("#side2").accordion("activate", 1); $("#side2").accordion("activate", 1);
/* Load Folders */
loadFolders();
/* experiemntal: only works with first folder level */
$("span.folder").click(function() {
qtag = "/"+$(this).text();
if (tabid == "#Bookmarks") {
$tabs.tabs("load", 3);
} else {
$tabs.tabs('select',3);
}
});
/* Load TagCloud */ /* Load TagCloud */
loadTagCloud();
});
function loadFolders() {
$("#yfolder *").remove();
$("#yfolder").getTransform('xsl/xbel2folder-ul.xsl','/xml/bookmarks/xbel/xbel.xml');
$("#yfolder").treeview({
collapsed: true,
unique: true
});
}
function loadTagCloud() {
$("#tagcloud *").remove();
$("#sidebar-2-1").toggleClass("loading");
$.ajax({ $.ajax({
type: "GET", type: "POST",
url: "/xml/bookmarks/tags/get.xml?top=25&sort=alpha", url: "/xml/bookmarks/tags/get.xml?top=25&sort=alpha",
dataType: "xml", dataType: "xml",
cache: false, cache: false,
success: function(xml) { success: function(xml) {
$(xml).find('tag').each(function(){ $(xml).find('tag').each(function(){
var count = $(this).attr('count'); var count = $(this).attr('count');
@ -36,19 +58,15 @@
} }
}); });
}); //close each( }); //close each(
$("#sidebar-2-1").toggleClass("loading");
} }
}); //close $.ajax( }); //close $.ajax(
/* Load Folders */ }
$("#yfolder").getTransform('xsl/xbel2folder-ul.xsl','/xml/bookmarks/xbel/xbel.xml'); //]]>
$("#yfolder").treeview({
collapsed: true,
unique: true
});
});
//]]>
</script> </script>
<h3>Search Options</h3> <!-- 0 --> <!-- 0 -->
<h3>Search Options</h3>
<div class="yform"> <div class="yform">
<form id="yoptions" class="small" method="get" action="" accept-charset="UTF-8"> <form id="yoptions" class="small" method="get" action="" accept-charset="UTF-8">
<p> <p>
@ -81,13 +99,20 @@
</form> </form>
</div> </div>
<h3>Bookmark TagCloud</h3> <!-- 1 --> <!-- 1 -->
<h3 id="tagcloud-h3">Bookmark TagCloud
<span id="sidebar-2-1"></span>
</h3>
<div class="menu"> <div class="menu">
<p id="tagcloud"></p> <p id="tagcloud"></p>
</div> </div>
<h3>Bookmark Folders</h3> <!-- 2 -->
<!-- 2 -->
<h3>Bookmark Folders
<span id="sidebar-2-2"></span>
</h3>
<div class="menu"> <div class="menu">
<ul class="filetree" id="yfolder"></ul> <ul class="filetree" id="yfolder"></ul>
</div> </div>

@ -2,7 +2,7 @@
//<![CDATA[ //<![CDATA[
$(document).ready(function() { $(document).ready(function() {
$("#side1").accordion("activate", 0); $("#side1").accordion("activate", 0);
$("#side2").accordion("activate", 1); // $("#side2").accordion("activate", 1);
// $('#yoptions').resetForm(); // $('#yoptions').resetForm();
$("#bmadd").dialog({ $("#bmadd").dialog({
autoOpen: false, autoOpen: false,
@ -24,34 +24,15 @@
dataType: "xml", dataType: "xml",
success: function(xml) { success: function(xml) {
$('#bmaddform').resetForm(); $('#bmaddform').resetForm();
$("#bmadd").dialog("close"); $("#bmadd").dialog("close");
$tabs.tabs("load", 3); loadFolders();
$("#side2 *").remove(); loadTagCloud();
$("#side2").load("sidebar/sidebar_2.html"); $tabs.tabs("select", 3);
} }
}); });
} }
} }
}); });
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',
success: function(xml) {
$tabs.tabs("load", 3);
}
}); // close $.ajax(
}); //close each(
}
else if (com=='Add') {
$("#bmadd").dialog('open');
}
}
$("#bm_url").blur(function() { $("#bm_url").blur(function() {
var url = $("input[@name='bm_url']").getValue(); var url = $("input[@name='bm_url']").getValue();
$.ajax({ $.ajax({
@ -70,10 +51,29 @@
$("input[@name='bm_tags']").setValue(tags); $("input[@name='bm_tags']").setValue(tags);
} }
}); });
}); });
counter = 0; 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({ $.ajax({
type: "GET", type: "POST",
async: true,
url: "/xml/bookmarks/xbel/xbel.xml?tag="+qtag, url: "/xml/bookmarks/xbel/xbel.xml?tag="+qtag,
dataType: "xml", dataType: "xml",
success: function(xml) { success: function(xml) {
@ -97,8 +97,7 @@
} }
$('<tr></tr') $('<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>' +HTMLenc(tags)+ ' </td><td>' +date+ '</td>')
.appendTo('#ymarks tbody'); .appendTo('#ymarks tbody');
counter++;
}); //close each( }); //close each(
var height=document.documentElement.clientHeight - 205; var height=document.documentElement.clientHeight - 205;
$('#ymarks').flexigrid({ $('#ymarks').flexigrid({

@ -7,6 +7,8 @@
apfelmaennchen apfelmaennchen
<h3>Change Log</h3> <h3>Change Log</h3>
<ul> <ul>
<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> <li>23-09-2008: Added bookmark folder widget to sidebar (it uses the xbel.xml with XSLT!</li>
<li>21-09-2008: Enabled the new language selection - special thanks to orbiter</li> <li>21-09-2008: Enabled the new language selection - special thanks to orbiter</li>
<li>21-09-2008: Added basic functionallity to add bookmark(s) from search results</li> <li>21-09-2008: Added basic functionallity to add bookmark(s) from search results</li>

Loading…
Cancel
Save