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

fixed visibility of custom icon

Browse Source
pull/1/head
Michael Peter Christen 11 years ago
parent a9b9950d7f
commit fda591695c
17 changed files with 8 additions and 76 deletions
Show Stats Download Patch File Download Diff File

3
htroot/HostBrowser.html
Unescape View File

@ -69,9 +69,6 @@ function updatepage(str) {
#%env/templates/simpleheader.template%# #%env/templates/simpleheader.template%#
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("header_hostbrowser").className += " active"; document.getElementById("header_hostbrowser").className += " active";
//document.getElementById("greeting").innerHTML="#[promoteSearchPageGreeting]#";
document.getElementById("greeting-icon").src="#[promoteSearchPageGreeting.smallImage]#";
document.getElementById("navbar-brand").href="#[promoteSearchPageGreeting.homepage]#";
</script> </script>
#(/topmenu)# #(/topmenu)#
<h2>Host Browser</h2> <h2>Host Browser</h2>

2
htroot/HostBrowser.java
Unescape View File

@ -102,8 +102,6 @@ public class HostBrowser {
env.getConfig("network.unit.description", "") : env.getConfig("network.unit.description", "") :
env.getConfig(SwitchboardConstants.GREETING, ""); env.getConfig(SwitchboardConstants.GREETING, "");
prop.put("topmenu_promoteSearchPageGreeting", promoteSearchPageGreeting); prop.put("topmenu_promoteSearchPageGreeting", promoteSearchPageGreeting);
prop.put("topmenu_promoteSearchPageGreeting.homepage", sb.getConfig(SwitchboardConstants.GREETING_HOMEPAGE, ""));
prop.put("topmenu_promoteSearchPageGreeting.smallImage", sb.getConfig(SwitchboardConstants.GREETING_SMALL_IMAGE, ""));
if (!searchAllowed) { if (!searchAllowed) {
prop.put("result", "You are not allowed to use this page. Please ask an administrator for permission."); prop.put("result", "You are not allowed to use this page. Please ask an administrator for permission.");

3
htroot/ViewFile.html
Unescape View File

@ -68,9 +68,6 @@ function updatepage(str) {
#(/topmenu)# #(/topmenu)#
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("header_urlviewer").className += " active"; document.getElementById("header_urlviewer").className += " active";
//document.getElementById("greeting").innerHTML="#[promoteSearchPageGreeting]#";
//document.getElementById("greeting-icon").src="#[promoteSearchPageGreeting.smallImage]#";
//document.getElementById("navbar-brand").href="#[promoteSearchPageGreeting.homepage]#";
</script> </script>
<div id="api"> <div id="api">

3
htroot/ViewProfile.html
Unescape View File

@ -11,9 +11,6 @@
#%env/templates/simpleheader.template%# #%env/templates/simpleheader.template%#
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("header_profile").className += " active"; document.getElementById("header_profile").className += " active";
//document.getElementById("greeting").innerHTML="#[promoteSearchPageGreeting]#";
document.getElementById("greeting-icon").src="#[promoteSearchPageGreeting.smallImage]#";
document.getElementById("navbar-brand").href="#[promoteSearchPageGreeting.homepage]#";
</script> </script>
:: ::
#%env/templates/header.template%# #%env/templates/header.template%#

3
htroot/ViewProfile.java
Unescape View File

@ -67,9 +67,6 @@ public class ViewProfile {
env.getConfig("network.unit.description", "") : env.getConfig("network.unit.description", "") :
env.getConfig(SwitchboardConstants.GREETING, ""); env.getConfig(SwitchboardConstants.GREETING, "");
prop.put("display_promoteSearchPageGreeting", promoteSearchPageGreeting); prop.put("display_promoteSearchPageGreeting", promoteSearchPageGreeting);
prop.put("display_promoteSearchPageGreeting.homepage", sb.getConfig(SwitchboardConstants.GREETING_HOMEPAGE, ""));
prop.put("display_promoteSearchPageGreeting.smallImage", sb.getConfig(SwitchboardConstants.GREETING_SMALL_IMAGE, ""));
prop.put("edit", authenticated ? 1 : 0); prop.put("edit", authenticated ? 1 : 0);
final String hash = (post == null) ? null : post.get("hash"); final String hash = (post == null) ? null : post.get("hash");

3
htroot/compare_yacy.html
Unescape View File

@ -15,9 +15,6 @@
#(/display)# #(/display)#
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("header_comparesearch").className += " active"; document.getElementById("header_comparesearch").className += " active";
//document.getElementById("greeting").innerHTML="#[promoteSearchPageGreeting]#";
//document.getElementById("greeting-icon").src="#[promoteSearchPageGreeting.smallImage]#";
//document.getElementById("navbar-brand").href="#[promoteSearchPageGreeting.homepage]#";
</script> </script>
<fieldset> <fieldset>
<legend>Websearch Comparison</legend> <legend>Websearch Comparison</legend>

4
htroot/env/templates/embeddedheader.template vendored
Unescape View File

@ -2,8 +2,8 @@
<div class="navbar navbar-default navbar-fixed-top" role="navigation"> <div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container-fluid"> <div class="container-fluid">
<div class="navbar-header"> <div class="navbar-header">
<a class="navbar-brand" id="navbar-brand" href="/" style="position:absolute;top:-6px;display:inline;white-space:nowrap;"> <a class="navbar-brand" id="navbar-brand" href="#[promoteSearchPageGreeting.homepage]#" style="position:absolute;top:-6px;display:inline;white-space:nowrap;">
<img id="greeting-icon" class="yacylogo" src="/env/grafics/yacy.png" style="height:auto; width:auto; max-width:200px; max-height:32px;vertical-align:middle">&nbsp;<span id="greeting"></span> <img id="greeting-icon" class="yacylogo" src="#[promoteSearchPageGreeting.smallImage]#" style="height:auto; width:auto; max-width:200px; max-height:32px;vertical-align:middle">&nbsp;<span id="greeting"></span>
</a> </a>
</div> </div>
</div> </div>

26
htroot/env/templates/portalheader.template vendored
Unescape View File

@ -1,26 +0,0 @@
<!-- YaCy Portalseach by apfelmaennchen <sof@gmx.de> -->
<!-- /env/portalheader.template -->
<link media="screen" type="text/css" href="portalsearch/yacy-portalsearch.css" rel="stylesheet" />
<script src="jquery/js/jquery.query-2.1.7.js" type="text/javascript"></script>
<script src="jquery/js/jquery.form-2.73.js" type="text/javascript"></script>
<script src="jquery/js/jquery.field-0.9.2.min.js" type="text/javascript"></script>
<script type="text/javascript">
//<![CDATA[
$(document).ready(function() {
if ($("#yacylivesearch").length ) {
yconf = {
url : ' ',
global : false,
width : 500,
height : 600,
theme : 'start',
title : 'YaCy Search Widget',
load_js : false,
load_css : false
};
$.getScript(yconf.url+'portalsearch/yacy-portalsearch.js', function(){});
}
});
//]]>
</script>
<!-- END YaCy Portalsearch -->

14
htroot/env/templates/portalinput.template vendored
Unescape View File

@ -1,14 +0,0 @@
<!-- YaCy Portalseach by apfelmaennchen <sof@gmx.de> -->
<!-- /env/portalinput.template -->
<div id="yacylivesearch">
<form id="ysearch" method="get" accept-charset="UTF-8" action="yacysearch.html"><p>
<input name="query" id="yquery" placeholder="Search..." class="form-control" type="text" size="20" maxlength="80" value=""/>
<input type="hidden" name="verify" value="cacheonly" />
<input type="hidden" name="maximumRecords" value="10" />
<input type="hidden" name="resource" value="local" />
<input type="hidden" name="urlmaskfilter" value=".*" />
<input type="hidden" name="prefermaskfilter" value="" />
<input type="hidden" name="nav" value="all" /></p>
</form>
</div>
<!-- END YaCy Portalsearch -->

4
htroot/env/templates/simpleheader.template vendored
Unescape View File

@ -8,8 +8,8 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" id="navbar-brand" href="/" style="position:absolute;top:-6px;display:inline;white-space:nowrap;"> <a class="navbar-brand" id="navbar-brand" href="#[promoteSearchPageGreeting.homepage]#" style="position:absolute;top:-6px;display:inline;white-space:nowrap;">
<img id="greeting-icon" class="yacylogo" src="/env/grafics/yacy.png" style="height:auto; width:auto; max-width:200px; max-height:32px;vertical-align:middle">&nbsp;<span id="greeting"></span> <img id="greeting-icon" class="yacylogo" src="#[promoteSearchPageGreeting.smallImage]#" style="height:auto; width:auto; max-width:200px; max-height:32px;vertical-align:middle">&nbsp;<span id="greeting"></span>
</a> </a>
</div> </div>
<div class="navbar-collapse collapse"> <div class="navbar-collapse collapse">

2
htroot/index.html
Unescape View File

@ -44,8 +44,6 @@
#%env/templates/simpleheader.template%# #%env/templates/simpleheader.template%#
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("header_websearch").className += " active"; document.getElementById("header_websearch").className += " active";
document.getElementById("greeting-icon").src="#[promoteSearchPageGreeting.smallImage]#";
document.getElementById("navbar-brand").href="#[promoteSearchPageGreeting.homepage]#";
</script> </script>
#(/topmenu)# #(/topmenu)#

3
htroot/yacyinteractive.html
Unescape View File

@ -13,9 +13,6 @@
#%env/templates/simpleheader.template%# #%env/templates/simpleheader.template%#
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("header_filesearch").className += " active"; document.getElementById("header_filesearch").className += " active";
//document.getElementById("greeting").innerHTML="#[promoteSearchPageGreeting]#";
document.getElementById("greeting-icon").src="#[promoteSearchPageGreeting.smallImage]#";
document.getElementById("navbar-brand").href="#[promoteSearchPageGreeting.homepage]#";
</script> </script>
#(/topmenu)# #(/topmenu)#

2
htroot/yacyinteractive.java
Unescape View File

@ -47,8 +47,6 @@ public class yacyinteractive {
env.getConfig("network.unit.description", "") : env.getConfig("network.unit.description", "") :
env.getConfig(SwitchboardConstants.GREETING, ""); env.getConfig(SwitchboardConstants.GREETING, "");
prop.put("topmenu_promoteSearchPageGreeting", promoteSearchPageGreeting); prop.put("topmenu_promoteSearchPageGreeting", promoteSearchPageGreeting);
prop.put("topmenu_promoteSearchPageGreeting.homepage", sb.getConfig(SwitchboardConstants.GREETING_HOMEPAGE, ""));
prop.put("topmenu_promoteSearchPageGreeting.smallImage", sb.getConfig(SwitchboardConstants.GREETING_SMALL_IMAGE, ""));
final String query = (post == null) ? "" : post.get("query", ""); final String query = (post == null) ? "" : post.get("query", "");
final String startRecord = (post == null) ? "0" : post.get("startRecord", ""); final String startRecord = (post == null) ? "0" : post.get("startRecord", "");

3
htroot/yacysearch.html
Unescape View File

@ -68,9 +68,6 @@
#%env/templates/simpleheader.template%# #%env/templates/simpleheader.template%#
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("header_websearch").className += " active"; document.getElementById("header_websearch").className += " active";
//document.getElementById("greeting").innerHTML="#[promoteSearchPageGreeting]#";
document.getElementById("greeting-icon").src="#[promoteSearchPageGreeting.smallImage]#";
document.getElementById("navbar-brand").href="#[promoteSearchPageGreeting.homepage]#";
</script> </script>
#(/topmenu)# #(/topmenu)#

2
htroot/yacysearch.java
Unescape View File

@ -143,8 +143,6 @@ public class yacysearch {
final boolean rss = EXT.equals("rss"); final boolean rss = EXT.equals("rss");
final boolean json = EXT.equals("json"); final boolean json = EXT.equals("json");
prop.put("topmenu_promoteSearchPageGreeting", promoteSearchPageGreeting); prop.put("topmenu_promoteSearchPageGreeting", promoteSearchPageGreeting);
prop.put("topmenu_promoteSearchPageGreeting.homepage", sb.getConfig(SwitchboardConstants.GREETING_HOMEPAGE, ""));
prop.put("topmenu_promoteSearchPageGreeting.smallImage", sb.getConfig(SwitchboardConstants.GREETING_SMALL_IMAGE, ""));
// adding some additional properties needed for the rss feed // adding some additional properties needed for the rss feed
String hostName = header.get("Host", Domains.LOCALHOST); String hostName = header.get("Host", Domains.LOCALHOST);

2
htroot/yacysearch_location.java
Unescape View File

@ -139,8 +139,6 @@ public class yacysearch_location {
if (header.get(HeaderFramework.CONNECTION_PROP_EXT, "").equals("html")) { if (header.get(HeaderFramework.CONNECTION_PROP_EXT, "").equals("html")) {
prop.put("topmenu", sb.getConfigBool("publicTopmenu", true) ? 1 : 0); prop.put("topmenu", sb.getConfigBool("publicTopmenu", true) ? 1 : 0);
prop.put("promoteSearchPageGreeting", sb.getConfig(SwitchboardConstants.GREETING, "")); prop.put("promoteSearchPageGreeting", sb.getConfig(SwitchboardConstants.GREETING, ""));
prop.put("promoteSearchPageGreeting.homepage", sb.getConfig(SwitchboardConstants.GREETING_HOMEPAGE, ""));
prop.put("promoteSearchPageGreeting.smallImage", sb.getConfig(SwitchboardConstants.GREETING_SMALL_IMAGE, ""));
if (post == null || post.get("query") == null) { if (post == null || post.get("query") == null) {
prop.put("initsearch", 0); prop.put("initsearch", 0);
} else { } else {

5
source/net/yacy/http/servlets/YaCyDefaultServlet.java
Unescape View File

@ -887,7 +887,9 @@ public class YaCyDefaultServlet extends HttpServlet {
templatePatterns.put("newpeer", myPeer.getAge() >= 1 ? 0 : 1); templatePatterns.put("newpeer", myPeer.getAge() >= 1 ? 0 : 1);
templatePatterns.putHTML("newpeer_peerhash", myPeer.hash); templatePatterns.putHTML("newpeer_peerhash", myPeer.hash);
templatePatterns.put("p2p", sb.getConfigBool(SwitchboardConstants.DHT_ENABLED, true) || !sb.isRobinsonMode() ? 1 : 0); templatePatterns.put("p2p", sb.getConfigBool(SwitchboardConstants.DHT_ENABLED, true) || !sb.isRobinsonMode() ? 1 : 0);
templatePatterns.put(SwitchboardConstants.GREETING_HOMEPAGE, sb.getConfig(SwitchboardConstants.GREETING_HOMEPAGE, ""));
templatePatterns.put(SwitchboardConstants.GREETING_SMALL_IMAGE, sb.getConfig(SwitchboardConstants.GREETING_SMALL_IMAGE, ""));
if (targetFile.exists() && targetFile.isFile() && targetFile.canRead()) { if (targetFile.exists() && targetFile.isFile() && targetFile.canRead()) {
String mimeType = Classification.ext2mime(targetExt, MimeTypes.TEXT_HTML); String mimeType = Classification.ext2mime(targetExt, MimeTypes.TEXT_HTML);
@ -944,6 +946,7 @@ public class YaCyDefaultServlet extends HttpServlet {
p = buffer.indexOf(inctxt, offset); p = buffer.indexOf(inctxt, offset);
} }
out.write(in, offset, in.length - offset); out.write(in, offset, in.length - offset);
out.close();
buffer.close(); buffer.close();
} }

Write Preview
Loading…
Cancel
Save