mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
- some improvements for: http://forum.yacy-websuche.de/viewtopic.php?f=9&t=1904#p15668
- portalsearch: introduced yconf.load_js and yconf.load_css - yacysearch.html still having problems with focus after sidebar is loaded - yacysearchtrailer.json seems not to be valid json for ?nav=all git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6046 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
apfelmaennchen
parent
5d7045387b
commit
5a7dec880e
18
htroot/env/templates/header.template
vendored
18
htroot/env/templates/header.template
vendored
|
|
@ -1,16 +1,30 @@
|
|||
<link media="screen" type="text/css" href="/yacy/ui/css/themes/start/ui.base.css" rel="stylesheet" />
|
||||
<link media="screen" type="text/css" href="/yacy/ui/css/themes/start/ui.theme.css" rel="stylesheet" />
|
||||
<link media="screen" type="text/css" href="/yacy/ui/css/yacyui-portalsearch.css" rel="stylesheet" />
|
||||
|
||||
<script src="/yacy/ui/js/jquery-1.3.1.min.js" type="text/javascript"></script>
|
||||
<script src="/yacy/ui/js/jquery.ui.all.min.js" type="text/javascript"></script>
|
||||
<script src="/yacy/ui/js/jquery.dimensions.min.js"></script>
|
||||
<script src="/yacy/ui/js/jquery.query.js"></script>
|
||||
<script src="/yacy/ui/js/jquery.form.js"></script>
|
||||
<script src="/yacy/ui/js/jquery.field.min.js"></script>
|
||||
<script src="/yacy/ui/js/jquery-faviconize-1.0.js"></script>
|
||||
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
yconf = {
|
||||
url : '',
|
||||
global: true,
|
||||
global : true,
|
||||
width : 500,
|
||||
theme : 'start',
|
||||
title : 'YaCy P2P Search'
|
||||
title : 'YaCy P2P Search',
|
||||
load_js : false,
|
||||
load_css : false,
|
||||
};
|
||||
$.getScript(yconf.url+'/yacy/ui/js/yacyui-portalsearch.js', function(){});
|
||||
});
|
||||
</script>
|
||||
|
||||
<div class="head">
|
||||
<h1>YaCy - Distributed Search Engine</h1>
|
||||
<div id="yacylivesearch" style="float: right; margin-right: 90px; margin-top: -27px;">
|
||||
|
|
|
|||
|
|
@ -20,11 +20,14 @@ $(document).ready(function() {
|
|||
modal : false,
|
||||
resizable: true,
|
||||
show : '',
|
||||
hide : ''
|
||||
hide : '',
|
||||
load_js : true,
|
||||
load_css : true
|
||||
}, yconf);
|
||||
|
||||
$('<div id="ypopup" class="classic"></div>').appendTo("#yacylivesearch");
|
||||
|
||||
if(yconf.load_css) {
|
||||
var style1 = yconf.url + '/yacy/ui/css/yacyui-portalsearch.css';
|
||||
var style2 = yconf.url + '/yacy/ui/css/themes/'+yconf.theme+'/ui.core.css';
|
||||
var style3 = yconf.url + '/yacy/ui/css/themes/'+yconf.theme+'/ui.dialog.css';
|
||||
|
|
@ -52,7 +55,9 @@ $(document).ready(function() {
|
|||
$(document.createElement('link'))
|
||||
.attr({type:'text/css', href: style6, rel:'stylesheet', media:'screen'})
|
||||
.appendTo(head);
|
||||
}
|
||||
|
||||
if(yconf.load_js) {
|
||||
var script0 = yconf.url + '/yacy/ui/js/jquery.dimensions.min.js';
|
||||
var script1 = yconf.url + '/yacy/ui/js/jquery.query.js';
|
||||
var script2 = yconf.url + '/yacy/ui/js/jquery.form.js';
|
||||
|
|
@ -65,9 +70,15 @@ $(document).ready(function() {
|
|||
$.getScript(script2, function(){});
|
||||
$.getScript(script3, function(){});
|
||||
$.getScript(script4, function(){});
|
||||
|
||||
$.getScript(script5, function(){
|
||||
yrun();
|
||||
});
|
||||
} else {
|
||||
yrun();
|
||||
}
|
||||
});
|
||||
|
||||
function yrun() {
|
||||
maximumRecords = parseInt($("#ysearch input[name='maximumRecords']").getValue());
|
||||
|
||||
$("#ypopup").dialog({
|
||||
|
|
@ -126,8 +137,6 @@ $(document).ready(function() {
|
|||
open: function(event, ui) {
|
||||
$('<div id="yside" style="padding:0px;"></div>').insertAfter(".ui-dialog-content");
|
||||
$('<div id="ynav" style="margin0px; padding:0px;"></div>').appendTo('#yside');
|
||||
$('<h3 style="padding-left:25px;">Topics</h3><div id="ytop"></div>').appendTo('#ynav');
|
||||
$('<h3 style="padding-left:25px;">Domains</h3><div id="ydom"></div>').appendTo('#ynav');
|
||||
var position = $(".ui-dialog").position();
|
||||
$("#yside").dialog({
|
||||
title: 'Navigation',
|
||||
|
|
@ -147,14 +156,8 @@ $(document).ready(function() {
|
|||
});
|
||||
$('.ui-widget-shadow').remove();
|
||||
$('div[aria-labelledby="ui-dialog-title-yside"] div.ui-dialog-titlebar').remove();
|
||||
$("#ynav").accordion({
|
||||
autoHeight: false,
|
||||
clearStyle: true,
|
||||
header: "h3"
|
||||
});
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
$('#ysearch').keyup(function(e) {
|
||||
if(e.which == 27) { // ESC
|
||||
|
|
@ -175,12 +178,14 @@ $(document).ready(function() {
|
|||
}
|
||||
return false;
|
||||
});
|
||||
|
||||
$('#ysearch').submit(function() {
|
||||
submit = true;
|
||||
yacysearch(yconf.global);
|
||||
return false;
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function yacysearch(global) {
|
||||
var url = yconf.url + '/yacysearch.json?callback=?'
|
||||
$('#ypopup').empty();
|
||||
|
|
@ -235,31 +240,31 @@ function yacysearch(global) {
|
|||
className: "favicon"
|
||||
});
|
||||
|
||||
$("#ytop").empty();
|
||||
var bhtml = "<ul style='padding-left: 0px;'>";
|
||||
$('#ynav').empty();
|
||||
$.each (
|
||||
data.channels[0].topwords,
|
||||
function(i,topword) {
|
||||
if (topword) {
|
||||
bhtml = bhtml + "<li>"+topword.word+"</li>";
|
||||
data.channels[0].navigation,
|
||||
function(i,facet) {
|
||||
if (facet) {
|
||||
var id = "#y"+facet.facetname;
|
||||
$('<h3 style="padding-left:25px;">'+facet.displayname+'</h3>').appendTo('#ynav');
|
||||
$('<div id="y'+facet.facetname+'"></div>').appendTo('#ynav');
|
||||
$("<ul style='padding-left: 0px;'>").appendTo(id);
|
||||
$.each (
|
||||
facet.elements,
|
||||
function(j,element) {
|
||||
$("<li><a href='"+element.url+"'>"+element.name+" ("+element.count+")</a></li>").appendTo(id);
|
||||
}
|
||||
)
|
||||
$("</ul>").appendTo(id);
|
||||
}
|
||||
}
|
||||
);
|
||||
bhtml = bhtml + "</ul>";
|
||||
$(bhtml).appendTo("#ytop");
|
||||
|
||||
$("#ydom").empty();
|
||||
var bhtml = "<ul style='padding-left: 0px;'>";
|
||||
$.each (
|
||||
data.channels[0].domains,
|
||||
function(i,dom) {
|
||||
if (dom) {
|
||||
bhtml = bhtml + "<li>"+dom.domain+"</li>";
|
||||
}
|
||||
}
|
||||
);
|
||||
bhtml = bhtml + "</ul>";
|
||||
$(bhtml).appendTo("#ydom");
|
||||
$("#ynav").accordion({
|
||||
autoHeight: false,
|
||||
clearStyle: true,
|
||||
collapsible: true,
|
||||
header: "h3"
|
||||
});
|
||||
}
|
||||
);
|
||||
}
|
||||
|
|
@ -5,35 +5,21 @@
|
|||
#%env/templates/metas.template%#
|
||||
<link rel="alternate" type="application/rss+xml" title="Search for #[former]#" href="yacysearch.rss?search=#[former]#" />
|
||||
<link rel="search" type="application/opensearchdescription+xml" title="YaCy Search on '#[clientname]#'" href="opensearchdescription.xml" />
|
||||
<link rel="stylesheet" type="text/css" media="screen" href="/env/highslide.css" />
|
||||
<script type="text/javascript" src="/js/ajax.js"></script>
|
||||
<script type="text/javascript" src="/js/xml.js"></script>
|
||||
<script type="text/javascript" src="/js/yacysearch.js"></script>
|
||||
<script type="text/javascript" src="/js/highslide/highslide.js"></script>
|
||||
<link rel="stylesheet" type="text/css" media="screen" href="/env/highslide.css" />
|
||||
<script type="text/javascript">hs.outlineType = 'rounded-white';</script>
|
||||
|
||||
<!-- Styles and Scripts for yacysearchtrailer.html -->
|
||||
<link media="screen" type="text/css" href="/yacy/ui/css/themes/start/ui.base.css" rel="stylesheet" />
|
||||
<link media="screen" type="text/css" href="/yacy/ui/css/themes/start/ui.theme.css" rel="stylesheet" />
|
||||
<script src="/yacy/ui/js/jquery-1.3.1.min.js" type="text/javascript"></script>
|
||||
<script src="/yacy/ui/js/jquery.ui.all.min.js" type="text/javascript"></script>
|
||||
<script>
|
||||
//<![CDATA[
|
||||
$(function() {
|
||||
$("#sidebar").accordion({
|
||||
autoHeight: false,
|
||||
clearStyle: true,
|
||||
header: "h3"
|
||||
});
|
||||
});
|
||||
//]]>
|
||||
</script>
|
||||
|
||||
</head>
|
||||
<body id="yacysearch">
|
||||
|
||||
#(display)#
|
||||
#%env/templates/simpleheader.template%#
|
||||
<script src="/yacy/ui/js/jquery-1.3.1.min.js" type="text/javascript"></script>
|
||||
<script src="/yacy/ui/js/jquery.ui.all.min.js" type="text/javascript"></script>
|
||||
<link media="screen" type="text/css" href="/yacy/ui/css/themes/start/ui.base.css" rel="stylesheet" />
|
||||
<link media="screen" type="text/css" href="/yacy/ui/css/themes/start/ui.theme.css" rel="stylesheet" />
|
||||
::
|
||||
<div id="api">
|
||||
<script type="text/javascript">
|
||||
|
|
@ -50,8 +36,29 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
|
|||
#%env/templates/header.template%#
|
||||
::
|
||||
#%env/templates/embeddedheader.template%#
|
||||
<script src="/yacy/ui/js/jquery-1.3.1.min.js" type="text/javascript"></script>
|
||||
<script src="/yacy/ui/js/jquery.ui.all.min.js" type="text/javascript"></script>
|
||||
<link media="screen" type="text/css" href="/yacy/ui/css/themes/start/ui.base.css" rel="stylesheet" />
|
||||
<link media="screen" type="text/css" href="/yacy/ui/css/themes/start/ui.theme.css" rel="stylesheet" />
|
||||
#(/display)#
|
||||
|
||||
<script>
|
||||
//<![CDATA[
|
||||
$(function() {
|
||||
$.extend($.ui.accordion.defaults, {
|
||||
autoHeight: false,
|
||||
clearStyle: true,
|
||||
collapsible: true,
|
||||
header: "h3"
|
||||
});
|
||||
$("#sidebar1").accordion({});
|
||||
$("#sidebar2").accordion({});
|
||||
$("#sidebar2").accordion('activate', 1);
|
||||
$("#search").focus();
|
||||
});
|
||||
//]]>
|
||||
</script>
|
||||
|
||||
<form class="search small" action="yacysearch.html" method="get" accept-charset="UTF-8">
|
||||
<h2>#[promoteSearchPageGreeting]#</h2>
|
||||
<div class="yacylogo"><a href="#[promoteSearchPageGreeting.homepage]#" class="yacylogo"><img src="#[promoteSearchPageGreeting.smallImage]#" alt="yacysearch" /></a></div>
|
||||
|
|
@ -128,9 +135,7 @@ var progressbar = new Progressbar(#[results]#, document.getElementById("results"
|
|||
<!-- linklist end -->
|
||||
<!-- attach the bottomline -->
|
||||
</div>
|
||||
<div id="sidebar" style="position:fixed; right:8px; margin-top:5px; width: 220px;">
|
||||
<!--#include virtual="yacysearchtrailer.html?eventID=#[eventID]#&display=#[display]#" -->
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,46 +1,25 @@
|
|||
<div id="sidebar1" style="float: right; margin-top:5px; width: 220px;">
|
||||
#(nav-domains)#::
|
||||
<h3 style="padding-left:25px;">Domains</h3>
|
||||
<div><ul style="padding-left: 0px;">#{element}#
|
||||
<li>#[url]#</li>
|
||||
#{/element}#</ul></div>
|
||||
#(/nav-domains)#
|
||||
|
||||
</div>
|
||||
<div id="sidebar2" style="float: right; margin-top:5px; width: 220px;">
|
||||
#(nav-authors)#::
|
||||
<h3 style="padding-left:25px;">Authors</h3>
|
||||
<div><ul style="padding-left: 0px;">#{element}#
|
||||
<li>#[url]#</li>
|
||||
#{/element}#</ul></div>
|
||||
#(/nav-authors)#
|
||||
|
||||
#(nav-topics)#::
|
||||
<h3 style="padding-left:25px;">Topics</h3>
|
||||
<div><ul style="padding-left: 0px;">#{element}#
|
||||
<li>#[url]#</li>
|
||||
#{/element}#</ul></div>
|
||||
#(/nav-topics)#
|
||||
|
||||
<h3 style="padding-left:25px;">Timeline</h3>
|
||||
<div>
|
||||
<p>
|
||||
<input type="text" id="min" size="7" style="text-align:left; border:0; color:#f6931f; font-weight:bold;" />
|
||||
|
||||
<input type="text" id="max" size="7" style="text-align:right; border:0; color:#f6931f; font-weight:bold;" />
|
||||
</p>
|
||||
<p>
|
||||
<div id="slider-range" style="margin-left:-10px;"></div>
|
||||
</p>
|
||||
</div>
|
||||
<script>
|
||||
$("#slider-range").slider({
|
||||
range: true,
|
||||
min: 1999,
|
||||
max: 2009,
|
||||
values: [2001, 2005],
|
||||
slide: function(event, ui) {
|
||||
$("#min").val($("#slider-range").slider("values", 0));
|
||||
$("#max").val($("#slider-range").slider("values", 1));
|
||||
}
|
||||
});
|
||||
$("#min").val($("#slider-range").slider("values", 0));
|
||||
$("#max").val($("#slider-range").slider("values", 1));
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user