boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

misc style bugfixes

Browse Source
pull/1/head
Michael Peter Christen 11 years ago
parent e6dec011ea
commit 721178dc84
9 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File

2
htroot/env/templates/header.template vendored
Unescape View File

@ -73,7 +73,7 @@
<ul class="nav nav-sidebar menugroup">
<li><h3>Index&nbsp;Production</h3></li>
<li><a href="CrawlStartSite_p.html" class="MenuItemLink lock">Crawler / Harvester</a></li>
<li><a href="Crawler_p.html" class="MenuItemLink lock">Creation Monitor</a></li>
<li><a href="Crawler_p.html" class="MenuItemLink lock">Crawler Monitor</a></li>
<li><a href="IndexControlURLs_p.html" class="MenuItemLink lock">Index Administration</a></li>
<li><a href="Blacklist_p.html" class="MenuItemLink lock">Filter &amp; Blacklists</a></li>
<li><a href="Vocabulary_p.html" class="MenuItemLink lock">Content Semantic</a></li>

70
htroot/js/yacysearch.js
Unescape View File

@ -16,7 +16,7 @@ function addHover() {
}
function fadeOutBar() {
document.getElementById("progressbar").setAttribute('style',"transition:transform 0s;backgroundColor:transparent;");
document.getElementById("progressbar").setAttribute('style',"transition:transform 0s;-webkit-transition:-webkit-transform 0s;backgroundColor:transparent;");
}
function statistics(offset, itemscount, itemsperpage, totalcount, localResourceSize, remoteResourceSize, remoteIndexCount, remotePeerCount, navurlbase) {
@ -34,45 +34,47 @@ function statistics(offset, itemscount, itemsperpage, totalcount, localResourceS
if (document.getElementById("progressbar").getAttribute('class') != "progress-bar progress-bar-success") {
var percent = 100 * (itemscount - offset + 1) / itemsperpage;
if (percent == 100) {
document.getElementById("progressbar").setAttribute('style',"transition:transform 0s;");
document.getElementById("progressbar").setAttribute('style',"transition:transform 0s;-webkit-transition:-webkit-transform 0s;");
document.getElementById("progressbar").setAttribute('class',"progress-bar progress-bar-success");
window.setTimeout(fadeOutBar, 500);
}
document.getElementById("progressbar").setAttribute('style',"width:" + percent + "%");
}
var resnav = "<ul class=\"pagination\">";
thispage = Math.floor(offset / itemsperpage);
if (thispage == 0) {
resnav += "<li class=\"disabled\"><a href=\"#\">&laquo;</a></li>";
} else {
resnav += "<li><a id=\"prevpage\" href=\"";
resnav += (navurlbase + "&amp;startRecord=" + ((thispage - 1) * itemsperpage));
resnav += "\">&laquo;</a></li>";
}
numberofpages = Math.floor(Math.min(10, 1 + ((totalcount.replace(/\./g,'') - 1) / itemsperpage)));
if (!numberofpages) numberofpages = 10;
for (i = 0; i < numberofpages; i++) {
if (i == thispage) {
resnav += "<li class=\"active\"><a href=\"#\">";
resnav += (i + 1);
resnav += "</a></li>";
} else {
resnav += "<li><a href=\"";
resnav += (navurlbase + "&amp;startRecord=" + (i * itemsperpage));
resnav += "\">" + (i + 1) + "</a></li>";
}
}
if (thispage >= numberofpages) {
resnav += "<li><a href=\"#\">&raquo;</a></li>";
} else {
resnav += "<li><a id=\"nextpage\" href=\"";
resnav += (navurlbase + "&amp;startRecord=" + ((thispage + 1) * itemsperpage));
resnav += "\">&raquo;</a>";
var resnavElement = document.getElementById("resNav");
if (resnavElement != null) {
var resnav = "<ul class=\"pagination\">";
thispage = Math.floor(offset / itemsperpage);
if (thispage == 0) {
resnav += "<li class=\"disabled\"><a href=\"#\">&laquo;</a></li>";
} else {
resnav += "<li><a id=\"prevpage\" href=\"";
resnav += (navurlbase + "&amp;startRecord=" + ((thispage - 1) * itemsperpage));
resnav += "\">&laquo;</a></li>";
}
numberofpages = Math.floor(Math.min(10, 1 + ((totalcount.replace(/\./g,'') - 1) / itemsperpage)));
if (!numberofpages) numberofpages = 10;
for (i = 0; i < numberofpages; i++) {
if (i == thispage) {
resnav += "<li class=\"active\"><a href=\"#\">";
resnav += (i + 1);
resnav += "</a></li>";
} else {
resnav += "<li><a href=\"";
resnav += (navurlbase + "&amp;startRecord=" + (i * itemsperpage));
resnav += "\">" + (i + 1) + "</a></li>";
}
}
if (thispage >= numberofpages) {
resnav += "<li><a href=\"#\">&raquo;</a></li>";
} else {
resnav += "<li><a id=\"nextpage\" href=\"";
resnav += (navurlbase + "&amp;startRecord=" + ((thispage + 1) * itemsperpage));
resnav += "\">&raquo;</a>";
}
resnav += "</ul>";
resnavElement.innerHTML = resnav;
}
resnav += "</ul>";
document.getElementById("resNav").innerHTML = resnav;
}

12
htroot/yacysearch.html
Unescape View File

@ -85,7 +85,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
<div class="row">
<div class="col-sm-8 col-sm-offset-4 col-md-9 col-md-offset-3 main">
<form class="search small" action="" method="get" accept-charset="UTF-8" style="position:absolute;top:-48px;left:200;z-index:1052;max-width:500px;">
<form class="search small" name="searchform" action="" method="get" accept-charset="UTF-8" style="position:absolute;top:-48px;left:200;z-index:1052;max-width:500px;">
<div class="input-group">
<input type="text" class="form-control searchinput typeahead" size="40" maxlength="200" placeholder="#(topmenu)##[promoteSearchPageGreeting]#::#[promoteSearchPageGreeting]##(/topmenu)#" name="query" value="#[former]#" onFocus="this.select()" id="search" onclick="document.getElementById('Enter').innerHTML = 'search'"/>
@ -111,7 +111,7 @@ To see a list of all APIs, please visit the <a href="http://www.yacy-websuche.de
<input type="hidden" name="maximumRecords" value="#[count]#" />
<input type="hidden" name="startRecord" id="startRecord" value="0" />
<input type="hidden" name="verify" value="#[search.verify]#" />
<input type="hidden" name="resource" value="#[resource]#" />
<input type="hidden" name="resource" id="resource" value="#[resource]#" />
<input type="hidden" name="nav" value="#[search.navigation]#" />
<input type="hidden" name="prefermaskfilter" value="#[prefermaskfilter]#" />
<input type="hidden" name="depth" value="#[depth]#" />
@ -200,7 +200,6 @@ document.getElementById("Enter").innerHTML = "search again";
::
::
<span id="resNav" style="display: inline;"></span>
</div>
::
#(/num-results)#
@ -209,13 +208,6 @@ document.getElementById("Enter").innerHTML = "search again";
<div class="col-sm-4 col-md-3 sidebar" id="sidebar">
<!-- navigation begin -->
<!--#include virtual="yacysearchtrailer.html?eventID=#[eventID]#" -->
<script type="text/javascript">
//<![CDATA[
$(function() {
$("#sidebarTopics").tagcloud({type:"sphere",power:.25,seed:0,sizemin:10,sizemax:20,height:80,colormin:"682",colormax:"20C"}).find("li").tsort();
});
//]]>
</script>
<!-- navigation end -->
</div> <!-- close sidebar -->

2
htroot/yacysearch.java
Unescape View File

@ -157,7 +157,7 @@ public class yacysearch {
final boolean clustersearch = sb.isRobinsonMode() && sb.getConfig(SwitchboardConstants.CLUSTER_MODE, "").equals(SwitchboardConstants.CLUSTER_MODE_PUBLIC_CLUSTER);
final boolean indexReceiveGranted = sb.getConfigBool(SwitchboardConstants.INDEX_RECEIVE_ALLOW_SEARCH, true) || clustersearch;
boolean p2pmode = sb.peers != null && sb.peers.sizeConnected() > 0 && indexReceiveGranted;
boolean global = post == null || (post.get("resource-switch", post.get("resource", "local")).equals("global") && p2pmode);
boolean global = post == null || (!post.get("resource-switch", post.get("resource", "global")).equals("local") && p2pmode);
boolean stealthmode = p2pmode && !global;
if ( post == null || indexSegment == null || env == null || !searchAllowed ) {

24
htroot/yacysearchtrailer.html
Unescape View File

@ -1,7 +1,7 @@
<script>
if (document.getElementById("progressbar").getAttribute('class') != "progress-bar progress-bar-success") {
document.getElementById("progressbar").setAttribute('style',"width:100%");
document.getElementById("progressbar").setAttribute('style',"transition:transform 0s;");
document.getElementById("progressbar").setAttribute('style',"transition:transform 0s;-webkit-transition:-webkit-transform 0s;");
document.getElementById("progressbar").setAttribute('class',"progress-bar progress-bar-success");
window.setTimeout(fadeOutBar, 500);
}
@ -9,20 +9,26 @@
#(resource-select)#::
<form action="yacysearch.html" method="get" accept-charset="UTF-8">
<input type="checkbox" name="resource-switch" value="local" data-size="large" style="width:100%" checked="checked" onchange="this.form.submit()">
<script>$("[name='resource-switch']").bootstrapSwitch();
$("[name='resource-switch']").bootstrapSwitch('onText', '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Peer-to-Peer&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');
$("[name='resource-switch']").bootstrapSwitch('offText', '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Stealth&nbsp;Mode&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');</script>
<input checked="checked"
data-label-text="Privacy"
data-on-text="<span style='padding:0 20px 0 20px;'>Peer-to-Peer</span>"
data-off-text="<span style='padding:0 20px 0 20px;'>Stealth&nbsp;Mode</span>"
type="checkbox" name="resource-switch" value="local" data-size="large" style="width:100%"
onchange="document.getElementById('resource').value='local';document.searchform.submit();">
<script>$("[name='resource-switch']").bootstrapSwitch();</script>
</form>
<!--
<span>Your search is done using peers in the YaCy P2P network. You can switch to 'Stealth Mode' which will switch off P2P, giving you full privacy. Expect less results then, because then only your own search index is used.</span>
-->
::
<form action="yacysearch.html" method="get" accept-charset="UTF-8">
<input type="checkbox" name="resource-switch" value="global" data-size="large" onchange="this.form.submit()">
<script>$("[name='resource-switch']").bootstrapSwitch();
$("[name='resource-switch']").bootstrapSwitch('onText', '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Peer-to-Peer&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');
$("[name='resource-switch']").bootstrapSwitch('offText', '&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Stealth&nbsp;Mode&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;');</script>
<input
data-label-text="Privacy"
data-on-text="<span style='padding:0 20px 0 20px';>Peer-to-Peer</span>"
data-off-text="<span style='padding:0 20px 0 20px;'>Stealth&nbsp;Mode</span>"
type="checkbox" name="resource-switch" value="global" data-size="large" style="width:100%"
onchange="document.getElementById('resource').value='global';document.searchform.submit();">
<script>$("[name='resource-switch']").bootstrapSwitch();</script>
</form>
<!--
<span>Your search is done using only your own peer, locally. You can switch to 'Peer-to-Peer Mode' which will cause that your search is done using the other peers in the YaCy network.</span>

16
htroot/yacysearchtrailer.java
Unescape View File

@ -61,6 +61,14 @@ public class yacysearchtrailer {
final Switchboard sb = (Switchboard) env;
final String eventID = post.get("eventID", "");
final boolean authorized = sb.verifyAuthentication(header);
final boolean clustersearch = sb.isRobinsonMode() && sb.getConfig(SwitchboardConstants.CLUSTER_MODE, "").equals(SwitchboardConstants.CLUSTER_MODE_PUBLIC_CLUSTER);
final boolean indexReceiveGranted = sb.getConfigBool(SwitchboardConstants.INDEX_RECEIVE_ALLOW_SEARCH, true) || clustersearch;
boolean p2pmode = sb.peers != null && sb.peers.sizeConnected() > 0 && indexReceiveGranted;
boolean global = post == null || (!post.get("resource-switch", post.get("resource", "global")).equals("local") && p2pmode);
boolean stealthmode = p2pmode && !global;
prop.put("resource-select", !authorized ? 0 : stealthmode ? 2 : global ? 1 : 0);
// find search event
final SearchEvent theSearch = SearchEventCache.getEvent(eventID);
if (theSearch == null) {
@ -69,14 +77,6 @@ public class yacysearchtrailer {
}
final RequestHeader.FileType fileType = header.fileType();
final boolean authorized = sb.verifyAuthentication(header);
final boolean clustersearch = sb.isRobinsonMode() && sb.getConfig(SwitchboardConstants.CLUSTER_MODE, "").equals(SwitchboardConstants.CLUSTER_MODE_PUBLIC_CLUSTER);
final boolean indexReceiveGranted = sb.getConfigBool(SwitchboardConstants.INDEX_RECEIVE_ALLOW_SEARCH, true) || clustersearch;
boolean p2pmode = sb.peers != null && sb.peers.sizeConnected() > 0 && indexReceiveGranted;
boolean global = post == null || (post.get("resource-switch", post.get("resource", "local")).equals("global") && p2pmode);
boolean stealthmode = p2pmode && !global;
prop.put("resource-select", !authorized ? 0 : stealthmode ? 2 : global ? 1 : 0);
// compose search navigation
// namespace navigators

2
locales/de.lng
Unescape View File

@ -3877,7 +3877,7 @@ Integrated Search Configuration==Konfiguration der Integrierten Suche
### INDEX CONTROL ###
Index&nbsp;Production==Indexerzeugung
#Crawler / Harvester==Crawler / Harvester
Creation Monitor==Crawler Überwachung
Crawler Monitor==Crawler Überwachung
Index Administration==Indexverwaltung
Filter &amp; Blacklists==Filter &amp; Sperrlisten
Content Semantic==Inhalt Semantik

2
locales/ru.lng
Unescape View File

@ -4142,7 +4142,7 @@ Integrated Search Configuration==Настройка интегрируемого
### INDEX CONTROL ###
Index&nbsp;Production==Индексирование
Crawler / Harvester==Индексирование / Сканер сети
Creation Monitor==Монитор индексирования
Crawler Monitor==Монитор индексирования
Index Administration==Администрирование индекса
Filter &amp; Blacklists==Фильтр и чёрный список
Content Semantic==Семантический контент

2
locales/uk.lng
Unescape View File

@ -3540,7 +3540,7 @@ Peer Statistics::YaCy Statistics==Статистика::Статистика YaC
Computation==Обчислення
Tutorial==Підручник
Network Access==Мережа
Creation Monitor==Створення
Crawler Monitor==Створення
Crawler / Harvester==Сканер / Збирач
#-----------------------------

Write Preview
Loading…
Cancel
Save