Skip to content

Commit

Permalink
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
Browse files Browse the repository at this point in the history
  • Loading branch information
@Orbiter
Orbiter committed Mar 19, 2014
2 parents 453bfd0 + ab0e6ba commit 523dde9
Show file tree
Hide file tree
Showing 14 changed files with 50 additions and 50 deletions.
1 change: 0 additions & 1 deletion htroot/HostBrowser.html
View file
Expand Up @@ -59,7 +59,6 @@
</head>
<body id="IndexControl">
#(topmenu)#
#%env/templates/portalheader.template%#
<div class="SubMenu">
<ul class="SubMenu">
<li style="width:15%;"><a class="MenuItemLink" href="index.html"><img src="env/grafics/navsl.gif" height="10px" style="padding-right:10px" align="baseline"/>back to start page</a></li>
Expand Down
2 changes: 1 addition & 1 deletion htroot/env/base.css
View file
Expand Up @@ -156,7 +156,7 @@ tt, *.tt {
}

.hidden {
display:hidden;
display:none;
}

.listing {
Expand Down
16 changes: 8 additions & 8 deletions htroot/env/bootstrap-base.css
View file
Expand Up @@ -4,7 +4,7 @@

/* Move down content because we have a fixed navbar that is 50px tall */
body {
padding-top: 59px;
padding-top: 57px;
}


Expand All @@ -23,7 +23,7 @@ body {
/* Hide for mobile, show later */
.sidebar {
display: none;
margin-top: -12px;
margin-top: -14px;
}
@media (min-width: 768px) {
.sidebar {
Expand All @@ -46,15 +46,15 @@ body {
margin-left: -20px;
}
.nav-sidebar > li > a {
padding-right: 20px;
padding-left: 20px;
padding-right: 10px;
padding-left: 16px;
padding-top: 0px;
padding-bottom: 0px;
}
.nav-sidebar > li {
padding: 0px;
margin-left: 8px;
margin-right: 8px;
margin-left: 6px;
margin-right: 6px;
}
.nav-sidebar > .active > a,
.nav-sidebar > .active > a:hover,
Expand All @@ -63,8 +63,8 @@ body {
background-color: #428bca;
}
.nav-sidebar h3 {
padding-right: 20px;
padding-left: 20px;
padding-right: 10px;
padding-left: 16px;
padding-top: 4px;
padding-bottom: 1px;
margin: 0px;
Expand Down
4 changes: 4 additions & 0 deletions htroot/env/bootstrap/js/jquery.min.js
View file

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions htroot/env/templates/embeddedfooter.template
View file
@@ -1 +1,6 @@
</div>

<!-- Bootstrap core JavaScript, Placed at the end of the document so the pages load faster -->
<script src="env/bootstrap/js/jquery.min.js"></script>
<script src="/env/bootstrap/js/bootstrap.min.js"></script>
<script src="/env/bootstrap/js/docs.min.js"></script>
1 change: 1 addition & 0 deletions htroot/env/templates/footer.template
View file
Expand Up @@ -3,5 +3,6 @@
</div>

<!-- Bootstrap core JavaScript, Placed at the end of the document so the pages load faster -->
<script src="env/bootstrap/js/jquery.min.js"></script>
<script src="/env/bootstrap/js/bootstrap.min.js"></script>
<script src="/env/bootstrap/js/docs.min.js"></script>
2 changes: 0 additions & 2 deletions htroot/env/templates/metas.template
View file
Expand Up @@ -29,6 +29,4 @@
<!--[if lte IE 7.0]>
<link rel="stylesheet" type="text/css" media="screen" href="/env/ie7.css" />
<![endif]-->
#%env/templates/jqueryheader.template%#
#%env/templates/portalheader.template%#
<!-- (C), Architecture: Michael Peter Christen; Contact: mc <at> yacy.net -->
5 changes: 5 additions & 0 deletions htroot/env/templates/simplefooter.template
View file
@@ -1 +1,6 @@
</div>

<!-- Bootstrap core JavaScript, Placed at the end of the document so the pages load faster -->
<script src="env/bootstrap/js/jquery.min.js"></script>
<script src="/env/bootstrap/js/bootstrap.min.js"></script>
<script src="/env/bootstrap/js/docs.min.js"></script>
2 changes: 0 additions & 2 deletions htroot/index.html
View file
Expand Up @@ -9,8 +9,6 @@
<link rel="stylesheet" type="text/css" media="screen" href="env/highslide.css" />
<script type="text/javascript" src="js/highslide/highslide.js"></script>
<script type="text/javascript">hs.outlineType = 'rounded-white';</script>
<script src="yacy/ui/js/jquery-1.3.2.min.js" type="text/javascript"></script>
<script src="yacy/ui/js/jquery-ui-1.7.2.min.js" type="text/javascript"></script>
<link media="screen" type="text/css" href="yacy/ui/css/autocomplete.css" rel="stylesheet" />
<script type="text/javascript" src="js/html.js"></script>
<script type="text/javascript" src="yacy/ui/js/jquery.autocomplete.yacy.js"></script>
Expand Down
26 changes: 11 additions & 15 deletions htroot/test.html
View file
Expand Up @@ -10,21 +10,20 @@
<title>Dashboard Template for Bootstrap</title>

<!-- Bootstrap core CSS -->
<link href="/env/bootstrap/css/bootstrap.min.css" rel="stylesheet">
<link href="env/bootstrap/css/bootstrap.min.css" rel="stylesheet">

<!-- Custom styles for this template -->
<link href="/env/bootstrap-base.css" rel="stylesheet">
<link href="env/bootstrap-base.css" rel="stylesheet">

<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
<!--[if lt IE 9]>
<script src="/env/bootstrap/js/html5shiv.js"></script>
<script src="/env/bootstrap/js/respond.min.js"></script>
<script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
<![endif]-->
</head>

<body>

<!-- top navigation -->
<div class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container-fluid">
<div class="navbar-header">
Expand All @@ -50,34 +49,28 @@
</div>
</div>

<!-- left navigation -->
<div class="container-fluid">
<div class="row">
<div class="col-sm-3 col-md-2 sidebar">
<h3>Section 1</h3>
<ul class="nav nav-sidebar">
<li class="active"><a href="#">Overview</a></li>
<li><a href="#">Reports</a></li>
<li><a href="#">Analytics</a></li>
<li><a href="#">Export</a></li>
</ul>
<h3>Section 2</h3>
<ul class="nav nav-sidebar">
<li><a href="">Nav item</a></li>
<li><a href="">Nav item again</a></li>
<li><a href="">One more nav</a></li>
<li><a href="">Another nav item</a></li>
<li><a href="">More navigation</a></li>
</ul>
<h3>Section 3</h3>
<ul class="nav nav-sidebar">
<li><a href="">Nav item again</a></li>
<li><a href="">One more nav</a></li>
<li><a href="">Another nav item</a></li>
</ul>
</div>

<!-- content -->
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
<h1 class="page-header">Dashboard</h1>

Expand Down Expand Up @@ -236,8 +229,11 @@ <h2 class="sub-header">Section title</h2>
</div>
</div>

<!-- Bootstrap core JavaScript, Placed at the end of the document so the pages load faster -->
<script src="/env/bootstrap/js/bootstrap.min.js"></script>
<script src="/env/bootstrap/js/docs.min.js"></script>
<!-- Bootstrap core JavaScript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
<script src="env/bootstrap/js/jquery.min.js"></script>
<script src="env/bootstrap/js/bootstrap.min.js"></script>
<script src="env/bootstrap/js/docs.min.js"></script>
</body>
</html>
1 change: 0 additions & 1 deletion htroot/yacyinteractive.html
View file
Expand Up @@ -3,7 +3,6 @@
<head>
<title>YaCy Interactive Search</title>
#%env/templates/metas.template%#
<script src="yacy/ui/js/jquery-1.3.2.min.js" type="text/javascript"></script>
<script type="text/javascript" src="js/yacyinteractive.js"></script>
<script type="text/javascript" src="js/sorttable.js"></script>
<link media="screen" type="text/css" href="yacy/ui/css/autocomplete.css" rel="stylesheet" />
Expand Down
8 changes: 1 addition & 7 deletions htroot/yacysearch.html
View file
Expand Up @@ -11,13 +11,6 @@
<script type="text/javascript" src="js/yacysearch.js"></script>
<script type="text/javascript" src="js/highslide/highslide.js"></script>
<script type="text/javascript">hs.outlineType = 'rounded-white';</script>
<script src="yacy/ui/js/jquery-1.3.2.min.js" type="text/javascript"></script>
<script src="yacy/ui/js/jquery-ui-1.7.2.min.js" type="text/javascript"></script>
<script src="yacy/ui/js/jquery.tagcloud.js" type="text/javascript"></script>
<script src="yacy/ui/js/jquery.tinysort.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" />
<link media="screen" type="text/css" href="yacy/ui/css/autocomplete.css" rel="stylesheet" />

<script type="text/javascript">
//<![CDATA[
Expand Down Expand Up @@ -265,5 +258,6 @@ <h4 class="linktitle">
*/
</script>

#%env/templates/footer.template%#
</body>
</html>
10 changes: 1 addition & 9 deletions htroot/yacysearchtrailer.html
View file
Expand Up @@ -7,17 +7,9 @@

#(nav-topics)#::
<div id="tagcloud" style="text-align:justify">#{element}#
<a rel="#[count]#" href="#[url]#" style="text-decoration: none;">#[name]#</a>
<a rel="#[count]#" href="#[url]#" style="text-decoration: none;font-size:#[size]#px;">#[name]#</a>
#{/element}#</div>
<script type="text/javascript" charset="utf-8">
$.fn.tagcloud.defaults = {
size: {start: 8, end: 16, unit: 'pt'},
color: {start: '#c08080', end: '#2200CC'}
};
$(document).ready(function(){
$("#tagcloud a").tagcloud();
return false;
})
</script>
#(/nav-topics)#

Expand Down
17 changes: 13 additions & 4 deletions htroot/yacysearchtrailer.java
View file
Expand Up @@ -49,7 +49,9 @@

public class yacysearchtrailer {

private static final int MAX_TOPWORDS = 16;
private static final int TOPWORDS_MAXCOUNT = 16;
private static final int TOPWORDS_MINSIZE = 8;
private static final int TOPWORDS_MAXSIZE = 20;
private static final int MAXLIMIT_NAV_LOW = 5;
private static final int MAXLIMIT_NAV_HIGH = 20;

Expand Down Expand Up @@ -239,7 +241,7 @@ public static serverObjects respond(final RequestHeader header, final serverObje
}

// topics navigator
final ScoreMap<String> topicNavigator = sb.index.connectedRWI() ? theSearch.getTopicNavigator(MAX_TOPWORDS) : null;
final ScoreMap<String> topicNavigator = sb.index.connectedRWI() ? theSearch.getTopicNavigator(TOPWORDS_MAXCOUNT) : null;
if (topicNavigator == null || topicNavigator.isEmpty()) {
prop.put("nav-topics", "0");
} else {
Expand All @@ -248,12 +250,16 @@ public static serverObjects respond(final RequestHeader header, final serverObje
int i = 0;
// first sort the list to a form where the greatest element is in the middle
LinkedList<Map.Entry<String, Integer>> cloud = new LinkedList<Map.Entry<String, Integer>>();
while (i < MAX_TOPWORDS && navigatorIterator.hasNext()) {
int mincount = Integer.MAX_VALUE; int maxcount = 0;
while (i < TOPWORDS_MAXCOUNT && navigatorIterator.hasNext()) {
name = navigatorIterator.next();
count = topicNavigator.get(name);
if (count == 0) break;
if (name == null) continue;
Map.Entry<String, Integer> entry = new AbstractMap.SimpleEntry<String, Integer>(name, (count + MAX_TOPWORDS - i) / 2);
int normcount = (count + TOPWORDS_MAXCOUNT - i) / 2;
if (normcount > maxcount) maxcount = normcount;
if (normcount < mincount) mincount = normcount;
Map.Entry<String, Integer> entry = new AbstractMap.SimpleEntry<String, Integer>(name, normcount);
if (cloud.size() % 2 == 0) cloud.addFirst(entry); else cloud.addLast(entry); // alternating add entry to first or last position.
i++;
}
Expand All @@ -266,6 +272,9 @@ public static serverObjects respond(final RequestHeader header, final serverObje
prop.put(fileType, "nav-topics_element_" + i + "_name", name);
prop.put(fileType, "nav-topics_element_" + i + "_url", QueryParams.navurl(fileType.name().toLowerCase(), 0, theSearch.query, name).toString());
prop.put("nav-topics_element_" + i + "_count", count);
int fontsize = TOPWORDS_MINSIZE + (TOPWORDS_MAXSIZE - TOPWORDS_MINSIZE) * (count - mincount) / (maxcount / mincount);
fontsize = Math.max(TOPWORDS_MINSIZE, fontsize - (name.length() - 5));
prop.put("nav-topics_element_" + i + "_size", fontsize); // font size in pixel
prop.put("nav-topics_element_" + i + "_nl", 1);
i++;
}
Expand Down

0 comments on commit 523dde9

Please sign in to comment.