diff --git a/htroot/env/templates/header.template b/htroot/env/templates/header.template index a9eda61a6..7fbb165a3 100644 --- a/htroot/env/templates/header.template +++ b/htroot/env/templates/header.template @@ -1,16 +1,30 @@ - + + + + + + + + + + + + +

YaCy - Distributed Search Engine

diff --git a/htroot/yacy/ui/js/yacyui-portalsearch.js b/htroot/yacy/ui/js/yacyui-portalsearch.js index c32ba8c86..5eef154f3 100644 --- a/htroot/yacy/ui/js/yacyui-portalsearch.js +++ b/htroot/yacy/ui/js/yacyui-portalsearch.js @@ -20,140 +20,143 @@ $(document).ready(function() { modal : false, resizable: true, show : '', - hide : '' + hide : '', + load_js : true, + load_css : true }, yconf); $('
').appendTo("#yacylivesearch"); - - 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'; - var style4 = yconf.url + '/yacy/ui/css/themes/'+yconf.theme+'/ui.theme.css'; - var style5 = yconf.url + '/yacy/ui/css/themes/'+yconf.theme+'/ui.resizable.css'; - var style6 = yconf.url + '/yacy/ui/css/themes/'+yconf.theme+'/ui.accordion.css'; - - var head = document.getElementsByTagName('head')[0]; - - $(document.createElement('link')) - .attr({type:'text/css', href: style1, rel:'stylesheet', media:'screen'}) - .appendTo(head); - $(document.createElement('link')) - .attr({type:'text/css', href: style2, rel:'stylesheet', media:'screen'}) - .appendTo(head); - $(document.createElement('link')) - .attr({type:'text/css', href: style3, rel:'stylesheet', media:'screen'}) - .appendTo(head); - $(document.createElement('link')) - .attr({type:'text/css', href: style4, rel:'stylesheet', media:'screen'}) - .appendTo(head); - $(document.createElement('link')) - .attr({type:'text/css', href: style5, rel:'stylesheet', media:'screen'}) - .appendTo(head); - $(document.createElement('link')) - .attr({type:'text/css', href: style6, rel:'stylesheet', media:'screen'}) - .appendTo(head); - - 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'; - var script3 = yconf.url + '/yacy/ui/js/jquery.field.min.js'; - var script4 = yconf.url + '/yacy/ui/js/jquery-faviconize-1.0.js'; - var script5 = yconf.url + '/yacy/ui/js/jquery.ui.all.min.js'; - $.getScript(script0, function(){}); - $.getScript(script1, function(){}); - $.getScript(script2, function(){}); - $.getScript(script3, function(){}); - $.getScript(script4, function(){}); + 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'; + var style4 = yconf.url + '/yacy/ui/css/themes/'+yconf.theme+'/ui.theme.css'; + var style5 = yconf.url + '/yacy/ui/css/themes/'+yconf.theme+'/ui.resizable.css'; + var style6 = yconf.url + '/yacy/ui/css/themes/'+yconf.theme+'/ui.accordion.css'; - $.getScript(script5, function(){ - - maximumRecords = parseInt($("#ysearch input[name='maximumRecords']").getValue()); + var head = document.getElementsByTagName('head')[0]; - $("#ypopup").dialog({ - autoOpen: false, - height: yconf.height, - width: yconf.width, - minWidth: yconf.width, - position: yconf.position, - modal: yconf.modal, - resizable: yconf.resizable, - title: yconf.title, - show: yconf.show, - hide: yconf.hide, - close: function(event, ui) { - $("#yquery").setValue(''); - }, - buttons: { - '@': function() { - if ($("#yside").dialog('isOpen')) { - $("#yside").dialog('close'); - } else { - $("#yside").dialog('open'); - } - }, - Next: function() { - startRecord = startRecord + maximumRecords; - $('#ysearch').trigger('submit'); - }, - Prev: function() { - startRecord = startRecord - maximumRecords; - if(startRecord < 0) startRecord = 0; - $('#ysearch').trigger('submit'); - } - }, - drag: function(event, ui) { - var position = $(".ui-dialog").position(); - var left = $(".ui-dialog").width()+5+position.left; - $("#yside").dialog('option', 'position', [left,position.top+32]); - }, - dragStop: function(event, ui) { - var position = $(".ui-dialog").position(); - var left = $(".ui-dialog").width()+5+position.left; - $("#yside").dialog('option', 'position', [left,position.top+32]); - }, - resizeStop: function(event, ui) { - var position = $(".ui-dialog").position(); - var height = $(".ui-dialog").height()-85; - var left = $(".ui-dialog").width()+5+position.left; - $("#yside").dialog('option', 'height', height); - $("#yside").dialog('option', 'position', [left,position.top+32]); - }, - close: function(event, ui) { - $("#yside").dialog('destroy'); - $('#yside').remove(); + $(document.createElement('link')) + .attr({type:'text/css', href: style1, rel:'stylesheet', media:'screen'}) + .appendTo(head); + $(document.createElement('link')) + .attr({type:'text/css', href: style2, rel:'stylesheet', media:'screen'}) + .appendTo(head); + $(document.createElement('link')) + .attr({type:'text/css', href: style3, rel:'stylesheet', media:'screen'}) + .appendTo(head); + $(document.createElement('link')) + .attr({type:'text/css', href: style4, rel:'stylesheet', media:'screen'}) + .appendTo(head); + $(document.createElement('link')) + .attr({type:'text/css', href: style5, rel:'stylesheet', media:'screen'}) + .appendTo(head); + $(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'; + var script3 = yconf.url + '/yacy/ui/js/jquery.field.min.js'; + var script4 = yconf.url + '/yacy/ui/js/jquery-faviconize-1.0.js'; + var script5 = yconf.url + '/yacy/ui/js/jquery.ui.all.min.js'; + + $.getScript(script0, function(){}); + $.getScript(script1, 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({ + autoOpen: false, + height: yconf.height, + width: yconf.width, + minWidth: yconf.width, + position: yconf.position, + modal: yconf.modal, + resizable: yconf.resizable, + title: yconf.title, + show: yconf.show, + hide: yconf.hide, + close: function(event, ui) { + $("#yquery").setValue(''); + }, + buttons: { + '@': function() { + if ($("#yside").dialog('isOpen')) { + $("#yside").dialog('close'); + } else { + $("#yside").dialog('open'); + } + }, + Next: function() { + startRecord = startRecord + maximumRecords; + $('#ysearch').trigger('submit'); }, - open: function(event, ui) { - $('
').insertAfter(".ui-dialog-content"); - $('
').appendTo('#yside'); - $('

Topics

').appendTo('#ynav'); - $('

Domains

').appendTo('#ynav'); - var position = $(".ui-dialog").position(); - $("#yside").dialog({ - title: 'Navigation', - autoOpen: false, - draggable: false, - resizable: false, - width: 220, - height: yconf.height-85, - minHeight: yconf.height-85, - show: 'slide', - hide: 'slide', - position : [position.left+yconf.width+5,position.top+32], - open: function(event, ui) { - $('div.ui-widget-shadow').remove(); - $('ypopup').dialog( 'moveToTop' ); - } - }); - $('.ui-widget-shadow').remove(); - $('div[aria-labelledby="ui-dialog-title-yside"] div.ui-dialog-titlebar').remove(); - $("#ynav").accordion({ - autoHeight: false, - clearStyle: true, - header: "h3" - }); - } - }); + Prev: function() { + startRecord = startRecord - maximumRecords; + if(startRecord < 0) startRecord = 0; + $('#ysearch').trigger('submit'); + } + }, + drag: function(event, ui) { + var position = $(".ui-dialog").position(); + var left = $(".ui-dialog").width()+5+position.left; + $("#yside").dialog('option', 'position', [left,position.top+32]); + }, + dragStop: function(event, ui) { + var position = $(".ui-dialog").position(); + var left = $(".ui-dialog").width()+5+position.left; + $("#yside").dialog('option', 'position', [left,position.top+32]); + }, + resizeStop: function(event, ui) { + var position = $(".ui-dialog").position(); + var height = $(".ui-dialog").height()-85; + var left = $(".ui-dialog").width()+5+position.left; + $("#yside").dialog('option', 'height', height); + $("#yside").dialog('option', 'position', [left,position.top+32]); + }, + close: function(event, ui) { + $("#yside").dialog('destroy'); + $('#yside').remove(); + }, + open: function(event, ui) { + $('
').insertAfter(".ui-dialog-content"); + $('
').appendTo('#yside'); + var position = $(".ui-dialog").position(); + $("#yside").dialog({ + title: 'Navigation', + autoOpen: false, + draggable: false, + resizable: false, + width: 220, + height: yconf.height-85, + minHeight: yconf.height-85, + show: 'slide', + hide: 'slide', + position : [position.left+yconf.width+5,position.top+32], + open: function(event, ui) { + $('div.ui-widget-shadow').remove(); + $('ypopup').dialog( 'moveToTop' ); + } + }); + $('.ui-widget-shadow').remove(); + $('div[aria-labelledby="ui-dialog-title-yside"] div.ui-dialog-titlebar').remove(); + } }); $('#ysearch').keyup(function(e) { @@ -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 = ""; - $(bhtml).appendTo("#ytop"); - - $("#ydom").empty(); - var bhtml = ""; - $(bhtml).appendTo("#ydom"); + $("#ynav").accordion({ + autoHeight: false, + clearStyle: true, + collapsible: true, + header: "h3" + }); } ); } \ No newline at end of file diff --git a/htroot/yacysearch.html b/htroot/yacysearch.html index 01611fb4c..504b3e48c 100644 --- a/htroot/yacysearch.html +++ b/htroot/yacysearch.html @@ -5,35 +5,21 @@ #%env/templates/metas.template%# + - - - - - - - - - #(display)# #%env/templates/simpleheader.template%# + + + + ::
+ + + #(/display)# + +

#[promoteSearchPageGreeting]#

@@ -128,9 +135,7 @@ var progressbar = new Progressbar(#[results]#, document.getElementById("results"
- -
\ No newline at end of file diff --git a/htroot/yacysearchtrailer.html b/htroot/yacysearchtrailer.html index c6f458d1b..a44484545 100644 --- a/htroot/yacysearchtrailer.html +++ b/htroot/yacysearchtrailer.html @@ -1,46 +1,25 @@ +
#(nav-domains)#::

Domains

    #{element}#
  • #[url]#
    • #{/element}#
#(/nav-domains)# - +
+
#(nav-authors)#::

Authors

    #{element}#
  • #[url]#
    • #{/element}#
#(/nav-authors)# - #(nav-topics)#::

Topics

    #{element}#
  • #[url]#
    • #{/element}#
#(/nav-topics)# - -

Timeline

-
-

- -  - -

-

-

-

- + + +